From: Zhu Lingshan <lingshan.zhu@intel.com>
To: jasowang@redhat.com, mst@redhat.com, lulu@redhat.com, leonro@nvidia.com
Cc: virtualization@lists.linux-foundation.org,
netdev@vger.kernel.org, kvm@vger.kernel.org,
linux-kernel@vger.kernel.org,
Zhu Lingshan <lingshan.zhu@intel.com>
Subject: [PATCH V4 7/7] vDPA/ifcvf: deduce VIRTIO device ID from pdev ids
Date: Mon, 15 Mar 2021 15:45:01 +0800 [thread overview]
Message-ID: <20210315074501.15868-8-lingshan.zhu@intel.com> (raw)
In-Reply-To: <20210315074501.15868-1-lingshan.zhu@intel.com>
This commit checks the device ids from pdev, then deduce
VIRTIO device ID from the probed device.
Here we checks all four device ids than only subsystem_device_id,
help detecting a certain device for furture enabling.
Signed-off-by: Zhu Lingshan <lingshan.zhu@intel.com>
---
drivers/vdpa/ifcvf/ifcvf_base.c | 42 +++++++++++++++++++++++++++++++++
drivers/vdpa/ifcvf/ifcvf_base.h | 1 +
drivers/vdpa/ifcvf/ifcvf_main.c | 8 ++++++-
3 files changed, 50 insertions(+), 1 deletion(-)
diff --git a/drivers/vdpa/ifcvf/ifcvf_base.c b/drivers/vdpa/ifcvf/ifcvf_base.c
index 4f257c4b2f76..1a6ad7a11f16 100644
--- a/drivers/vdpa/ifcvf/ifcvf_base.c
+++ b/drivers/vdpa/ifcvf/ifcvf_base.c
@@ -408,3 +408,45 @@ void ifcvf_notify_queue(struct ifcvf_hw *hw, u16 qid)
{
ifc_iowrite16(qid, hw->vring[qid].notify_addr);
}
+
+static int ifcvf_probed_N3000(struct pci_dev *pdev)
+{
+ int ret = false;
+
+ if (pdev->device == N3000_DEVICE_ID &&
+ pdev->vendor == N3000_VENDOR_ID &&
+ pdev->subsystem_device == N3000_SUBSYS_DEVICE_ID &&
+ pdev->subsystem_vendor == N3000_SUBSYS_VENDOR_ID)
+ ret = true;
+
+ return ret;
+}
+
+static int ifcvf_probed_C5000X_PL(struct pci_dev *pdev)
+{
+ int ret = false;
+
+ if (pdev->device == C5000X_PL_DEVICE_ID &&
+ pdev->vendor == C5000X_PL_VENDOR_ID &&
+ pdev->subsystem_device == C5000X_PL_SUBSYS_DEVICE_ID &&
+ pdev->subsystem_vendor == C5000X_PL_SUBSYS_VENDOR_ID)
+ ret = true;
+
+ return ret;
+}
+
+int ifcvf_probed_virtio_net(struct ifcvf_hw *hw)
+{
+ struct ifcvf_adapter *adapter;
+ struct pci_dev *pdev;
+ int ret = false;
+
+ adapter = vf_to_adapter(hw);
+ pdev = adapter->pdev;
+
+ if (ifcvf_probed_N3000(pdev) ||
+ ifcvf_probed_C5000X_PL(pdev))
+ ret = true;
+
+ return ret;
+}
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..b0787f79dac3 100644
--- a/drivers/vdpa/ifcvf/ifcvf_main.c
+++ b/drivers/vdpa/ifcvf/ifcvf_main.c
@@ -323,7 +323,13 @@ 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_hw *vf = vdpa_to_vf(vdpa_dev);
+ u32 ret = -EOPNOTSUPP;
+
+ if (ifcvf_probed_virtio_net(vf))
+ ret = VIRTIO_ID_NET;
+
+ return ret;
}
static u32 ifcvf_vdpa_get_vendor_id(struct vdpa_device *vdpa_dev)
--
2.27.0
next prev parent reply other threads:[~2021-03-15 7:51 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-15 7:44 [PATCH V4 0/7] vDPA/ifcvf: enables Intel C5000X-PL virtio-net Zhu Lingshan
2021-03-15 7:44 ` [PATCH V4 1/7] vDPA/ifcvf: get_vendor_id returns a device specific vendor id Zhu Lingshan
2021-03-16 6:09 ` Jason Wang
2021-03-15 7:44 ` [PATCH V4 2/7] vDPA/ifcvf: enable Intel C5000X-PL virtio-net for vDPA Zhu Lingshan
2021-03-16 6:09 ` Jason Wang
2021-03-15 7:44 ` [PATCH V4 3/7] vDPA/ifcvf: rename original IFCVF dev ids to N3000 ids Zhu Lingshan
2021-03-16 6:10 ` Jason Wang
2021-03-15 7:44 ` [PATCH V4 4/7] vDPA/ifcvf: remove the version number string Zhu Lingshan
2021-03-16 6:11 ` Jason Wang
2021-03-15 7:44 ` [PATCH V4 5/7] vDPA/ifcvf: fetch device feature bits when probe Zhu Lingshan
2021-03-17 3:57 ` Jason Wang
2021-03-15 7:45 ` [PATCH V4 6/7] vDPA/ifcvf: verify mandatory feature bits for vDPA Zhu Lingshan
2021-03-17 3:58 ` Jason Wang
2021-03-15 7:45 ` Zhu Lingshan [this message]
2021-03-17 4:07 ` [PATCH V4 7/7] vDPA/ifcvf: deduce VIRTIO device ID from pdev ids Jason Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210315074501.15868-8-lingshan.zhu@intel.com \
--to=lingshan.zhu@intel.com \
--cc=jasowang@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=leonro@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lulu@redhat.com \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=virtualization@lists.linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).