From: Satish Kharat via B4 Relay <devnull+satishkh.cisco.com@kernel.org>
To: netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Satish Kharat <satishkh@cisco.com>
Subject: [PATCH net-next 3/6] enic: detect SR-IOV VF type from PCI capability
Date: Wed, 25 Mar 2026 00:21:41 -0700 [thread overview]
Message-ID: <20260325-enic-sriov-v2-prep-v1-3-48f04ce110cc@cisco.com> (raw)
In-Reply-To: <20260325-enic-sriov-v2-prep-v1-0-48f04ce110cc@cisco.com>
From: Satish Kharat <satishkh@cisco.com>
Read the VF device ID from the SR-IOV PCI capability at probe time to
determine whether the PF is configured for V1, USNIC, or V2 virtual
functions. Store the result in enic->vf_type for use by subsequent
SR-IOV operations.
The VF type is a firmware-configured property (set via UCSM, CIMC,
Intersight etc) that is immutable from the driver's perspective. Only
PFs are probed for this capability; VFs and dynamic vnics skip
detection.
Signed-off-by: Satish Kharat <satishkh@cisco.com>
---
drivers/net/ethernet/cisco/enic/enic.h | 8 +++++++
drivers/net/ethernet/cisco/enic/enic_main.c | 37 +++++++++++++++++++++++++++++
2 files changed, 45 insertions(+)
diff --git a/drivers/net/ethernet/cisco/enic/enic.h b/drivers/net/ethernet/cisco/enic/enic.h
index 366c65d072fc..0fd9cd917132 100644
--- a/drivers/net/ethernet/cisco/enic/enic.h
+++ b/drivers/net/ethernet/cisco/enic/enic.h
@@ -225,6 +225,13 @@ struct enic_rq {
struct page_pool *pool;
} ____cacheline_aligned;
+enum enic_vf_type {
+ ENIC_VF_TYPE_NONE,
+ ENIC_VF_TYPE_V1,
+ ENIC_VF_TYPE_USNIC,
+ ENIC_VF_TYPE_V2,
+};
+
/* Per-instance private data structure */
struct enic {
struct net_device *netdev;
@@ -252,6 +259,7 @@ struct enic {
#ifdef CONFIG_PCI_IOV
u16 num_vfs;
#endif
+ enum enic_vf_type vf_type;
spinlock_t enic_api_lock;
bool enic_api_busy;
struct enic_port_profile *pp;
diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c
index e16dfbcd2c22..acd05350ec1a 100644
--- a/drivers/net/ethernet/cisco/enic/enic_main.c
+++ b/drivers/net/ethernet/cisco/enic/enic_main.c
@@ -67,6 +67,7 @@
#define PCI_DEVICE_ID_CISCO_VIC_ENET_DYN 0x0044 /* enet dynamic vnic */
#define PCI_DEVICE_ID_CISCO_VIC_ENET_VF 0x0071 /* enet SRIOV VF */
#define PCI_DEVICE_ID_CISCO_VIC_ENET_VF_V2 0x02b7 /* enet SRIOV V2 VF */
+#define PCI_DEVICE_ID_CISCO_VIC_ENET_VF_USNIC 0x00cf /* enet USNIC VF */
/* Supported devices */
static const struct pci_device_id enic_id_table[] = {
@@ -2621,6 +2622,41 @@ static void enic_iounmap(struct enic *enic)
iounmap(enic->bar[i].vaddr);
}
+#ifdef CONFIG_PCI_IOV
+static void enic_sriov_detect_vf_type(struct enic *enic)
+{
+ struct pci_dev *pdev = enic->pdev;
+ int pos;
+ u16 vf_dev_id;
+
+ if (enic_is_sriov_vf(enic) || enic_is_dynamic(enic))
+ return;
+
+ pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_SRIOV);
+ if (!pos) {
+ enic->vf_type = ENIC_VF_TYPE_NONE;
+ return;
+ }
+
+ pci_read_config_word(pdev, pos + PCI_SRIOV_VF_DID, &vf_dev_id);
+
+ switch (vf_dev_id) {
+ case PCI_DEVICE_ID_CISCO_VIC_ENET_VF:
+ enic->vf_type = ENIC_VF_TYPE_V1;
+ break;
+ case PCI_DEVICE_ID_CISCO_VIC_ENET_VF_USNIC:
+ enic->vf_type = ENIC_VF_TYPE_USNIC;
+ break;
+ case PCI_DEVICE_ID_CISCO_VIC_ENET_VF_V2:
+ enic->vf_type = ENIC_VF_TYPE_V2;
+ break;
+ default:
+ enic->vf_type = ENIC_VF_TYPE_NONE;
+ break;
+ }
+}
+#endif
+
static int enic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
{
struct device *dev = &pdev->dev;
@@ -2734,6 +2770,7 @@ static int enic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
num_pps = enic->num_vfs;
}
}
+ enic_sriov_detect_vf_type(enic);
#endif
/* Allocate structure for port profiles */
--
2.43.0
next prev parent reply other threads:[~2026-03-25 7:21 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-25 7:21 [PATCH net-next 0/6] enic: SR-IOV V2 preparatory infrastructure Satish Kharat via B4 Relay
2026-03-25 7:21 ` [PATCH net-next 1/6] enic: extend resource discovery for SR-IOV admin channel Satish Kharat via B4 Relay
2026-03-25 7:21 ` [PATCH net-next 2/6] enic: add V2 SR-IOV VF device ID Satish Kharat via B4 Relay
2026-03-25 7:21 ` Satish Kharat via B4 Relay [this message]
2026-03-25 7:21 ` [PATCH net-next 4/6] enic: make enic_dev_enable/disable ref-counted Satish Kharat via B4 Relay
2026-03-25 7:21 ` [PATCH net-next 5/6] enic: add type-aware alloc for WQ, RQ, CQ and INTR resources Satish Kharat via B4 Relay
2026-03-25 7:21 ` [PATCH net-next 6/6] enic: detect admin channel resources for SR-IOV Satish Kharat via B4 Relay
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=20260325-enic-sriov-v2-prep-v1-3-48f04ce110cc@cisco.com \
--to=devnull+satishkh.cisco.com@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=satishkh@cisco.com \
/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