Browse Source

Platform/Sgi: Update ACPI tables to use console UART

Patch 433b5b1b0f7f ("Platform/Sgi: Route logs to different sets of
consoles") assigns different address for the console UART and the debug
UART. Correspondingly, update the SPCR and SSDT ACPI tables to use the
address of the console UART port instead of the debug UART port.

Signed-off-by: Rohit Mathew <rohit.mathew@arm.com>
Reviewed-by: Thomas Abraham <thomas.abraham@arm.com>
Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
Tested-by: Thomas Abraham <thomas.abraham@arm.com>
Rohit Mathew 1 year ago
parent
commit
69bd631ff5

+ 2 - 0
Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf

@@ -32,6 +32,7 @@
   ArmPkg/ArmPkg.dec
   ArmPlatformPkg/ArmPlatformPkg.dec
   EmbeddedPkg/EmbeddedPkg.dec
+  MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
   Platform/ARM/SgiPkg/SgiPlatform.dec
 
@@ -69,4 +70,5 @@
   gArmSgiTokenSpaceGuid.PcdWdogWS0Gsiv
   gArmSgiTokenSpaceGuid.PcdWdogWS1Gsiv
 
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress

+ 2 - 0
Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf

@@ -32,6 +32,7 @@
   ArmPkg/ArmPkg.dec
   ArmPlatformPkg/ArmPlatformPkg.dec
   EmbeddedPkg/EmbeddedPkg.dec
+  MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
   Platform/ARM/SgiPkg/SgiPlatform.dec
 
@@ -70,4 +71,5 @@
   gArmSgiTokenSpaceGuid.PcdWdogWS0Gsiv
   gArmSgiTokenSpaceGuid.PcdWdogWS1Gsiv
 
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress

+ 2 - 0
Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf

@@ -34,6 +34,7 @@
   ArmPkg/ArmPkg.dec
   ArmPlatformPkg/ArmPlatformPkg.dec
   EmbeddedPkg/EmbeddedPkg.dec
+  MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
   Platform/ARM/SgiPkg/SgiPlatform.dec
 
@@ -80,4 +81,5 @@
   gArmSgiTokenSpaceGuid.PcdWdogWS0Gsiv
   gArmSgiTokenSpaceGuid.PcdWdogWS1Gsiv
 
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress

+ 2 - 0
Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf

@@ -32,6 +32,7 @@
   ArmPkg/ArmPkg.dec
   ArmPlatformPkg/ArmPlatformPkg.dec
   EmbeddedPkg/EmbeddedPkg.dec
+  MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
   Platform/ARM/SgiPkg/SgiPlatform.dec
 
@@ -71,4 +72,5 @@
   gArmSgiTokenSpaceGuid.PcdWdogWS0Gsiv
   gArmSgiTokenSpaceGuid.PcdWdogWS1Gsiv
 
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress

+ 2 - 0
Platform/ARM/SgiPkg/AcpiTables/RdN2Cfg1AcpiTables.inf

@@ -32,6 +32,7 @@
   ArmPkg/ArmPkg.dec
   ArmPlatformPkg/ArmPlatformPkg.dec
   EmbeddedPkg/EmbeddedPkg.dec
+  MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
   Platform/ARM/SgiPkg/SgiPlatform.dec
 
@@ -72,4 +73,5 @@
   gArmSgiTokenSpaceGuid.PcdWdogWS0Gsiv
   gArmSgiTokenSpaceGuid.PcdWdogWS1Gsiv
 
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress

+ 2 - 0
Platform/ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf

@@ -32,6 +32,7 @@
   ArmPkg/ArmPkg.dec
   ArmPlatformPkg/ArmPlatformPkg.dec
   EmbeddedPkg/EmbeddedPkg.dec
+  MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
   Platform/ARM/SgiPkg/SgiPlatform.dec
 
@@ -71,4 +72,5 @@
   gArmSgiTokenSpaceGuid.PcdWdogWS0Gsiv
   gArmSgiTokenSpaceGuid.PcdWdogWS1Gsiv
 
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress

+ 2 - 0
Platform/ARM/SgiPkg/AcpiTables/RdV1McAcpiTables.inf

@@ -34,6 +34,7 @@
   ArmPkg/ArmPkg.dec
   ArmPlatformPkg/ArmPlatformPkg.dec
   EmbeddedPkg/EmbeddedPkg.dec
+  MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
   Platform/ARM/SgiPkg/SgiPlatform.dec
 
@@ -81,4 +82,5 @@
   gArmSgiTokenSpaceGuid.PcdWdogWS0Gsiv
   gArmSgiTokenSpaceGuid.PcdWdogWS1Gsiv
 
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress

+ 2 - 0
Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf

@@ -32,6 +32,7 @@
   ArmPkg/ArmPkg.dec
   ArmPlatformPkg/ArmPlatformPkg.dec
   EmbeddedPkg/EmbeddedPkg.dec
+  MdeModulePkg/MdeModulePkg.dec
   MdePkg/MdePkg.dec
   Platform/ARM/SgiPkg/SgiPlatform.dec
 
@@ -70,4 +71,5 @@
   gArmSgiTokenSpaceGuid.PcdWdogWS0Gsiv
   gArmSgiTokenSpaceGuid.PcdWdogWS1Gsiv
 
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress

+ 1 - 1
Platform/ARM/SgiPkg/AcpiTables/Spcr.aslc

@@ -34,7 +34,7 @@ STATIC EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE Spcr = {
     EFI_ACPI_RESERVED_BYTE
   },
   // EFI_ACPI_6_4_GENERIC_ADDRESS_STRUCTURE  BaseAddress;
-  ARM_GAS32 (FixedPcdGet64 (PcdSerialDbgRegisterBase)),
+  ARM_GAS32 (FixedPcdGet64 (PcdSerialRegisterBase)),
   // UINT8                                   InterruptType;
   EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_INTERRUPT_TYPE_GIC,
   // UINT8                                   Irq;

+ 1 - 1
Platform/ARM/SgiPkg/AcpiTables/SsdtRos.asl

@@ -22,7 +22,7 @@ DefinitionBlock ("SsdtRosTable.aml", "SSDT", 2, "ARMLTD", "ARMSGI",
       Name (_CRS, ResourceTemplate () {
         Memory32Fixed (
           ReadWrite,
-          FixedPcdGet64 (PcdSerialDbgRegisterBase),
+          FixedPcdGet64 (PcdSerialRegisterBase),
           0x1000
           )
         Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { FixedPcdGet32 (PL011UartInterrupt) }