Platforms/ARM/Juno: Acpi - update SPCR to aslc.

Amend the Serial Port Console Redirection Table to aslc.

This patch replaces the Spcr.asl file which described the SPCR table
in TDL format with Spcr.aslc which introduces the option of using EDK2
build defined PCDs.  Using PCDs will allow for future improvements.

No functional changes are made by this change, it is a preliminary step
towards introducing improvements to allow build time modifications for
bug fixes and improvements.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Evan Lloyd <evan.lloyd@arm.com>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

3 files changed, 91 insertions, 75 deletions

diff --git a/Platforms/ARM/Juno/AcpiTables/AcpiTables.inf b/Platforms/ARM/Juno/AcpiTables/AcpiTables.inf
index 039cff0..3caf4af 100644
--- a/Platforms/ARM/Juno/AcpiTables/AcpiTables.inf
+++ b/Platforms/ARM/Juno/AcpiTables/AcpiTables.inf
@@ -2,7 +2,7 @@
 #

 #  ACPI table data and ASL sources required to boot the platform.

 #

-#  Copyright (c) 2014-2015, ARM Ltd. All rights reserved.

+#  Copyright (c) 2014-2016, ARM Ltd. All rights reserved.

 #

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -24,7 +24,7 @@
 [Sources]

   Dsdt.asl

   Dbg2.asl

-  Spcr.asl

+  Spcr.aslc

   Fadt.aslc

   Gtdt.aslc

   Madt.aslc

diff --git a/Platforms/ARM/Juno/AcpiTables/Spcr.asl b/Platforms/ARM/Juno/AcpiTables/Spcr.asl
deleted file mode 100644
index 2b65326..0000000
--- a/Platforms/ARM/Juno/AcpiTables/Spcr.asl
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2015, Graeme Gregory <graeme.gregory@linaro.org>
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * 1. Redistributions of source code must retain the above copyright 
- * notice, this list of conditions and the following disclaimer.
- * 
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the 
- * documentation and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * 
- * NB: This License is also known as the "BSD 2-Clause License".
- * 
- *
- * [SPCR] ACPI Table
- *
- */
-
-[0004]                    Signature : "SPCR"    [Serial Port Console Redirection table]
-[0004]                 Table Length : 00000050
-[0001]                     Revision : 02
-[0001]                     Checksum : 29
-[0006]                       Oem ID : "LINARO"
-[0008]                 Oem Table ID : "ARM-JUNO"
-[0004]                 Oem Revision : 00000000
-[0004]              Asl Compiler ID : "INTL"
-[0004]        Asl Compiler Revision : 20140926
-
-[0001]               Interface Type : 03
-[0003]                     Reserved : 000000
-
-[000C]         Serial Port Register : [Generic Address Structure]
-[0001]                     Space ID : 00 [SystemMemory]
-[0001]                    Bit Width : 20
-[0001]                   Bit Offset : 00
-[0001]         Encoded Access Width : 03 [DWord Access:32]
-[0008]                      Address : 000000007FF80000
-
-[0001]               Interrupt Type : 08
-[0001]          PCAT-compatible IRQ : 00
-[0004]                    Interrupt : 00000073
-[0001]                    Baud Rate : 07
-[0001]                       Parity : 00
-[0001]                    Stop Bits : 01
-[0001]                 Flow Control : 00
-[0001]                Terminal Type : 03
-[0001]                     Reserved : 00
-[0002]                PCI Device ID : FFFF
-[0002]                PCI Vendor ID : FFFF
-[0001]                      PCI Bus : 00
-[0001]                   PCI Device : 00
-[0001]                 PCI Function : 00
-[0004]                    PCI Flags : 00000000
-[04Bh]                  PCI Segment : 00
-[04Ch]                     Reserved : 00000000
-
diff --git a/Platforms/ARM/Juno/AcpiTables/Spcr.aslc b/Platforms/ARM/Juno/AcpiTables/Spcr.aslc
new file mode 100644
index 0000000..6fea989
--- /dev/null
+++ b/Platforms/ARM/Juno/AcpiTables/Spcr.aslc
@@ -0,0 +1,89 @@
+/** @file

+* SPCR Table

+*

+* Copyright (c) 2014 - 2016, ARM Limited. All rights reserved.

+*

+* This program and the accompanying materials are licensed and made available

+* under the terms and conditions of the BSD License which accompanies this

+* distribution.  The full text of the license may be found at

+* http://opensource.org/licenses/bsd-license.php

+*

+* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

+*

+**/

+

+#include "ArmPlatform.h"

+#include <Library/AcpiLib.h>

+#include <Library/ArmLib.h>

+#include <Library/PcdLib.h>

+#include <IndustryStandard/Acpi.h>

+#include <IndustryStandard/SerialPortConsoleRedirectionTable.h>

+

+/**

+ * References:

+ * Serial Port Console Redirection Table Specification Version 1.03 - August 10, 2015

+ **/

+

+

+///

+/// SPCR Flow Control

+///

+#define SPCR_FLOW_CONTROL_NONE           0

+

+

+STATIC EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE Spcr = {

+  ARM_ACPI_HEADER (EFI_ACPI_5_1_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_SIGNATURE,

+                     EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE,

+                     EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_REVISION),

+  // UINT8                                   InterfaceType;

+  EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_INTERFACE_TYPE_ARM_PL011_UART,

+  // UINT8                                   Reserved1[3];

+  {

+    EFI_ACPI_RESERVED_BYTE,

+    EFI_ACPI_RESERVED_BYTE,

+    EFI_ACPI_RESERVED_BYTE

+  },

+  // EFI_ACPI_5_0_GENERIC_ADDRESS_STRUCTURE  BaseAddress;

+  ARM_GAS32 (0x7FF80000),

+  // UINT8                                   InterruptType;

+  EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_INTERRUPT_TYPE_GIC,

+  // UINT8                                   Irq;

+  0,                                         // Not used on ARM

+  // UINT32                                  GlobalSystemInterrupt;

+  0x73,

+  // UINT8                                   BaudRate;

+  EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_BAUD_RATE_115200,

+  // UINT8                                   Parity;

+  EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_PARITY_NO_PARITY,

+  // UINT8                                   StopBits;

+  EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_STOP_BITS_1,

+  // UINT8                                   FlowControl;

+  SPCR_FLOW_CONTROL_NONE,

+  // UINT8                                   TerminalType;

+  EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_TERMINAL_TYPE_ANSI,

+  // UINT8                                   Reserved2;

+  EFI_ACPI_RESERVED_BYTE,

+  // UINT16                                  PciDeviceId;

+  0xFFFF,

+  // UINT16                                  PciVendorId;

+  0xFFFF,

+  // UINT8                                   PciBusNumber;

+  0x00,

+  // UINT8                                   PciDeviceNumber;

+  0x00,

+  // UINT8                                   PciFunctionNumber;

+  0x00,

+  // UINT32                                  PciFlags;

+  0x00000000,

+  // UINT8                                   PciSegment;

+  0x00,

+  // UINT32                                  Reserved3;

+  EFI_ACPI_RESERVED_DWORD

+};

+

+//

+// Reference the table being generated to prevent the optimizer from removing the

+// data structure from the executable

+//

+VOID* CONST ReferenceAcpiTable = &Spcr;