From: Suneel Garapati <suneelglinux@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [RFC PATCH 08/29] drivers: pci-uclass: add support for Single-Root I/O Virtualizaiton
Date: Tue, 29 Oct 2019 14:08:00 -0700 [thread overview]
Message-ID: <20191029210821.1954-9-suneelglinux@gmail.com> (raw)
In-Reply-To: <20191029210821.1954-1-suneelglinux@gmail.com>
From: Suneel Garapati <sgarapati@marvell.com>
If SR-IOV capability is present, use it to initialize Virtual function
(VF) PCI device instances. pci_sriov_init function will read SR-IOV
registers to create VF devices under the PF PCI device and also bind
driver if available. This function needs to be invoked from Physical
function device driver which expects VF device support, creating
minimal impact on existing framework.
Signed-off-by: Suneel Garapati <sgarapati@marvell.com>
---
drivers/pci/pci-uclass.c | 113 +++++++++++++++++++++++++++++++++++++++
include/pci.h | 18 +++++++
2 files changed, 131 insertions(+)
diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c
index 51f7135723..3be49c7115 100644
--- a/drivers/pci/pci-uclass.c
+++ b/drivers/pci/pci-uclass.c
@@ -1535,6 +1535,119 @@ int dm_pci_flr(struct udevice *dev)
return 0;
}
+int pci_sriov_init(struct udevice *pdev, int vf_en)
+{
+ u16 vendor, device;
+ struct udevice *bus;
+ struct udevice *dev;
+ pci_dev_t bdf;
+ u16 ctrl;
+ u16 num_vfs;
+ u16 total_vf;
+ u16 vf_offset;
+ u16 vf_stride;
+ int vf, ret;
+ int pos;
+
+ pos = dm_pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_SRIOV);
+ if (!pos) {
+ printf("Error: SRIOV capability not found\n");
+ return -ENOENT;
+ }
+
+ dm_pci_read_config16(pdev, pos + PCI_SRIOV_CTRL, &ctrl);
+
+ dm_pci_read_config16(pdev, pos + PCI_SRIOV_TOTAL_VF, &total_vf);
+ if (vf_en > total_vf)
+ vf_en = total_vf;
+ dm_pci_write_config16(pdev, pos + PCI_SRIOV_NUM_VF, vf_en);
+
+ ctrl |= PCI_SRIOV_CTRL_VFE | PCI_SRIOV_CTRL_MSE;
+ dm_pci_write_config16(pdev, pos + PCI_SRIOV_CTRL, ctrl);
+
+ dm_pci_read_config16(pdev, pos + PCI_SRIOV_NUM_VF, &num_vfs);
+ if (num_vfs > vf_en)
+ num_vfs = vf_en;
+
+ dm_pci_read_config16(pdev, pos + PCI_SRIOV_VF_OFFSET, &vf_offset);
+ dm_pci_read_config16(pdev, pos + PCI_SRIOV_VF_STRIDE, &vf_stride);
+
+ dm_pci_read_config16(pdev, PCI_VENDOR_ID, &vendor);
+ dm_pci_read_config16(pdev, pos + PCI_SRIOV_VF_DID, &device);
+
+ bdf = dm_pci_get_bdf(pdev);
+
+ pci_get_bus(PCI_BUS(bdf), &bus);
+
+ if (!bus)
+ return -ENODEV;
+
+ bdf += PCI_BDF(0, 0, vf_offset);
+
+ for (vf = 0; vf < num_vfs; vf++) {
+ struct pci_child_platdata *pplat;
+ ulong class;
+
+ pci_bus_read_config(bus, bdf, PCI_CLASS_DEVICE,
+ &class, PCI_SIZE_16);
+
+ debug("%s: bus %d/%s: found VF %x:%x\n", __func__,
+ bus->seq, bus->name, PCI_DEV(bdf), PCI_FUNC(bdf));
+
+ /* Find this device in the device tree */
+ ret = pci_bus_find_devfn(bus, PCI_MASK_BUS(bdf), &dev);
+
+ if (ret == -ENODEV) {
+ struct pci_device_id find_id;
+
+ memset(&find_id, 0, sizeof(find_id));
+
+ find_id.vendor = vendor;
+ find_id.device = device;
+ find_id.class = class;
+
+ ret = pci_find_and_bind_driver(bus, &find_id,
+ bdf, &dev);
+
+ if (ret)
+ return ret;
+ }
+
+ /* Update the platform data */
+ pplat = dev_get_parent_platdata(dev);
+ pplat->devfn = PCI_MASK_BUS(bdf);
+ pplat->vendor = vendor;
+ pplat->device = device;
+ pplat->class = class;
+ pplat->is_virtfn = true;
+ pplat->pfdev = pdev;
+ pplat->virtid = vf * vf_stride + vf_offset;
+
+ debug("%s: bus %d/%s: found VF %x:%x %x:%x class %lx id %x\n",
+ __func__, dev->seq, dev->name, PCI_DEV(bdf),
+ PCI_FUNC(bdf), vendor, device, class, pplat->virtid);
+ bdf += PCI_BDF(0, 0, vf_stride);
+ }
+
+ return 0;
+}
+
+int pci_sriov_get_totalvfs(struct udevice *pdev)
+{
+ u16 total_vf;
+ int pos;
+
+ pos = dm_pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_SRIOV);
+ if (!pos) {
+ printf("Error: SRIOV capability not found\n");
+ return -ENOENT;
+ }
+
+ dm_pci_read_config16(pdev, pos + PCI_SRIOV_TOTAL_VF, &total_vf);
+
+ return total_vf;
+}
+
UCLASS_DRIVER(pci) = {
.id = UCLASS_PCI,
.name = "pci",
diff --git a/include/pci.h b/include/pci.h
index 0b14842285..1343d0e9fb 100644
--- a/include/pci.h
+++ b/include/pci.h
@@ -475,6 +475,17 @@
#define PCI_EXP_DEVCAP_FLR 0x10000000 /* Function Level Reset */
#define PCI_EXP_DEVCTL 8 /* Device Control */
#define PCI_EXP_DEVCTL_BCR_FLR 0x8000 /* Bridge Configuration Retry / FLR */
+/* Single Root I/O Virtualization Registers */
+#define PCI_SRIOV_CAP 0x04 /* SR-IOV Capabilities */
+#define PCI_SRIOV_CTRL 0x08 /* SR-IOV Control */
+#define PCI_SRIOV_CTRL_VFE 0x01 /* VF Enable */
+#define PCI_SRIOV_CTRL_MSE 0x08 /* VF Memory Space Enable */
+#define PCI_SRIOV_INITIAL_VF 0x0c /* Initial VFs */
+#define PCI_SRIOV_TOTAL_VF 0x0e /* Total VFs */
+#define PCI_SRIOV_NUM_VF 0x10 /* Number of VFs */
+#define PCI_SRIOV_VF_OFFSET 0x14 /* First VF Offset */
+#define PCI_SRIOV_VF_STRIDE 0x16 /* Following VF Stride */
+#define PCI_SRIOV_VF_DID 0x1a /* VF Device ID */
/* Include the ID list */
@@ -868,6 +879,10 @@ struct pci_child_platdata {
unsigned short vendor;
unsigned short device;
unsigned int class;
+
+ bool is_virtfn;
+ struct udevice *pfdev;
+ int virtid;
};
/* PCI bus operations */
@@ -1178,6 +1193,9 @@ int pci_generic_mmap_read_config(
ulong *valuep,
enum pci_size_t size);
+int pci_sriov_init(struct udevice *pdev, int vf_en);
+int pci_sriov_get_totalvfs(struct udevice *pdev);
+
#ifdef CONFIG_DM_PCI_COMPAT
/* Compatibility with old naming */
static inline int pci_write_config_dword(pci_dev_t pcidev, int offset,
--
2.23.0
next prev parent reply other threads:[~2019-10-29 21:08 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-29 21:07 [U-Boot] [RFC PATCH 00/29] arm: Introduce Marvell/Cavium OcteonTX Suneel Garapati
2019-10-29 21:07 ` [U-Boot] [RFC PATCH 01/29] include: pci_ids: add vendor ID for Cavium Suneel Garapati
2019-11-20 3:00 ` Simon Glass
2019-10-29 21:07 ` [U-Boot] [RFC PATCH 02/29] include: pci: Increase max pci region limit Suneel Garapati
2019-11-20 3:00 ` Simon Glass
2019-10-29 21:07 ` [U-Boot] [RFC PATCH 03/29] fdtdec: add API to read pci bus-range property Suneel Garapati
2019-11-20 3:00 ` Simon Glass
2019-10-29 21:07 ` [U-Boot] [RFC PATCH 04/29] drivers: pci-uclass: fix incorrect argument in map_sysmem Suneel Garapati
2019-11-20 3:00 ` Simon Glass
2019-10-29 21:07 ` [U-Boot] [RFC PATCH 05/29] drivers: pci-uclass: make DT subnode parse optional Suneel Garapati
2019-11-20 3:00 ` Simon Glass
2019-10-29 21:07 ` [U-Boot] [RFC PATCH 06/29] drivers: pci-uclass: add multi entry support for pci regions Suneel Garapati
2019-11-20 3:00 ` Simon Glass
2019-10-29 21:07 ` [U-Boot] [RFC PATCH 07/29] drivers: pci-uclass: add support for Enhanced Allocation in Bridges Suneel Garapati
2019-11-20 3:00 ` Simon Glass
2019-10-29 21:08 ` Suneel Garapati [this message]
2019-11-20 3:00 ` [U-Boot] [RFC PATCH 08/29] drivers: pci-uclass: add support for Single-Root I/O Virtualizaiton Simon Glass
2019-10-29 21:08 ` [U-Boot] [RFC PATCH 09/29] drivers: pci-uclass: add VF map_bar support for Enhanced Allocation Suneel Garapati
2019-11-20 3:00 ` Simon Glass
2019-10-29 21:08 ` [U-Boot] [RFC PATCH 10/29] drivers: pci-uclass: Add support for Alternate-RoutingID capability Suneel Garapati
2019-11-20 3:00 ` Simon Glass
2019-10-29 21:08 ` [U-Boot] [RFC PATCH 11/29] include: arm: asm: io: add 64bit clrbits and setbits helpers Suneel Garapati
2019-11-20 3:00 ` Simon Glass
2019-10-29 21:08 ` [U-Boot] [RFC PATCH 12/29] drivers: rtc: ds1337: add driver model support Suneel Garapati
2019-11-20 3:00 ` Simon Glass
2019-10-29 21:08 ` [U-Boot] [RFC PATCH 13/29] arch: include: octeontx: add headers for OcteonTX Suneel Garapati
2019-11-20 3:00 ` Simon Glass
2019-11-20 5:47 ` [U-Boot] [EXT] " Aaron Williams
2019-10-29 21:08 ` [U-Boot] [RFC PATCH 14/29] arch: include: octeontx2: add headers for OcteonTX2 Suneel Garapati
2019-11-20 3:00 ` Simon Glass
2019-10-29 21:08 ` [U-Boot] [RFC PATCH 15/29] drivers: ata: ahci: update max id if it is more than available ports Suneel Garapati
2019-11-20 3:00 ` Simon Glass
2019-10-29 21:08 ` [U-Boot] [RFC PATCH 16/29] drivers: ata: ahci: fill upper 32bit buffer address in sg descriptor Suneel Garapati
2019-11-20 3:00 ` Simon Glass
2019-10-29 21:08 ` [U-Boot] [RFC PATCH 17/29] drivers: ata: ahci: add BAR index quirk for OcteonTX Suneel Garapati
2019-11-20 3:00 ` Simon Glass
2019-10-29 21:08 ` [U-Boot] [RFC PATCH 18/29] drivers: pci: add PCI controller driver " Suneel Garapati
2019-11-20 3:00 ` Simon Glass
2019-10-29 21:08 ` [U-Boot] [RFC PATCH 19/29] drivers: gpio: add GPIO " Suneel Garapati
2019-11-20 3:00 ` Simon Glass
2019-10-29 21:08 ` [U-Boot] [RFC PATCH 20/29] drivers: i2c: add I2C " Suneel Garapati
2019-11-20 3:00 ` Simon Glass
2019-10-29 21:08 ` [U-Boot] [RFC PATCH 21/29] drivers: spi: add SPI " Suneel Garapati
2019-10-29 21:08 ` [U-Boot] [RFC PATCH 22/29] drivers: mmc: remove static qualifier on mmc_power_init Suneel Garapati
2019-10-29 21:08 ` [U-Boot] [RFC PATCH 23/29] drivers: mmc: add MMC controller driver for OcteonTX Suneel Garapati
2019-10-29 21:08 ` [U-Boot] [RFC PATCH 24/29] drivers: mtd: nand: add NAND " Suneel Garapati
2019-10-29 21:08 ` [U-Boot] [RFC PATCH 25/29] drivers: net: add NIC " Suneel Garapati
2019-10-29 21:08 ` [U-Boot] [RFC PATCH 26/29] drivers: net: add NIC controller driver for OcteonTX2 Suneel Garapati
2019-10-29 21:08 ` [U-Boot] [RFC PATCH 27/29] drivers: watchdog: add reset support for OcteonTX Suneel Garapati
2019-10-29 21:08 ` [U-Boot] [RFC PATCH 28/29] octeontx: Add support for OcteonTX SoC platforms Suneel Garapati
2019-10-29 21:08 ` [U-Boot] [RFC PATCH 29/29] octeontx2: Add support for OcteonTX2 " Suneel Garapati
2019-10-30 17:06 ` [U-Boot] [RFC PATCH 00/29] arm: Introduce Marvell/Cavium OcteonTX Tim Harvey
2019-10-31 0:04 ` [U-Boot] [EXT] " Aaron Williams
2019-10-31 19:12 ` Tim Harvey
2019-10-31 19:22 ` Chandrakala Chavva
2019-11-05 1:09 ` Aaron Williams
2019-11-05 16:07 ` Tim Harvey
2019-10-31 19:46 ` [U-Boot] " Suneel Garapati
2019-10-31 22:14 ` Tim Harvey
2019-10-31 22:40 ` Suneel Garapati
2019-11-01 16:07 ` Tim Harvey
2019-11-19 18:55 ` Tim Harvey
2019-11-20 3:00 ` Simon Glass
2019-11-20 20:41 ` Tom Rini
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=20191029210821.1954-9-suneelglinux@gmail.com \
--to=suneelglinux@gmail.com \
--cc=u-boot@lists.denx.de \
/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