OvmfPkg/LegacyRegion: Support legacy region manipulation of Q35

Current implementation only supports legacy region of 440 chip.
When QEMU is launched in Q35 mode using CSM enabled OVMF image,
LegacyBios driver fails to start due to the legacy region
[0xC0000, 0xFFFFF] cannot be written.

v2:
 * just updates the comments.

v3:
 * uses PcdOvmfHostBridgePciDevId as Jordan suggested.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Justen Jordan <jordan.l.justen@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

diff --git a/OvmfPkg/Csm/CsmSupportLib/LegacyRegion.c b/OvmfPkg/Csm/CsmSupportLib/LegacyRegion.c
index 44d340be681d8cf1eb4ad83b22a1210533c48029..b929db04d9c5b82e5a50f4c99558848bd2acebf0 100644 (file)
--- a/OvmfPkg/Csm/CsmSupportLib/LegacyRegion.c
+++ b/OvmfPkg/Csm/CsmSupportLib/LegacyRegion.c
@@ -1,7 +1,7 @@
 /** @file\r
   Legacy Region Support\r
 \r
-  Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
 \r
   This program and the accompanying materials are\r
   licensed and made available under the terms and conditions of the BSD License\r
@@ -16,23 +16,24 @@
 #include "LegacyRegion.h"\r
 \r
 //\r
-// 440 PAM map.\r
+// 440/Q35 PAM map.\r
 //\r
-// PAM Range       Offset  Bits  Operation\r
-// =============== ======  ====  ===============================================================\r
-// 0xC0000-0xC3FFF  0x5a   1:0   00 = DRAM Disabled, 01= Read Only, 10 = Write Only, 11 = Normal\r
-// 0xC4000-0xC7FFF  0x5a   5:4   00 = DRAM Disabled, 01= Read Only, 10 = Write Only, 11 = Normal\r
-// 0xC8000-0xCBFFF  0x5b   1:0   00 = DRAM Disabled, 01= Read Only, 10 = Write Only, 11 = Normal\r
-// 0xCC000-0xCFFFF  0x5b   5:4   00 = DRAM Disabled, 01= Read Only, 10 = Write Only, 11 = Normal\r
-// 0xD0000-0xD3FFF  0x5c   1:0   00 = DRAM Disabled, 01= Read Only, 10 = Write Only, 11 = Normal\r
-// 0xD4000-0xD7FFF  0x5c   5:4   00 = DRAM Disabled, 01= Read Only, 10 = Write Only, 11 = Normal\r
-// 0xD8000-0xDBFFF  0x5d   1:0   00 = DRAM Disabled, 01= Read Only, 10 = Write Only, 11 = Normal\r
-// 0xDC000-0xDFFFF  0x5d   5:4   00 = DRAM Disabled, 01= Read Only, 10 = Write Only, 11 = Normal\r
-// 0xE0000-0xE3FFF  0x5e   1:0   00 = DRAM Disabled, 01= Read Only, 10 = Write Only, 11 = Normal\r
-// 0xE4000-0xE7FFF  0x5e   5:4   00 = DRAM Disabled, 01= Read Only, 10 = Write Only, 11 = Normal\r
-// 0xE8000-0xEBFFF  0x5f   1:0   00 = DRAM Disabled, 01= Read Only, 10 = Write Only, 11 = Normal\r
-// 0xEC000-0xEFFFF  0x5f   5:4   00 = DRAM Disabled, 01= Read Only, 10 = Write Only, 11 = Normal\r
-// 0xF0000-0xFFFFF  0x59   5:4   00 = DRAM Disabled, 01= Read Only, 10 = Write Only, 11 = Normal\r
+// PAM Range          Offset    Bits  Operation\r
+//                  440   Q35\r
+// ===============  ====  ====  ====  ===============================================================\r
+// 0xC0000-0xC3FFF  0x5a  0x91  1:0   00 = DRAM Disabled, 01= Read Only, 10 = Write Only, 11 = Normal\r
+// 0xC4000-0xC7FFF  0x5a  0x91  5:4   00 = DRAM Disabled, 01= Read Only, 10 = Write Only, 11 = Normal\r
+// 0xC8000-0xCBFFF  0x5b  0x92  1:0   00 = DRAM Disabled, 01= Read Only, 10 = Write Only, 11 = Normal\r
+// 0xCC000-0xCFFFF  0x5b  0x92  5:4   00 = DRAM Disabled, 01= Read Only, 10 = Write Only, 11 = Normal\r
+// 0xD0000-0xD3FFF  0x5c  0x93  1:0   00 = DRAM Disabled, 01= Read Only, 10 = Write Only, 11 = Normal\r
+// 0xD4000-0xD7FFF  0x5c  0x93  5:4   00 = DRAM Disabled, 01= Read Only, 10 = Write Only, 11 = Normal\r
+// 0xD8000-0xDBFFF  0x5d  0x94  1:0   00 = DRAM Disabled, 01= Read Only, 10 = Write Only, 11 = Normal\r
+// 0xDC000-0xDFFFF  0x5d  0x94  5:4   00 = DRAM Disabled, 01= Read Only, 10 = Write Only, 11 = Normal\r
+// 0xE0000-0xE3FFF  0x5e  0x95  1:0   00 = DRAM Disabled, 01= Read Only, 10 = Write Only, 11 = Normal\r
+// 0xE4000-0xE7FFF  0x5e  0x95  5:4   00 = DRAM Disabled, 01= Read Only, 10 = Write Only, 11 = Normal\r
+// 0xE8000-0xEBFFF  0x5f  0x96  1:0   00 = DRAM Disabled, 01= Read Only, 10 = Write Only, 11 = Normal\r
+// 0xEC000-0xEFFFF  0x5f  0x96  5:4   00 = DRAM Disabled, 01= Read Only, 10 = Write Only, 11 = Normal\r
+// 0xF0000-0xFFFFF  0x59  0x90  5:4   00 = DRAM Disabled, 01= Read Only, 10 = Write Only, 11 = Normal\r
 //\r
 STATIC LEGACY_MEMORY_SECTION_INFO   mSectionArray[] = {\r
   {0xC0000, SIZE_16KB, FALSE, FALSE},\r
@@ -50,22 +51,40 @@ STATIC LEGACY_MEMORY_SECTION_INFO   mSectionArray[] = {
   {0xF0000, SIZE_64KB, FALSE, FALSE}\r
 };\r
 \r
-STATIC PAM_REGISTER_VALUE  mRegisterValues[] = {\r
-  {REG_PAM1_OFFSET, 0x01, 0x02},\r
-  {REG_PAM1_OFFSET, 0x10, 0x20},\r
-  {REG_PAM2_OFFSET, 0x01, 0x02},\r
-  {REG_PAM2_OFFSET, 0x10, 0x20},\r
-  {REG_PAM3_OFFSET, 0x01, 0x02},\r
-  {REG_PAM3_OFFSET, 0x10, 0x20},\r
-  {REG_PAM4_OFFSET, 0x01, 0x02},\r
-  {REG_PAM4_OFFSET, 0x10, 0x20},\r
-  {REG_PAM5_OFFSET, 0x01, 0x02},\r
-  {REG_PAM5_OFFSET, 0x10, 0x20},\r
-  {REG_PAM6_OFFSET, 0x01, 0x02},\r
-  {REG_PAM6_OFFSET, 0x10, 0x20},\r
-  {REG_PAM0_OFFSET, 0x10, 0x20}\r
+STATIC PAM_REGISTER_VALUE  mRegisterValues440[] = {\r
+  {REG_PAM1_OFFSET_440, 0x01, 0x02},\r
+  {REG_PAM1_OFFSET_440, 0x10, 0x20},\r
+  {REG_PAM2_OFFSET_440, 0x01, 0x02},\r
+  {REG_PAM2_OFFSET_440, 0x10, 0x20},\r
+  {REG_PAM3_OFFSET_440, 0x01, 0x02},\r
+  {REG_PAM3_OFFSET_440, 0x10, 0x20},\r
+  {REG_PAM4_OFFSET_440, 0x01, 0x02},\r
+  {REG_PAM4_OFFSET_440, 0x10, 0x20},\r
+  {REG_PAM5_OFFSET_440, 0x01, 0x02},\r
+  {REG_PAM5_OFFSET_440, 0x10, 0x20},\r
+  {REG_PAM6_OFFSET_440, 0x01, 0x02},\r
+  {REG_PAM6_OFFSET_440, 0x10, 0x20},\r
+  {REG_PAM0_OFFSET_440, 0x10, 0x20}\r
 };\r
 \r
+STATIC PAM_REGISTER_VALUE  mRegisterValuesQ35[] = {\r
+  {REG_PAM1_OFFSET_Q35, 0x01, 0x02},\r
+  {REG_PAM1_OFFSET_Q35, 0x10, 0x20},\r
+  {REG_PAM2_OFFSET_Q35, 0x01, 0x02},\r
+  {REG_PAM2_OFFSET_Q35, 0x10, 0x20},\r
+  {REG_PAM3_OFFSET_Q35, 0x01, 0x02},\r
+  {REG_PAM3_OFFSET_Q35, 0x10, 0x20},\r
+  {REG_PAM4_OFFSET_Q35, 0x01, 0x02},\r
+  {REG_PAM4_OFFSET_Q35, 0x10, 0x20},\r
+  {REG_PAM5_OFFSET_Q35, 0x01, 0x02},\r
+  {REG_PAM5_OFFSET_Q35, 0x10, 0x20},\r
+  {REG_PAM6_OFFSET_Q35, 0x01, 0x02},\r
+  {REG_PAM6_OFFSET_Q35, 0x10, 0x20},\r
+  {REG_PAM0_OFFSET_Q35, 0x10, 0x20}\r
+};\r
+\r
+STATIC PAM_REGISTER_VALUE *mRegisterValues;\r
+\r
 //\r
 // Handle used to install the Legacy Region Protocol\r
 //\r
@@ -450,6 +469,25 @@ LegacyRegionInit (
   )\r
 {\r
   EFI_STATUS  Status;\r
+  UINT16      HostBridgeDevId;\r
+\r
+  //\r
+  // Query Host Bridge DID to determine platform type\r
+  //\r
+  HostBridgeDevId = PcdGet16 (PcdOvmfHostBridgePciDevId);\r
+  switch (HostBridgeDevId) {\r
+  case INTEL_82441_DEVICE_ID:\r
+    mRegisterValues = mRegisterValues440;\r
+    break;\r
+  case INTEL_Q35_MCH_DEVICE_ID:\r
+    mRegisterValues = mRegisterValuesQ35;\r
+    break;\r
+  default:\r
+    DEBUG ((EFI_D_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",\r
+            __FUNCTION__, HostBridgeDevId));\r
+    ASSERT (FALSE);\r
+    return RETURN_UNSUPPORTED;\r
+  }\r
 \r
   //\r
   // Install the Legacy Region Protocol on a new handle\r

diff --git a/OvmfPkg/Csm/CsmSupportLib/LegacyRegion.h b/OvmfPkg/Csm/CsmSupportLib/LegacyRegion.h
index 805df8656f09dcbbe151505fd29a7e63de8d470b..f755a2a359e52293578611b10d174d291a8da495 100644 (file)
--- a/OvmfPkg/Csm/CsmSupportLib/LegacyRegion.h
+++ b/OvmfPkg/Csm/CsmSupportLib/LegacyRegion.h
@@ -1,7 +1,7 @@
 /** @file\r
   Legacy Region Support\r
 \r
-  Copyright (c) 2008 - 2011, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2008 - 2016, Intel Corporation. All rights reserved.<BR>\r
 \r
   This program and the accompanying materials are\r
   licensed and made available under the terms and conditions of the BSD License\r
@@ -21,6 +21,8 @@
 #include <Protocol/LegacyRegion2.h>\r
 \r
 #include <IndustryStandard/Pci.h>\r
+#include <IndustryStandard/Q35MchIch9.h>\r
+#include <IndustryStandard/I440FxPiix4.h>\r
 \r
 #include <Library/PciLib.h>\r
 #include <Library/PcdLib.h>\r
@@ -32,13 +34,21 @@
 #define PAM_PCI_DEV        0\r
 #define PAM_PCI_FUNC       0\r
 \r
-#define REG_PAM0_OFFSET    0x59    // Programmable Attribute Map 0\r
-#define REG_PAM1_OFFSET    0x5a    // Programmable Attribute Map 1\r
-#define REG_PAM2_OFFSET    0x5b    // Programmable Attribute Map 2\r
-#define REG_PAM3_OFFSET    0x5c    // Programmable Attribute Map 3\r
-#define REG_PAM4_OFFSET    0x5d    // Programmable Attribute Map 4\r
-#define REG_PAM5_OFFSET    0x5e    // Programmable Attribute Map 5\r
-#define REG_PAM6_OFFSET    0x5f    // Programmable Attribute Map 6\r
+#define REG_PAM0_OFFSET_440    0x59    // Programmable Attribute Map 0\r
+#define REG_PAM1_OFFSET_440    0x5a    // Programmable Attribute Map 1\r
+#define REG_PAM2_OFFSET_440    0x5b    // Programmable Attribute Map 2\r
+#define REG_PAM3_OFFSET_440    0x5c    // Programmable Attribute Map 3\r
+#define REG_PAM4_OFFSET_440    0x5d    // Programmable Attribute Map 4\r
+#define REG_PAM5_OFFSET_440    0x5e    // Programmable Attribute Map 5\r
+#define REG_PAM6_OFFSET_440    0x5f    // Programmable Attribute Map 6\r
+\r
+#define REG_PAM0_OFFSET_Q35    0x90    // Programmable Attribute Map 0\r
+#define REG_PAM1_OFFSET_Q35    0x91    // Programmable Attribute Map 1\r
+#define REG_PAM2_OFFSET_Q35    0x92    // Programmable Attribute Map 2\r
+#define REG_PAM3_OFFSET_Q35    0x93    // Programmable Attribute Map 3\r
+#define REG_PAM4_OFFSET_Q35    0x94    // Programmable Attribute Map 4\r
+#define REG_PAM5_OFFSET_Q35    0x95    // Programmable Attribute Map 5\r
+#define REG_PAM6_OFFSET_Q35    0x96    // Programmable Attribute Map 6\r
 \r
 #define PAM_BASE_ADDRESS   0xc0000\r
 #define PAM_LIMIT_ADDRESS  BASE_1MB\r