IntelSiliconPkg/VTdDxe: Disable PMR

[mirror_edk2.git] / IntelSiliconPkg / IntelVTdDxe / VtdReg.c

diff --git a/IntelSiliconPkg/IntelVTdDxe/VtdReg.c b/IntelSiliconPkg/IntelVTdDxe/VtdReg.c
index b1178b70744d84e3ee39c083f4ae37152e9d8fb8..1404af7cd7817fb4163b9eb01e7ad2df66631d87 100644 (file)
--- a/IntelSiliconPkg/IntelVTdDxe/VtdReg.c
+++ b/IntelSiliconPkg/IntelVTdDxe/VtdReg.c
@@ -187,14 +187,47 @@ PrepareVtdConfig (
     }\r
 \r
     DomainNumber = (UINTN)1 << (UINT8)((UINTN)mVtdUnitInformation[Index].CapReg.Bits.ND * 2 + 4);\r
-    if (mVtdUnitInformation[Index].PciDeviceInfo.PciDescriptorNumber >= DomainNumber) {\r
-      DEBUG((DEBUG_ERROR, "!!!! Pci device Number(0x%x) >= DomainNumber(0x%x) !!!!\n", mVtdUnitInformation[Index].PciDeviceInfo.PciDescriptorNumber, DomainNumber));\r
+    if (mVtdUnitInformation[Index].PciDeviceInfo.PciDeviceDataNumber >= DomainNumber) {\r
+      DEBUG((DEBUG_ERROR, "!!!! Pci device Number(0x%x) >= DomainNumber(0x%x) !!!!\n", mVtdUnitInformation[Index].PciDeviceInfo.PciDeviceDataNumber, DomainNumber));\r
       return ;\r
     }\r
   }\r
   return ;\r
 }\r
 \r
+/**\r
+  Disable PMR in all VTd engine.\r
+**/\r
+VOID\r
+DisablePmr (\r
+  VOID\r
+  )\r
+{\r
+  UINT32        Reg32;\r
+  VTD_CAP_REG   CapReg;\r
+  UINTN         Index;\r
+\r
+  DEBUG ((DEBUG_INFO,"DisablePmr\n"));\r
+  for (Index = 0; Index < mVtdUnitNumber; Index++) {\r
+    CapReg.Uint64 = MmioRead64 (mVtdUnitInformation[Index].VtdUnitBaseAddress + R_CAP_REG);\r
+    if (CapReg.Bits.PLMR == 0 || CapReg.Bits.PHMR == 0) {\r
+      continue ;\r
+    }\r
+\r
+    Reg32 = MmioRead32 (mVtdUnitInformation[Index].VtdUnitBaseAddress + R_PMEN_ENABLE_REG);\r
+    if ((Reg32 & BIT0) != 0) {\r
+      MmioWrite32 (mVtdUnitInformation[Index].VtdUnitBaseAddress + R_PMEN_ENABLE_REG, 0x0);\r
+      do {\r
+        Reg32 = MmioRead32 (mVtdUnitInformation[Index].VtdUnitBaseAddress + R_PMEN_ENABLE_REG);\r
+      } while((Reg32 & BIT0) != 0);\r
+      DEBUG ((DEBUG_INFO,"Pmr(%d) disabled\n", Index));\r
+    } else {\r
+      DEBUG ((DEBUG_INFO,"Pmr(%d) not enabled\n", Index));\r
+    }\r
+  }\r
+  return ;\r
+}\r
+\r
 /**\r
   Enable DMAR translation.\r
 \r
@@ -259,6 +292,11 @@ EnableDmar (
     DEBUG ((DEBUG_INFO,"VTD (%d) enabled!<<<<<<\n",Index));\r
   }\r
 \r
+  //\r
+  // Need disable PMR, since we already setup translation table.\r
+  //\r
+  DisablePmr ();\r
+\r
   mVtdEnabled = TRUE;\r
 \r
   return EFI_SUCCESS;\r
@@ -305,13 +343,13 @@ DisableDmar (
 \r
   for (Index = 0; Index < mVtdUnitNumber; Index++) {\r
     DEBUG((DEBUG_INFO, "engine [%d] access\n", Index));\r
-    for (SubIndex = 0; SubIndex < mVtdUnitInformation[Index].PciDeviceInfo.PciDescriptorNumber; SubIndex++) {\r
+    for (SubIndex = 0; SubIndex < mVtdUnitInformation[Index].PciDeviceInfo.PciDeviceDataNumber; SubIndex++) {\r
       DEBUG ((DEBUG_INFO, "  PCI S%04X B%02x D%02x F%02x - %d\n",\r
         mVtdUnitInformation[Index].Segment,\r
-        mVtdUnitInformation[Index].PciDeviceInfo.PciDescriptors[SubIndex].Bits.Bus,\r
-        mVtdUnitInformation[Index].PciDeviceInfo.PciDescriptors[SubIndex].Bits.Device,\r
-        mVtdUnitInformation[Index].PciDeviceInfo.PciDescriptors[SubIndex].Bits.Function,\r
-        mVtdUnitInformation[Index].PciDeviceInfo.AccessCount[SubIndex]\r
+        mVtdUnitInformation[Index].PciDeviceInfo.PciDeviceData[Index].PciSourceId.Bits.Bus,\r
+        mVtdUnitInformation[Index].PciDeviceInfo.PciDeviceData[Index].PciSourceId.Bits.Device,\r
+        mVtdUnitInformation[Index].PciDeviceInfo.PciDeviceData[Index].PciSourceId.Bits.Function,\r
+        mVtdUnitInformation[Index].PciDeviceInfo.PciDeviceData[Index].AccessCount\r
         ));\r
     }\r
   }\r
@@ -502,15 +540,26 @@ DumpVtdIfError (
     for (Index = 0; Index < (UINTN)CapReg.Bits.NFR + 1; Index++) {\r
       FrcdReg.Uint64[0] = MmioRead64 (mVtdUnitInformation[Num].VtdUnitBaseAddress + ((CapReg.Bits.FRO * 16) + (Index * 16) + R_FRCD_REG));\r
       FrcdReg.Uint64[1] = MmioRead64 (mVtdUnitInformation[Num].VtdUnitBaseAddress + ((CapReg.Bits.FRO * 16) + (Index * 16) + R_FRCD_REG + sizeof(UINT64)));\r
-      if ((FrcdReg.Uint64[0] != 0) || (FrcdReg.Uint64[1] != 0)) {\r
+      if (FrcdReg.Bits.F != 0) {\r
         HasError = TRUE;\r
       }\r
     }\r
 \r
     if (HasError) {\r
-      DEBUG((DEBUG_INFO, "#### ERROR ####\n"));\r
+      DEBUG((DEBUG_INFO, "\n#### ERROR ####\n"));\r
       DumpVtdRegs (Num);\r
-      DEBUG((DEBUG_INFO, "#### ERROR ####\n"));\r
+      DEBUG((DEBUG_INFO, "#### ERROR ####\n\n"));\r
+      //\r
+      // Clear\r
+      //\r
+      for (Index = 0; Index < (UINTN)CapReg.Bits.NFR + 1; Index++) {\r
+        FrcdReg.Uint64[1] = MmioRead64 (mVtdUnitInformation[Num].VtdUnitBaseAddress + ((CapReg.Bits.FRO * 16) + (Index * 16) + R_FRCD_REG + sizeof(UINT64)));\r
+        if (FrcdReg.Bits.F != 0) {\r
+          FrcdReg.Bits.F = 0;\r
+          MmioWrite64 (mVtdUnitInformation[Num].VtdUnitBaseAddress + ((CapReg.Bits.FRO * 16) + (Index * 16) + R_FRCD_REG + sizeof(UINT64)), FrcdReg.Uint64[1]);\r
+        }\r
+        MmioWrite32 (mVtdUnitInformation[Num].VtdUnitBaseAddress + R_FSTS_REG, MmioRead32 (mVtdUnitInformation[Num].VtdUnitBaseAddress + R_FSTS_REG));\r
+      }\r
     }\r
   }\r
 }\r