summaryrefslogtreecommitdiff
path: root/drivers/vdpa
diff options
context:
space:
mode:
authorZhu Lingshan <lingshan.zhu@intel.com>2021-03-17 12:49:33 +0300
committerMichael S. Tsirkin <mst@redhat.com>2021-05-03 11:55:52 +0300
commite8ef6124959a7c4004ef95b1b17cfa9b2ca582bd (patch)
treed035d1891048ad15b1fdd37388bb850a7e360b80 /drivers/vdpa
parent1d895a68085b28d098893570b024229aacc9a057 (diff)
downloadlinux-e8ef6124959a7c4004ef95b1b17cfa9b2ca582bd.tar.xz
vDPA/ifcvf: deduce VIRTIO device ID from pdev ids
This commit deduces the VIRTIO device ID of a probed device from its pdev device ids. Signed-off-by: Zhu Lingshan <lingshan.zhu@intel.com> Link: https://lore.kernel.org/r/20210317094933.16417-8-lingshan.zhu@intel.com Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Acked-by: Jason Wang <jasowang@redhat.com>
Diffstat (limited to 'drivers/vdpa')
-rw-r--r--drivers/vdpa/ifcvf/ifcvf_base.h1
-rw-r--r--drivers/vdpa/ifcvf/ifcvf_main.c14
2 files changed, 14 insertions, 1 deletions
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 8bff4efbe749..a16753f1de5b 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;
}
static u32 ifcvf_vdpa_get_vendor_id(struct vdpa_device *vdpa_dev)