mbox series

[V2,0/4] vDPA/ifcvf: enables Intel C5000X-PL virtio-net

Message ID 20210308083525.382514-1-lingshan.zhu@intel.com
Headers show
Series vDPA/ifcvf: enables Intel C5000X-PL virtio-net | expand

Message

Zhu Lingshan March 8, 2021, 8:35 a.m. UTC 
This series enabled Intel FGPA SmartNIC C5000X-PL virtio-net for vDPA

changes from V1:
remove version number string(Leon)
add new device ids and remove original device ids
in separate patches(Jason)

Zhu Lingshan (4):
  vDPA/ifcvf: get_vendor_id returns a device specific vendor id
  vDPA/ifcvf: enable Intel C5000X-PL virtio-net for vDPA
  vDPA/ifcvf: rename original IFCVF dev ids to N3000 ids
  vDPA/ifcvf: remove the version number string

 drivers/vdpa/ifcvf/ifcvf_base.h | 13 +++++++++----
 drivers/vdpa/ifcvf/ifcvf_main.c | 20 +++++++++++++-------
 2 files changed, 22 insertions(+), 11 deletions(-)

Comments

Jason Wang March 9, 2021, 2:18 a.m. UTC | #1 
On 2021/3/8 4:35 下午, Zhu Lingshan wrote:
> In this commit, ifcvf_get_vendor_id() will return

> a device specific vendor id of the probed pci device

> than a hard code.

>

> Signed-off-by: Zhu Lingshan <lingshan.zhu@intel.com>



Acked-by: Jason Wang <jasowang@redhat.com>



> ---

>   drivers/vdpa/ifcvf/ifcvf_main.c | 5 ++++-

>   1 file changed, 4 insertions(+), 1 deletion(-)

>

> diff --git a/drivers/vdpa/ifcvf/ifcvf_main.c b/drivers/vdpa/ifcvf/ifcvf_main.c

> index fa1af301cf55..e501ee07de17 100644

> --- a/drivers/vdpa/ifcvf/ifcvf_main.c

> +++ b/drivers/vdpa/ifcvf/ifcvf_main.c

> @@ -324,7 +324,10 @@ static u32 ifcvf_vdpa_get_device_id(struct vdpa_device *vdpa_dev)

>   

>   static u32 ifcvf_vdpa_get_vendor_id(struct vdpa_device *vdpa_dev)

>   {

> -	return IFCVF_SUBSYS_VENDOR_ID;

> +	struct ifcvf_adapter *adapter = vdpa_to_adapter(vdpa_dev);

> +	struct pci_dev *pdev = adapter->pdev;

> +

> +	return pdev->subsystem_vendor;

>   }

>   

>   static u32 ifcvf_vdpa_get_vq_align(struct vdpa_device *vdpa_dev)
Jason Wang March 9, 2021, 2:24 a.m. UTC | #2 
On 2021/3/8 4:35 下午, Zhu Lingshan wrote:
> IFCVF driver probes multiple types of devices now,

> to distinguish the original device driven by IFCVF

> from others, it is renamed as "N3000".

>

> Signed-off-by: Zhu Lingshan <lingshan.zhu@intel.com>



Acked-by: Jason Wang <jasowang@redhat.com>


You probably need to rename the driver.

Thanks


> ---

>   drivers/vdpa/ifcvf/ifcvf_base.h | 8 ++++----

>   drivers/vdpa/ifcvf/ifcvf_main.c | 8 ++++----

>   2 files changed, 8 insertions(+), 8 deletions(-)

>

> diff --git a/drivers/vdpa/ifcvf/ifcvf_base.h b/drivers/vdpa/ifcvf/ifcvf_base.h

> index 75d9a8052039..794d1505d857 100644

> --- a/drivers/vdpa/ifcvf/ifcvf_base.h

> +++ b/drivers/vdpa/ifcvf/ifcvf_base.h

> @@ -18,10 +18,10 @@

>   #include <uapi/linux/virtio_config.h>

>   #include <uapi/linux/virtio_pci.h>

>   

> -#define IFCVF_VENDOR_ID		0x1AF4

> -#define IFCVF_DEVICE_ID		0x1041

> -#define IFCVF_SUBSYS_VENDOR_ID	0x8086

> -#define IFCVF_SUBSYS_DEVICE_ID	0x001A

> +#define N3000_VENDOR_ID		0x1AF4

> +#define N3000_DEVICE_ID		0x1041

> +#define N3000_SUBSYS_VENDOR_ID	0x8086

> +#define N3000_SUBSYS_DEVICE_ID	0x001A

>   

>   #define C5000X_PL_VENDOR_ID		0x1AF4

>   #define C5000X_PL_DEVICE_ID		0x1000

> diff --git a/drivers/vdpa/ifcvf/ifcvf_main.c b/drivers/vdpa/ifcvf/ifcvf_main.c

> index 26a2dab7ca66..fd5befc5cbcc 100644

> --- a/drivers/vdpa/ifcvf/ifcvf_main.c

> +++ b/drivers/vdpa/ifcvf/ifcvf_main.c

> @@ -480,10 +480,10 @@ static void ifcvf_remove(struct pci_dev *pdev)

>   }

>   

>   static struct pci_device_id ifcvf_pci_ids[] = {

> -	{ PCI_DEVICE_SUB(IFCVF_VENDOR_ID,

> -		IFCVF_DEVICE_ID,

> -		IFCVF_SUBSYS_VENDOR_ID,

> -		IFCVF_SUBSYS_DEVICE_ID) },

> +	{ PCI_DEVICE_SUB(N3000_VENDOR_ID,

> +			 N3000_DEVICE_ID,

> +			 N3000_SUBSYS_VENDOR_ID,

> +			 N3000_SUBSYS_DEVICE_ID) },

>   	{ PCI_DEVICE_SUB(C5000X_PL_VENDOR_ID,

>   			 C5000X_PL_DEVICE_ID,

>   			 C5000X_PL_SUBSYS_VENDOR_ID,