| Message ID | 20210706023649.23360-2-lingshan.zhu@intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | vDPA/ifcvf: implement management netlink framework | expand |
在 2021/7/6 上午10:36, Zhu Lingshan 写道: > This commit introduces a new function get_dev_type() which returns > the virtio device id of a device, to avoid duplicated code. > > Signed-off-by: Zhu Lingshan <lingshan.zhu@intel.com> Acked-by: Jason Wang <jasowang@redhat.com> > --- > drivers/vdpa/ifcvf/ifcvf_main.c | 34 ++++++++++++++++++++------------- > 1 file changed, 21 insertions(+), 13 deletions(-) > > diff --git a/drivers/vdpa/ifcvf/ifcvf_main.c b/drivers/vdpa/ifcvf/ifcvf_main.c > index bc1d59f316d1..5f70ab1283a0 100644 > --- a/drivers/vdpa/ifcvf/ifcvf_main.c > +++ b/drivers/vdpa/ifcvf/ifcvf_main.c > @@ -442,6 +442,26 @@ static const struct vdpa_config_ops ifc_vdpa_ops = { > .set_config_cb = ifcvf_vdpa_set_config_cb, > }; > > +static u32 get_dev_type(struct pci_dev *pdev) > +{ > + u32 dev_type; > + > + /* This drirver drives both modern virtio devices and transitional > + * devices in modern mode. > + * vDPA requires feature bit VIRTIO_F_ACCESS_PLATFORM, > + * so legacy devices and transitional devices in legacy > + * mode will not work for vDPA, this driver will not > + * drive devices with legacy interface. > + */ > + > + if (pdev->device < 0x1040) > + dev_type = pdev->subsystem_device; > + else > + dev_type = pdev->device - 0x1040; > + > + return dev_type; > +} > + > static int ifcvf_probe(struct pci_dev *pdev, const struct pci_device_id *id) > { > struct device *dev = &pdev->dev; > @@ -486,19 +506,7 @@ static int ifcvf_probe(struct pci_dev *pdev, const struct pci_device_id *id) > pci_set_drvdata(pdev, adapter); > > vf = &adapter->vf; > - > - /* This drirver drives both modern virtio devices and transitional > - * devices in modern mode. > - * vDPA requires feature bit VIRTIO_F_ACCESS_PLATFORM, > - * so legacy devices and transitional devices in legacy > - * mode will not work for vDPA, this driver will not > - * drive devices with legacy interface. > - */ > - if (pdev->device < 0x1040) > - vf->dev_type = pdev->subsystem_device; > - else > - vf->dev_type = pdev->device - 0x1040; > - > + vf->dev_type = get_dev_type(pdev); > vf->base = pcim_iomap_table(pdev); > > adapter->pdev = pdev;
diff --git a/drivers/vdpa/ifcvf/ifcvf_main.c b/drivers/vdpa/ifcvf/ifcvf_main.c index bc1d59f316d1..5f70ab1283a0 100644 --- a/drivers/vdpa/ifcvf/ifcvf_main.c +++ b/drivers/vdpa/ifcvf/ifcvf_main.c @@ -442,6 +442,26 @@ static const struct vdpa_config_ops ifc_vdpa_ops = { .set_config_cb = ifcvf_vdpa_set_config_cb, }; +static u32 get_dev_type(struct pci_dev *pdev) +{ + u32 dev_type; + + /* This drirver drives both modern virtio devices and transitional + * devices in modern mode. + * vDPA requires feature bit VIRTIO_F_ACCESS_PLATFORM, + * so legacy devices and transitional devices in legacy + * mode will not work for vDPA, this driver will not + * drive devices with legacy interface. + */ + + if (pdev->device < 0x1040) + dev_type = pdev->subsystem_device; + else + dev_type = pdev->device - 0x1040; + + return dev_type; +} + static int ifcvf_probe(struct pci_dev *pdev, const struct pci_device_id *id) { struct device *dev = &pdev->dev; @@ -486,19 +506,7 @@ static int ifcvf_probe(struct pci_dev *pdev, const struct pci_device_id *id) pci_set_drvdata(pdev, adapter); vf = &adapter->vf; - - /* This drirver drives both modern virtio devices and transitional - * devices in modern mode. - * vDPA requires feature bit VIRTIO_F_ACCESS_PLATFORM, - * so legacy devices and transitional devices in legacy - * mode will not work for vDPA, this driver will not - * drive devices with legacy interface. - */ - if (pdev->device < 0x1040) - vf->dev_type = pdev->subsystem_device; - else - vf->dev_type = pdev->device - 0x1040; - + vf->dev_type = get_dev_type(pdev); vf->base = pcim_iomap_table(pdev); adapter->pdev = pdev;
This commit introduces a new function get_dev_type() which returns the virtio device id of a device, to avoid duplicated code. Signed-off-by: Zhu Lingshan <lingshan.zhu@intel.com> --- drivers/vdpa/ifcvf/ifcvf_main.c | 34 ++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-)