Jason Wang
2021-Mar-18 02:44 UTC
[PATCH V5 7/7] vDPA/ifcvf: deduce VIRTIO device ID from pdev ids
? 2021/3/17 ??5:49, Zhu Lingshan ??:> This commit deduces the VIRTIO device ID of a probed > device from its pdev device ids. > > Signed-off-by: Zhu Lingshan <lingshan.zhu at intel.com> > --- > drivers/vdpa/ifcvf/ifcvf_base.h | 1 + > drivers/vdpa/ifcvf/ifcvf_main.c | 14 +++++++++++++- > 2 files changed, 14 insertions(+), 1 deletion(-) > > diff --git a/drivers/vdpa/ifcvf/ifcvf_base.h b/drivers/vdpa/ifcvf/ifcvf_base.h > index f77239fc1644..b2eeb16b9c2c 100644 > --- a/drivers/vdpa/ifcvf/ifcvf_base.h > +++ b/drivers/vdpa/ifcvf/ifcvf_base.h > @@ -127,4 +127,5 @@ int ifcvf_verify_min_features(struct ifcvf_hw *hw, u64 features); > u16 ifcvf_get_vq_state(struct ifcvf_hw *hw, u16 qid); > int ifcvf_set_vq_state(struct ifcvf_hw *hw, u16 qid, u16 num); > struct ifcvf_adapter *vf_to_adapter(struct ifcvf_hw *hw); > +int ifcvf_probed_virtio_net(struct ifcvf_hw *hw); > #endif /* _IFCVF_H_ */ > diff --git a/drivers/vdpa/ifcvf/ifcvf_main.c b/drivers/vdpa/ifcvf/ifcvf_main.c > index ea93ea7fd5df..9fade400b5a4 100644 > --- a/drivers/vdpa/ifcvf/ifcvf_main.c > +++ b/drivers/vdpa/ifcvf/ifcvf_main.c > @@ -323,7 +323,19 @@ static u32 ifcvf_vdpa_get_generation(struct vdpa_device *vdpa_dev) > > static u32 ifcvf_vdpa_get_device_id(struct vdpa_device *vdpa_dev) > { > - return VIRTIO_ID_NET; > + struct ifcvf_adapter *adapter = vdpa_to_adapter(vdpa_dev); > + struct pci_dev *pdev = adapter->pdev; > + u32 ret = -ENODEV; > + > + if (pdev->device < 0x1000 || pdev->device > 0x107f) > + return ret; > + > + if (pdev->device < 0x1040) > + ret = pdev->subsystem_device; > + else > + ret = pdev->device - 0x1040; > + > + return ret; > }It would be better to keep the comment. But anyway Acked-by: Jason Wang <jasowang at redhat.com>> > static u32 ifcvf_vdpa_get_vendor_id(struct vdpa_device *vdpa_dev)