PCI: vmd: Add feature to scan BIOS enumerated devices.
Subsystems (3)
Nirmal Patel
maintainerPATCH v4 1/1 PCI: vmd: Add feature to scan BIOS enumerated devices.
Newer VMD with device ID 0x28c1 has unique settings compared to its predecessor where BIOS enumerates the entire VMD device tree and assigns respective configurations.
VMD configuration BAR0 carries over from GNR legacy VMD as the mechanism to access the configuration space of the devices owned by VMD. The size of this window is fixed at 256 MB, where each function consumes 4 KB and every bus consumes 1 MB.
The shadow and scratchpad registers have been relocated from the VMD configuration space to the VMD MMIO space in VMD BAR4/BAR5, otherwise refers to as MEMBAR2 or MSI-X bar.
VMD MSI-X remapping enable/disable is no longer supported.
All the VMD driver code needs to do is to obtain bus hide range along with shadow register values set by BIOS and perform a bus scan.
The patch also involves small refactoring of vmd_enable_domain function.
---
v4 : Updating vmd_set_msi_remapping for supported devices only. v3 : Hard code configbar .end to 0xff same as probe.c; Adjust membar2
offset to accommodate more registers in 28C1. Remove redundant IORESOURCE_MEM check in vmd_prepare_offsets_and_bus.
v2 : Using PCI features flag instead of devic ID and fixing corner cases
for vmd_remove_irq.
--- drivers/pci/controller/vmd.c | 174 +++++++++++++++++++++++++++-------- include/linux/pci_ids.h | 1 + 2 files changed, 136 insertions(+), 39 deletions(-)
drivers/pci/controller/vmd.c +135 -39
@@ -37,6 +37,12 @@#define MB2_SHADOW_OFFSET 0x2000#define MB2_SHADOW_SIZE 16 +/* DMR BAR4 register offsets */ +#define SHADOW_MEMBAR1_28C1 0x2818/* MEMBAR1 physical address */ +#define SHADOW_MEMBAR2_28C1 0x2820/* MEMBAR2 physical address */ +#define BASE_ID_REG_28C1 0x2840 +#define MEMBAR2_OFFSET_28C1 0x30d0 +enum vmd_features {/* * Device may contain registers which hint the physical location of the
@@ -77,6 +83,15 @@ enum vmd_features {* proper power management of the SoC. */ VMD_FEAT_BIOS_PM_QUIRK = (1 <<5 ), + +/* +* Newer VMD with device ID 0x28c1 has unique settings compared to its +* predecessor where BIOS enumerates the entire VMD device tree and +* stores respective configurations including bus start range and +* shadow registers in VMD MMIO space in VMD BAR4/BAR5, otherwise refers +* to as MEMBAR2 or MSI-X bar. +*/ + VMD_FEAT_USE_BIOS_INFO = (1 << 6), };#define VMD_BIOS_PM_QUIRK_LTR 0x1003/* 3145728 ns */
@@ -142,6 +157,7 @@ struct vmd_dev {u8 first_vec;char *name;int instance; +unsigned long features; };static inline struct vmd_dev *vmd_from_bus (struct pci_bus *bus)
@@ -365,6 +381,8 @@ static int vmd_create_irq_domain(struct vmd_dev *vmd)static void vmd_set_msi_remapping (struct vmd_dev *vmd,bool enable) {u16 reg; +if (!!(vmd->features &VMD_FEAT_USE_BIOS_INFO )) +return ;pci_read_config_word (vmd->dev,PCI_REG_VMCONFIG , ®); reg = enable ? (reg & ~VMCONFIG_MSI_REMAP) :
@@ -374,6 +392,8 @@ static void vmd_set_msi_remapping(struct vmd_dev *vmd, bool enable)static void vmd_remove_irq_domain (struct vmd_dev *vmd) { +if (!!(vmd->features &VMD_FEAT_USE_BIOS_INFO )) +return ;/* * Some production BIOS won't enable remapping between soft reboots. * Ensure remapping is restored before unloading the driver.
@@ -393,7 +413,12 @@ static void __iomem *vmd_cfg_addr(struct vmd_dev *vmd, struct pci_bus *bus, unsigned int devfn, int reg, int len) { unsigned int busnr_ecam = bus->number - vmd->busn_start; -u32 offset =PCIE_ECAM_OFFSET (busnr_ecam, devfn, reg); +u32 offset; + +if (!!(vmd->features &VMD_FEAT_USE_BIOS_INFO )) + busnr_ecam = bus->number; + + offset =PCIE_ECAM_OFFSET (busnr_ecam, devfn, reg);if (offset + len >=resource_size (&vmd->dev->resource[VMD_CFGBAR ]))return NULL ;
@@ -661,6 +686,46 @@ static int vmd_get_bus_number_start(struct vmd_dev *vmd)return 0 ; } +static int vmd_get_bus_info_from_bar4 (struct vmd_dev *vmd, +resource_size_t *offset1, +resource_size_t *offset2) +{ +u64 phys1, phys2, bar4_2840; +void __iomem *bar4; +u32 base_id; +u8 base_bus; + + + bar4 =pci_ioremap_bar (vmd->dev,4 ); +if (!bar4) +return -ENOMEM ; + +/* Read shadow registers for MEMBAR1 and MEMBAR2 physical addresses. */ + phys1 =readq (bar4 +SHADOW_MEMBAR1_28C1 ); + phys2 =readq (bar4 +SHADOW_MEMBAR2_28C1 ); + +/* +* Read and set bus start number from Base ID register. +* 24-bit Base ID register is part of 64-bit shadowed reqid hide +* range register and holds segment, bus, device and function. +*/ + bar4_2840 =readq (bar4 +BASE_ID_REG_28C1 ); + base_id = bar4_2840 &0xFFFFFF ; + base_bus = base_id >>8 ; + vmd->busn_start = base_bus; + +/* Calculate offsets like vmd_get_phys_offsets() does. */ +if (phys1) + *offset1 = vmd->dev->resource[VMD_MEMBAR1 ].start - + (phys1 &PCI_BASE_ADDRESS_MEM_MASK ); +if (phys2) + *offset2 = vmd->dev->resource[VMD_MEMBAR2 ].start - + (phys2 &PCI_BASE_ADDRESS_MEM_MASK ); + +pci_iounmap (vmd->dev, bar4); +return 0 ; +} +static irqreturn_t vmd_irq (int irq,void *data) {struct vmd_irq_list *irqs = data;
@@ -711,6 +776,53 @@ static int vmd_alloc_irqs(struct vmd_dev *vmd)return 0 ; } +static int vmd_prepare_offsets_and_bus (struct vmd_dev *vmd, +unsigned long features, +resource_size_t *membar2_offset, +resource_size_t *offset1, +resource_size_t *offset2) +{ +int ret; + +/* +* Shadow registers may exist in certain VMD device ids which allow +* guests to correctly assign host physical addresses to the root ports +* and child devices. These registers will either return the host value +* or 0, depending on an enable bit in the VMD device. +*/ +/* +* For certain VMD devices (i.e. 0x28C1), BIOS places device info +* in BAR4 shadow registers to determine the base bus number and memory +* offsets. +*/ +if (features &VMD_FEAT_USE_BIOS_INFO ) { + *membar2_offset =MEMBAR2_OFFSET_28C1 ; + ret =vmd_get_bus_info_from_bar4 (vmd, offset1, offset2); +if (ret) +return ret; + }else if (features &VMD_FEAT_HAS_MEMBAR_SHADOW ) { + *membar2_offset =MB2_SHADOW_OFFSET +MB2_SHADOW_SIZE ; + ret =vmd_get_phys_offsets (vmd, true, offset1, offset2); +if (ret) +return ret; + }else if (features &VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP ) { + ret =vmd_get_phys_offsets (vmd, false, offset1, offset2); +if (ret) +return ret; + } + +/* +* Certain VMD devices may have a root port configuration option which +* limits the bus range to between 0-127, 128-255, or 224-255. +*/ +if (features &VMD_FEAT_HAS_BUS_RESTRICTIONS ) { + ret =vmd_get_bus_number_start (vmd); +if (ret) +return ret; + } +return 0 ; +} +/* * Since VMD is an aperture to regular PCIe root ports, only allow it to * control features that the OS is allowed to control on the physical PCI bus.
@@ -784,38 +896,16 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features)struct pci_dev *dev;int ret; -/* -* Shadow registers may exist in certain VMD device ids which allow -* guests to correctly assign host physical addresses to the root ports -* and child devices. These registers will either return the host value -* or 0, depending on an enable bit in the VMD device. -*/ -if (features &VMD_FEAT_HAS_MEMBAR_SHADOW ) { - membar2_offset =MB2_SHADOW_OFFSET +MB2_SHADOW_SIZE ; - ret =vmd_get_phys_offsets (vmd, true, &offset[0 ], &offset[1 ]); -if (ret) -return ret; - }else if (features &VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP ) { - ret =vmd_get_phys_offsets (vmd, false, &offset[0 ], &offset[1 ]); -if (ret) -return ret; - } - -/* -* Certain VMD devices may have a root port configuration option which -* limits the bus range to between 0-127, 128-255, or 224-255 -*/ -if (features &VMD_FEAT_HAS_BUS_RESTRICTIONS ) { - ret =vmd_get_bus_number_start (vmd); -if (ret) -return ret; - } + ret =vmd_prepare_offsets_and_bus (vmd, features, &membar2_offset, + &offset[0 ], &offset[1 ]); +if (ret) +return ret; res = &vmd->dev->resource[VMD_CFGBAR ]; vmd->resources[0 ] = (struct resource ) { .name ="VMD CFGBAR" , .start = vmd->busn_start, - .end = vmd->busn_start + (resource_size (res) >>20 ) -1 , + .end =0xff , .flags =IORESOURCE_BUS |IORESOURCE_PCI_FIXED , };
@@ -868,19 +958,21 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features)* acceptable because the guest is usually CPU-limited and MSI * remapping doesn't become a performance bottleneck. */ -if (!(features &VMD_FEAT_CAN_BYPASS_MSI_REMAP ) || - offset[0 ] || offset[1 ]) { - ret =vmd_alloc_irqs (vmd); -if (ret) -return ret; +if (!(features &VMD_FEAT_USE_BIOS_INFO )) { +if (!(features &VMD_FEAT_CAN_BYPASS_MSI_REMAP ) || + offset[0 ] || offset[1 ]) { + ret =vmd_alloc_irqs (vmd); +if (ret) +return ret; -vmd_set_msi_remapping (vmd, true); +vmd_set_msi_remapping (vmd, true); - ret =vmd_create_irq_domain (vmd); -if (ret) -return ret; - }else { -vmd_set_msi_remapping (vmd, false); + ret =vmd_create_irq_domain (vmd); +if (ret) +return ret; + }else { +vmd_set_msi_remapping (vmd, false); + } }pci_add_resource (&resources, &vmd->resources[0 ]);
@@ -998,6 +1090,7 @@ static int vmd_probe(struct pci_dev *dev, const struct pci_device_id *id) vmd->dev = dev; vmd->sysdata.domain =PCI_DOMAIN_NR_NOT_SET ; + vmd->features = features; vmd->instance =ida_alloc (&vmd_instance_ida,GFP_KERNEL );if (vmd->instance <0 )return vmd->instance;
@@ -1114,6 +1207,9 @@ static const struct pci_device_id vmd_ids[] = { .driver_data = VMD_FEAT_HAS_MEMBAR_SHADOW | VMD_FEAT_HAS_BUS_RESTRICTIONS | VMD_FEAT_CAN_BYPASS_MSI_REMAP,}, + {PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_VMD_28C1), + .driver_data =VMD_FEAT_HAS_MEMBAR_SHADOW | + VMD_FEAT_USE_BIOS_INFO,}, {PCI_VDEVICE(INTEL, 0x467f), .driver_data = VMD_FEATS_CLIENT,}, {PCI_VDEVICE(INTEL, 0x4c3d),
include/linux/pci_ids.h +1 -0
@@ -2889,6 +2889,7 @@#define PCI_DEVICE_ID_INTEL_HDA_ICH8 0x284b#define PCI_DEVICE_ID_INTEL_ICH8_6 0x2850#define PCI_DEVICE_ID_INTEL_VMD_28C0 0x28c0 +#define PCI_DEVICE_ID_INTEL_VMD_28C1 0x28c1#define PCI_DEVICE_ID_INTEL_ICH9_0 0x2910#define PCI_DEVICE_ID_INTEL_ICH9_2 0x2912#define PCI_DEVICE_ID_INTEL_ICH9_3 0x2913
Signature · 1 line
2.52.0
[email protected]
AI reviewThank you for your contribution! Sashiko AI review found 6 potential issue(s) to consider:
Thank you for your contribution! Sashiko AI review found 6 potential issue(s) to consider:
New issues:
- [High] The driver unconditionally reads from fixed offsets in BAR4 without verifying that the BAR size is sufficiently large.
- [High] The PCI bus resource .end is unconditionally hardcoded to 0xff, breaking legacy devices with smaller configuration BARs.
Pre-existing issues:
- [High] Allocated IRQ vectors are leaked in multiple error paths and during device teardown.
- [High] Per-CPU memory allocated for SRCU structures is leaked on error paths.
- [High] SRCU lock structures are destroyed before the IRQ handlers are unregistered, allowing a use-after-free.
- [High] Subtracting a fixed offset from the resource bounds of MEMBAR2 without verifying the actual BAR length causes an integer underflow. --
commit 0653c66e9c93e9c62213a329c19bf93e4499969f
Author: Nirmal Patel <[email protected]>
Subject: PCI: vmd: Add feature to scan BIOS enumerated devices.
This commit introduces the VMD_FEAT_USE_BIOS_INFO feature flag for device 0x28c1. It parses configuration parameters, bus start ranges, and shadow registers directly from the BIOS-populated BAR4/BAR5 MMIO space rather than enumerating the tree dynamically.
Quoted 4 lines
drivers/pci/controller/vmd.c +0
-0
[ ... ]
Quoted 10 lines
drivers/pci/controller/vmd.c +6
-0@@ -661,6 +686,46 @@ static int vmd_get_bus_number_start(struct vmd_dev *vmd)return 0 ; } +static int vmd_get_bus_info_from_bar4 (struct vmd_dev *vmd, +resource_size_t *offset1, +resource_size_t *offset2) +{ +u64 phys1, phys2, bar4_2840; +void __iomem *bar4;
drivers/pci/controller/vmd.c static int vmd_get_bus_number_start(struct vmd_dev *vmd) · line 704
Quoted 10 lines
drivers/pci/controller/vmd.c +10
-0+u32 base_id; +u8 base_bus; + + + bar4 =pci_ioremap_bar (vmd->dev,4 ); +if (!bar4) +return -ENOMEM ; + +/* Read shadow registers for MEMBAR1 and MEMBAR2 physical addresses. */ + phys1 =readq (bar4 +SHADOW_MEMBAR1_28C1 );
[Severity: High]
Does this code read out-of-bounds if the hardware presents a smaller BAR4?
pci_ioremap_bar() maps the available resource, but there doesn't appear to be a check verifying that the BAR length is at least large enough to cover the fixed offsets being read, such as 0x2840 (BASE_ID_REG_28C1).
Could a misconfigured or malicious device trigger an out-of-bounds MMIO read here?
Quoted 1 line
drivers/pci/controller/vmd.c +1
-0+ phys2 =readq (bar4 +SHADOW_MEMBAR2_28C1 );
[ ... ]
Quoted 15 lines
drivers/pci/controller/vmd.c +11
-0@@ -711,6 +776,53 @@ static int vmd_alloc_irqs(struct vmd_dev *vmd)return 0 ; } +static int vmd_prepare_offsets_and_bus (struct vmd_dev *vmd, +unsigned long features, +resource_size_t *membar2_offset, +resource_size_t *offset1, +resource_size_t *offset2) +{ +int ret; + +/* +* Shadow registers may exist in certain VMD device ids which allow +* guests to correctly assign host physical addresses to the root ports
drivers/pci/controller/vmd.c static int vmd_alloc_irqs(struct vmd_dev *vmd) · line 799
Quoted 10 lines
drivers/pci/controller/vmd.c +10
-0+* and child devices. These registers will either return the host value +* or 0, depending on an enable bit in the VMD device. +*/ +/* +* For certain VMD devices (i.e. 0x28C1), BIOS places device info +* in BAR4 shadow registers to determine the base bus number and memory +* offsets. +*/ +if (features &VMD_FEAT_USE_BIOS_INFO ) { + *membar2_offset =MEMBAR2_OFFSET_28C1 ;
[Severity: High]
This is a pre-existing issue, but can setting this offset cause an integer underflow later?
In vmd_enable_domain(), the resource start is calculated as:
vmd->resources[2] = (struct resource) {
.name = "VMD MEMBAR2",
.start = res->start + membar2_offset,
.end = res->end,
...
};If the physical MEMBAR2 length provided by the hardware is smaller than membar2_offset, start becomes greater than end, which could cause resource_size() to underflow and yield a massively inflated memory window.
Quoted 4 lines
drivers/pci/controller/vmd.c +4
-0+ ret =vmd_get_bus_info_from_bar4 (vmd, offset1, offset2); +if (ret) +return ret; + }else if (features &VMD_FEAT_HAS_MEMBAR_SHADOW ) {
[ ... ]
Quoted 6 lines
drivers/pci/controller/vmd.c +0
-2@@ -784,38 +896,16 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features)struct pci_dev *dev;int ret; -/* -* Shadow registers may exist in certain VMD device ids which allow
[ ... ]
Quoted 6 lines
drivers/pci/controller/vmd.c +1
-5-if (features &VMD_FEAT_HAS_BUS_RESTRICTIONS ) { - ret =vmd_get_bus_number_start (vmd); -if (ret) -return ret; - } + ret = vmd_prepare_offsets_and_bus(vmd, features, &membar2_offset,
drivers/pci/controller/vmd.c static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features) · line 908
Quoted 10 lines
drivers/pci/controller/vmd.c +4
-1+ &offset[0], &offset[1]); +if (ret) +return ret; res = &vmd->dev->resource[VMD_CFGBAR ]; vmd->resources[0 ] = (struct resource ) { .name ="VMD CFGBAR" , .start = vmd->busn_start, - .end = vmd->busn_start + (resource_size (res) >>20 ) -1 , + .end =0xff ,
[Severity: High]
Does unconditionally setting the end to 0xff cause a regression for legacy VMD devices with smaller configuration BARs?
Older devices on client platforms might have smaller CFGBARs. Claiming buses up to 255 might cause the PCI subsystem to erroneously assign bus numbers that fall outside the hardware's actual ECAM capabilities.
Quoted 18 lines
drivers/pci/controller/vmd.c +6
-5.flags = IORESOURCE_BUS | IORESOURCE_PCI_FIXED, };@@ -868,19 +958,21 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features)* acceptable because the guest is usually CPU-limited and MSI * remapping doesn't become a performance bottleneck. */ -if (!(features &VMD_FEAT_CAN_BYPASS_MSI_REMAP ) || - offset[0 ] || offset[1 ]) { - ret =vmd_alloc_irqs (vmd); -if (ret) -return ret; +if (!(features &VMD_FEAT_USE_BIOS_INFO )) { +if (!(features &VMD_FEAT_CAN_BYPASS_MSI_REMAP ) || + offset[0 ] || offset[1 ]) { + ret =vmd_alloc_irqs (vmd); +if (ret) +return ret;
drivers/pci/controller/vmd.c static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features) · line 972
Quoted 10 lines
drivers/pci/controller/vmd.c +4
-4-vmd_set_msi_remapping (vmd, true); +vmd_set_msi_remapping (vmd, true); - ret =vmd_create_irq_domain (vmd); -if (ret) -return ret; + ret =vmd_create_irq_domain (vmd); +if (ret) +return ret;
[Severity: High]
This is a pre-existing issue, but are IRQ vectors leaked when errors occur here?
The PCI subsystem guidelines mandate calling pci_free_irq_vectors() in error paths after a successful pci_alloc_irq_vectors(). If vmd_create_irq_domain() fails, we return directly without freeing the vectors allocated in vmd_alloc_irqs(). This same cleanup omission appears to exist in vmd_remove() as well, potentially leading to system IRQ capacity exhaustion.
Additionally, if vmd_alloc_irqs() fails midway through devm_request_irq(), does it return without cleaning up the successfully initialized SRCU structures from previous loop iterations? The per-CPU memory allocated by init_srcu_struct() might be leaked.
[Severity: High]
Also a pre-existing issue, but does using devm_request_irq() for the handlers cause a use-after-free during device teardown?
In vmd_remove(), the driver calls vmd_cleanup_srcu() which destroys the SRCU structures. However, since the IRQs are managed by devres, they aren't deregistered until after vmd_remove() returns.
If an interrupt fires in this window, vmd_irq() would call srcu_read_lock() on an already-destroyed SRCU structure.
Quoted 4 lines
drivers/pci/controller/vmd.c +3
-0+ }else { +vmd_set_msi_remapping (vmd, false); + } }
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Nirmal Patel
maintainerQuoted 9 lines · On Fri, 22 May 2026 15:42:16 +0000 [email protected] wrote:
Thank you for your contribution! Sashiko AI review found 6 potential issue(s) to consider:
New issues:
- [High] The driver unconditionally reads from fixed offsets in BAR4 without verifying that the BAR size is sufficiently large.
- [High] The PCI bus resource.endis unconditionally hardcoded to0xff, breaking legacy devices with smaller configuration BARs.
Quoted 11 lines
Pre-existing issues:
- [High] Allocated IRQ vectors are leaked in multiple error paths and during device teardown.
- [High] Per-CPU memory allocated for SRCU structures is leaked on error paths.
- [High] SRCU lock structures are destroyed before the IRQ handlers are unregistered, allowing a use-after-free.
- [High] Subtracting a fixed offset from the resource bounds of MEMBAR2 without verifying the actual BAR length causes an integer underflow. --
Pre-existing issues are not in scope of the feature in this patch series.
Quoted 40 lines
commit
0653c66e9c93e9c62213a329c19bf93e4499969f
Author: Nirmal Patel <[email protected]>
Subject: PCI: vmd: Add feature to scan BIOS enumerated devices.This commit introduces the
VMD_FEAT_USE_BIOS_INFOfeature flag for device0x28c1. It parses configuration parameters, bus start ranges, and shadow registers directly from the BIOS-populated BAR4/BAR5 MMIO space rather than enumerating the tree dynamically.Quoted 4 lines
(quoted diff) +0
-0
b/drivers/pci/controller/vmd.cindexd4ae250d4bc6d..7c90243b5ff0c100644 ---a/drivers/pci/controller/vmd.c
+++b/drivers/pci/controller/vmd.c[ ... ]
Quoted 20 lines
drivers/pci/controller/vmd.c +15
-0@@ -661,6 +686,46 @@ static int vmd_get_bus_number_start(struct vmd_dev *vmd) return 0; } +static int vmd_get_bus_info_from_bar4 (struct vmd_dev *vmd, +resource_size_t *offset1, +resource_size_t *offset2) +{ +u64 phys1, phys2, bar4_2840; +void __iomem *bar4; +u32 base_id; +u8 base_bus; + + + bar4 =pci_ioremap_bar (vmd->dev,4 ); +if (!bar4) +return -ENOMEM ; + +/* Read shadow registers for MEMBAR1 and MEMBAR2 physical addresses. */
drivers/pci/controller/vmd.c static int vmd_get_bus_number_start(struct vmd_dev *vmd) · line 704
Quoted 1 line
drivers/pci/controller/vmd.c +1
-0+ phys1 =readq (bar4 +SHADOW_MEMBAR1_28C1 );[Severity: High]
Does this code read out-of-bounds if the hardware presents a smaller BAR4?
Quoted 7 lines
pci_ioremap_bar()maps the available resource, but there doesn't appear to be a check verifying that the BAR length is at least large enough to cover the fixed offsets being read, such as0x2840(BASE_ID_REG_28C1).Could a misconfigured or malicious device trigger an out-of-bounds MMIO read here?
I dont think so. vmd_get_bus_info_from_bar4 gets called for only device ID specific flag VMD_FEAT_USE_BIOS_INFO. BASE_ID_REG_28C is set to 0x2840 which is just 10KB of space and is much lesser than standard membar2 resource size 2MB. Besides we are doing the same thing in vmd_get_phys_offsets.
Quoted 48 lines
Quoted 2 lines
drivers/pci/controller/vmd.c +1
-0+ phys2 =readq (bar4 +SHADOW_MEMBAR2_28C1 );[ ... ]
Quoted 27 lines
drivers/pci/controller/vmd.c +10
-0@@ -711,6 +776,53 @@ static int vmd_alloc_irqs(struct vmd_dev *vmd)return 0 ; } +static int vmd_prepare_offsets_and_bus (struct vmd_dev *vmd, +unsigned long features, +resource_size_t *membar2_offset, +resource_size_t *offset1, +resource_size_t *offset2) +{ +int ret; + +/* +* Shadow registers may exist in certain VMD device ids which allow
(quoted diff) +1
-0+ * guests to correctly assign host physical addresses tothe root ports
(quoted diff) +1
-0+ * and child devices. These registers will either returnthe host value
drivers/pci/controller/vmd.c +4
-0+* or 0, depending on an enable bit in the VMD device. +*/ +/* +* For certain VMD devices (i.e. 0x28C1), BIOS places device info
(quoted diff) +1
-0+ * in BAR4 shadow registers to determine the base busnumber and memory
drivers/pci/controller/vmd.c static int vmd_alloc_irqs(struct vmd_dev *vmd) · line 799
Quoted 4 lines
drivers/pci/controller/vmd.c +4
-0+* offsets. +*/ +if (features &VMD_FEAT_USE_BIOS_INFO ) { + *membar2_offset =MEMBAR2_OFFSET_28C1 ;[Severity: High]
This is a pre-existing issue, but can setting this offset cause an integer underflow later?In
vmd_enable_domain(), the resource start is calculated as:vmd->resources[2] = (struct resource) { .name = "VMD MEMBAR2", .start = res->start + membar2_offset, .end = res->end, ... };
Quoted 4 lines
If the physical MEMBAR2 length provided by the hardware is smaller than
membar2_offset, start becomes greater than end, which could causeresource_size()to underflow and yield a massively inflated memory window.
membar2_offset is 0x2000 and it is required to leave such space to successfully map other VMD hardware registers including MSI-X. So resource_size() will never be less than 0x2000 for any vmd device since the minimum possible membar2 size is 2MB set in BIOS.
Quoted 38 lines
Quoted 6 lines
(quoted diff) +1
-0+ ret = vmd_get_bus_info_from_bar4(vmd, offset1,offset2);
drivers/pci/controller/vmd.c +3
-0+if (ret) +return ret; + }else if (features &VMD_FEAT_HAS_MEMBAR_SHADOW ) {[ ... ]
Quoted 7 lines
drivers/pci/controller/vmd.c +0
-2@@ -784,38 +896,16 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features) struct pci_dev *dev;int ret; -/* -* Shadow registers may exist in certain VMD device ids which allow
[ ... ]
Quoted 17 lines
drivers/pci/controller/vmd.c +1
-5-if (features &VMD_FEAT_HAS_BUS_RESTRICTIONS ) { - ret =vmd_get_bus_number_start (vmd); -if (ret) -return ret; - } + ret = vmd_prepare_offsets_and_bus(vmd, features,
&membar2_offset,drivers/pci/controller/vmd.c +3
-1+ &offset[0], &offset[1]); +if (ret) +return ret; res = &vmd->dev->resource[VMD_CFGBAR ]; vmd->resources[0 ] = (struct resource ) { .name ="VMD CFGBAR" , .start = vmd->busn_start, - .end = vmd->busn_start + (resource_size(res) >>20) - 1,
drivers/pci/controller/vmd.c static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features) · line 908
Quoted 1 line
drivers/pci/controller/vmd.c +1
-0+ .end = 0xff,[Severity: High]
Does unconditionally setting the end to0xffcause a regression for legacy VMD devices with smaller configuration BARs?
Quoted 4 lines
Older devices on client platforms might have smaller CFGBARs. Claiming buses up to 255 might cause the PCI subsystem to erroneously assign bus numbers that fall outside the hardware's actual ECAM capabilities.
If i keep existing implementation (like v1), the .end value can go out-of-bound (i.e. 478).
Keeping just .end = (resource_size(res) >> 20) - 1 will result in a crash when busn_start is a high value like 128 and .end is set to 32. So like other places in pci code-base (i.e. pci/probe.c), it is better to hard code it to 0xff.
Quoted 25 lines
Quoted 25 lines
drivers/pci/controller/vmd.c +0
-0.flags = IORESOURCE_BUS | IORESOURCE_PCI_FIXED, };@@ -868,19 +958,21 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features) * acceptable because the guest is usually CPU-limited andMSI
drivers/pci/controller/vmd.c +7
-6* remapping doesn't become a performance bottleneck. */ -if (!(features &VMD_FEAT_CAN_BYPASS_MSI_REMAP ) || - offset[0 ] || offset[1 ]) { - ret =vmd_alloc_irqs (vmd); -if (ret) -return ret; +if (!(features &VMD_FEAT_USE_BIOS_INFO )) { +if (!(features &VMD_FEAT_CAN_BYPASS_MSI_REMAP ) || + offset[0 ] || offset[1 ]) { + ret =vmd_alloc_irqs (vmd); +if (ret) +return ret; -vmd_set_msi_remapping (vmd, true); +vmd_set_msi_remapping (vmd, true);
Quoted 10 lines
drivers/pci/controller/vmd.c static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features) · line 972
Quoted 6 lines
drivers/pci/controller/vmd.c +3
-3- ret =vmd_create_irq_domain (vmd); -if (ret) -return ret; + ret =vmd_create_irq_domain (vmd); +if (ret) +return ret;[Severity: High]
This is a pre-existing issue, but are IRQ vectors leaked when errors occur here?
No changes are being done here as part of this feature patch series. The existing issue needs to be reproduced and if needed, then to be fixed in separate patches.
Quoted 14 lines
The PCI subsystem guidelines mandate calling
pci_free_irq_vectors()in error paths after a successfulpci_alloc_irq_vectors(). Ifvmd_create_irq_domain()fails, we return directly without freeing the vectors allocated invmd_alloc_irqs(). This same cleanup omission appears to exist invmd_remove()as well, potentially leading to system IRQ capacity exhaustion.Additionally, if
vmd_alloc_irqs()fails midway throughdevm_request_irq(), does it return without cleaning up the successfully initialized SRCU structures from previous loop iterations? The per-CPU memory allocated byinit_srcu_struct()might be leaked.
Quoted 3 lines
[Severity: High]
Also a pre-existing issue, but does usingdevm_request_irq()for the handlers cause a use-after-free during device teardown?
The issue has not be reported or seen in any vmd generations. No changes are being done here as part of this feature patch series. The existing issue needs to be reproduced and if needed, then to be fixed in separate patches.
Quoted 13 lines
In
vmd_remove(), the driver callsvmd_cleanup_srcu()which destroys the SRCU structures. However, since the IRQs are managed by devres, they aren't deregistered until aftervmd_remove()returns.If an interrupt fires in this window,
vmd_irq()would callsrcu_read_lock()on an already-destroyed SRCU structure.Quoted 4 lines
drivers/pci/controller/vmd.c +3
-0+ }else { +vmd_set_msi_remapping (vmd, false); + } }
Nirmal Patel
maintainerQuoted 339 lines · On Fri, 22 May 2026 15:08:29 +0000 Nirmal Patel <[email protected]>…
Newer VMD with device ID
0x28c1has unique settings compared to its predecessor where BIOS enumerates the entire VMD device tree and assigns respective configurations.VMD configuration BAR0 carries over from GNR legacy VMD as the mechanism to access the configuration space of the devices owned by VMD. The size of this window is fixed at 256 MB, where each function consumes 4 KB and every bus consumes 1 MB.
The shadow and scratchpad registers have been relocated from the VMD configuration space to the VMD MMIO space in VMD BAR4/BAR5, otherwise refers to as MEMBAR2 or MSI-X bar.
VMD MSI-X remapping enable/disable is no longer supported.
All the VMD driver code needs to do is to obtain bus hide range along with shadow register values set by BIOS and perform a bus scan.
The patch also involves small refactoring of
vmd_enable_domainfunction.Signed-off-by Nirmal Patel <[email protected]>---
v4 : Updatingvmd_set_msi_remappingfor supported devices only. v3 : Hard code configbar .end to0xffsame asprobe.c; Adjust membar2
offset to accommodate more registers in 28C1. Remove redundantIORESOURCE_MEMcheck invmd_prepare_offsets_and_bus.
v2 : Using PCI features flag instead of devic ID and fixing corner cases forvmd_remove_irq.--- drivers/pci/controller/vmd.c | 174+++++++++++++++++++++++++++--------
include/linux/pci_ids.h|
1 + 2 files changed, 136 insertions(+), 39 deletions(-)(quoted diff) +0
-0
b/drivers/pci/controller/vmd.cindexd4ae250d4bc6..7c90243b5ff0100644drivers/pci/controller/vmd.c +2
-0@@ -37,6 +37,12 @@#define MB2_SHADOW_OFFSET 0x2000#define MB2_SHADOW_SIZE 16 +/* DMR BAR4 register offsets */ +#define SHADOW_MEMBAR1_28C1 0x2818/* MEMBAR1 physical address */ +#define
SHADOW_MEMBAR2_28C10x2820/* MEMBAR2 physical address */ +#defineBASE_ID_REG_28C10x2840+#defineMEMBAR2_OFFSET_28C10x30d0+
enumvmd_features{drivers/pci/controller/vmd.c +0
-0/* * Device may contain registers which hint the physical location of the @@ -77,6 +83,15 @@ enum
vmd_features{drivers/pci/controller/vmd.c +3
-0* proper power management of the SoC. */ VMD_FEAT_BIOS_PM_QUIRK = (1 << 5), + +/* +* Newer VMD with device ID 0x28c1 has unique settings compared to its
drivers/pci/controller/vmd.c +1
-0+* predecessor where BIOS enumerates the entire VMD device tree and
drivers/pci/controller/vmd.c +1
-0+* stores respective configurations including bus start range and
drivers/pci/controller/vmd.c +1
-0+* shadow registers in VMD MMIO space in VMD BAR4/BAR5, otherwise refers
drivers/pci/controller/vmd.c +8
-0+* to as MEMBAR2 or MSI-X bar. +*/ + VMD_FEAT_USE_BIOS_INFO = (1 << 6), };#define VMD_BIOS_PM_QUIRK_LTR 0x1003/* 3145728 ns */ @@ -142,6 +157,7 @@ struct vmd_dev {u8 first_vec;char *name;int instance; +unsigned long features; };static inline struct vmd_dev *vmd_from_bus (struct pci_bus *bus)@@ -365,6 +381,8 @@ static int vmd_create_irq_domain(struct vmd_dev *vmd) static void vmd_set_msi_remapping(struct vmd_dev *vmd, bool enable) {u16 reg; +if (!!(vmd->features &VMD_FEAT_USE_BIOS_INFO )) +return ;pci_read_config_word (vmd->dev,PCI_REG_VMCONFIG , ®); reg = enable ? (reg & ~VMCONFIG_MSI_REMAP) :@@ -374,6 +392,8 @@ static void vmd_set_msi_remapping(struct vmd_dev *vmd, bool enable)static void vmd_remove_irq_domain (struct vmd_dev *vmd) { +if (!!(vmd->features &VMD_FEAT_USE_BIOS_INFO )) +return ;/* * Some production BIOS won't enable remapping between soft reboots.
drivers/pci/controller/vmd.c +21
-1* Ensure remapping is restored before unloading the driver. @@ -393,7 +413,12 @@ static void __iomem *vmd_cfg_addr(struct vmd_dev *vmd, struct pci_bus *bus, unsigned int devfn, int reg, int len) {unsigned int busnr_ecam = bus->number - vmd->busn_start; -u32 offset =PCIE_ECAM_OFFSET (busnr_ecam, devfn, reg); +u32 offset; + +if (!!(vmd->features &VMD_FEAT_USE_BIOS_INFO )) + busnr_ecam = bus->number; + + offset =PCIE_ECAM_OFFSET (busnr_ecam, devfn, reg);if (offset + len >=resource_size (&vmd->dev->resource[VMD_CFGBAR ]))return NULL ;@@ -661,6 +686,46 @@ static int vmd_get_bus_number_start(struct vmd_dev *vmd) return 0; } +static int vmd_get_bus_info_from_bar4 (struct vmd_dev *vmd, +resource_size_t *offset1, +resource_size_t *offset2) +{ +u64 phys1, phys2, bar4_2840; +void __iomem *bar4; +u32 base_id; +u8 base_bus; + + + bar4 =pci_ioremap_bar (vmd->dev,4 ); +if (!bar4) +return -ENOMEM ; + +/* Read shadow registers for MEMBAR1 and MEMBAR2 physical addresses. */
drivers/pci/controller/vmd.c +6
-0+ phys1 =readq (bar4 +SHADOW_MEMBAR1_28C1 ); + phys2 =readq (bar4 +SHADOW_MEMBAR2_28C1 ); + +/* +* Read and set bus start number from Base ID register. +* 24-bit Base ID register is part of 64-bit shadowed reqid hide
drivers/pci/controller/vmd.c +1
-0+* range register and holds segment, bus, device and function.
drivers/pci/controller/vmd.c +28
-0+*/ + bar4_2840 =readq (bar4 +BASE_ID_REG_28C1 ); + base_id = bar4_2840 &0xFFFFFF ; + base_bus = base_id >>8 ; + vmd->busn_start = base_bus; + +/* Calculate offsets like vmd_get_phys_offsets() does. */ +if (phys1) + *offset1 = vmd->dev->resource[VMD_MEMBAR1 ].start - + (phys1 &PCI_BASE_ADDRESS_MEM_MASK ); +if (phys2) + *offset2 = vmd->dev->resource[VMD_MEMBAR2 ].start - + (phys2 &PCI_BASE_ADDRESS_MEM_MASK ); + +pci_iounmap (vmd->dev, bar4); +return 0 ; +} +static irqreturn_t vmd_irq (int irq,void *data) {struct vmd_irq_list *irqs = data;@@ -711,6 +776,53 @@ static int vmd_alloc_irqs(struct vmd_dev *vmd)return 0 ; } +static int vmd_prepare_offsets_and_bus (struct vmd_dev *vmd, +unsigned long features, +resource_size_t *membar2_offset, +resource_size_t *offset1, +resource_size_t *offset2) +{ +int ret; + +/* +* Shadow registers may exist in certain VMD device ids which allow
drivers/pci/controller/vmd.c +1
-0+* guests to correctly assign host physical addresses to the root ports
drivers/pci/controller/vmd.c +1
-0+* and child devices. These registers will either return the host value
drivers/pci/controller/vmd.c +4
-0+* or 0, depending on an enable bit in the VMD device. +*/ +/* +* For certain VMD devices (i.e. 0x28C1), BIOS places device info
drivers/pci/controller/vmd.c +1
-0+* in BAR4 shadow registers to determine the base bus number and memory
drivers/pci/controller/vmd.c +5
-0+* offsets. +*/ +if (features &VMD_FEAT_USE_BIOS_INFO ) { + *membar2_offset =MEMBAR2_OFFSET_28C1 ; + ret = vmd_get_bus_info_from_bar4(vmd, offset1,offset2);
drivers/pci/controller/vmd.c +4
-0+if (ret) +return ret; + }else if (features &VMD_FEAT_HAS_MEMBAR_SHADOW ) { + *membar2_offset = MB2_SHADOW_OFFSET +
MB2_SHADOW_SIZE;drivers/pci/controller/vmd.c +1
-0+ ret = vmd_get_phys_offsets(vmd, true, offset1,offset2);
drivers/pci/controller/vmd.c +4
-0+if (ret) +return ret; + }else if (features &VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP ) { + ret = vmd_get_phys_offsets(vmd, false, offset1,offset2);
drivers/pci/controller/vmd.c +6
-0+if (ret) +return ret; + } + +/* +* Certain VMD devices may have a root port configuration option which
drivers/pci/controller/vmd.c +1
-0+* limits the bus range to between 0-127, 128-255, or 224-255.
drivers/pci/controller/vmd.c +9
-0+*/ +if (features &VMD_FEAT_HAS_BUS_RESTRICTIONS ) { + ret =vmd_get_bus_number_start (vmd); +if (ret) +return ret; + } +return 0 ; +} +/* * Since VMD is an aperture to regular PCIe root ports, only allow it to
* control features that the OS is allowed to control on the
physical PCI bus. @@ -784,38 +896,16 @@ static intvmd_enable_domain(struct vmd_dev *vmd, unsigned long features)structpci_dev*dev; int ret;drivers/pci/controller/vmd.c +0
-2-/* -* Shadow registers may exist in certain VMD device ids which allow
drivers/pci/controller/vmd.c +0
-1-* guests to correctly assign host physical addresses to the root ports
drivers/pci/controller/vmd.c +0
-1-* and child devices. These registers will either return the host value
drivers/pci/controller/vmd.c +0
-5-* or 0, depending on an enable bit in the VMD device. -*/ -if (features &VMD_FEAT_HAS_MEMBAR_SHADOW ) { - membar2_offset =MB2_SHADOW_OFFSET +MB2_SHADOW_SIZE ; - ret = vmd_get_phys_offsets(vmd, true, &offset[0],&offset[1]);
drivers/pci/controller/vmd.c +0
-4-if (ret) -return ret; - }else if (features &VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP ) { - ret = vmd_get_phys_offsets(vmd, false, &offset[0],&offset[1]);
drivers/pci/controller/vmd.c +0
-6-if (ret) -return ret; - } - -/* -* Certain VMD devices may have a root port configuration option which
drivers/pci/controller/vmd.c +1
-7-* limits the bus range to between 0-127, 128-255, or 224-255 -*/ -if (features &VMD_FEAT_HAS_BUS_RESTRICTIONS ) { - ret =vmd_get_bus_number_start (vmd); -if (ret) -return ret; - } + ret = vmd_prepare_offsets_and_bus(vmd, features,
&membar2_offset,drivers/pci/controller/vmd.c +3
-1+ &offset[0], &offset[1]); +if (ret) +return ret; res = &vmd->dev->resource[VMD_CFGBAR ]; vmd->resources[0 ] = (struct resource ) { .name ="VMD CFGBAR" , .start = vmd->busn_start, - .end = vmd->busn_start + (resource_size(res) >>20) - 1,
drivers/pci/controller/vmd.c +1
-0+ .end = 0xff, .flags = IORESOURCE_BUS | IORESOURCE_PCI_FIXED, };@@ -868,19 +958,21 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features) * acceptable because the guest is usually CPU-limited andMSI
drivers/pci/controller/vmd.c +17
-11* remapping doesn't become a performance bottleneck. */ -if (!(features &VMD_FEAT_CAN_BYPASS_MSI_REMAP ) || - offset[0 ] || offset[1 ]) { - ret =vmd_alloc_irqs (vmd); -if (ret) -return ret; +if (!(features &VMD_FEAT_USE_BIOS_INFO )) { +if (!(features &VMD_FEAT_CAN_BYPASS_MSI_REMAP ) || + offset[0 ] || offset[1 ]) { + ret =vmd_alloc_irqs (vmd); +if (ret) +return ret; -vmd_set_msi_remapping (vmd, true); +vmd_set_msi_remapping (vmd, true); - ret =vmd_create_irq_domain (vmd); -if (ret) -return ret; - }else { -vmd_set_msi_remapping (vmd, false); + ret =vmd_create_irq_domain (vmd); +if (ret) +return ret; + }else { +vmd_set_msi_remapping (vmd, false); + } }pci_add_resource (&resources, &vmd->resources[0 ]);@@ -998,6 +1090,7 @@ static int vmd_probe(struct pci_dev *dev, const struct pci_device_id *id) vmd->dev = dev; vmd->sysdata.domain =PCI_DOMAIN_NR_NOT_SET ; + vmd->features = features; vmd->instance =ida_alloc (&vmd_instance_ida,GFP_KERNEL );if (vmd->instance <0 )return vmd->instance;@@ -1114,6 +1207,9 @@ static const struct pci_device_id vmd_ids[] = { .driver_data = VMD_FEAT_HAS_MEMBAR_SHADOW | VMD_FEAT_HAS_BUS_RESTRICTIONS | VMD_FEAT_CAN_BYPASS_MSI_REMAP,}, + {PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_VMD_28C1), + .driver_data =VMD_FEAT_HAS_MEMBAR_SHADOW | + VMD_FEAT_USE_BIOS_INFO,}, {PCI_VDEVICE(INTEL, 0x467f), .driver_data = VMD_FEATS_CLIENT,}, {PCI_VDEVICE(INTEL, 0x4c3d),include/linux/pci_ids.h +0
-0
include/linux/pci_ids.h line 2895
Quoted 7 lines
include/linux/pci_ids.h +1
-0@@ -2889,6 +2889,7 @@#define PCI_DEVICE_ID_INTEL_HDA_ICH8 0x284b#define PCI_DEVICE_ID_INTEL_ICH8_6 0x2850#define PCI_DEVICE_ID_INTEL_VMD_28C0 0x28c0 +#define PCI_DEVICE_ID_INTEL_VMD_28C1 0x28c1#define PCI_DEVICE_ID_INTEL_ICH9_0 0x2910#define PCI_DEVICE_ID_INTEL_ICH9_2 0x2912#define PCI_DEVICE_ID_INTEL_ICH9_3 0x2913
Gentle reminder. FYI, I also addressed comments from AI review.
Thanks.
Nirmal Patel
maintainerQuoted 355 lines · On Wed, 27 May 2026 12:01:39 -0700 Nirmal Patel <[email protected]>…
Quoted 342 lines · On Fri, 22 May 2026 15:08:29 +0000 Nirmal Patel <[email protected]>…
Newer VMD with device ID
0x28c1has unique settings compared to its predecessor where BIOS enumerates the entire VMD device tree and assigns respective configurations.VMD configuration BAR0 carries over from GNR legacy VMD as the mechanism to access the configuration space of the devices owned by VMD. The size of this window is fixed at 256 MB, where each function consumes 4 KB and every bus consumes 1 MB.
The shadow and scratchpad registers have been relocated from the VMD configuration space to the VMD MMIO space in VMD BAR4/BAR5, otherwise refers to as MEMBAR2 or MSI-X bar.
VMD MSI-X remapping enable/disable is no longer supported.
All the VMD driver code needs to do is to obtain bus hide range along with shadow register values set by BIOS and perform a bus scan.
The patch also involves small refactoring of
vmd_enable_domainfunction.Signed-off-by Nirmal Patel <[email protected]>---
v4 : Updatingvmd_set_msi_remappingfor supported devices only. v3 : Hard code configbar .end to0xffsame asprobe.c; Adjust membar2 offset to accommodate more registers in 28C1. Remove redundantIORESOURCE_MEMcheck invmd_prepare_offsets_and_bus. v2 : Using PCI features flag instead of devic ID and fixing corner cases forvmd_remove_irq.--- drivers/pci/controller/vmd.c | 174+++++++++++++++++++++++++++--------
include/linux/pci_ids.h|
1 + 2 files changed, 136 insertions(+), 39 deletions(-)(quoted diff) +0
-0
b/drivers/pci/controller/vmd.cindexd4ae250d4bc6..7c90243b5ff0100644 ---a/drivers/pci/controller/vmd.c
+++b/drivers/pci/controller/vmd.cdrivers/pci/controller/vmd.c +2
-0@@ -37,6 +37,12 @@#define MB2_SHADOW_OFFSET 0x2000#define MB2_SHADOW_SIZE 16 +/* DMR BAR4 register offsets */ +#define SHADOW_MEMBAR1_28C1 0x2818/* MEMBAR1 physical address */ +#define
SHADOW_MEMBAR2_28C10x2820/* MEMBAR2 physical address */ +#defineBASE_ID_REG_28C10x2840+#defineMEMBAR2_OFFSET_28C10x30d0+
enumvmd_features{(quoted diff) +0
-0/* * Device may contain registers which hint the physicallocation of the @@ -77,6 +83,15 @@ enum
vmd_features{drivers/pci/controller/vmd.c +3
-0* proper power management of the SoC. */ VMD_FEAT_BIOS_PM_QUIRK = (1 << 5), + +/* +* Newer VMD with device ID 0x28c1 has unique settings compared to its
(quoted diff) +1
-0+ * predecessor where BIOS enumerates the entire VMD devicetree and
(quoted diff) +1
-0+ * stores respective configurations including bus startrange and
(quoted diff) +1
-0+ * shadow registers in VMD MMIO space in VMD BAR4/BAR5,otherwise refers
drivers/pci/controller/vmd.c +8
-0+* to as MEMBAR2 or MSI-X bar. +*/ + VMD_FEAT_USE_BIOS_INFO = (1 << 6), };#define VMD_BIOS_PM_QUIRK_LTR 0x1003/* 3145728 ns */ @@ -142,6 +157,7 @@ struct vmd_dev {u8 first_vec;char *name;int instance; +unsigned long features; };static inline struct vmd_dev *vmd_from_bus (struct pci_bus *bus)@@ -365,6 +381,8 @@ static int vmd_create_irq_domain(struct vmd_dev *vmd) static void vmd_set_msi_remapping(struct vmd_dev *vmd, bool enable) {u16 reg; +if (!!(vmd->features &VMD_FEAT_USE_BIOS_INFO )) +return ;pci_read_config_word (vmd->dev,PCI_REG_VMCONFIG , ®); reg = enable ? (reg & ~VMCONFIG_MSI_REMAP) :@@ -374,6 +392,8 @@ static void vmd_set_msi_remapping(struct vmd_dev *vmd, bool enable)static void vmd_remove_irq_domain (struct vmd_dev *vmd) { +if (!!(vmd->features &VMD_FEAT_USE_BIOS_INFO )) +return ;/* * Some production BIOS won't enable remapping between soft reboots.
* Ensure remapping is restored before unloading the
driver. @@ -393,7 +413,12 @@ static void__iomem*vmd_cfg_addr(structvmd_dev*vmd, structpci_bus*bus, unsigned int devfn, int reg, int len) {drivers/pci/controller/vmd.c +6
-1unsigned int busnr_ecam = bus->number - vmd->busn_start; -u32 offset =PCIE_ECAM_OFFSET (busnr_ecam, devfn, reg); +u32 offset; + +if (!!(vmd->features &VMD_FEAT_USE_BIOS_INFO )) + busnr_ecam = bus->number; + + offset =PCIE_ECAM_OFFSET (busnr_ecam, devfn, reg); if (offset + len >=
resource_size(&vmd->dev->resource[VMD_CFGBAR])) return NULL;drivers/pci/controller/vmd.c +15
-0@@ -661,6 +686,46 @@ static int vmd_get_bus_number_start(struct vmd_dev *vmd) return 0; } +static int vmd_get_bus_info_from_bar4 (struct vmd_dev *vmd, +resource_size_t *offset1, +resource_size_t *offset2) +{ +u64 phys1, phys2, bar4_2840; +void __iomem *bar4; +u32 base_id; +u8 base_bus; + + + bar4 =pci_ioremap_bar (vmd->dev,4 ); +if (!bar4) +return -ENOMEM ; + +/* Read shadow registers for MEMBAR1 and MEMBAR2 physical addresses. */
drivers/pci/controller/vmd.c +6
-0+ phys1 =readq (bar4 +SHADOW_MEMBAR1_28C1 ); + phys2 =readq (bar4 +SHADOW_MEMBAR2_28C1 ); + +/* +* Read and set bus start number from Base ID register. +* 24-bit Base ID register is part of 64-bit shadowed reqid hide
(quoted diff) +1
-0+ * range register and holds segment, bus, device andfunction.
drivers/pci/controller/vmd.c +28
-0+*/ + bar4_2840 =readq (bar4 +BASE_ID_REG_28C1 ); + base_id = bar4_2840 &0xFFFFFF ; + base_bus = base_id >>8 ; + vmd->busn_start = base_bus; + +/* Calculate offsets like vmd_get_phys_offsets() does. */ +if (phys1) + *offset1 = vmd->dev->resource[VMD_MEMBAR1 ].start - + (phys1 &PCI_BASE_ADDRESS_MEM_MASK ); +if (phys2) + *offset2 = vmd->dev->resource[VMD_MEMBAR2 ].start - + (phys2 &PCI_BASE_ADDRESS_MEM_MASK ); + +pci_iounmap (vmd->dev, bar4); +return 0 ; +} +static irqreturn_t vmd_irq (int irq,void *data) {struct vmd_irq_list *irqs = data;@@ -711,6 +776,53 @@ static int vmd_alloc_irqs(struct vmd_dev *vmd)return 0 ; } +static int vmd_prepare_offsets_and_bus (struct vmd_dev *vmd, +unsigned long features, +resource_size_t *membar2_offset, +resource_size_t *offset1, +resource_size_t *offset2) +{ +int ret; + +/* +* Shadow registers may exist in certain VMD device ids which allow
(quoted diff) +1
-0+ * guests to correctly assign host physical addresses tothe root ports
(quoted diff) +1
-0+ * and child devices. These registers will either returnthe host value
drivers/pci/controller/vmd.c +4
-0+* or 0, depending on an enable bit in the VMD device. +*/ +/* +* For certain VMD devices (i.e. 0x28C1), BIOS places device info
(quoted diff) +1
-0+ * in BAR4 shadow registers to determine the base busnumber and memory
drivers/pci/controller/vmd.c +5
-0+* offsets. +*/ +if (features &VMD_FEAT_USE_BIOS_INFO ) { + *membar2_offset =MEMBAR2_OFFSET_28C1 ; + ret = vmd_get_bus_info_from_bar4(vmd, offset1,offset2);
drivers/pci/controller/vmd.c +4
-0+if (ret) +return ret; + }else if (features &VMD_FEAT_HAS_MEMBAR_SHADOW ) { + *membar2_offset = MB2_SHADOW_OFFSET +
MB2_SHADOW_SIZE;(quoted diff) +1
-0+ ret = vmd_get_phys_offsets(vmd, true, offset1,offset2);
drivers/pci/controller/vmd.c +4
-0+if (ret) +return ret; + }else if (features &VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP ) { + ret = vmd_get_phys_offsets(vmd, false, offset1,offset2);
drivers/pci/controller/vmd.c +6
-0+if (ret) +return ret; + } + +/* +* Certain VMD devices may have a root port configuration option which
(quoted diff) +1
-0+ * limits the bus range to between 0-127, 128-255, or224-255.
drivers/pci/controller/vmd.c +9
-0+*/ +if (features &VMD_FEAT_HAS_BUS_RESTRICTIONS ) { + ret =vmd_get_bus_number_start (vmd); +if (ret) +return ret; + } +return 0 ; +} +/* * Since VMD is an aperture to regular PCIe root ports, only allow it to
* control features that the OS is allowed to control on the
physical PCI bus. @@ -784,38 +896,16 @@ static intvmd_enable_domain(struct vmd_dev *vmd, unsigned long features)structpci_dev*dev; int ret;(quoted diff) +0
-2- /* - * Shadow registers may exist in certain VMD device idswhich allow
(quoted diff) +0
-1- * guests to correctly assign host physical addresses tothe root ports
(quoted diff) +0
-1- * and child devices. These registers will either returnthe host value
drivers/pci/controller/vmd.c +0
-4-* or 0, depending on an enable bit in the VMD device. -*/ -if (features &VMD_FEAT_HAS_MEMBAR_SHADOW ) { - membar2_offset = MB2_SHADOW_OFFSET +
MB2_SHADOW_SIZE;(quoted diff) +0
-1- ret = vmd_get_phys_offsets(vmd, true, &offset[0],&offset[1]);
drivers/pci/controller/vmd.c +0
-4-if (ret) -return ret; - }else if (features &VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP ) { - ret = vmd_get_phys_offsets(vmd, false, &offset[0],&offset[1]);
drivers/pci/controller/vmd.c +0
-6-if (ret) -return ret; - } - -/* -* Certain VMD devices may have a root port configuration option which
(quoted diff) +0
-1- * limits the bus range to between 0-127, 128-255, or224-255
drivers/pci/controller/vmd.c +1
-6-*/ -if (features &VMD_FEAT_HAS_BUS_RESTRICTIONS ) { - ret =vmd_get_bus_number_start (vmd); -if (ret) -return ret; - } + ret = vmd_prepare_offsets_and_bus(vmd, features,
&membar2_offset,drivers/pci/controller/vmd.c +3
-1+ &offset[0], &offset[1]); +if (ret) +return ret; res = &vmd->dev->resource[VMD_CFGBAR ]; vmd->resources[0 ] = (struct resource ) { .name ="VMD CFGBAR" , .start = vmd->busn_start, - .end = vmd->busn_start + (resource_size(res) >>20) - 1,
drivers/pci/controller/vmd.c +1
-0+ .end = 0xff, .flags = IORESOURCE_BUS | IORESOURCE_PCI_FIXED, };@@ -868,19 +958,21 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features) * acceptable because the guest is usually CPU-limited andMSI
drivers/pci/controller/vmd.c +14
-11* remapping doesn't become a performance bottleneck. */ -if (!(features &VMD_FEAT_CAN_BYPASS_MSI_REMAP ) || - offset[0 ] || offset[1 ]) { - ret =vmd_alloc_irqs (vmd); -if (ret) -return ret; +if (!(features &VMD_FEAT_USE_BIOS_INFO )) { +if (!(features &VMD_FEAT_CAN_BYPASS_MSI_REMAP ) || + offset[0 ] || offset[1 ]) { + ret =vmd_alloc_irqs (vmd); +if (ret) +return ret; -vmd_set_msi_remapping (vmd, true); +vmd_set_msi_remapping (vmd, true); - ret =vmd_create_irq_domain (vmd); -if (ret) -return ret; - }else { -vmd_set_msi_remapping (vmd, false); + ret =vmd_create_irq_domain (vmd); +if (ret) +return ret; + }else { +vmd_set_msi_remapping (vmd, false); + } }pci_add_resource (&resources, &vmd->resources[0 ]);@@ -998,6 +1090,7 @@ static int vmd_probe(struct pci_dev *dev, const struct pci_device_id *id) vmd->dev = dev; vmd->sysdata.domain =PCI_DOMAIN_NR_NOT_SET ; + vmd->features = features; vmd->instance =ida_alloc (&vmd_instance_ida,GFP_KERNEL );if (vmd->instance <0 )return vmd->instance;@@ -1114,6 +1207,9 @@ static const struct pci_device_id vmd_ids[] ={ .driver_data =
VMD_FEAT_HAS_MEMBAR_SHADOW|drivers/pci/controller/vmd.c +3
-0VMD_FEAT_HAS_BUS_RESTRICTIONS | VMD_FEAT_CAN_BYPASS_MSI_REMAP,}, + {PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_VMD_28C1), + .driver_data = VMD_FEAT_HAS_MEMBAR_SHADOW | + VMD_FEAT_USE_BIOS_INFO,}, {PCI_VDEVICE(INTEL, 0x467f), .driver_data = VMD_FEATS_CLIENT,}, {PCI_VDEVICE(INTEL, 0x4c3d),include/linux/pci_ids.h +0
-0include/linux/pci_ids.h line 2895
Quoted 7 lines
include/linux/pci_ids.h +1
-0@@ -2889,6 +2889,7 @@#define PCI_DEVICE_ID_INTEL_HDA_ICH8 0x284b#define PCI_DEVICE_ID_INTEL_ICH8_6 0x2850#define PCI_DEVICE_ID_INTEL_VMD_28C0 0x28c0 +#define PCI_DEVICE_ID_INTEL_VMD_28C1 0x28c1#define PCI_DEVICE_ID_INTEL_ICH9_0 0x2910#define PCI_DEVICE_ID_INTEL_ICH9_2 0x2912#define PCI_DEVICE_ID_INTEL_ICH9_3 0x2913Gentle reminder. FYI, I also addressed comments from AI review.
Quoted 1 line
Thanks.
Gentle review reminder.
Thanks.
Manivannan Sadhasivam
maintainerOn Mon, Jun 08, 2026 at 07:33:20AM -0700, Nirmal Patel wrote:
[...]
Quoted 7 lines
Quoted 3 lines
Gentle reminder. FYI, I also addressed comments from AI review.
Thanks.
Gentle review reminder.
Thanks.
./scripts/get_maintainer.pl drivers/pci/controller/vmd.c
Nirmal Patel <[email protected]> (maintainer:PCI DRIVER FOR INTEL VOLUME MANAGEMENT DEVICE (...) Jonathan Derrick <[email protected]> (reviewer:PCI DRIVER FOR INTEL VOLUME MANAGEMENT DEVICE (...) Lorenzo Pieralisi <[email protected]> (maintainer:PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS) "Krzysztof Wilczyński" <[email protected]> (maintainer:PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS) Manivannan Sadhasivam <[email protected]> (maintainer:PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS) Rob Herring <[email protected]> (reviewer:PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS)
Bjorn Helgaas <[email protected]> (maintainer:PCI SUBSYSTEM)
[email protected] (open list:PCI DRIVER FOR INTEL VOLUME MANAGEMENT DEVICE (...) [email protected] (open list)
You didn't CC more than half of the above entries. So you can expect the patch to fall through the crack...
- Mani
Signature · 1 line
மணிவண்ணன் சதாசிவம்
Nirmal Patel
maintainerQuoted 28 lines · On Mon, 8 Jun 2026 22:21:34 +0530 Manivannan Sadhasivam <[email protected]> wrote:
On Mon, Jun 08, 2026 at 07:33:20AM -0700, Nirmal Patel wrote:
[...]
Quoted 7 lines
Quoted 3 lines
Gentle reminder. FYI, I also addressed comments from AI review.
Thanks.
Gentle review reminder.
Thanks.
./scripts/get_maintainer.pldrivers/pci/controller/vmd.cNirmal Patel <[email protected]> (maintainer:PCI DRIVER FOR INTEL VOLUME MANAGEMENT DEVICE (...) Jonathan Derrick <[email protected]> (reviewer:PCI DRIVER FOR INTEL VOLUME MANAGEMENT DEVICE (...) Lorenzo Pieralisi <[email protected]> (maintainer:PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS) "Krzysztof Wilczyński" <[email protected]> (maintainer:PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS) Manivannan Sadhasivam <[email protected]> (maintainer:PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS) Rob Herring <[email protected]> (reviewer:PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS) Bjorn Helgaas <[email protected]> (maintainer:PCI SUBSYSTEM) [email protected] (open list:PCI DRIVER FOR INTEL VOLUME MANAGEMENT DEVICE (...) [email protected] (open list)
Quoted 5 lines
You didn't CC more than half of the above entries. So you can expect the patch to fall through the crack...
- Mani
I will address your comments and add contacts to cc in v5 patch. Thanks for the suggestion.
Manivannan Sadhasivam
maintainerQuoted 13 lines · Nirmal Patel
Newer VMD with device ID
0x28c1has unique settings compared to its predecessor where BIOS enumerates the entire VMD device tree and assigns respective configurations.VMD configuration BAR0 carries over from GNR legacy VMD as the mechanism to access the configuration space of the devices owned by VMD. The size of this window is fixed at 256 MB, where each function consumes 4 KB and every bus consumes 1 MB.
The shadow and scratchpad registers have been relocated from the VMD configuration space to the VMD MMIO space in VMD BAR4/BAR5, otherwise refers to as MEMBAR2 or MSI-X bar.
Quoted 7 lines
VMD MSI-X remapping enable/disable is no longer supported.
All the VMD driver code needs to do is to obtain bus hide range along with shadow register values set by BIOS and perform a bus scan.
The patch also involves small refactoring of
vmd_enable_domainfunction.
s/patch/commit
Quoted 1 line
Signed-off-by Nirmal Patel <[email protected]>
Just a few nits below...
Quoted 30 lines
---
v4 : Updatingvmd_set_msi_remappingfor supported devices only. v3 : Hard code configbar .end to0xffsame asprobe.c; Adjust membar2
offset to accommodate more registers in 28C1. Remove redundantIORESOURCE_MEMcheck invmd_prepare_offsets_and_bus.
v2 : Using PCI features flag instead of devic ID and fixing corner cases
forvmd_remove_irq.--- drivers/pci/controller/vmd.c | 174 +++++++++++++++++++++++++++-------- include/linux/pci_ids.h | 1 + 2 files changed, 136 insertions(+), 39 deletions(-)drivers/pci/controller/vmd.c +6
-0@@ -37,6 +37,12 @@#define MB2_SHADOW_OFFSET 0x2000#define MB2_SHADOW_SIZE 16 +/* DMR BAR4 register offsets */ +#define SHADOW_MEMBAR1_28C1 0x2818/* MEMBAR1 physical address */ +#define SHADOW_MEMBAR2_28C1 0x2820/* MEMBAR2 physical address */ +#define BASE_ID_REG_28C1 0x2840 +#define MEMBAR2_OFFSET_28C1 0x30d0 +enum vmd_features {/* * Device may contain registers which hint the physical location of the
drivers/pci/controller/vmd.c enum vmd_features { · line 88
Quoted 6 lines
drivers/pci/controller/vmd.c +3
-0@@ -77,6 +83,15 @@ enum vmd_features {* proper power management of the SoC. */ VMD_FEAT_BIOS_PM_QUIRK = (1 << 5), + +/* +* Newer VMD with device ID 0x28c1 has unique settings compared to its
Double space after 'VMD'
Quoted 18 lines
drivers/pci/controller/vmd.c +7
-0+* predecessor where BIOS enumerates the entire VMD device tree and +* stores respective configurations including bus start range and +* shadow registers in VMD MMIO space in VMD BAR4/BAR5, otherwise refers +* to as MEMBAR2 or MSI-X bar. +*/ + VMD_FEAT_USE_BIOS_INFO = (1 << 6), };#define VMD_BIOS_PM_QUIRK_LTR 0x1003/* 3145728 ns */ @@ -142,6 +157,7 @@ struct vmd_dev {u8 first_vec;char *name;int instance; +unsigned long features; };static inline struct vmd_dev *vmd_from_bus (struct pci_bus *bus)
drivers/pci/controller/vmd.c static int vmd_create_irq_domain(struct vmd_dev *vmd) · line 383
Quoted 3 lines
drivers/pci/controller/vmd.c +0
-0@@ -365,6 +381,8 @@ static int vmd_create_irq_domain(struct vmd_dev *vmd)static void vmd_set_msi_remapping (struct vmd_dev *vmd,bool enable) {u16 reg;
Leave a new line between variable declaration and statement.
drivers/pci/controller/vmd.c static void vmd_set_msi_remapping(struct vmd_dev *vmd, bool enable) · line 396
Quoted 11 lines
drivers/pci/controller/vmd.c +4
-0+if (!!(vmd->features &VMD_FEAT_USE_BIOS_INFO )) +return ;pci_read_config_word (vmd->dev,PCI_REG_VMCONFIG , ®); reg = enable ? (reg & ~VMCONFIG_MSI_REMAP) :@@ -374,6 +392,8 @@ static void vmd_set_msi_remapping(struct vmd_dev *vmd, bool enable)static void vmd_remove_irq_domain (struct vmd_dev *vmd) { +if (!!(vmd->features &VMD_FEAT_USE_BIOS_INFO )) +return ;
Add a new line.
Quoted 21 lines
drivers/pci/controller/vmd.c +6
-1/* * Some production BIOS won't enable remapping between soft reboots. * Ensure remapping is restored before unloading the driver. @@ -393,7 +413,12 @@ static void __iomem *vmd_cfg_addr(struct vmd_dev *vmd, struct pci_bus *bus, unsigned int devfn, int reg, int len) { unsigned int busnr_ecam = bus->number - vmd->busn_start; -u32 offset =PCIE_ECAM_OFFSET (busnr_ecam, devfn, reg); +u32 offset; + +if (!!(vmd->features &VMD_FEAT_USE_BIOS_INFO )) + busnr_ecam = bus->number; + + offset =PCIE_ECAM_OFFSET (busnr_ecam, devfn, reg);if (offset + len >=resource_size (&vmd->dev->resource[VMD_CFGBAR ]))return NULL ;@@ -661,6 +686,46 @@ static int vmd_get_bus_number_start(struct vmd_dev *vmd)return 0 ; }
drivers/pci/controller/vmd.c static int vmd_get_bus_number_start(struct vmd_dev *vmd) · line 698
Quoted 10 lines
drivers/pci/controller/vmd.c +10
-0+static int vmd_get_bus_info_from_bar4 (struct vmd_dev *vmd, +resource_size_t *offset1, +resource_size_t *offset2) +{ +u64 phys1, phys2, bar4_2840; +void __iomem *bar4; +u32 base_id; +u8 base_bus; + +
Extra newline.
drivers/pci/controller/vmd.c static int vmd_get_bus_number_start(struct vmd_dev *vmd) · line 711
Quoted 13 lines
drivers/pci/controller/vmd.c +13
-0+ bar4 =pci_ioremap_bar (vmd->dev,4 ); +if (!bar4) +return -ENOMEM ; + +/* Read shadow registers for MEMBAR1 and MEMBAR2 physical addresses. */ + phys1 =readq (bar4 +SHADOW_MEMBAR1_28C1 ); + phys2 =readq (bar4 +SHADOW_MEMBAR2_28C1 ); + +/* +* Read and set bus start number from Base ID register. +* 24-bit Base ID register is part of 64-bit shadowed reqid hide +* range register and holds segment, bus, device and function. +*/
Make use of 80 column width for comments.
Quoted 4 lines
drivers/pci/controller/vmd.c +4
-0+ bar4_2840 =readq (bar4 +BASE_ID_REG_28C1 ); + base_id = bar4_2840 &0xFFFFFF ; + base_bus = base_id >>8 ; + vmd->busn_start = base_bus;
drivers/pci/controller/vmd.c static int vmd_get_bus_number_start(struct vmd_dev *vmd) · line 725
Quoted 10 lines
drivers/pci/controller/vmd.c +10
-0+ +/* Calculate offsets like vmd_get_phys_offsets() does. */ +if (phys1) + *offset1 = vmd->dev->resource[VMD_MEMBAR1 ].start - + (phys1 &PCI_BASE_ADDRESS_MEM_MASK ); +if (phys2) + *offset2 = vmd->dev->resource[VMD_MEMBAR2 ].start - + (phys2 &PCI_BASE_ADDRESS_MEM_MASK ); + +pci_iounmap (vmd->dev, bar4);
Add a newline before return statement.
Quoted 19 lines
drivers/pci/controller/vmd.c +12
-0+return 0 ; +} +static irqreturn_t vmd_irq (int irq,void *data) {struct vmd_irq_list *irqs = data;@@ -711,6 +776,53 @@ static int vmd_alloc_irqs(struct vmd_dev *vmd)return 0 ; } +static int vmd_prepare_offsets_and_bus (struct vmd_dev *vmd, +unsigned long features, +resource_size_t *membar2_offset, +resource_size_t *offset1, +resource_size_t *offset2) +{ +int ret; + +/*
drivers/pci/controller/vmd.c static int vmd_alloc_irqs(struct vmd_dev *vmd) · line 797
Quoted 10 lines
drivers/pci/controller/vmd.c +10
-0+* Shadow registers may exist in certain VMD device ids which allow +* guests to correctly assign host physical addresses to the root ports +* and child devices. These registers will either return the host value +* or 0, depending on an enable bit in the VMD device. +*/ +/* +* For certain VMD devices (i.e. 0x28C1), BIOS places device info +* in BAR4 shadow registers to determine the base bus number and memory +* offsets. +*/
Club both comments into one.
Quoted 62 lines
drivers/pci/controller/vmd.c +29
-26+if (features &VMD_FEAT_USE_BIOS_INFO ) { + *membar2_offset =MEMBAR2_OFFSET_28C1 ; + ret =vmd_get_bus_info_from_bar4 (vmd, offset1, offset2); +if (ret) +return ret; + }else if (features &VMD_FEAT_HAS_MEMBAR_SHADOW ) { + *membar2_offset =MB2_SHADOW_OFFSET +MB2_SHADOW_SIZE ; + ret =vmd_get_phys_offsets (vmd, true, offset1, offset2); +if (ret) +return ret; + }else if (features &VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP ) { + ret =vmd_get_phys_offsets (vmd, false, offset1, offset2); +if (ret) +return ret; + } + +/* +* Certain VMD devices may have a root port configuration option which +* limits the bus range to between 0-127, 128-255, or 224-255. +*/ +if (features &VMD_FEAT_HAS_BUS_RESTRICTIONS ) { + ret =vmd_get_bus_number_start (vmd); +if (ret) +return ret; + } +return 0 ; +} +/* * Since VMD is an aperture to regular PCIe root ports, only allow it to * control features that the OS is allowed to control on the physical PCI bus. @@ -784,38 +896,16 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features)struct pci_dev *dev;int ret; -/* -* Shadow registers may exist in certain VMD device ids which allow -* guests to correctly assign host physical addresses to the root ports -* and child devices. These registers will either return the host value -* or 0, depending on an enable bit in the VMD device. -*/ -if (features &VMD_FEAT_HAS_MEMBAR_SHADOW ) { - membar2_offset =MB2_SHADOW_OFFSET +MB2_SHADOW_SIZE ; - ret =vmd_get_phys_offsets (vmd, true, &offset[0 ], &offset[1 ]); -if (ret) -return ret; - }else if (features &VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP ) { - ret =vmd_get_phys_offsets (vmd, false, &offset[0 ], &offset[1 ]); -if (ret) -return ret; - } - -/* -* Certain VMD devices may have a root port configuration option which -* limits the bus range to between 0-127, 128-255, or 224-255 -*/ -if (features &VMD_FEAT_HAS_BUS_RESTRICTIONS ) { - ret =vmd_get_bus_number_start (vmd); -if (ret) -return ret; - } + ret = vmd_prepare_offsets_and_bus(vmd, features, &membar2_offset,
drivers/pci/controller/vmd.c static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features) · line 908
Quoted 10 lines
drivers/pci/controller/vmd.c +4
-1+ &offset[0], &offset[1]); +if (ret) +return ret; res = &vmd->dev->resource[VMD_CFGBAR ]; vmd->resources[0 ] = (struct resource ) { .name ="VMD CFGBAR" , .start = vmd->busn_start, - .end = vmd->busn_start + (resource_size (res) >>20 ) -1 , + .end =0xff ,
Is this change related to this patch?
- Mani
Signature · 1 line
மணிவண்ணன் சதாசிவம்
Nirmal Patel
maintainerQuoted 16 lines · On Mon, 8 Jun 2026 22:30:07 +0530 Manivannan Sadhasivam <[email protected]> wrote:
Quoted 15 lines · Nirmal Patel
Newer VMD with device ID
0x28c1has unique settings compared to its predecessor where BIOS enumerates the entire VMD device tree and assigns respective configurations.VMD configuration BAR0 carries over from GNR legacy VMD as the mechanism to access the configuration space of the devices owned by VMD. The size of this window is fixed at 256 MB, where each function consumes 4 KB and every bus consumes 1 MB.
The shadow and scratchpad registers have been relocated from the VMD configuration space to the VMD MMIO space in VMD BAR4/BAR5, otherwise refers to as MEMBAR2 or MSI-X bar.
VMD MSI-X remapping enable/disable is no longer supported.
Quoted 8 lines
Quoted 6 lines
All the VMD driver code needs to do is to obtain bus hide range along with shadow register values set by BIOS and perform a bus scan.
The patch also involves small refactoring of
vmd_enable_domainfunction.s/patch/commit
Ack
Quoted 36 lines
Quoted 2 lines
Signed-off-by Nirmal Patel <[email protected]>Just a few nits below...
Quoted 31 lines
---
v4 : Updatingvmd_set_msi_remappingfor supported devices only. v3 : Hard code configbar .end to0xffsame asprobe.c; Adjust membar2 offset to accommodate more registers in 28C1. Remove redundantIORESOURCE_MEMcheck invmd_prepare_offsets_and_bus. v2 : Using PCI features flag instead of devic ID and fixing corner cases forvmd_remove_irq.--- drivers/pci/controller/vmd.c | 174+++++++++++++++++++++++++++--------
include/linux/pci_ids.h|
1 + 2 files changed, 136 insertions(+), 39 deletions(-)(quoted diff) +0
-0
b/drivers/pci/controller/vmd.cindexd4ae250d4bc6..7c90243b5ff0100644 ---a/drivers/pci/controller/vmd.c
+++b/drivers/pci/controller/vmd.cdrivers/pci/controller/vmd.c +2
-0@@ -37,6 +37,12 @@#define MB2_SHADOW_OFFSET 0x2000#define MB2_SHADOW_SIZE 16 +/* DMR BAR4 register offsets */ +#define SHADOW_MEMBAR1_28C1 0x2818/* MEMBAR1 physical address */ +#define
SHADOW_MEMBAR2_28C10x2820/* MEMBAR2 physical address */ +#defineBASE_ID_REG_28C10x2840+#defineMEMBAR2_OFFSET_28C10x30d0+
enumvmd_features{(quoted diff) +0
-0/* * Device may contain registers which hint the physicallocation of the @@ -77,6 +83,15 @@ enum
vmd_features{
* proper power management of the SoC.
Quoted 8 lines
Quoted 6 lines
drivers/pci/controller/vmd.c +3
-0*/ VMD_FEAT_BIOS_PM_QUIRK = (1 << 5), + +/* +* Newer VMD with device ID 0x28c1 has unique settings compared to its
Double space after 'VMD'
Ack
Quoted 31 lines
Quoted 22 lines
(quoted diff) +1
-0+ * predecessor where BIOS enumerates the entire VMD devicetree and
(quoted diff) +1
-0+ * stores respective configurations including bus startrange and
(quoted diff) +1
-0+ * shadow registers in VMD MMIO space in VMD BAR4/BAR5,otherwise refers
drivers/pci/controller/vmd.c +4
-0+* to as MEMBAR2 or MSI-X bar. +*/ + VMD_FEAT_USE_BIOS_INFO = (1 << 6), };#define VMD_BIOS_PM_QUIRK_LTR 0x1003/* 3145728 ns */ @@ -142,6 +157,7 @@ struct vmd_dev {u8 first_vec;char *name;int instance; +unsigned long features; };static inline struct vmd_dev *vmd_from_bus (struct pci_bus *bus)drivers/pci/controller/vmd.c static int vmd_create_irq_domain(struct vmd_dev · line 383
Quoted 3 lines
drivers/pci/controller/vmd.c +0
-0@@ -365,6 +381,8 @@ static int vmd_create_irq_domain(struct vmd_dev *vmd) static void vmd_set_msi_remapping(struct vmd_dev *vmd, bool enable) {u16 reg;Leave a new line between variable declaration and statement.
Quoted 3 lines
drivers/pci/controller/vmd.c +2
-0+if (!!(vmd->features &VMD_FEAT_USE_BIOS_INFO )) +return ;
Quoted 10 lines
drivers/pci/controller/vmd.c static void vmd_set_msi_remapping(struct · line 396
Quoted 8 lines
drivers/pci/controller/vmd.c +2
-0pci_read_config_word (vmd->dev,PCI_REG_VMCONFIG , ®); reg = enable ? (reg & ~VMCONFIG_MSI_REMAP) :@@ -374,6 +392,8 @@ static void vmd_set_msi_remapping(struct vmd_dev *vmd, bool enable)static void vmd_remove_irq_domain (struct vmd_dev *vmd) { +if (!!(vmd->features &VMD_FEAT_USE_BIOS_INFO )) +return ;Add a new line.
Ack
Quoted 23 lines
Quoted 23 lines
(quoted diff) +0
-0/* * Some production BIOS won't enable remapping betweensoft reboots.
* Ensure remapping is restored before unloading the
driver. @@ -393,7 +413,12 @@ static void__iomem*vmd_cfg_addr(structvmd_dev*vmd, structpci_bus*bus, unsigned int devfn, int reg, int len) {drivers/pci/controller/vmd.c +6
-1unsigned int busnr_ecam = bus->number - vmd->busn_start; -u32 offset =PCIE_ECAM_OFFSET (busnr_ecam, devfn, reg); +u32 offset; + +if (!!(vmd->features &VMD_FEAT_USE_BIOS_INFO )) + busnr_ecam = bus->number; + + offset =PCIE_ECAM_OFFSET (busnr_ecam, devfn, reg); if (offset + len >=
resource_size(&vmd->dev->resource[VMD_CFGBAR])) return NULL;(quoted diff) +0
-0@@ -661,6 +686,46 @@ static int vmd_get_bus_number_start(struct vmd_dev *vmd) return 0; }
Quoted 12 lines
drivers/pci/controller/vmd.c static int vmd_get_bus_number_start(struct vmd_dev *vmd) · line 698
Quoted 10 lines
drivers/pci/controller/vmd.c +10
-0+static int vmd_get_bus_info_from_bar4 (struct vmd_dev *vmd, +resource_size_t *offset1, +resource_size_t *offset2) +{ +u64 phys1, phys2, bar4_2840; +void __iomem *bar4; +u32 base_id; +u8 base_bus; + +Extra newline.
Ack
Quoted 11 lines
Quoted 11 lines
drivers/pci/controller/vmd.c +5
-0+ bar4 =pci_ioremap_bar (vmd->dev,4 ); +if (!bar4) +return -ENOMEM ; + +/* Read shadow registers for MEMBAR1 and MEMBAR2 physical addresses. */
drivers/pci/controller/vmd.c +4
-0+ phys1 =readq (bar4 +SHADOW_MEMBAR1_28C1 ); + phys2 =readq (bar4 +SHADOW_MEMBAR2_28C1 ); + +/*
Quoted 8 lines
Review
Quoted 6 lines
(quoted diff) +2
-0+ * Read and set bus start number from Base ID register. + * 24-bit Base ID register is part of 64-bit shadowedreqid hide
(quoted diff) +1
-0+ * range register and holds segment, bus, device andfunction.
(quoted diff) +1
-0+ */Make use of 80 column width for comments.
Ack
Quoted 138 lines
Quoted 5 lines
drivers/pci/controller/vmd.c +4
-0+ bar4_2840 =readq (bar4 +BASE_ID_REG_28C1 ); + base_id = bar4_2840 &0xFFFFFF ; + base_bus = base_id >>8 ; + vmd->busn_start = base_bus;drivers/pci/controller/vmd.c static int vmd_get_bus_number_start(struct vmd_dev *vmd) · line 725
Quoted 10 lines
drivers/pci/controller/vmd.c +10
-0+ +/* Calculate offsets like vmd_get_phys_offsets() does. */ +if (phys1) + *offset1 = vmd->dev->resource[VMD_MEMBAR1 ].start - + (phys1 &PCI_BASE_ADDRESS_MEM_MASK ); +if (phys2) + *offset2 = vmd->dev->resource[VMD_MEMBAR2 ].start - + (phys2 &PCI_BASE_ADDRESS_MEM_MASK ); + +pci_iounmap (vmd->dev, bar4);Add a newline before return statement.
Quoted 33 lines
drivers/pci/controller/vmd.c +13
-0+return 0 ; +} +static irqreturn_t vmd_irq (int irq,void *data) {struct vmd_irq_list *irqs = data;@@ -711,6 +776,53 @@ static int vmd_alloc_irqs(struct vmd_dev *vmd)return 0 ; } +static int vmd_prepare_offsets_and_bus (struct vmd_dev *vmd, +unsigned long features, +resource_size_t *membar2_offset, +resource_size_t *offset1, +resource_size_t *offset2) +{ +int ret; + +/* +* Shadow registers may exist in certain VMD device ids which allow
(quoted diff) +1
-0+ * guests to correctly assign host physical addresses tothe root ports
(quoted diff) +1
-0+ * and child devices. These registers will either returnthe host value
drivers/pci/controller/vmd.c +4
-0+* or 0, depending on an enable bit in the VMD device. +*/ +/* +* For certain VMD devices (i.e. 0x28C1), BIOS places device info
(quoted diff) +1
-0+ * in BAR4 shadow registers to determine the base busnumber and memory
Review
Quoted 2 lines
(quoted diff) +2
-0+ * offsets. + */Club both comments into one.
Quoted 82 lines
drivers/pci/controller/vmd.c +3
-0+if (features &VMD_FEAT_USE_BIOS_INFO ) { + *membar2_offset =MEMBAR2_OFFSET_28C1 ; + ret = vmd_get_bus_info_from_bar4(vmd, offset1,offset2);
drivers/pci/controller/vmd.c +4
-0+if (ret) +return ret; + }else if (features &VMD_FEAT_HAS_MEMBAR_SHADOW ) { + *membar2_offset = MB2_SHADOW_OFFSET +
MB2_SHADOW_SIZE;(quoted diff) +1
-0+ ret = vmd_get_phys_offsets(vmd, true, offset1,offset2);
drivers/pci/controller/vmd.c +4
-0+if (ret) +return ret; + }else if (features &VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP ) { + ret = vmd_get_phys_offsets(vmd, false, offset1,offset2);
drivers/pci/controller/vmd.c +6
-0+if (ret) +return ret; + } + +/* +* Certain VMD devices may have a root port configuration option which
(quoted diff) +1
-0+ * limits the bus range to between 0-127, 128-255, or224-255.
drivers/pci/controller/vmd.c +9
-0+*/ +if (features &VMD_FEAT_HAS_BUS_RESTRICTIONS ) { + ret =vmd_get_bus_number_start (vmd); +if (ret) +return ret; + } +return 0 ; +} +/* * Since VMD is an aperture to regular PCIe root ports, only allow it to
* control features that the OS is allowed to control on the
physical PCI bus. @@ -784,38 +896,16 @@ static intvmd_enable_domain(struct vmd_dev *vmd, unsigned long features)structpci_dev*dev; int ret;(quoted diff) +0
-2- /* - * Shadow registers may exist in certain VMD device idswhich allow
(quoted diff) +0
-1- * guests to correctly assign host physical addresses tothe root ports
(quoted diff) +0
-1- * and child devices. These registers will either returnthe host value
drivers/pci/controller/vmd.c +0
-4-* or 0, depending on an enable bit in the VMD device. -*/ -if (features &VMD_FEAT_HAS_MEMBAR_SHADOW ) { - membar2_offset = MB2_SHADOW_OFFSET +
MB2_SHADOW_SIZE;(quoted diff) +0
-1- ret = vmd_get_phys_offsets(vmd, true, &offset[0],&offset[1]);
drivers/pci/controller/vmd.c +0
-4-if (ret) -return ret; - }else if (features &VMD_FEAT_HAS_MEMBAR_SHADOW_VSCAP ) { - ret = vmd_get_phys_offsets(vmd, false, &offset[0],&offset[1]);
drivers/pci/controller/vmd.c +0
-6-if (ret) -return ret; - } - -/* -* Certain VMD devices may have a root port configuration option which
(quoted diff) +0
-1- * limits the bus range to between 0-127, 128-255, or224-255
drivers/pci/controller/vmd.c +1
-6-*/ -if (features &VMD_FEAT_HAS_BUS_RESTRICTIONS ) { - ret =vmd_get_bus_number_start (vmd); -if (ret) -return ret; - } + ret = vmd_prepare_offsets_and_bus(vmd, features,
&membar2_offset,drivers/pci/controller/vmd.c +3
-0+ &offset[0], &offset[1]); +if (ret) +return ret;
Quoted 9 lines
drivers/pci/controller/vmd.c static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features) · line 908
Quoted 7 lines
drivers/pci/controller/vmd.c +0
-1res = &vmd->dev->resource[VMD_CFGBAR ]; vmd->resources[0 ] = (struct resource ) { .name ="VMD CFGBAR" , .start = vmd->busn_start, - .end = vmd->busn_start + (resource_size(res) >>20) - 1,
drivers/pci/controller/vmd.c +1
-0+ .end = 0xff,Is this change related to this patch?
Yes.
Quoted 3 lines
- Mani