Platform/RdDaniel: add support for Arm's RD-Daniel platformRD-INFRA-20191024-RC0

RD-Daniel platform consists of 16-Zeus cores directly connected to the
interconnect. Add initial support for Arm's RD-Daniel platform.

Change-Id: I8ae3e1f250f7dc0f5a2f1edcf137856f23c3a544
Signed-off-by: Jagadeesh Ujja <jagadeesh.ujja@arm.com>

9 files changed, 463 insertions, 1 deletions

diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdDaniel/Dsdt.asl b/Platform/ARM/SgiPkg/AcpiTables/RdDaniel/Dsdt.asl
new file mode 100644
index 00000000..469b3489
--- /dev/null
+++ b/Platform/ARM/SgiPkg/AcpiTables/RdDaniel/Dsdt.asl
@@ -0,0 +1,187 @@
+/** @file

+*  Differentiated System Description Table Fields (DSDT)

+*

+*  Copyright (c) 2019, 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 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 "SgiPlatform.h"

+#include "SgiAcpiHeader.h"

+

+DefinitionBlock ("DsdtTable.aml", "DSDT", 1, "ARMLTD", "ARMSGI",

+                 EFI_ACPI_ARM_OEM_REVISION) {

+  Scope (_SB) {

+

+    Device (CP00) { // Zeus core 0

+      Name (_HID, "ACPI0007")

+      Name (_UID, 0)

+      Name (_STA, 0xF)

+    }

+

+    Device (CP01) { // Zeus core 1

+      Name (_HID, "ACPI0007")

+      Name (_UID, 1)

+      Name (_STA, 0xF)

+    }

+ 

+    Device (CP02) { // Zeus core 2

+      Name (_HID, "ACPI0007")

+      Name (_UID, 2)

+      Name (_STA, 0xF)

+    }

+

+    Device (CP03) { // Zeus core 3

+      Name (_HID, "ACPI0007")

+      Name (_UID, 3)

+      Name (_STA, 0xF)

+    }

+

+    Device (CP04) { // Zeus core 4

+      Name (_HID, "ACPI0007")

+      Name (_UID, 4)

+      Name (_STA, 0xF)

+    }

+

+    Device (CP05) { // Zeus core 5

+      Name (_HID, "ACPI0007")

+      Name (_UID, 5)

+      Name (_STA, 0xF)

+    }

+

+    Device (CP06) { // Zeus core 6

+      Name (_HID, "ACPI0007")

+      Name (_UID, 6)

+      Name (_STA, 0xF)

+    }

+

+    Device (CP07) { // Zeus core 7

+      Name (_HID, "ACPI0007")

+      Name (_UID, 7)

+      Name (_STA, 0xF)

+    }

+    

+    Device (CP08) { // Zeus core 8

+      Name (_HID, "ACPI0007")

+      Name (_UID, 8)

+      Name (_STA, 0xF)

+    }

+   

+   Device (CP09) { // Zeus core 9

+      Name (_HID, "ACPI0007")

+      Name (_UID, 9)

+      Name (_STA, 0xF)

+    }

+

+   Device (CP10) { // Zeus core 10

+      Name (_HID, "ACPI0007")

+      Name (_UID, 10)

+      Name (_STA, 0xF)

+    }

+   

+   Device (CP11) { // Zeus core 11

+      Name (_HID, "ACPI0007")

+      Name (_UID, 11)

+      Name (_STA, 0xF)

+    }

+

+    Device (CP12) { // Zeus core 12

+      Name (_HID, "ACPI0007")

+      Name (_UID, 12)

+      Name (_STA, 0xF)

+    }

+

+   Device (CP13) { // Zeus core 13

+      Name (_HID, "ACPI0007")

+      Name (_UID, 13)

+      Name (_STA, 0xF)

+    }

+

+   Device (CP14) { // Zeus core 14

+      Name (_HID, "ACPI0007")

+      Name (_UID, 14)

+      Name (_STA, 0xF)

+    }

+

+   Device (CP15) { // Zeus core 15

+      Name (_HID, "ACPI0007")

+      Name (_UID, 15)

+      Name (_STA, 0xF)

+    }

+

+    // UART PL011

+    Device (COM0) {

+      Name (_HID, "ARMH0011")

+      Name (_CID, "ARMH0011")

+      Name (_UID, Zero)

+      Name (_STA, 0xF)

+      Name (_CRS, ResourceTemplate () {

+        Memory32Fixed (

+          ReadWrite,

+          FixedPcdGet64 (PcdSerialDbgRegisterBase),

+          0x1000

+          )

+        Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { 147 }

+      })

+    }

+

+    // SMSC 91C111

+    Device (ETH0) {

+      Name (_HID, "LNRO0003")

+      Name (_UID, Zero)

+      Name (_STA, 0xF)

+      Name (_CRS, ResourceTemplate () {

+        Memory32Fixed (ReadWrite, 0x18000000, 0x1000)

+        Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { 111 }

+      })

+      Name (_DSD, Package() {

+        ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),

+                Package() {

+                  Package(2) {"reg-io-width", 4 },

+                }

+      })

+    }

+

+    // VIRTIO DISK

+    Device (VR00) {

+      Name (_HID, "LNRO0005")

+      Name (_UID, 0)

+      Name (_CCA, 1)    // mark the device coherent

+

+      Name (_CRS, ResourceTemplate() {

+        Memory32Fixed (

+          ReadWrite,

+          FixedPcdGet32 (PcdVirtioBlkBaseAddress),

+          FixedPcdGet32 (PcdVirtioBlkSize)

+        )

+        Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) {

+          FixedPcdGet32 (PcdVirtioBlkInterrupt)

+        }

+      })

+    }

+

+    // VIRTIO NET

+    Device (VR01) {

+      Name (_HID, "LNRO0005")

+      Name (_UID, 1)

+      Name (_CCA, 1)    // mark the device coherent

+

+      Name (_CRS, ResourceTemplate() {

+        Memory32Fixed (ReadWrite,

+          FixedPcdGet32 (PcdVirtioNetBaseAddress),

+          FixedPcdGet32 (PcdVirtioNetSize)

+        )

+        Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) {

+          FixedPcdGet32 (PcdVirtioNetInterrupt)

+        }

+      })

+    }

+  } // Scope(_SB)

+}

diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdDaniel/Madt.aslc b/Platform/ARM/SgiPkg/AcpiTables/RdDaniel/Madt.aslc
new file mode 100644
index 00000000..84bfa278
--- /dev/null
+++ b/Platform/ARM/SgiPkg/AcpiTables/RdDaniel/Madt.aslc
@@ -0,0 +1,202 @@
+/** @file

+*  Multiple APIC Description Table (MADT)

+*

+*  Copyright (c) 2019, 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 "SgiPlatform.h"

+#include "SgiAcpiHeader.h"

+#include <Library/AcpiLib.h>

+#include <Library/ArmLib.h>

+#include <Library/PcdLib.h>

+#include <IndustryStandard/Acpi.h>

+

+#define CORE_CNT   (FixedPcdGet32 (PcdClusterCount) * \

+                    FixedPcdGet32 (PcdCoreCount))

+

+// EFI_ACPI_6_2_GIC_STRUCTURE

+#define EFI_ACPI_6_2_GICC_STRUCTURE_INIT(GicId, AcpiCpuUid, Mpidr, Flags,      \

+  PmuIrq, GicBase, GicVBase, GicHBase, GsivId, GicRBase, Efficiency)           \

+  {                                                                            \

+    EFI_ACPI_6_2_GIC,                     /* Type */                           \

+    sizeof (EFI_ACPI_6_2_GIC_STRUCTURE),  /* Length */                         \

+    EFI_ACPI_RESERVED_WORD,               /* Reserved */                       \

+    GicId,                                /* CPUInterfaceNumber */             \

+    AcpiCpuUid,                           /* AcpiProcessorUid */               \

+    Flags,                                /* Flags */                          \

+    0,                                    /* ParkingProtocolVersion */         \

+    PmuIrq,                               /* PerformanceInterruptGsiv */       \

+    0,                                    /* ParkedAddress */                  \

+    GicBase,                              /* PhysicalBaseAddress */            \

+    GicVBase,                             /* GICV */                           \

+    GicHBase,                             /* GICH */                           \

+    GsivId,                               /* VGICMaintenanceInterrupt */       \

+    GicRBase,                             /* GICRBaseAddress */                \

+    Mpidr,                                /* MPIDR */                          \

+    Efficiency,                           /* ProcessorPowerEfficiencyClass */  \

+    {                                                                          \

+      EFI_ACPI_RESERVED_BYTE,             /* Reserved2[0] */                   \

+      EFI_ACPI_RESERVED_BYTE,             /* Reserved2[1] */                   \

+      EFI_ACPI_RESERVED_BYTE              /* Reserved2[2] */                   \

+    }                                                                          \

+  }

+

+// EFI_ACPI_6_2_GIC_DISTRIBUTOR_STRUCTURE

+#define EFI_ACPI_6_2_GIC_DISTRIBUTOR_INIT(GicDistHwId, GicDistBase,            \

+  GicDistVector, GicVersion)                                                   \

+  {                                                                            \

+    EFI_ACPI_6_2_GICD,                    /* Type */                           \

+    sizeof (EFI_ACPI_6_2_GIC_DISTRIBUTOR_STRUCTURE),                           \

+    EFI_ACPI_RESERVED_WORD,               /* Reserved1 */                      \

+    GicDistHwId,                          /* GicId */                          \

+    GicDistBase,                          /* PhysicalBaseAddress */            \

+    GicDistVector,                        /* SystemVectorBase */               \

+    GicVersion,                           /* GicVersion */                     \

+    {                                                                          \

+      EFI_ACPI_RESERVED_BYTE,             /* Reserved2[0] */                   \

+      EFI_ACPI_RESERVED_BYTE,             /* Reserved2[1] */                   \

+      EFI_ACPI_RESERVED_BYTE              /* Reserved2[2] */                   \

+    }                                                                          \

+  }

+

+// EFI_ACPI_6_2_GICR_STRUCTURE

+#define EFI_ACPI_6_2_GIC_REDISTRIBUTOR_INIT(RedisRegionAddr, RedisDiscLength)  \

+  {                                                                            \

+    EFI_ACPI_6_2_GICR,                    /* Type */                           \

+    sizeof (EFI_ACPI_6_2_GICR_STRUCTURE), /* Length */                         \

+    EFI_ACPI_RESERVED_WORD,               /* Reserved */                       \

+    RedisRegionAddr,                      /* DiscoveryRangeBaseAddress */      \

+    RedisDiscLength                       /* DiscoveryRangeLength */           \

+  }

+

+// EFI_ACPI_6_2_GIC_ITS_STRUCTURE

+#define EFI_ACPI_6_2_GIC_ITS_INIT(GicItsId, GicItsBase)                        \

+  {                                                                            \

+    EFI_ACPI_6_2_GIC_ITS,                 /* Type */                           \

+    sizeof (EFI_ACPI_6_2_GIC_ITS_STRUCTURE),                                   \

+    EFI_ACPI_RESERVED_WORD,               /* Reserved */                       \

+    GicItsId,                             /* GicItsId */                       \

+    GicItsBase,                           /* PhysicalBaseAddress */            \

+    EFI_ACPI_RESERVED_DWORD               /* DiscoveryRangeLength */           \

+  }

+

+// Multiple APIC Description Table

+#pragma pack (1)

+

+typedef struct {

+  EFI_ACPI_6_2_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER   Header;

+  EFI_ACPI_6_2_GIC_STRUCTURE                            GicInterfaces[16];

+  EFI_ACPI_6_2_GIC_DISTRIBUTOR_STRUCTURE                GicDistributor;

+  EFI_ACPI_6_2_GICR_STRUCTURE                           GicRedistributor;

+  EFI_ACPI_6_2_GIC_ITS_STRUCTURE                        GicIts;

+} EFI_ACPI_6_2_MULTIPLE_APIC_DESCRIPTION_TABLE;

+

+#pragma pack ()

+

+STATIC EFI_ACPI_6_2_MULTIPLE_APIC_DESCRIPTION_TABLE Madt = {

+  {

+    ARM_ACPI_HEADER (

+      EFI_ACPI_6_2_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE,

+      EFI_ACPI_6_2_MULTIPLE_APIC_DESCRIPTION_TABLE,

+      EFI_ACPI_6_2_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION

+    ),

+    // MADT specific fields

+    0, // LocalApicAddress

+    0  // Flags

+  },

+  {

+    // Format: EFI_ACPI_6_2_GICC_STRUCTURE_INIT(GicId, AcpiCpuUid, Mpidr, Flags,

+    //                                          PmuIrq, GicBase, GicVBase,

+    //                                          GicHBase, GsivId, GicRBase,

+    //                                          Efficiency)

+    // Note: The GIC Structure of the primary CPU must be the first entry

+    // (see note in 5.2.12.14 GICC Structure of ACPI v6.2).

+    EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Zeus core0

+      0, 0, GET_MPID(0x0, 0x0), EFI_ACPI_6_2_GIC_ENABLED, 23,

+      FixedPcdGet32 (PcdGicDistributorBase),

+      0x2c020000, 0x2c010000, 25, 0 /* GicRBase */, 0 /* Efficiency */),

+    EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Zeus core1

+      0, 1, GET_MPID(0x100, 0x0), EFI_ACPI_6_2_GIC_ENABLED, 23,

+      FixedPcdGet32 (PcdGicDistributorBase),

+      0x2c020000, 0x2c010000, 25, 0 /* GicRBase */, 0 /* Efficiency */),

+    EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Zeus core2

+      0, 2, GET_MPID(0x200, 0x0), EFI_ACPI_6_2_GIC_ENABLED, 23,

+      FixedPcdGet32 (PcdGicDistributorBase),

+      0x2c020000, 0x2c010000, 25, 0 /* GicRBase */, 0 /* Efficiency */),

+    EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Zeus core3

+      0, 3, GET_MPID(0x300, 0x0), EFI_ACPI_6_2_GIC_ENABLED, 23,

+      FixedPcdGet32 (PcdGicDistributorBase),

+      0x2c020000, 0x2c010000, 25, 0 /* GicRBase */, 0 /* Efficiency */),

+    EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Zeus core4

+      0, 4, GET_MPID(0x400, 0x0), EFI_ACPI_6_2_GIC_ENABLED, 23,

+      FixedPcdGet32 (PcdGicDistributorBase),

+      0x2c020000, 0x2c010000, 25, 0 /* GicRBase */, 0 /* Efficiency */),

+    EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Zeus core5

+      0, 5, GET_MPID(0x500, 0x0), EFI_ACPI_6_2_GIC_ENABLED, 23,

+      FixedPcdGet32 (PcdGicDistributorBase),

+      0x2c020000, 0x2c010000, 25, 0 /* GicRBase */, 0 /* Efficiency */),

+    EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Zeus core6

+      0, 6, GET_MPID(0x600, 0x0), EFI_ACPI_6_2_GIC_ENABLED, 23,

+      FixedPcdGet32 (PcdGicDistributorBase),

+      0x2c020000, 0x2c010000, 25, 0 /* GicRBase */, 0 /* Efficiency */),

+    EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Zeus core7

+      0, 7, GET_MPID(0x700, 0x0), EFI_ACPI_6_2_GIC_ENABLED, 23,

+      FixedPcdGet32 (PcdGicDistributorBase),

+      0x2c020000, 0x2c010000, 25, 0 /* GicRBase */, 0 /* Efficiency */),

+    EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Zeus core8

+      0, 8, GET_MPID(0x800, 0x0), EFI_ACPI_6_2_GIC_ENABLED, 23,

+      FixedPcdGet32 (PcdGicDistributorBase),

+      0x2c020000, 0x2c010000, 25, 0 /* GicRBase */, 0 /* Efficiency */),

+    EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Zeus core9

+      0, 9, GET_MPID(0x900, 0x0), EFI_ACPI_6_2_GIC_ENABLED, 23,

+      FixedPcdGet32 (PcdGicDistributorBase),

+      0x2c020000, 0x2c010000, 25, 0 /* GicRBase */, 0 /* Efficiency */),

+    EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Zeus core10

+      0, 10, GET_MPID(0xa00, 0x0), EFI_ACPI_6_2_GIC_ENABLED, 23,

+      FixedPcdGet32 (PcdGicDistributorBase),

+      0x2c020000, 0x2c010000, 25, 0 /* GicRBase */, 0 /* Efficiency */),

+    EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Zeus core11

+      0, 11, GET_MPID(0xb00, 0x0), EFI_ACPI_6_2_GIC_ENABLED, 23,

+      FixedPcdGet32 (PcdGicDistributorBase),

+      0x2c020000, 0x2c010000, 25, 0 /* GicRBase */, 0 /* Efficiency */),

+    EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Zeus core12

+      0, 12, GET_MPID(0xc00, 0x0), EFI_ACPI_6_2_GIC_ENABLED, 23,

+      FixedPcdGet32 (PcdGicDistributorBase),

+      0x2c020000, 0x2c010000, 25, 0 /* GicRBase */, 0 /* Efficiency */),

+    EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Zeus core13

+      0, 13, GET_MPID(0xd00, 0x0), EFI_ACPI_6_2_GIC_ENABLED, 23,

+      FixedPcdGet32 (PcdGicDistributorBase),

+      0x2c020000, 0x2c010000, 25, 0 /* GicRBase */, 0 /* Efficiency */),

+    EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Zeus core14

+      0, 14, GET_MPID(0xe00, 0x0), EFI_ACPI_6_2_GIC_ENABLED, 23,

+      FixedPcdGet32 (PcdGicDistributorBase),

+      0x2c020000, 0x2c010000, 25, 0 /* GicRBase */, 0 /* Efficiency */),

+    EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Zeus core15

+      0, 15, GET_MPID(0xf00, 0x0), EFI_ACPI_6_2_GIC_ENABLED, 23,

+      FixedPcdGet32 (PcdGicDistributorBase),

+      0x2c020000, 0x2c010000, 25, 0 /* GicRBase */, 0 /* Efficiency */),

+  },

+  // GIC Distributor Entry

+  EFI_ACPI_6_2_GIC_DISTRIBUTOR_INIT(0, FixedPcdGet32 (PcdGicDistributorBase),

+                                    0, 3),

+  // GIC Redistributor

+  EFI_ACPI_6_2_GIC_REDISTRIBUTOR_INIT(FixedPcdGet32 (PcdGicRedistributorsBase),

+                                      SIZE_16MB),

+  // GIC ITS

+  EFI_ACPI_6_2_GIC_ITS_INIT(0, 0x30040000)

+};

+

+//

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

+// the data structure from the executable

+//

+VOID* CONST ReferenceAcpiTable = &Madt;

diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdDanielAcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/RdDanielAcpiTables.inf
new file mode 100644
index 00000000..1557f845
--- /dev/null
+++ b/Platform/ARM/SgiPkg/AcpiTables/RdDanielAcpiTables.inf
@@ -0,0 +1,64 @@
+## @file

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

+#

+#  Copyright (c) 2019, 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 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.

+#

+##

+

+[Defines]

+  INF_VERSION                    = 0x0001001A

+  BASE_NAME                      = RdDanielAcpiTables

+  FILE_GUID                      = 163132b3-8ec1-48f7-b4d1-49306c3f4d51

+  MODULE_TYPE                    = USER_DEFINED

+  VERSION_STRING                 = 1.0

+

+[Sources]

+  Dbg2.aslc

+  Fadt.aslc

+  Gtdt.aslc

+  Iort.aslc

+  Mcfg.aslc

+  RdDaniel/Dsdt.asl

+  RdDaniel/Madt.aslc

+  Spcr.aslc

+

+[Packages]

+  ArmPkg/ArmPkg.dec

+  ArmPlatformPkg/ArmPlatformPkg.dec

+  EmbeddedPkg/EmbeddedPkg.dec

+  MdePkg/MdePkg.dec

+  Platform/ARM/SgiPkg/SgiPlatform.dec

+

+[FixedPcd]

+  gArmPlatformTokenSpaceGuid.PcdCoreCount

+  gArmPlatformTokenSpaceGuid.PcdClusterCount

+  gArmPlatformTokenSpaceGuid.PcdSerialDbgRegisterBase

+  gArmPlatformTokenSpaceGuid.PL011UartInterrupt

+

+  gArmTokenSpaceGuid.PcdArmArchTimerSecIntrNum

+  gArmTokenSpaceGuid.PcdArmArchTimerIntrNum

+  gArmTokenSpaceGuid.PcdArmArchTimerHypIntrNum

+  gArmTokenSpaceGuid.PcdArmArchTimerVirtIntrNum

+  gArmTokenSpaceGuid.PcdGicDistributorBase

+  gArmTokenSpaceGuid.PcdGicRedistributorsBase

+  gArmTokenSpaceGuid.PcdGenericWatchdogControlBase

+  gArmTokenSpaceGuid.PcdGenericWatchdogRefreshBase

+  gArmTokenSpaceGuid.PcdPciBusMin

+  gArmTokenSpaceGuid.PcdPciBusMax

+

+  gArmSgiTokenSpaceGuid.PcdVirtioBlkBaseAddress

+  gArmSgiTokenSpaceGuid.PcdVirtioBlkSize

+  gArmSgiTokenSpaceGuid.PcdVirtioBlkInterrupt

+  gArmSgiTokenSpaceGuid.PcdVirtioNetBaseAddress

+  gArmSgiTokenSpaceGuid.PcdVirtioNetSize

+  gArmSgiTokenSpaceGuid.PcdVirtioNetInterrupt

+

+  gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress

diff --git a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.c b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.c
index 1e95ff26..9f5d1db0 100644
--- a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.c
+++ b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.c
@@ -1,6 +1,6 @@
 /** @file

 *

-*  Copyright (c) 2018, ARM Limited. All rights reserved.

+*  Copyright (c) 2019, ARM Limited. All rights reserved.

 *

 *  SPDX-License-Identifier: BSD-2-Clause-Patent

 *

@@ -53,6 +53,8 @@ ArmSgiPkgEntryPoint (
   } else if ((PartNum == RD_N1E1_EDGE_PART_NUM) &&

              (ConfigId == RD_E1_EDGE_CONF_ID)) {

     Status = LocateAndInstallAcpiFromFv (&gRdE1EdgeAcpiTablesFileGuid);

+  } else if (PartNum == RD_DANIEL_PART_NUM) {

+    Status = LocateAndInstallAcpiFromFv (&gRdDanielAcpiTablesFileGuid); 

   } else {

     Status = EFI_UNSUPPORTED;

   }

diff --git a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf
index 199fe285..13df506d 100644
--- a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf
+++ b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf
@@ -33,6 +33,7 @@
   gSgi575AcpiTablesFileGuid

   gRdN1EdgeAcpiTablesFileGuid

   gRdE1EdgeAcpiTablesFileGuid

+  gRdDanielAcpiTablesFileGuid

 

 [FeaturePcd]

   gArmSgiTokenSpaceGuid.PcdVirtioBlkSupported

diff --git a/Platform/ARM/SgiPkg/Include/SgiPlatform.h b/Platform/ARM/SgiPkg/Include/SgiPlatform.h
index 0f1dc947..822e4bf3 100644
--- a/Platform/ARM/SgiPkg/Include/SgiPlatform.h
+++ b/Platform/ARM/SgiPkg/Include/SgiPlatform.h
@@ -83,6 +83,9 @@
 #define SGI_CONFIG_SHIFT                          0x1C

 #define SGI_PART_NUM_MASK                         0xFFF

 

+//RDDANIEL Platform Identification values

+#define RD_DANIEL_PART_NUM                        0x78a

+

 // ARM platform description data.

 typedef struct {

   UINTN  PlatformId;

diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dec b/Platform/ARM/SgiPkg/SgiPlatform.dec
index ab9e9970..8fc97aea 100644
--- a/Platform/ARM/SgiPkg/SgiPlatform.dec
+++ b/Platform/ARM/SgiPkg/SgiPlatform.dec
@@ -29,6 +29,7 @@
   gSgi575AcpiTablesFileGuid  = { 0xc712719a, 0x0aaf, 0x438c, { 0x9c, 0xdd, 0x35, 0xab, 0x4d, 0x60, 0x20, 0x7d } }

   gRdN1EdgeAcpiTablesFileGuid = { 0x4b0b91d0, 0x4a05, 0x45c4, { 0x88, 0xa7, 0x88, 0xe1, 0x70, 0xe7, 0x66, 0x94 } }

   gRdE1EdgeAcpiTablesFileGuid = { 0x2af40815, 0xa84e, 0x4de9, { 0x8c, 0x38, 0x91, 0x40, 0xb3, 0x54, 0x40, 0x73 } }

+  gRdDanielAcpiTablesFileGuid = { 0x163132b3, 0x8ec1, 0x48f7, { 0xb4, 0xd1, 0x49, 0x30, 0x6c, 0x3f, 0x4d, 0x51 } }

 

 [PcdsFeatureFlag.common]

   gArmSgiTokenSpaceGuid.PcdVirtioBlkSupported|FALSE|BOOLEAN|0x00000001

diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dsc b/Platform/ARM/SgiPkg/SgiPlatform.dsc
index 1f8a6941..588c32fb 100644
--- a/Platform/ARM/SgiPkg/SgiPlatform.dsc
+++ b/Platform/ARM/SgiPkg/SgiPlatform.dsc
@@ -309,6 +309,7 @@
   Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf

   Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf

   Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf

+  Platform/ARM/SgiPkg/AcpiTables/RdDanielAcpiTables.inf

   MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

 

   #

diff --git a/Platform/ARM/SgiPkg/SgiPlatform.fdf b/Platform/ARM/SgiPkg/SgiPlatform.fdf
index c265c668..e22f397e 100644
--- a/Platform/ARM/SgiPkg/SgiPlatform.fdf
+++ b/Platform/ARM/SgiPkg/SgiPlatform.fdf
@@ -109,6 +109,7 @@ READ_LOCK_STATUS   = TRUE
   INF RuleOverride=ACPITABLE Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf

   INF RuleOverride=ACPITABLE Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf

   INF RuleOverride=ACPITABLE Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf

+  INF RuleOverride=ACPITABLE Platform/ARM/SgiPkg/AcpiTables/RdDanielAcpiTables.inf

   INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

 

   # Required by PCI