diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h index b66c5900ef..01bce28b1b 100644 --- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h +++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBus.h @@ -50,7 +50,6 @@ typedef struct _PCI_BAR PCI_BAR; #define EFI_PCI_IOV_POLICY_ARI 0x0001 #define EFI_PCI_IOV_POLICY_SRIOV 0x0002 -#define EFI_PCI_IOV_POLICY_MRIOV 0x0004 typedef enum { PciBarTypeUnknown = 0, @@ -268,7 +267,6 @@ struct _PCI_IO_DEVICE { UINT8 PciExpressCapabilityOffset; UINT32 AriCapabilityOffset; UINT32 SrIovCapabilityOffset; - UINT32 MrIovCapabilityOffset; PCI_BAR VfPciBar[PCI_MAX_BAR]; UINT32 SystemPageSize; UINT16 InitialVFs; diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf index d99c236f26..d18f1f712e 100644 --- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf +++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf @@ -94,7 +94,6 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdSrIovSystemPageSize ## SOMETIMES_CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdSrIovSupport ## CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdAriSupport ## CONSUMES - gEfiMdeModulePkgTokenSpaceGuid.PcdMrIovSupport ## CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration ## SOMETIMES_CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdPcieResizableBarSupport ## CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdPcieResizableBarMaxSize ## CONSUMES diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c index 5c4b215f7a..278a0eb9c4 100644 --- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c +++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c @@ -2460,18 +2460,6 @@ CreatePciIoDevice ( } } - if (PcdGetBool (PcdMrIovSupport)) { - Status = LocatePciExpressCapabilityRegBlock ( - PciIoDevice, - EFI_PCIE_CAPABILITY_ID_MRIOV, - &PciIoDevice->MrIovCapabilityOffset, - NULL - ); - if (!EFI_ERROR (Status)) { - DEBUG ((DEBUG_INFO, " MR-IOV: CapOffset = 0x%x\n", PciIoDevice->MrIovCapabilityOffset)); - } - } - PciIoDevice->ResizableBarOffset = 0; if (PcdGetBool (PcdPcieResizableBarSupport)) { Status = LocatePciExpressCapabilityRegBlock ( diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec index f19704aaf8..5195ea4aae 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec @@ -2059,8 +2059,7 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdAriSupport|TRUE|BOOLEAN|0x10000045 ## Indicates if the Multi Root I/O virtualization is supported.

- # TRUE - Multi Root I/O virtualization is supported.
- # FALSE - Multi Root I/O virtualization is not supported.
+ # NOTE: MR-IOV is deprecated in PCIe 6.0 specification and PcdMrIovSupport shall not be used. # @Prompt Enable MRIOV support. gEfiMdeModulePkgTokenSpaceGuid.PcdMrIovSupport|FALSE|BOOLEAN|0x10000046