Jason Wang
2021-Mar-11 03:25 UTC
[PATCH V3 3/6] vDPA/ifcvf: rename original IFCVF dev ids to N3000 ids
On 2021/3/10 5:00 ??, 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 at intel.com> > --- > 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,I am not sure the plan for Intel but I wonder if we can simply use PCI_ANY_ID for device id here. Otherewise you need to maintain a very long list of ids here. Thanks> + N3000_SUBSYS_VENDOR_ID, > + N3000_SUBSYS_DEVICE_ID) }, > { PCI_DEVICE_SUB(C5000X_PL_VENDOR_ID, > C5000X_PL_DEVICE_ID, > C5000X_PL_SUBSYS_VENDOR_ID,
Zhu Lingshan
2021-Mar-11 04:23 UTC
[PATCH V3 3/6] vDPA/ifcvf: rename original IFCVF dev ids to N3000 ids
On 3/11/2021 11:25 AM, Jason Wang wrote:> > On 2021/3/10 5:00 ??, 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 at intel.com> >> --- >> ? 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, > > > I am not sure the plan for Intel but I wonder if we can simply use > PCI_ANY_ID for device id here. Otherewise you need to maintain a very > long list of ids here. > > ThanksHi Jason, Thanks! but maybe if we present a very simple and clear list like what e1000 does can help the users understand what we support easily. Thanks!> > >> + N3000_SUBSYS_VENDOR_ID, >> +???????????? N3000_SUBSYS_DEVICE_ID) }, >> ????? { PCI_DEVICE_SUB(C5000X_PL_VENDOR_ID, >> ?????????????? C5000X_PL_DEVICE_ID, >> ?????????????? C5000X_PL_SUBSYS_VENDOR_ID, >