Skip to contentSkip to conversation

Expose VMD BIOS domain info

PATCH In review Jon Derrick 5 participants 18 messages Oct 16, 2019 – Jan 27, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover Expose VMD BIOS domain info

In order to provide better VMD userspace management support, VMD needs to know its instance number in the platform. VMDs can be enabled or disabled, so a simple enumeration can't explicitly determine the instance number of the VMD.

To assist userspace with management tasks, VMD BIOS writes the VMD instance number and socket number into the first enabled root port's IO Base/Limit registers prior to OS handoff. VMD driver can capture this information and expose it to userspace.

This set exposes hardware-specific details of the VMD configuration as written by the VMD-enabled BIOS. This data is restored to the same location on reset or module unload. This set reuses the serialized child device configuration accessors for proper ordering and write flushing.

Jon Derrick (3):
PCI: vmd: Add helpers to access device config space
PCI: vmd: Expose VMD details from BIOS
PCI: vmd: Restore domain info during resets/unloads

 drivers/pci/controller/vmd.c | 147 ++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 133 insertions(+), 14 deletions(-)
Signature · 1 line
1.8.3.1
#1 lore raw

PATCH 1/3 PCI: vmd: Add helpers to access device config space

This patch adds helpers to access child device config space. It uses the fabric-view of the bus number, which requires the pci accessors to translate out the starting bus number. This will allow internal code to access child device config space without a struct pci_bus while minding the accessing rules.

---
 drivers/pci/controller/vmd.c | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)
drivers/pci/controller/vmd.c +24 -12
index a35d3f3..959c7c7 100644
@@ -440,12 +440,10 @@ static void vmd_setup_dma_ops(struct vmd_dev *vmd)
 }
 #undef ASSIGN_VMD_DMA_OPS
 
-static char __iomem *vmd_cfg_addr(struct vmd_dev *vmd, struct pci_bus *bus,
+static char __iomem *vmd_cfg_addr(struct vmd_dev *vmd, unsigned char busn,
 				  unsigned int devfn, int reg, int len)
 {
-	char __iomem *addr = vmd->cfgbar +
-			     ((bus->number - vmd->busn_start) << 20) +
-			     (devfn << 12) + reg;
+	char __iomem *addr = vmd->cfgbar + (busn << 20) + (devfn << 12) + reg;
 
 	if ((addr - vmd->cfgbar) + len >=
 	    resource_size(&vmd->dev->resource[VMD_CFGBAR]))
@@ -458,11 +456,10 @@ static char __iomem *vmd_cfg_addr(struct vmd_dev *vmd, struct pci_bus *bus,
  * CPU may deadlock if config space is not serialized on some versions of this
  * hardware, so all config space access is done under a spinlock.
  */
-static int vmd_pci_read(struct pci_bus *bus, unsigned int devfn, int reg,
-			int len, u32 *value)
+static int vmd_cfg_read(struct vmd_dev *vmd, unsigned char busn,
+			unsigned int devfn, int reg, int len, u32 *value)
 {
-	struct vmd_dev *vmd = vmd_from_bus(bus);
-	char __iomem *addr = vmd_cfg_addr(vmd, bus, devfn, reg, len);
+	char __iomem *addr = vmd_cfg_addr(vmd, busn, devfn, reg, len);
 	unsigned long flags;
 	int ret = 0;
 
@@ -488,16 +485,23 @@ static int vmd_pci_read(struct pci_bus *bus, unsigned int devfn, int reg,
 	return ret;
 }
 
+static int vmd_pci_read(struct pci_bus *bus, unsigned int devfn, int reg,
+			int len, u32 *value)
+{
+	struct vmd_dev *vmd = vmd_from_bus(bus);
+	return vmd_cfg_read(vmd, bus->number - vmd->busn_start, devfn,
+			    reg, len, value);
+}
+
 /*
  * VMD h/w converts non-posted config writes to posted memory writes. The
  * read-back in this function forces the completion so it returns only after
  * the config space was written, as expected.
  */
-static int vmd_pci_write(struct pci_bus *bus, unsigned int devfn, int reg,
-			 int len, u32 value)
+static int vmd_cfg_write(struct vmd_dev *vmd, unsigned char busn,
+			 unsigned int devfn, int reg, int len, u32 value)
 {
-	struct vmd_dev *vmd = vmd_from_bus(bus);
-	char __iomem *addr = vmd_cfg_addr(vmd, bus, devfn, reg, len);
+	char __iomem *addr = vmd_cfg_addr(vmd, busn, devfn, reg, len);
 	unsigned long flags;
 	int ret = 0;
 
@@ -526,6 +530,14 @@ static int vmd_pci_write(struct pci_bus *bus, unsigned int devfn, int reg,
 	return ret;
 }
 
+static int vmd_pci_write(struct pci_bus *bus, unsigned int devfn, int reg,
+			 int len, u32 value)
+{
+	struct vmd_dev *vmd = vmd_from_bus(bus);
+	return vmd_cfg_write(vmd, bus->number - vmd->busn_start, devfn,
+			     reg, len, value);
+}
+
 static struct pci_ops vmd_ops = {
 	.read		= vmd_pci_read,
 	.write		= vmd_pci_write,
Signature · 1 line
1.8.3.1
#2 lore raw

PATCH 2/3 PCI: vmd: Expose VMD details from BIOS

In reply to Jon Derrick

When some VMDs are enabled and others are not, it's difficult to determine which IIO stack corresponds to the enabled VMD.

To assist userspace with management tasks, VMD BIOS will write the VMD instance number and socket number into the first enabled root port's IO Base/Limit registers prior to OS handoff. VMD driver can capture this information and expose it to userspace.

---
 drivers/pci/controller/vmd.c | 79 ++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 77 insertions(+), 2 deletions(-)
drivers/pci/controller/vmd.c +77 -2
index 959c7c7..dbe1bff 100644
@@ -98,6 +98,8 @@ struct vmd_dev {
 	struct irq_domain	*irq_domain;
 	struct pci_bus		*bus;
 	u8			busn_start;
+	u8			socket_nr;
+	u8			instance_nr;
 
 	struct dma_map_ops	dma_ops;
 	struct dma_domain	dma_domain;
@@ -543,6 +545,74 @@ static int vmd_pci_write(struct pci_bus *bus, unsigned int devfn, int reg,
 	.write		= vmd_pci_write,
 };
 
+/**
+ * for_each_vmd_root_port - iterate over all enabled VMD Root Ports
+ * @vmd: &struct vmd_dev VMD device descriptor
+ * @rp: int iterator cursor
+ * @temp: u32 temporary value for config read
+ *
+ * VMD Root Ports are located in the VMD PCIe Domain at 00:[0-3].0, and config
+ * space can be determinately accessed through the VMD Config BAR. Because VMD
+ * Root Ports can be individually disabled, it's important to iterate for the
+ * first enabled Root Port as determined by reading the Vendor/Device register.
+ */
+#define for_each_vmd_root_port(vmd, rp, temp)				\
+	for (rp = 0; rp < 4; rp++)					\
+		if (vmd_cfg_read(vmd, 0, PCI_DEVFN(root_port, 0),	\
+				 PCI_VENDOR_ID, 4, &temp) ||		\
+		    temp == 0xffffffff) {} else
+
+static int vmd_parse_domain(struct vmd_dev *vmd)
+{
+	int root_port, ret;
+	u32 temp, iobase;
+
+	vmd->socket_nr = -1;
+	vmd->instance_nr = -1;
+
+	for_each_vmd_root_port(vmd, root_port, temp) {
+		ret = vmd_cfg_read(vmd, 0, PCI_DEVFN(root_port, 0),
+				   PCI_IO_BASE, 2, &iobase);
+		if (ret)
+			return ret;
+
+		vmd->socket_nr = (iobase >> 4) & 0xf;
+		vmd->instance_nr = (iobase >> 14) & 0x3;
+
+		/* First available will be used */
+		break;
+	}
+
+	return 0;
+}
+
+static ssize_t socket_nr_show(struct device *dev,
+			      struct device_attribute *attr, char *buf)
+{
+	struct pci_dev *pdev = to_pci_dev(dev);
+	struct vmd_dev *vmd = pci_get_drvdata(pdev);
+
+	return sprintf(buf, "%u\n", vmd->socket_nr);
+}
+static DEVICE_ATTR_RO(socket_nr);
+
+static ssize_t instance_nr_show(struct device *dev,
+			      struct device_attribute *attr, char *buf)
+{
+	struct pci_dev *pdev = to_pci_dev(dev);
+	struct vmd_dev *vmd = pci_get_drvdata(pdev);
+
+	return sprintf(buf, "%u\n", vmd->instance_nr);
+}
+static DEVICE_ATTR_RO(instance_nr);
+
+static struct attribute *vmd_dev_attrs[] = {
+	&dev_attr_socket_nr.attr,
+	&dev_attr_instance_nr.attr,
+	NULL
+};
+ATTRIBUTE_GROUPS(vmd_dev);
+
 static void vmd_attach_resources(struct vmd_dev *vmd)
 {
 	vmd->dev->resource[VMD_MEMBAR1].child = &vmd->resources[1];
@@ -582,6 +652,11 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features)
 	resource_size_t offset[2] = {0};
 	resource_size_t membar2_offset = 0x2000;
 	struct pci_bus *child;
+	int ret;
+
+	ret = vmd_parse_domain(vmd);
+	if (ret)
+		return ret;
 
 	/*
 	 * Shadow registers may exist in certain VMD device ids which allow
@@ -591,7 +666,6 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features)
 	 */
 	if (features & VMD_FEAT_HAS_MEMBAR_SHADOW) {
 		u32 vmlock;
-		int ret;
 
 		membar2_offset = MB2_SHADOW_OFFSET + MB2_SHADOW_SIZE;
 		ret = pci_read_config_dword(vmd->dev, PCI_REG_VMLOCK, &vmlock);
@@ -876,7 +950,8 @@ static int vmd_resume(struct device *dev)
 	.probe		= vmd_probe,
 	.remove		= vmd_remove,
 	.driver		= {
-		.pm	= &vmd_dev_pm_ops,
+		.pm		= &vmd_dev_pm_ops,
+		.dev_groups	= vmd_dev_groups,
 	},
 };
 module_pci_driver(vmd_drv);
Signature · 1 line
1.8.3.1
#3 lore raw

Re: [PATCH 2/3] PCI: vmd: Expose VMD details from BIOS

Quoted 37 lines · Jon Derrick

When some VMDs are enabled and others are not, it's difficult to determine which IIO stack corresponds to the enabled VMD.

To assist userspace with management tasks, VMD BIOS will write the VMD instance number and socket number into the first enabled root port's IO Base/Limit registers prior to OS handoff. VMD driver can capture this information and expose it to userspace.

---
 drivers/pci/controller/vmd.c | 79 ++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 77 insertions(+), 2 deletions(-)
drivers/pci/controller/vmd.c +8 -0
index 959c7c7..dbe1bff 100644
@@ -98,6 +98,8 @@ struct vmd_dev {
 	struct irq_domain	*irq_domain;
 	struct pci_bus		*bus;
 	u8			busn_start;
+	u8			socket_nr;
+	u8			instance_nr;
 
 	struct dma_map_ops	dma_ops;
 	struct dma_domain	dma_domain;
@@ -543,6 +545,74 @@ static int vmd_pci_write(struct pci_bus *bus, unsigned int devfn, int reg,
 	.write		= vmd_pci_write,
 };
 
+/**
+ * for_each_vmd_root_port - iterate over all enabled VMD Root Ports
+ * @vmd: &struct vmd_dev VMD device descriptor
+ * @rp: int iterator cursor
+ * @temp: u32 temporary value for config read
+ *

drivers/pci/controller/vmd.c static int vmd_pci_write(struct pci_bus *bus, unsigned int devfn, int reg, · line 563

Quoted 10 lines
drivers/pci/controller/vmd.c +10 -0
+ * VMD Root Ports are located in the VMD PCIe Domain at 00:[0-3].0, and config
+ * space can be determinately accessed through the VMD Config BAR. Because VMD
+ * Root Ports can be individually disabled, it's important to iterate for the
+ * first enabled Root Port as determined by reading the Vendor/Device register.
+ */
+#define for_each_vmd_root_port(vmd, rp, temp)				\
+	for (rp = 0; rp < 4; rp++)					\
+		if (vmd_cfg_read(vmd, 0, PCI_DEVFN(root_port, 0),	\
+				 PCI_VENDOR_ID, 4, &temp) ||		\
+		    temp == 0xffffffff) {} else

Nit: I do not think this macro is particularly helpful or easy to read.

I leave it up to you but I would turn this code (plus the inner loop in vmd_parse_domain()) into a function, eg:

struct vmd_dev *vmd_find_first_root_port(..)

with the code in the macro above inlined. Up to you.

Thanks,
Lorenzo

Quoted 87 lines
drivers/pci/controller/vmd.c +58 -2
+static int vmd_parse_domain(struct vmd_dev *vmd)
+{
+	int root_port, ret;
+	u32 temp, iobase;
+
+	vmd->socket_nr = -1;
+	vmd->instance_nr = -1;
+
+	for_each_vmd_root_port(vmd, root_port, temp) {
+		ret = vmd_cfg_read(vmd, 0, PCI_DEVFN(root_port, 0),
+				   PCI_IO_BASE, 2, &iobase);
+		if (ret)
+			return ret;
+
+		vmd->socket_nr = (iobase >> 4) & 0xf;
+		vmd->instance_nr = (iobase >> 14) & 0x3;
+
+		/* First available will be used */
+		break;
+	}
+
+	return 0;
+}
+
+static ssize_t socket_nr_show(struct device *dev,
+			      struct device_attribute *attr, char *buf)
+{
+	struct pci_dev *pdev = to_pci_dev(dev);
+	struct vmd_dev *vmd = pci_get_drvdata(pdev);
+
+	return sprintf(buf, "%u\n", vmd->socket_nr);
+}
+static DEVICE_ATTR_RO(socket_nr);
+
+static ssize_t instance_nr_show(struct device *dev,
+			      struct device_attribute *attr, char *buf)
+{
+	struct pci_dev *pdev = to_pci_dev(dev);
+	struct vmd_dev *vmd = pci_get_drvdata(pdev);
+
+	return sprintf(buf, "%u\n", vmd->instance_nr);
+}
+static DEVICE_ATTR_RO(instance_nr);
+
+static struct attribute *vmd_dev_attrs[] = {
+	&dev_attr_socket_nr.attr,
+	&dev_attr_instance_nr.attr,
+	NULL
+};
+ATTRIBUTE_GROUPS(vmd_dev);
+
 static void vmd_attach_resources(struct vmd_dev *vmd)
 {
 	vmd->dev->resource[VMD_MEMBAR1].child = &vmd->resources[1];
@@ -582,6 +652,11 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features)
 	resource_size_t offset[2] = {0};
 	resource_size_t membar2_offset = 0x2000;
 	struct pci_bus *child;
+	int ret;
+
+	ret = vmd_parse_domain(vmd);
+	if (ret)
+		return ret;
 
 	/*
 	 * Shadow registers may exist in certain VMD device ids which allow
@@ -591,7 +666,6 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features)
 	 */
 	if (features & VMD_FEAT_HAS_MEMBAR_SHADOW) {
 		u32 vmlock;
-		int ret;
 
 		membar2_offset = MB2_SHADOW_OFFSET + MB2_SHADOW_SIZE;
 		ret = pci_read_config_dword(vmd->dev, PCI_REG_VMLOCK, &vmlock);
@@ -876,7 +950,8 @@ static int vmd_resume(struct device *dev)
 	.probe		= vmd_probe,
 	.remove		= vmd_remove,
 	.driver		= {
-		.pm	= &vmd_dev_pm_ops,
+		.pm		= &vmd_dev_pm_ops,
+		.dev_groups	= vmd_dev_groups,
 	},
 };
 module_pci_driver(vmd_drv);
Signature · 1 line
1.8.3.1
#4 lore raw

Re: [PATCH 2/3] PCI: vmd: Expose VMD details from BIOS

In reply to Jon Derrick
Quoted 37 lines · Jon Derrick

When some VMDs are enabled and others are not, it's difficult to determine which IIO stack corresponds to the enabled VMD.

To assist userspace with management tasks, VMD BIOS will write the VMD instance number and socket number into the first enabled root port's IO Base/Limit registers prior to OS handoff. VMD driver can capture this information and expose it to userspace.

---
 drivers/pci/controller/vmd.c | 79 ++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 77 insertions(+), 2 deletions(-)
drivers/pci/controller/vmd.c +8 -0
index 959c7c7..dbe1bff 100644
@@ -98,6 +98,8 @@ struct vmd_dev {
 	struct irq_domain	*irq_domain;
 	struct pci_bus		*bus;
 	u8			busn_start;
+	u8			socket_nr;
+	u8			instance_nr;
 
 	struct dma_map_ops	dma_ops;
 	struct dma_domain	dma_domain;
@@ -543,6 +545,74 @@ static int vmd_pci_write(struct pci_bus *bus, unsigned int devfn, int reg,
 	.write		= vmd_pci_write,
 };
 
+/**
+ * for_each_vmd_root_port - iterate over all enabled VMD Root Ports
+ * @vmd: &struct vmd_dev VMD device descriptor
+ * @rp: int iterator cursor
+ * @temp: u32 temporary value for config read
+ *

drivers/pci/controller/vmd.c static int vmd_pci_write(struct pci_bus *bus, unsigned int devfn, int reg, · line 563

Quoted 10 lines
drivers/pci/controller/vmd.c +10 -0
+ * VMD Root Ports are located in the VMD PCIe Domain at 00:[0-3].0, and config
+ * space can be determinately accessed through the VMD Config BAR. Because VMD
+ * Root Ports can be individually disabled, it's important to iterate for the
+ * first enabled Root Port as determined by reading the Vendor/Device register.
+ */
+#define for_each_vmd_root_port(vmd, rp, temp)				\
+	for (rp = 0; rp < 4; rp++)					\
+		if (vmd_cfg_read(vmd, 0, PCI_DEVFN(root_port, 0),	\
+				 PCI_VENDOR_ID, 4, &temp) ||		\
+		    temp == 0xffffffff) {} else

You may want to consider using PCI_ERROR_RESPONSE here instead of 0xffffffff. Though this hasn't yet been merged:

https://patchwork.ozlabs.org/project/linux-pci/list/?series=126820

Quoted 7 lines
drivers/pci/controller/vmd.c +7 -0
+
+static int vmd_parse_domain(struct vmd_dev *vmd)
+{
+	int root_port, ret;
+	u32 temp, iobase;
+
+	vmd->socket_nr = -1;

drivers/pci/controller/vmd.c static int vmd_pci_write(struct pci_bus *bus, unsigned int devfn, int reg, · line 580

Quoted 10 lines
drivers/pci/controller/vmd.c +10 -0
+	vmd->instance_nr = -1;
+
+	for_each_vmd_root_port(vmd, root_port, temp) {
+		ret = vmd_cfg_read(vmd, 0, PCI_DEVFN(root_port, 0),
+				   PCI_IO_BASE, 2, &iobase);
+		if (ret)
+			return ret;
+
+		vmd->socket_nr = (iobase >> 4) & 0xf;
+		vmd->instance_nr = (iobase >> 14) & 0x3;

I'm not familiar with VMD - however how can you be sure that the VMD BIOS will always populate these values here? Is it possible that earlier BIOS's won't do this and something will go wrong here?

Is there any sanity checking that can happen here?

Quoted 39 lines
drivers/pci/controller/vmd.c +35 -0
+
+		/* First available will be used */
+		break;
+	}
+
+	return 0;
+}
+
+static ssize_t socket_nr_show(struct device *dev,
+			      struct device_attribute *attr, char *buf)
+{
+	struct pci_dev *pdev = to_pci_dev(dev);
+	struct vmd_dev *vmd = pci_get_drvdata(pdev);
+
+	return sprintf(buf, "%u\n", vmd->socket_nr);
+}
+static DEVICE_ATTR_RO(socket_nr);
+
+static ssize_t instance_nr_show(struct device *dev,
+			      struct device_attribute *attr, char *buf)
+{
+	struct pci_dev *pdev = to_pci_dev(dev);
+	struct vmd_dev *vmd = pci_get_drvdata(pdev);
+
+	return sprintf(buf, "%u\n", vmd->instance_nr);
+}
+static DEVICE_ATTR_RO(instance_nr);
+
+static struct attribute *vmd_dev_attrs[] = {
+	&dev_attr_socket_nr.attr,
+	&dev_attr_instance_nr.attr,
+	NULL
+};
+ATTRIBUTE_GROUPS(vmd_dev);
+
 static void vmd_attach_resources(struct vmd_dev *vmd)
 {
 	vmd->dev->resource[VMD_MEMBAR1].child = &vmd->resources[1];

drivers/pci/controller/vmd.c static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features) · line 659

Quoted 8 lines
drivers/pci/controller/vmd.c +5 -0
@@ -582,6 +652,11 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features)
 	resource_size_t offset[2] = {0};
 	resource_size_t membar2_offset = 0x2000;
 	struct pci_bus *child;
+	int ret;
+
+	ret = vmd_parse_domain(vmd);
+	if (ret)
+		return ret;

This always will succeed. But what happens if this function returns yet socket_nr/instance_nr hasn't been written to? Is that OK?

Thanks,

Andrew Murray

Quoted 24 lines
drivers/pci/controller/vmd.c +2 -2
 	/*
 	 * Shadow registers may exist in certain VMD device ids which allow
@@ -591,7 +666,6 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features)
 	 */
 	if (features & VMD_FEAT_HAS_MEMBAR_SHADOW) {
 		u32 vmlock;
-		int ret;
 
 		membar2_offset = MB2_SHADOW_OFFSET + MB2_SHADOW_SIZE;
 		ret = pci_read_config_dword(vmd->dev, PCI_REG_VMLOCK, &vmlock);
@@ -876,7 +950,8 @@ static int vmd_resume(struct device *dev)
 	.probe		= vmd_probe,
 	.remove		= vmd_remove,
 	.driver		= {
-		.pm	= &vmd_dev_pm_ops,
+		.pm		= &vmd_dev_pm_ops,
+		.dev_groups	= vmd_dev_groups,
 	},
 };
 module_pci_driver(vmd_drv);
Signature · 1 line
1.8.3.1
#5 lore raw

Re: [PATCH 2/3] PCI: vmd: Expose VMD details from BIOS

Hi ANdrew,

Thanks for the review

Quoted 52 lines · Andrew Murray
Quoted 37 lines · Jon Derrick

When some VMDs are enabled and others are not, it's difficult to determine which IIO stack corresponds to the enabled VMD.

To assist userspace with management tasks, VMD BIOS will write the VMD instance number and socket number into the first enabled root port's IO Base/Limit registers prior to OS handoff. VMD driver can capture this information and expose it to userspace.

---
 drivers/pci/controller/vmd.c | 79 ++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 77 insertions(+), 2 deletions(-)
drivers/pci/controller/vmd.c +8 -0
index 959c7c7..dbe1bff 100644
@@ -98,6 +98,8 @@ struct vmd_dev {
 	struct irq_domain	*irq_domain;
 	struct pci_bus		*bus;
 	u8			busn_start;
+	u8			socket_nr;
+	u8			instance_nr;
 
 	struct dma_map_ops	dma_ops;
 	struct dma_domain	dma_domain;
@@ -543,6 +545,74 @@ static int vmd_pci_write(struct pci_bus *bus, unsigned int devfn, int reg,
 	.write		= vmd_pci_write,
 };
 
+/**
+ * for_each_vmd_root_port - iterate over all enabled VMD Root Ports
+ * @vmd: &struct vmd_dev VMD device descriptor
+ * @rp: int iterator cursor
+ * @temp: u32 temporary value for config read
+ *

drivers/pci/controller/vmd.c static int vmd_pci_write(struct pci_bus *bus, unsigned int devfn, int reg, · line 563

Quoted 10 lines
drivers/pci/controller/vmd.c +10 -0
+ * VMD Root Ports are located in the VMD PCIe Domain at 00:[0-3].0, and config
+ * space can be determinately accessed through the VMD Config BAR. Because VMD
+ * Root Ports can be individually disabled, it's important to iterate for the
+ * first enabled Root Port as determined by reading the Vendor/Device register.
+ */
+#define for_each_vmd_root_port(vmd, rp, temp)				\
+	for (rp = 0; rp < 4; rp++)					\
+		if (vmd_cfg_read(vmd, 0, PCI_DEVFN(root_port, 0),	\
+				 PCI_VENDOR_ID, 4, &temp) ||		\
+		    temp == 0xffffffff) {} else

You may want to consider using PCI_ERROR_RESPONSE here instead of 0xffffffff. Though this hasn't yet been merged:

Quoted 2 lines

https://patchwork.ozlabs.org/project/linux-pci/list/?series=126820

Sure it will fit this case perfectly once it's merged

Quoted 22 lines
Quoted 7 lines
drivers/pci/controller/vmd.c +7 -0
+
+static int vmd_parse_domain(struct vmd_dev *vmd)
+{
+	int root_port, ret;
+	u32 temp, iobase;
+
+	vmd->socket_nr = -1;

drivers/pci/controller/vmd.c static int vmd_pci_write(struct pci_bus *bus, unsigned int devfn, int reg, · line 580

Quoted 10 lines
drivers/pci/controller/vmd.c +10 -0
+	vmd->instance_nr = -1;
+
+	for_each_vmd_root_port(vmd, root_port, temp) {
+		ret = vmd_cfg_read(vmd, 0, PCI_DEVFN(root_port, 0),
+				   PCI_IO_BASE, 2, &iobase);
+		if (ret)
+			return ret;
+
+		vmd->socket_nr = (iobase >> 4) & 0xf;
+		vmd->instance_nr = (iobase >> 14) & 0x3;

I'm not familiar with VMD - however how can you be sure that the VMD BIOS will always populate these values here? Is it possible that earlier BIOS's won't do this and something will go wrong here?

Quoted 1 line

Is there any sanity checking that can happen here?

Yes that's entirely possible and would show indeterminate values in that case. It would be up to the user to understand if the BIOS supports the mode before relying on the data.

I am investigating to see if we can do a dmi_match to verify the data before publishing.

Quoted 43 lines
Quoted 43 lines
drivers/pci/controller/vmd.c +35 -0
+
+		/* First available will be used */
+		break;
+	}
+
+	return 0;
+}
+
+static ssize_t socket_nr_show(struct device *dev,
+			      struct device_attribute *attr, char *buf)
+{
+	struct pci_dev *pdev = to_pci_dev(dev);
+	struct vmd_dev *vmd = pci_get_drvdata(pdev);
+
+	return sprintf(buf, "%u\n", vmd->socket_nr);
+}
+static DEVICE_ATTR_RO(socket_nr);
+
+static ssize_t instance_nr_show(struct device *dev,
+			      struct device_attribute *attr, char *buf)
+{
+	struct pci_dev *pdev = to_pci_dev(dev);
+	struct vmd_dev *vmd = pci_get_drvdata(pdev);
+
+	return sprintf(buf, "%u\n", vmd->instance_nr);
+}
+static DEVICE_ATTR_RO(instance_nr);
+
+static struct attribute *vmd_dev_attrs[] = {
+	&dev_attr_socket_nr.attr,
+	&dev_attr_instance_nr.attr,
+	NULL
+};
+ATTRIBUTE_GROUPS(vmd_dev);
+
 static void vmd_attach_resources(struct vmd_dev *vmd)
 {
 	vmd->dev->resource[VMD_MEMBAR1].child = &vmd->resources[1];
@@ -582,6 +652,11 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features)
 	resource_size_t offset[2] = {0};
 	resource_size_t membar2_offset = 0x2000;
 	struct pci_bus *child;
Quoted 9 lines

drivers/pci/controller/vmd.c static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features) · line 659

Quoted 5 lines
drivers/pci/controller/vmd.c +5 -0
+	int ret;
+
+	ret = vmd_parse_domain(vmd);
+	if (ret)
+		return ret;

This always will succeed. But what happens if this function returns yet socket_nr/instance_nr hasn't been written to? Is that OK?

Basically only one possibility that could occur and that's if the VMD is enabled without any VMD Root Ports being enabled on the VMD domain. It's an odd configuration but is technically valid, although the domain becomes useless until the user reboots and enables the VMD Root Ports.

So it's more-or-less implied either socket_nr/instance_nr will have data or the domain won't be usable.

Thanks,
Jon

Quoted 28 lines

Thanks,

Andrew Murray

Quoted 24 lines
drivers/pci/controller/vmd.c +2 -2
 	/*
 	 * Shadow registers may exist in certain VMD device ids which allow
@@ -591,7 +666,6 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features)
 	 */
 	if (features & VMD_FEAT_HAS_MEMBAR_SHADOW) {
 		u32 vmlock;
-		int ret;
 
 		membar2_offset = MB2_SHADOW_OFFSET + MB2_SHADOW_SIZE;
 		ret = pci_read_config_dword(vmd->dev, PCI_REG_VMLOCK, &vmlock);
@@ -876,7 +950,8 @@ static int vmd_resume(struct device *dev)
 	.probe		= vmd_probe,
 	.remove		= vmd_remove,
 	.driver		= {
-		.pm	= &vmd_dev_pm_ops,
+		.pm		= &vmd_dev_pm_ops,
+		.dev_groups	= vmd_dev_groups,
 	},
 };
 module_pci_driver(vmd_drv);
Signature · 1 line
1.8.3.1
#6 lore raw

Re: [PATCH 2/3] PCI: vmd: Expose VMD details from BIOS

Quoted 84 lines · Jonathan

Hi ANdrew,

Thanks for the review

Quoted 52 lines · Andrew Murray
Quoted 37 lines · Jon Derrick

When some VMDs are enabled and others are not, it's difficult to determine which IIO stack corresponds to the enabled VMD.

To assist userspace with management tasks, VMD BIOS will write the VMD instance number and socket number into the first enabled root port's IO Base/Limit registers prior to OS handoff. VMD driver can capture this information and expose it to userspace.

---
 drivers/pci/controller/vmd.c | 79 ++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 77 insertions(+), 2 deletions(-)
drivers/pci/controller/vmd.c +8 -0
index 959c7c7..dbe1bff 100644
@@ -98,6 +98,8 @@ struct vmd_dev {
 	struct irq_domain	*irq_domain;
 	struct pci_bus		*bus;
 	u8			busn_start;
+	u8			socket_nr;
+	u8			instance_nr;
 
 	struct dma_map_ops	dma_ops;
 	struct dma_domain	dma_domain;
@@ -543,6 +545,74 @@ static int vmd_pci_write(struct pci_bus *bus, unsigned int devfn, int reg,
 	.write		= vmd_pci_write,
 };
 
+/**
+ * for_each_vmd_root_port - iterate over all enabled VMD Root Ports
+ * @vmd: &struct vmd_dev VMD device descriptor
+ * @rp: int iterator cursor
+ * @temp: u32 temporary value for config read
+ *

drivers/pci/controller/vmd.c static int vmd_pci_write(struct pci_bus *bus, unsigned int devfn, int reg, · line 563

Quoted 10 lines
drivers/pci/controller/vmd.c +10 -0
+ * VMD Root Ports are located in the VMD PCIe Domain at 00:[0-3].0, and config
+ * space can be determinately accessed through the VMD Config BAR. Because VMD
+ * Root Ports can be individually disabled, it's important to iterate for the
+ * first enabled Root Port as determined by reading the Vendor/Device register.
+ */
+#define for_each_vmd_root_port(vmd, rp, temp)				\
+	for (rp = 0; rp < 4; rp++)					\
+		if (vmd_cfg_read(vmd, 0, PCI_DEVFN(root_port, 0),	\
+				 PCI_VENDOR_ID, 4, &temp) ||		\
+		    temp == 0xffffffff) {} else

You may want to consider using PCI_ERROR_RESPONSE here instead of 0xffffffff. Though this hasn't yet been merged:

Quoted 2 lines

https://patchwork.ozlabs.org/project/linux-pci/list/?series=126820

Sure it will fit this case perfectly once it's merged

Quoted 22 lines
Quoted 7 lines
drivers/pci/controller/vmd.c +7 -0
+
+static int vmd_parse_domain(struct vmd_dev *vmd)
+{
+	int root_port, ret;
+	u32 temp, iobase;
+
+	vmd->socket_nr = -1;

drivers/pci/controller/vmd.c static int vmd_pci_write(struct pci_bus *bus, unsigned int devfn, int reg, · line 580

Quoted 10 lines
drivers/pci/controller/vmd.c +10 -0
+	vmd->instance_nr = -1;
+
+	for_each_vmd_root_port(vmd, root_port, temp) {
+		ret = vmd_cfg_read(vmd, 0, PCI_DEVFN(root_port, 0),
+				   PCI_IO_BASE, 2, &iobase);
+		if (ret)
+			return ret;
+
+		vmd->socket_nr = (iobase >> 4) & 0xf;
+		vmd->instance_nr = (iobase >> 14) & 0x3;

I'm not familiar with VMD - however how can you be sure that the VMD BIOS will always populate these values here? Is it possible that earlier BIOS's won't do this and something will go wrong here?

Quoted 8 lines
Quoted 1 line

Is there any sanity checking that can happen here?

Yes that's entirely possible and would show indeterminate values in that case. It would be up to the user to understand if the BIOS supports the mode before relying on the data.

I am investigating to see if we can do a dmi_match to verify the data before publishing.

I think that would be helpful if possible as it would simplify the user software - and also prevent the user ever getting garbage data.

Quoted 55 lines
Quoted 45 lines
Quoted 45 lines
drivers/pci/controller/vmd.c +35 -0
+
+		/* First available will be used */
+		break;
+	}
+
+	return 0;
+}
+
+static ssize_t socket_nr_show(struct device *dev,
+			      struct device_attribute *attr, char *buf)
+{
+	struct pci_dev *pdev = to_pci_dev(dev);
+	struct vmd_dev *vmd = pci_get_drvdata(pdev);
+
+	return sprintf(buf, "%u\n", vmd->socket_nr);
+}
+static DEVICE_ATTR_RO(socket_nr);
+
+static ssize_t instance_nr_show(struct device *dev,
+			      struct device_attribute *attr, char *buf)
+{
+	struct pci_dev *pdev = to_pci_dev(dev);
+	struct vmd_dev *vmd = pci_get_drvdata(pdev);
+
+	return sprintf(buf, "%u\n", vmd->instance_nr);
+}
+static DEVICE_ATTR_RO(instance_nr);
+
+static struct attribute *vmd_dev_attrs[] = {
+	&dev_attr_socket_nr.attr,
+	&dev_attr_instance_nr.attr,
+	NULL
+};
+ATTRIBUTE_GROUPS(vmd_dev);
+
 static void vmd_attach_resources(struct vmd_dev *vmd)
 {
 	vmd->dev->resource[VMD_MEMBAR1].child = &vmd->resources[1];
@@ -582,6 +652,11 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features)
 	resource_size_t offset[2] = {0};
 	resource_size_t membar2_offset = 0x2000;
 	struct pci_bus *child;
Quoted 9 lines

drivers/pci/controller/vmd.c static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features) · line 659

Quoted 5 lines
drivers/pci/controller/vmd.c +5 -0
+	int ret;
+
+	ret = vmd_parse_domain(vmd);
+	if (ret)
+		return ret;

This always will succeed. But what happens if this function returns yet socket_nr/instance_nr hasn't been written to? Is that OK?

Quoted 7 lines

Basically only one possibility that could occur and that's if the VMD is enabled without any VMD Root Ports being enabled on the VMD domain. It's an odd configuration but is technically valid, although the domain becomes useless until the user reboots and enables the VMD Root Ports.

So it's more-or-less implied either socket_nr/instance_nr will have data or the domain won't be usable.

Of course in this case, the default value will be -1, which should be quite obvious to a user that this isn't a valid value.

Thanks,

Andrew Murray

Quoted 33 lines

Thanks,
Jon

Quoted 28 lines

Thanks,

Andrew Murray

Quoted 24 lines
drivers/pci/controller/vmd.c +2 -2
 	/*
 	 * Shadow registers may exist in certain VMD device ids which allow
@@ -591,7 +666,6 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features)
 	 */
 	if (features & VMD_FEAT_HAS_MEMBAR_SHADOW) {
 		u32 vmlock;
-		int ret;
 
 		membar2_offset = MB2_SHADOW_OFFSET + MB2_SHADOW_SIZE;
 		ret = pci_read_config_dword(vmd->dev, PCI_REG_VMLOCK, &vmlock);
@@ -876,7 +950,8 @@ static int vmd_resume(struct device *dev)
 	.probe		= vmd_probe,
 	.remove		= vmd_remove,
 	.driver		= {
-		.pm	= &vmd_dev_pm_ops,
+		.pm		= &vmd_dev_pm_ops,
+		.dev_groups	= vmd_dev_groups,
 	},
 };
 module_pci_driver(vmd_drv);
Signature · 1 line
1.8.3.1
#7 lore raw

Re: [PATCH 2/3] PCI: vmd: Expose VMD details from BIOS

In reply to Jon Derrick

[+cc Andrew]

Quoted 7 lines · Jon Derrick

When some VMDs are enabled and others are not, it's difficult to determine which IIO stack corresponds to the enabled VMD.

To assist userspace with management tasks, VMD BIOS will write the VMD instance number and socket number into the first enabled root port's IO Base/Limit registers prior to OS handoff. VMD driver can capture this information and expose it to userspace.

Hmmm, I'm not sure I understand this, but it sounds possibly fragile. Are these Root Ports visible to the generic PCI core device enumeration? If so, it will find them and read these I/O window registers. Maybe today the PCI core doesn't change them, but I'm not sure we should rely on them always being preserved until the vmd driver can claim the device.

But I guess you're using a special config accessor (vmd_cfg_read()), so these are probably invisible to the generic enumeration?

Quoted 7 lines

+ * for_each_vmd_root_port - iterate over all enabled VMD Root Ports
+ * @vmd: &struct vmd_dev VMD device descriptor
+ * @rp: int iterator cursor
+ * @temp: u32 temporary value for config read
+ *
+ * VMD Root Ports are located in the VMD PCIe Domain at 00:[0-3].0, and config
+ * space can be determinately accessed through the VMD Config BAR. Because VMD

I'm not sure how to parse "determinately accessed". Maybe this config space can *only* be accessed via the VMD Config BAR?

Quoted 8 lines

+ * Root Ports can be individually disabled, it's important to iterate for the
+ * first enabled Root Port as determined by reading the Vendor/Device register.
+ */

drivers/pci/controller/vmd.c +5 -0
+#define for_each_vmd_root_port(vmd, rp, temp)				\
+	for (rp = 0; rp < 4; rp++)					\
+		if (vmd_cfg_read(vmd, 0, PCI_DEVFN(root_port, 0),	\
+				 PCI_VENDOR_ID, 4, &temp) ||		\
+		    temp == 0xffffffff) {} else
#8 lore raw

Re: [PATCH 2/3] PCI: vmd: Expose VMD details from BIOS

Hi Bjorn,

Quoted 11 lines · Bjorn Helgaas

[+cc Andrew]

Quoted 7 lines · Jon Derrick

When some VMDs are enabled and others are not, it's difficult to determine which IIO stack corresponds to the enabled VMD.

To assist userspace with management tasks, VMD BIOS will write the VMD instance number and socket number into the first enabled root port's IO Base/Limit registers prior to OS handoff. VMD driver can capture this information and expose it to userspace.

Quoted 7 lines

Hmmm, I'm not sure I understand this, but it sounds possibly fragile. Are these Root Ports visible to the generic PCI core device enumeration? If so, it will find them and read these I/O window registers. Maybe today the PCI core doesn't change them, but I'm not sure we should rely on them always being preserved until the vmd driver can claim the device.

The Root Ports are on the VMD PCI domain, and this IO BASE/LIMIT parsing occurs before this PCI domain is exposed to the generic PCI scancode with pci_scan_child_bus(). Until that point the VMD PCI domain is invisible to the kernel outside of /dev/mem or resource0.

However, yes, it is somewhat fragile in that a third-party driver could attach to the VMD endpoint prior to the VMD driver and modify the values. A /dev/mem or resource0 user could also do this on an unattached VMD endpoint.

I'm wondering if this would also be better suited for a special reset in quirks.c, but it would need to expose a bit of VMD config accessing in quirks.c to do that.

Quoted 3 lines

But I guess you're using a special config accessor (vmd_cfg_read()), so these are probably invisible to the generic enumeration?

Yes the VMD domain is invisible to generic PCI until the domain is enumerated late in vmd_enable_domain().

Quoted 10 lines
Quoted 7 lines

+ * for_each_vmd_root_port - iterate over all enabled VMD Root Ports
+ * @vmd: &struct vmd_dev VMD device descriptor
+ * @rp: int iterator cursor
+ * @temp: u32 temporary value for config read
+ *
+ * VMD Root Ports are located in the VMD PCIe Domain at 00:[0-3].0, and config
+ * space can be determinately accessed through the VMD Config BAR. Because VMD

I'm not sure how to parse "determinately accessed". Maybe this config space can *only* be accessed via the VMD Config BAR?

Perhaps it should instead say determinately addressed, as each Root Port config space is addressable at some offset of N * 0x8000 from the base of the VMD endpoint config bar. I can see the comment may not be helpful as that detail is abstracted using the vmd_cfg_read() helper.

Quoted 9 lines
Quoted 9 lines

+ * Root Ports can be individually disabled, it's important to iterate for the
+ * first enabled Root Port as determined by reading the Vendor/Device register.
+ */

drivers/pci/controller/vmd.c +5 -0
+#define for_each_vmd_root_port(vmd, rp, temp)				\
+	for (rp = 0; rp < 4; rp++)					\
+		if (vmd_cfg_read(vmd, 0, PCI_DEVFN(root_port, 0),	\
+				 PCI_VENDOR_ID, 4, &temp) ||		\
+		    temp == 0xffffffff) {} else
#9 lore raw

Re: [PATCH 2/3] PCI: vmd: Expose VMD details from BIOS

Quoted 22 lines · Jonathan

Hi Bjorn,

Quoted 11 lines · Bjorn Helgaas

[+cc Andrew]

Quoted 7 lines · Jon Derrick

When some VMDs are enabled and others are not, it's difficult to determine which IIO stack corresponds to the enabled VMD.

To assist userspace with management tasks, VMD BIOS will write the VMD instance number and socket number into the first enabled root port's IO Base/Limit registers prior to OS handoff. VMD driver can capture this information and expose it to userspace.

Quoted 7 lines

Hmmm, I'm not sure I understand this, but it sounds possibly fragile. Are these Root Ports visible to the generic PCI core device enumeration? If so, it will find them and read these I/O window registers. Maybe today the PCI core doesn't change them, but I'm not sure we should rely on them always being preserved until the vmd driver can claim the device.

Quoted 4 lines

The Root Ports are on the VMD PCI domain, and this IO BASE/LIMIT parsing occurs before this PCI domain is exposed to the generic PCI scancode with pci_scan_child_bus(). Until that point the VMD PCI domain is invisible to the kernel outside of /dev/mem or resource0.

That's because the VMD controller is a PCI device itself and its BARs values are used to configure the VMD host controller.

Interesting.

To add to Bjorn's question, this reasoning assumes that whatever code enumerates the PCI device representing the VMD host controller does not overwrite its BARs upon bus enumeration otherwise the VMD controller configuration would be lost. Am I reading the current code correctly ?

I assume there is not anything you can do to add firmware bindings to the VMD host controller PCI device to describe these properties you are exporting, so config space is the only available conduit to report them to an OS.

Lorenzo

Quoted 42 lines

However, yes, it is somewhat fragile in that a third-party driver could attach to the VMD endpoint prior to the VMD driver and modify the values. A /dev/mem or resource0 user could also do this on an unattached VMD endpoint.

I'm wondering if this would also be better suited for a special reset in quirks.c, but it would need to expose a bit of VMD config accessing in quirks.c to do that.

Quoted 3 lines

But I guess you're using a special config accessor (vmd_cfg_read()), so these are probably invisible to the generic enumeration?

Yes the VMD domain is invisible to generic PCI until the domain is enumerated late in vmd_enable_domain().

Quoted 10 lines
Quoted 7 lines

+ * for_each_vmd_root_port - iterate over all enabled VMD Root Ports
+ * @vmd: &struct vmd_dev VMD device descriptor
+ * @rp: int iterator cursor
+ * @temp: u32 temporary value for config read
+ *
+ * VMD Root Ports are located in the VMD PCIe Domain at 00:[0-3].0, and config
+ * space can be determinately accessed through the VMD Config BAR. Because VMD

I'm not sure how to parse "determinately accessed". Maybe this config space can *only* be accessed via the VMD Config BAR?

Perhaps it should instead say determinately addressed, as each Root Port config space is addressable at some offset of N * 0x8000 from the base of the VMD endpoint config bar. I can see the comment may not be helpful as that detail is abstracted using the vmd_cfg_read() helper.

Quoted 9 lines
Quoted 9 lines

+ * Root Ports can be individually disabled, it's important to iterate for the
+ * first enabled Root Port as determined by reading the Vendor/Device register.
+ */

drivers/pci/controller/vmd.c +5 -0
+#define for_each_vmd_root_port(vmd, rp, temp)				\
+	for (rp = 0; rp < 4; rp++)					\
+		if (vmd_cfg_read(vmd, 0, PCI_DEVFN(root_port, 0),	\
+				 PCI_VENDOR_ID, 4, &temp) ||		\
+		    temp == 0xffffffff) {} else
#10 lore raw

Re: [PATCH 2/3] PCI: vmd: Expose VMD details from BIOS

Quoted 31 lines · Lorenzo Pieralisi
Quoted 22 lines · Jonathan

Hi Bjorn,

Quoted 11 lines · Bjorn Helgaas

[+cc Andrew]

Quoted 7 lines · Jon Derrick

When some VMDs are enabled and others are not, it's difficult to determine which IIO stack corresponds to the enabled VMD.

To assist userspace with management tasks, VMD BIOS will write the VMD instance number and socket number into the first enabled root port's IO Base/Limit registers prior to OS handoff. VMD driver can capture this information and expose it to userspace.

Quoted 7 lines

Hmmm, I'm not sure I understand this, but it sounds possibly fragile. Are these Root Ports visible to the generic PCI core device enumeration? If so, it will find them and read these I/O window registers. Maybe today the PCI core doesn't change them, but I'm not sure we should rely on them always being preserved until the vmd driver can claim the device.

Quoted 4 lines

The Root Ports are on the VMD PCI domain, and this IO BASE/LIMIT parsing occurs before this PCI domain is exposed to the generic PCI scancode with pci_scan_child_bus(). Until that point the VMD PCI domain is invisible to the kernel outside of /dev/mem or resource0.

That's because the VMD controller is a PCI device itself and its BARs values are used to configure the VMD host controller.

Quoted 7 lines

Interesting.

To add to Bjorn's question, this reasoning assumes that whatever code enumerates the PCI device representing the VMD host controller does not overwrite its BARs upon bus enumeration otherwise the VMD controller configuration would be lost. Am I reading the current code correctly ?

Sorry, I just went through the code again, I think the VMD controller PCI device BARs can and are allowed to be reassigned by the PCI enumeration code - I misread the code, so I raised a non-existent issue here, they are like any other PCI device MEM/IO BARs in this respect.

Lorenzo

Quoted 49 lines

I assume there is not anything you can do to add firmware bindings to the VMD host controller PCI device to describe these properties you are exporting, so config space is the only available conduit to report them to an OS.

Lorenzo

Quoted 42 lines

However, yes, it is somewhat fragile in that a third-party driver could attach to the VMD endpoint prior to the VMD driver and modify the values. A /dev/mem or resource0 user could also do this on an unattached VMD endpoint.

I'm wondering if this would also be better suited for a special reset in quirks.c, but it would need to expose a bit of VMD config accessing in quirks.c to do that.

Quoted 3 lines

But I guess you're using a special config accessor (vmd_cfg_read()), so these are probably invisible to the generic enumeration?

Yes the VMD domain is invisible to generic PCI until the domain is enumerated late in vmd_enable_domain().

Quoted 10 lines
Quoted 7 lines

+ * for_each_vmd_root_port - iterate over all enabled VMD Root Ports
+ * @vmd: &struct vmd_dev VMD device descriptor
+ * @rp: int iterator cursor
+ * @temp: u32 temporary value for config read
+ *
+ * VMD Root Ports are located in the VMD PCIe Domain at 00:[0-3].0, and config
+ * space can be determinately accessed through the VMD Config BAR. Because VMD

I'm not sure how to parse "determinately accessed". Maybe this config space can *only* be accessed via the VMD Config BAR?

Perhaps it should instead say determinately addressed, as each Root Port config space is addressable at some offset of N * 0x8000 from the base of the VMD endpoint config bar. I can see the comment may not be helpful as that detail is abstracted using the vmd_cfg_read() helper.

Quoted 9 lines
Quoted 9 lines

+ * Root Ports can be individually disabled, it's important to iterate for the
+ * first enabled Root Port as determined by reading the Vendor/Device register.
+ */

drivers/pci/controller/vmd.c +5 -0
+#define for_each_vmd_root_port(vmd, rp, temp)				\
+	for (rp = 0; rp < 4; rp++)					\
+		if (vmd_cfg_read(vmd, 0, PCI_DEVFN(root_port, 0),	\
+				 PCI_VENDOR_ID, 4, &temp) ||		\
+		    temp == 0xffffffff) {} else
#11 lore raw

Re: [PATCH 2/3] PCI: vmd: Expose VMD details from BIOS

Quoted 40 lines · Lorenzo Pieralisi
Quoted 31 lines · Lorenzo Pieralisi
Quoted 22 lines · Jonathan

Hi Bjorn,

Quoted 11 lines · Bjorn Helgaas

[+cc Andrew]

Quoted 7 lines · Jon Derrick

When some VMDs are enabled and others are not, it's difficult to determine which IIO stack corresponds to the enabled VMD.

To assist userspace with management tasks, VMD BIOS will write the VMD instance number and socket number into the first enabled root port's IO Base/Limit registers prior to OS handoff. VMD driver can capture this information and expose it to userspace.

Quoted 7 lines

Hmmm, I'm not sure I understand this, but it sounds possibly fragile. Are these Root Ports visible to the generic PCI core device enumeration? If so, it will find them and read these I/O window registers. Maybe today the PCI core doesn't change them, but I'm not sure we should rely on them always being preserved until the vmd driver can claim the device.

Quoted 4 lines

The Root Ports are on the VMD PCI domain, and this IO BASE/LIMIT parsing occurs before this PCI domain is exposed to the generic PCI scancode with pci_scan_child_bus(). Until that point the VMD PCI domain is invisible to the kernel outside of /dev/mem or resource0.

That's because the VMD controller is a PCI device itself and its BARs values are used to configure the VMD host controller.

Quoted 7 lines

Interesting.

To add to Bjorn's question, this reasoning assumes that whatever code enumerates the PCI device representing the VMD host controller does not overwrite its BARs upon bus enumeration otherwise the VMD controller configuration would be lost. Am I reading the current code correctly ?

Quoted 7 lines

Sorry, I just went through the code again, I think the VMD controller PCI device BARs can and are allowed to be reassigned by the PCI enumeration code - I misread the code, so I raised a non-existent issue here, they are like any other PCI device MEM/IO BARs in this respect.

Lorenzo

Yes the VMD endpoint itself exposes the domain containing the Root Ports. It's the Root Ports which get enumerated by generic PCI scancode, and also the Root Port config space where this domain info is supplied. Without a VMD driver, the only aperture to access the Root Port config space is MMIO through the VMD endpoint's 'Config' BAR (aka MEMBAR0).

Without this patch, a /dev/mem, resource0, or third-party driver could overwrite these values if they don't also restore them on close/unbind. I imagine a kexec user would also overwrite these values.

This is one of the reasons I was also thinking it could live in device specific reset code as long as it can call into VMD for the specifics. Many kernel vendors already ship with VMD=y, so I am tempted to simply make that permanent and export a reset call to a dev specific reset in quirks.c.

#12 lore raw

Re: [PATCH 2/3] PCI: vmd: Expose VMD details from BIOS

Quoted 3 lines · Jonathan

Without this patch, a /dev/mem, resource0, or third-party driver could overwrite these values if they don't also restore them on close/unbind. I imagine a kexec user would also overwrite these values.

Don't you have the same problem with the in-kernel driver? It looks like pci core will clear the PCI_IO_BASE config registers in pci_setup_bridge_io() because VMD doesn't provide an IORESOURCE_IO resource. If you reload the driver, it'll read the wrong values on the second probing.

#13 lore raw

Re: [PATCH 2/3] PCI: vmd: Expose VMD details from BIOS

Quoted 10 lines · Keith Busch
Quoted 3 lines · Jonathan

Without this patch, a /dev/mem, resource0, or third-party driver could overwrite these values if they don't also restore them on close/unbind. I imagine a kexec user would also overwrite these values.

Don't you have the same problem with the in-kernel driver? It looks like pci core will clear the PCI_IO_BASE config registers in pci_setup_bridge_io() because VMD doesn't provide an IORESOURCE_IO resource. If you reload the driver, it'll read the wrong values on the second probing.

Is there a corner case I am missing with patch 3/3 that restores on unload?

#14 lore raw

Re: [PATCH 2/3] PCI: vmd: Expose VMD details from BIOS

Quoted 6 lines · Jonathan
Quoted 5 lines · Keith Busch
Quoted 3 lines · Jonathan

Without this patch, a /dev/mem, resource0, or third-party driver could overwrite these values if they don't also restore them on close/unbind. I imagine a kexec user would also overwrite these values.

Quoted 8 lines
Quoted 5 lines

Don't you have the same problem with the in-kernel driver? It looks like pci core will clear the PCI_IO_BASE config registers in pci_setup_bridge_io() because VMD doesn't provide an IORESOURCE_IO resource. If you reload the driver, it'll read the wrong values on the second probing.

Is there a corner case I am missing with patch 3/3 that restores on unload?

Nothing wrong with that. I just hadn't read that far :/

#15 lore raw

Re: [PATCH 2/3] PCI: vmd: Expose VMD details from BIOS

In reply to Derrick, Jonathan
Quoted 60 lines · Jonathan
Quoted 40 lines · Lorenzo Pieralisi
Quoted 31 lines · Lorenzo Pieralisi
Quoted 22 lines · Jonathan

Hi Bjorn,

Quoted 11 lines · Bjorn Helgaas

[+cc Andrew]

Quoted 7 lines · Jon Derrick

When some VMDs are enabled and others are not, it's difficult to determine which IIO stack corresponds to the enabled VMD.

To assist userspace with management tasks, VMD BIOS will write the VMD instance number and socket number into the first enabled root port's IO Base/Limit registers prior to OS handoff. VMD driver can capture this information and expose it to userspace.

Quoted 7 lines

Hmmm, I'm not sure I understand this, but it sounds possibly fragile. Are these Root Ports visible to the generic PCI core device enumeration? If so, it will find them and read these I/O window registers. Maybe today the PCI core doesn't change them, but I'm not sure we should rely on them always being preserved until the vmd driver can claim the device.

Quoted 4 lines

The Root Ports are on the VMD PCI domain, and this IO BASE/LIMIT parsing occurs before this PCI domain is exposed to the generic PCI scancode with pci_scan_child_bus(). Until that point the VMD PCI domain is invisible to the kernel outside of /dev/mem or resource0.

That's because the VMD controller is a PCI device itself and its BARs values are used to configure the VMD host controller.

Quoted 7 lines

Interesting.

To add to Bjorn's question, this reasoning assumes that whatever code enumerates the PCI device representing the VMD host controller does not overwrite its BARs upon bus enumeration otherwise the VMD controller configuration would be lost. Am I reading the current code correctly ?

Quoted 7 lines

Sorry, I just went through the code again, I think the VMD controller PCI device BARs can and are allowed to be reassigned by the PCI enumeration code - I misread the code, so I raised a non-existent issue here, they are like any other PCI device MEM/IO BARs in this respect.

Lorenzo

Yes the VMD endpoint itself exposes the domain containing the Root Ports. It's the Root Ports which get enumerated by generic PCI scancode, and also the Root Port config space where this domain info is supplied. Without a VMD driver, the only aperture to access the Root Port config space is MMIO through the VMD endpoint's 'Config' BAR (aka MEMBAR0).

Without this patch, a /dev/mem, resource0, or third-party driver could overwrite these values if they don't also restore them on close/unbind. I imagine a kexec user would also overwrite these values.

Quoted 5 lines

This is one of the reasons I was also thinking it could live in device specific reset code as long as it can call into VMD for the specifics. Many kernel vendors already ship with VMD=y, so I am tempted to simply make that permanent and export a reset call to a dev specific reset in quirks.c.

Hi Jon,

just wanted to ask you what's the plan with this series.

Thanks,
Lorenzo

#16 lore raw

Re: [PATCH 2/3] PCI: vmd: Expose VMD details from BIOS

Quoted 67 lines · Lorenzo Pieralisi
Quoted 60 lines · Jonathan
Quoted 40 lines · Lorenzo Pieralisi
Quoted 31 lines · Lorenzo Pieralisi
Quoted 22 lines · Jonathan

Hi Bjorn,

Quoted 11 lines · Bjorn Helgaas

[+cc Andrew]

Quoted 7 lines · Jon Derrick

When some VMDs are enabled and others are not, it's difficult to determine which IIO stack corresponds to the enabled VMD.

To assist userspace with management tasks, VMD BIOS will write the VMD instance number and socket number into the first enabled root port's IO Base/Limit registers prior to OS handoff. VMD driver can capture this information and expose it to userspace.

Quoted 7 lines

Hmmm, I'm not sure I understand this, but it sounds possibly fragile. Are these Root Ports visible to the generic PCI core device enumeration? If so, it will find them and read these I/O window registers. Maybe today the PCI core doesn't change them, but I'm not sure we should rely on them always being preserved until the vmd driver can claim the device.

Quoted 4 lines

The Root Ports are on the VMD PCI domain, and this IO BASE/LIMIT parsing occurs before this PCI domain is exposed to the generic PCI scancode with pci_scan_child_bus(). Until that point the VMD PCI domain is invisible to the kernel outside of /dev/mem or resource0.

That's because the VMD controller is a PCI device itself and its BARs values are used to configure the VMD host controller.

Quoted 7 lines

Interesting.

To add to Bjorn's question, this reasoning assumes that whatever code enumerates the PCI device representing the VMD host controller does not overwrite its BARs upon bus enumeration otherwise the VMD controller configuration would be lost. Am I reading the current code correctly ?

Quoted 7 lines

Sorry, I just went through the code again, I think the VMD controller PCI device BARs can and are allowed to be reassigned by the PCI enumeration code - I misread the code, so I raised a non-existent issue here, they are like any other PCI device MEM/IO BARs in this respect.

Lorenzo

Yes the VMD endpoint itself exposes the domain containing the Root Ports. It's the Root Ports which get enumerated by generic PCI scancode, and also the Root Port config space where this domain info is supplied. Without a VMD driver, the only aperture to access the Root Port config space is MMIO through the VMD endpoint's 'Config' BAR (aka MEMBAR0).

Without this patch, a /dev/mem, resource0, or third-party driver could overwrite these values if they don't also restore them on close/unbind. I imagine a kexec user would also overwrite these values.

Quoted 5 lines

This is one of the reasons I was also thinking it could live in device specific reset code as long as it can call into VMD for the specifics. Many kernel vendors already ship with VMD=y, so I am tempted to simply make that permanent and export a reset call to a dev specific reset in quirks.c.

Quoted 6 lines

Hi Jon,

just wanted to ask you what's the plan with this series.

Thanks,
Lorenzo

Please drop. We've implemented a different solution.

Thanks again,
Jon

#17 lore raw

PATCH 3/3 PCI: vmd: Restore domain info during resets/unloads

In reply to Jon Derrick

Persistent domain info written by VMD BIOS needs to be restored by the driver during module unloads or resets. This adds a remove or reset action to restore the parsed domain info to all enabled VMD Root Ports.

---
 drivers/pci/controller/vmd.c | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
drivers/pci/controller/vmd.c +32 -0
index dbe1bff..853aa93 100644
@@ -562,6 +562,33 @@ static int vmd_pci_write(struct pci_bus *bus, unsigned int devfn, int reg,
 				 PCI_VENDOR_ID, 4, &temp) ||		\
 		    temp == 0xffffffff) {} else
 
+static void vmd_restore_domain(void *data)
+{
+	struct vmd_dev *vmd = data;
+	int root_port;
+	u32 temp, iobase;
+
+	/*
+	 * It shouldn't be possible for the Root Port layout to change
+	 * dynamically (outside of BIOS), however there is no harm in writing
+	 * the persistent data back to all enabled Root Ports. PCI resource
+	 * assignment will discard any modifications on the next VMD domain bus
+	 * scan following VMD reset/probe.
+	 */
+	for_each_vmd_root_port(vmd, root_port, temp) {
+		if (vmd_cfg_read(vmd, 0, PCI_DEVFN(root_port, 0),
+				 PCI_IO_BASE, 2, &iobase))
+			return;
+
+		iobase &= ~((0xf << 4) | (0x3 << 14));
+		iobase |= vmd->socket_nr << 4 | vmd->instance_nr << 14;
+
+		if (vmd_cfg_write(vmd, 0, PCI_DEVFN(root_port, 0),
+				  PCI_IO_BASE, 2, iobase))
+			return;
+	}
+}
+
 static int vmd_parse_domain(struct vmd_dev *vmd)
 {
 	int root_port, ret;
@@ -579,6 +606,11 @@ static int vmd_parse_domain(struct vmd_dev *vmd)
 		vmd->socket_nr = (iobase >> 4) & 0xf;
 		vmd->instance_nr = (iobase >> 14) & 0x3;
 
+		ret = devm_add_action_or_reset(&vmd->dev->dev,
+					       vmd_restore_domain, vmd);
+		if (ret)
+			return ret;
+
 		/* First available will be used */
 		break;
 	}
Signature · 1 line
1.8.3.1