Revision: 17434
http://sourceforge.net/p/edk2/code/17434
Author: lersek
Date: 2015-05-13 09:31:44 +0000 (Wed, 13 May 2015)
Log Message:
-----------
OvmfPkg: consolidate POWER_MGMT_REGISTER_Q35() on "Q35MchIch9.h" macros
All POWER_MGMT_REGISTER_Q35() macro invocations in OvmfPkg should use the
macros in "Q35MchIch9.h" as arguments.
Cc: Gabriel Somlo <so...@cmu.edu>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <ler...@redhat.com>
Acked-by: Gabriel Somlo <so...@cmu.edu>
Tested-by: Gabriel Somlo <so...@cmu.edu>
Reviewed-by: Jordan Justen <jordan.l.jus...@intel.com>
Modified Paths:
--------------
trunk/edk2/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.c
trunk/edk2/OvmfPkg/Library/AcpiTimerLib/BaseRomAcpiTimerLib.c
trunk/edk2/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c
trunk/edk2/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c
trunk/edk2/OvmfPkg/PlatformPei/Platform.c
Modified: trunk/edk2/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.c
===================================================================
--- trunk/edk2/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.c 2015-05-13
09:31:39 UTC (rev 17433)
+++ trunk/edk2/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.c 2015-05-13
09:31:44 UTC (rev 17434)
@@ -23,7 +23,6 @@
//
#define PMBA_RTE BIT0
#define PIIX4_PMIOSE BIT0
-#define Q35_ACPI_EN BIT7
//
// Offset in the Power Management Base Address to the ACPI Timer
@@ -64,9 +63,9 @@
AcpiEnBit = PIIX4_PMIOSE;
break;
case INTEL_Q35_MCH_DEVICE_ID:
- Pmba = POWER_MGMT_REGISTER_Q35 (0x40);
- AcpiCtlReg = POWER_MGMT_REGISTER_Q35 (0x44); // ACPI_CNTL
- AcpiEnBit = Q35_ACPI_EN;
+ Pmba = POWER_MGMT_REGISTER_Q35 (ICH9_PMBASE);
+ AcpiCtlReg = POWER_MGMT_REGISTER_Q35 (ICH9_ACPI_CNTL);
+ AcpiEnBit = ICH9_ACPI_CNTL_ACPI_EN;
break;
default:
DEBUG ((EFI_D_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",
Modified: trunk/edk2/OvmfPkg/Library/AcpiTimerLib/BaseRomAcpiTimerLib.c
===================================================================
--- trunk/edk2/OvmfPkg/Library/AcpiTimerLib/BaseRomAcpiTimerLib.c
2015-05-13 09:31:39 UTC (rev 17433)
+++ trunk/edk2/OvmfPkg/Library/AcpiTimerLib/BaseRomAcpiTimerLib.c
2015-05-13 09:31:44 UTC (rev 17434)
@@ -24,7 +24,6 @@
//
#define PMBA_RTE BIT0
#define PIIX4_PMIOSE BIT0
-#define Q35_ACPI_EN BIT7
//
// Offset in the Power Management Base Address to the ACPI Timer
@@ -62,9 +61,9 @@
AcpiEnBit = PIIX4_PMIOSE;
break;
case INTEL_Q35_MCH_DEVICE_ID:
- Pmba = POWER_MGMT_REGISTER_Q35 (0x40);
- AcpiCtlReg = POWER_MGMT_REGISTER_Q35 (0x44); // ACPI_CNTL
- AcpiEnBit = Q35_ACPI_EN;
+ Pmba = POWER_MGMT_REGISTER_Q35 (ICH9_PMBASE);
+ AcpiCtlReg = POWER_MGMT_REGISTER_Q35 (ICH9_ACPI_CNTL);
+ AcpiEnBit = ICH9_ACPI_CNTL_ACPI_EN;
break;
default:
DEBUG ((EFI_D_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",
@@ -118,7 +117,7 @@
Pmba = POWER_MGMT_REGISTER_PIIX4 (0x40);
break;
case INTEL_Q35_MCH_DEVICE_ID:
- Pmba = POWER_MGMT_REGISTER_Q35 (0x40);
+ Pmba = POWER_MGMT_REGISTER_Q35 (ICH9_PMBASE);
break;
default:
DEBUG ((EFI_D_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",
Modified: trunk/edk2/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c
===================================================================
--- trunk/edk2/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c 2015-05-13
09:31:39 UTC (rev 17433)
+++ trunk/edk2/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c 2015-05-13
09:31:44 UTC (rev 17434)
@@ -64,7 +64,7 @@
Pmba = POWER_MGMT_REGISTER_PIIX4 (0x40);
break;
case INTEL_Q35_MCH_DEVICE_ID:
- Pmba = POWER_MGMT_REGISTER_Q35 (0x40);
+ Pmba = POWER_MGMT_REGISTER_Q35 (ICH9_PMBASE);
break;
default:
DEBUG ((EFI_D_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",
Modified: trunk/edk2/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c
===================================================================
--- trunk/edk2/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c 2015-05-13
09:31:39 UTC (rev 17433)
+++ trunk/edk2/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c 2015-05-13
09:31:44 UTC (rev 17434)
@@ -870,7 +870,7 @@
PciWrite8 (PCI_LIB_ADDRESS (0, 1, 0, 0x63), 0x0a); // D
break;
case INTEL_Q35_MCH_DEVICE_ID:
- Pmba = POWER_MGMT_REGISTER_Q35 (0x40);
+ Pmba = POWER_MGMT_REGISTER_Q35 (ICH9_PMBASE);
//
// 00:1f.0 LPC Bridge (Q35) LNK routing targets
//
Modified: trunk/edk2/OvmfPkg/PlatformPei/Platform.c
===================================================================
--- trunk/edk2/OvmfPkg/PlatformPei/Platform.c 2015-05-13 09:31:39 UTC (rev
17433)
+++ trunk/edk2/OvmfPkg/PlatformPei/Platform.c 2015-05-13 09:31:44 UTC (rev
17434)
@@ -258,9 +258,9 @@
break;
case INTEL_Q35_MCH_DEVICE_ID:
PmCmd = POWER_MGMT_REGISTER_Q35 (PCI_COMMAND_OFFSET);
- Pmba = POWER_MGMT_REGISTER_Q35 (0x40);
- AcpiCtlReg = POWER_MGMT_REGISTER_Q35 (0x44); // ACPI_CNTL
- AcpiEnBit = BIT7; // Q35_ACPI_EN
+ Pmba = POWER_MGMT_REGISTER_Q35 (ICH9_PMBASE);
+ AcpiCtlReg = POWER_MGMT_REGISTER_Q35 (ICH9_ACPI_CNTL);
+ AcpiEnBit = ICH9_ACPI_CNTL_ACPI_EN;
break;
default:
DEBUG ((EFI_D_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",
------------------------------------------------------------------------------
One dashboard for servers and applications across Physical-Virtual-Cloud
Widest out-of-the-box monitoring support with 50+ applications
Performance metrics, stats and reports that give you Actionable Insights
Deep dive visibility with transaction tracing using APM Insight.
http://ad.doubleclick.net/ddm/clk/290420510;117567292;y
_______________________________________________
edk2-commits mailing list
edk2-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/edk2-commits
