Sgi: Update ACPI tables to use console UART

Sami Mujawar Thu, 21 Jul 2022 05:41:02 -0700

Hi Rohit,

These changes are fine, just too repetitive.


Reviewed-by: Sami Mujawar <sami.muja...@arm.com>

Regards,

Sami Mujawar

On 04/07/2022 05:59 pm, Rohit Mathew wrote:

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.mat...@arm.com>
---
  Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf   | 2 ++
  Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf   | 2 ++
  Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf | 2 ++
  Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf       | 2 ++
  Platform/ARM/SgiPkg/AcpiTables/RdN2Cfg1AcpiTables.inf   | 2 ++
  Platform/ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf       | 2 ++
  Platform/ARM/SgiPkg/AcpiTables/RdV1McAcpiTables.inf     | 2 ++
  Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf     | 2 ++
  Platform/ARM/SgiPkg/AcpiTables/Spcr.aslc                | 2 +-
  Platform/ARM/SgiPkg/AcpiTables/SsdtRos.asl              | 2 +-
  10 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf 
b/Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf
index 8c34c2fa73e4..d2935f1e73e1 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf
+++ b/Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf
@@ -32,6 +32,7 @@ [Packages]
    ArmPkg/ArmPkg.dec
    ArmPlatformPkg/ArmPlatformPkg.dec
    EmbeddedPkg/EmbeddedPkg.dec
+  MdeModulePkg/MdeModulePkg.dec
    MdePkg/MdePkg.dec
    Platform/ARM/SgiPkg/SgiPlatform.dec

@@ -69,4 +70,5 @@ [FixedPcd]

    gArmSgiTokenSpaceGuid.PcdWdogWS0Gsiv
    gArmSgiTokenSpaceGuid.PcdWdogWS1Gsiv

+ gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase

    gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf 
b/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf
index ce89aa93ea7b..73f47ece7718 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf
+++ b/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf
@@ -32,6 +32,7 @@ [Packages]
    ArmPkg/ArmPkg.dec
    ArmPlatformPkg/ArmPlatformPkg.dec
    EmbeddedPkg/EmbeddedPkg.dec
+  MdeModulePkg/MdeModulePkg.dec
    MdePkg/MdePkg.dec
    Platform/ARM/SgiPkg/SgiPlatform.dec

@@ -70,4 +71,5 @@ [FixedPcd]

    gArmSgiTokenSpaceGuid.PcdWdogWS0Gsiv
    gArmSgiTokenSpaceGuid.PcdWdogWS1Gsiv

+ gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase

    gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf 
b/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf
index c96d0e40d2cd..da14120bde69 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf
+++ b/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeX2AcpiTables.inf
@@ -34,6 +34,7 @@ [Packages]
    ArmPkg/ArmPkg.dec
    ArmPlatformPkg/ArmPlatformPkg.dec
    EmbeddedPkg/EmbeddedPkg.dec
+  MdeModulePkg/MdeModulePkg.dec
    MdePkg/MdePkg.dec
    Platform/ARM/SgiPkg/SgiPlatform.dec

@@ -80,4 +81,5 @@ [FixedPcd]

    gArmSgiTokenSpaceGuid.PcdWdogWS0Gsiv
    gArmSgiTokenSpaceGuid.PcdWdogWS1Gsiv

+ gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase

    gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf 
b/Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf
index 25be2e276e85..90976250445e 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf
+++ b/Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables.inf
@@ -32,6 +32,7 @@ [Packages]
    ArmPkg/ArmPkg.dec
    ArmPlatformPkg/ArmPlatformPkg.dec
    EmbeddedPkg/EmbeddedPkg.dec
+  MdeModulePkg/MdeModulePkg.dec
    MdePkg/MdePkg.dec
    Platform/ARM/SgiPkg/SgiPlatform.dec

@@ -71,4 +72,5 @@ [FixedPcd]

    gArmSgiTokenSpaceGuid.PcdWdogWS0Gsiv
    gArmSgiTokenSpaceGuid.PcdWdogWS1Gsiv

+ gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase

    gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdN2Cfg1AcpiTables.inf 
b/Platform/ARM/SgiPkg/AcpiTables/RdN2Cfg1AcpiTables.inf
index 4b36c3e5ceb2..95fb446c105d 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/RdN2Cfg1AcpiTables.inf
+++ b/Platform/ARM/SgiPkg/AcpiTables/RdN2Cfg1AcpiTables.inf
@@ -32,6 +32,7 @@ [Packages]
    ArmPkg/ArmPkg.dec
    ArmPlatformPkg/ArmPlatformPkg.dec
    EmbeddedPkg/EmbeddedPkg.dec
+  MdeModulePkg/MdeModulePkg.dec
    MdePkg/MdePkg.dec
    Platform/ARM/SgiPkg/SgiPlatform.dec

@@ -72,4 +73,5 @@ [FixedPcd]

    gArmSgiTokenSpaceGuid.PcdWdogWS0Gsiv
    gArmSgiTokenSpaceGuid.PcdWdogWS1Gsiv

+ gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase

    gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf 
b/Platform/ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf
index 97a87462932b..3540575dd641 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf
+++ b/Platform/ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf
@@ -32,6 +32,7 @@ [Packages]
    ArmPkg/ArmPkg.dec
    ArmPlatformPkg/ArmPlatformPkg.dec
    EmbeddedPkg/EmbeddedPkg.dec
+  MdeModulePkg/MdeModulePkg.dec
    MdePkg/MdePkg.dec
    Platform/ARM/SgiPkg/SgiPlatform.dec

@@ -71,4 +72,5 @@ [FixedPcd]

    gArmSgiTokenSpaceGuid.PcdWdogWS0Gsiv
    gArmSgiTokenSpaceGuid.PcdWdogWS1Gsiv

+ gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase

    gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdV1McAcpiTables.inf 
b/Platform/ARM/SgiPkg/AcpiTables/RdV1McAcpiTables.inf
index 61a2f3a2452b..c6bd69b4a538 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/RdV1McAcpiTables.inf
+++ b/Platform/ARM/SgiPkg/AcpiTables/RdV1McAcpiTables.inf
@@ -34,6 +34,7 @@ [Packages]
    ArmPkg/ArmPkg.dec
    ArmPlatformPkg/ArmPlatformPkg.dec
    EmbeddedPkg/EmbeddedPkg.dec
+  MdeModulePkg/MdeModulePkg.dec
    MdePkg/MdePkg.dec
    Platform/ARM/SgiPkg/SgiPlatform.dec

@@ -81,4 +82,5 @@ [FixedPcd]

    gArmSgiTokenSpaceGuid.PcdWdogWS0Gsiv
    gArmSgiTokenSpaceGuid.PcdWdogWS1Gsiv

+ gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase

    gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
diff --git a/Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf 
b/Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf
index a1bd71fde761..cb3f3fcdb9b6 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf
+++ b/Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf
@@ -32,6 +32,7 @@ [Packages]
    ArmPkg/ArmPkg.dec
    ArmPlatformPkg/ArmPlatformPkg.dec
    EmbeddedPkg/EmbeddedPkg.dec
+  MdeModulePkg/MdeModulePkg.dec
    MdePkg/MdePkg.dec
    Platform/ARM/SgiPkg/SgiPlatform.dec

@@ -70,4 +71,5 @@ [FixedPcd]

    gArmSgiTokenSpaceGuid.PcdWdogWS0Gsiv
    gArmSgiTokenSpaceGuid.PcdWdogWS1Gsiv

+ gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase

    gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
diff --git a/Platform/ARM/SgiPkg/AcpiTables/Spcr.aslc 
b/Platform/ARM/SgiPkg/AcpiTables/Spcr.aslc
index 6467fcdf4fd0..6307777bd148 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/Spcr.aslc
+++ b/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;
diff --git a/Platform/ARM/SgiPkg/AcpiTables/SsdtRos.asl 
b/Platform/ARM/SgiPkg/AcpiTables/SsdtRos.asl
index 6b36da23cf0b..fd20c67e1225 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/SsdtRos.asl
+++ b/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) }



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#91636): https://edk2.groups.io/g/devel/message/91636
Mute This Topic: https://groups.io/mt/92169055/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH 1/2] Platform/Sgi: Update ACPI tables to use console UART

Reply via email to