Platform/RPi3: Use proper aslc for FADT, GTDT and MADT tables generation

The FADT and GTDT tables are virtually identical to the ones we use for
the Pi 4, except for the RPI_SYSTEM_TIMER_BASE_ADDRESS in Gtdt.aslc.

However, 2 changes are required for these tables to work with Windows:
1. The ACPI OEM ID for the FADT table MUST be "BC2836" (else Windows 10
   fails to boot) so we change the global value in AcpiTables.h.
2. The values for PcdArmArchTimerVirtIntrNum and PcdArmArchTimerHypIntrNum
   seem to have been swapped in our existing .dsc so we swap them back
   (Without this swap, Windows 10 simply refuses to boot).

The MADT table is deduced from the original Microsoft blob. The one thing
of notice is that no GIC Distributor section should exist in that table,
otherwise Windows 10 will fail to boot.

Obviously, all of the changes applied by this commit were validated on a
Raspberry Pi 3 running Windows 10.

Signed-off-by: Pete Batard <pete@akeo.ie>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

6 files changed, 181 insertions, 99 deletions

diff --git a/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.h b/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.h
index 9c76624e..c860b788 100644
--- a/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.h
+++ b/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.h
@@ -23,7 +23,7 @@
     CreateDwordField (^BufName, ^MemName._BAS, VarName)          \

     Add (BCM2836_SOC_REGISTERS, Offset, VarName)

 

-#define EFI_ACPI_OEM_ID                       {'M','C','R','S','F','T'} // OEMID 6 bytes long

+#define EFI_ACPI_OEM_ID                       {'B','C','2','8','3','6'} // OEMID 6 bytes long

 #define EFI_ACPI_OEM_TABLE_ID                 SIGNATURE_64 ('R','P','I','3','E','D','K','2') // OEM table id 8 bytes long

 #define EFI_ACPI_OEM_REVISION                 0x02000820

 #define EFI_ACPI_CREATOR_ID                   SIGNATURE_32 ('R','P','I','3')

diff --git a/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.inf b/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.inf
index 4b4e431d..9363660b 100644
--- a/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.inf
+++ b/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.inf
@@ -33,11 +33,17 @@
   Spcr.aslc

 

 [Packages]

+  ArmPkg/ArmPkg.dec

+  ArmPlatformPkg/ArmPlatformPkg.dec

   MdePkg/MdePkg.dec

   EmbeddedPkg/EmbeddedPkg.dec

   Silicon/Broadcom/Bcm283x/Bcm283x.dec

 

 [FixedPcd]

+  gArmTokenSpaceGuid.PcdArmArchTimerIntrNum

+  gArmTokenSpaceGuid.PcdArmArchTimerHypIntrNum

+  gArmTokenSpaceGuid.PcdArmArchTimerSecIntrNum

+  gArmTokenSpaceGuid.PcdArmArchTimerVirtIntrNum

   gBcm283xTokenSpaceGuid.PcdBcm283xRegistersAddress

   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate

   gEmbeddedTokenSpaceGuid.PcdInterruptBaseAddress

diff --git a/Platform/RaspberryPi/RPi3/AcpiTables/Fadt.aslc b/Platform/RaspberryPi/RPi3/AcpiTables/Fadt.aslc
index 3ef877fd..ebf58fb7 100644
--- a/Platform/RaspberryPi/RPi3/AcpiTables/Fadt.aslc
+++ b/Platform/RaspberryPi/RPi3/AcpiTables/Fadt.aslc
@@ -2,6 +2,7 @@
  *

  *  Fixed ACPI Description Table (FADT)

  *

+ *  Copyright (c) 2019, Pete Batard <pete@akeo.ie>

  *  Copyright (c) 2018, Andrey Warkentin <andrey.warkentin@gmail.com>

  *  Copyright (c) Microsoft Corporation. All rights reserved.

  *

@@ -9,34 +10,76 @@
  *

  **/

 

-UINT8 Fadt[268] = {

-  0x46, 0x41, 0x43, 0x50, 0x0C, 0x01, 0x00, 0x00, 0x05, 0x00, /*   0 */

-  0x42, 0x43, 0x32, 0x38, 0x33, 0x36, 0x45, 0x44, 0x4B, 0x32, /*  10 */

-  0x20, 0x20, 0x20, 0x20, 0x01, 0x00, 0x00, 0x00, 0x4D, 0x53, /*  20 */

-  0x46, 0x54, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /*  30 */

-  0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, /*  40 */

-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /*  50 */

-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /*  60 */

-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /*  70 */

-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /*  80 */

-  0x00, 0x04, 0x00, 0x00, 0x00, 0xE3, 0x00, 0x00, 0x00, 0x00, /*  90 */

-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, /* 100 */

-  0x00, 0x00, 0x21, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, /* 110 */

-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, /* 120 */

-  0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 130 */

-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 140 */

-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 150 */

-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 160 */

-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 170 */

-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 180 */

-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 190 */

-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 200 */

-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 210 */

-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 220 */

-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 230 */

-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 240 */

-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 250 */

-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00              /* 268 */

+#include <IndustryStandard/Acpi.h>

+#include <Library/AcpiLib.h>

+#include <Library/PcdLib.h>

+

+#include "AcpiTables.h"

+

+/*

+ * Note: Use ACPI 5.1 since we need to match MADT ACPI requirements

+ */

+EFI_ACPI_5_1_FIXED_ACPI_DESCRIPTION_TABLE Fadt = {

+  ACPI_HEADER (

+    EFI_ACPI_5_1_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE,

+    EFI_ACPI_5_1_FIXED_ACPI_DESCRIPTION_TABLE,

+    EFI_ACPI_5_1_FIXED_ACPI_DESCRIPTION_TABLE_REVISION

+  ),

+  0,                                                                        // UINT32     FirmwareCtrl

+  0,                                                                        // UINT32     Dsdt

+  EFI_ACPI_RESERVED_BYTE,                                                   // UINT8      Reserved0

+  EFI_ACPI_5_1_PM_PROFILE_APPLIANCE_PC,                                     // UINT8      PreferredPmProfile

+  0,                                                                        // UINT16     SciInt

+  0,                                                                        // UINT32     SmiCmd

+  0,                                                                        // UINT8      AcpiEnable

+  0,                                                                        // UINT8      AcpiDisable

+  0,                                                                        // UINT8      S4BiosReq

+  0,                                                                        // UINT8      PstateCnt

+  0,                                                                        // UINT32     Pm1aEvtBlk

+  0,                                                                        // UINT32     Pm1bEvtBlk

+  0,                                                                        // UINT32     Pm1aCntBlk

+  0,                                                                        // UINT32     Pm1bCntBlk

+  0,                                                                        // UINT32     Pm2CntBlk

+  0,                                                                        // UINT32     PmTmrBlk

+  0,                                                                        // UINT32     Gpe0Blk

+  0,                                                                        // UINT32     Gpe1Blk

+  0,                                                                        // UINT8      Pm1EvtLen

+  0,                                                                        // UINT8      Pm1CntLen

+  0,                                                                        // UINT8      Pm2CntLen

+  0,                                                                        // UINT8      PmTmrLen

+  0,                                                                        // UINT8      Gpe0BlkLen

+  0,                                                                        // UINT8      Gpe1BlkLen

+  0,                                                                        // UINT8      Gpe1Base

+  0,                                                                        // UINT8      CstCnt

+  0,                                                                        // UINT16     PLvl2Lat

+  0,                                                                        // UINT16     PLvl3Lat

+  0,                                                                        // UINT16     FlushSize

+  0,                                                                        // UINT16     FlushStride

+  0,                                                                        // UINT8      DutyOffset

+  0,                                                                        // UINT8      DutyWidth

+  0,                                                                        // UINT8      DayAlrm

+  0,                                                                        // UINT8      MonAlrm

+  0,                                                                        // UINT8      Century

+  EFI_ACPI_RESERVED_WORD,                                                   // UINT16     IaPcBootArch (Reserved on ARM)

+  EFI_ACPI_RESERVED_BYTE,                                                   // UINT8      Reserved1

+  EFI_ACPI_5_1_WBINVD | EFI_ACPI_5_1_SLP_BUTTON |                           // UINT32     Flags

+  EFI_ACPI_5_1_HW_REDUCED_ACPI,

+  NULL_GAS,                                                                 // EFI_ACPI_5_1_GENERIC_ADDRESS_STRUCTURE  ResetReg

+  0,                                                                        // UINT8      ResetValue

+  EFI_ACPI_5_1_ARM_PSCI_COMPLIANT,                                          // UINT16     ArmBootArchFlags

+  EFI_ACPI_5_1_FIXED_ACPI_DESCRIPTION_TABLE_MINOR_REVISION,                 // UINT8      MinorRevision

+  0,                                                                        // UINT64     XFirmwareCtrl

+  0,                                                                        // UINT64     XDsdt

+  NULL_GAS,                                                                 // EFI_ACPI_5_1_GENERIC_ADDRESS_STRUCTURE  XPm1aEvtBlk

+  NULL_GAS,                                                                 // EFI_ACPI_5_1_GENERIC_ADDRESS_STRUCTURE  XPm1bEvtBlk

+  NULL_GAS,                                                                 // EFI_ACPI_5_1_GENERIC_ADDRESS_STRUCTURE  XPm1aCntBlk

+  NULL_GAS,                                                                 // EFI_ACPI_5_1_GENERIC_ADDRESS_STRUCTURE  XPm1bCntBlk

+  NULL_GAS,                                                                 // EFI_ACPI_5_1_GENERIC_ADDRESS_STRUCTURE  XPm2CntBlk

+  NULL_GAS,                                                                 // EFI_ACPI_5_1_GENERIC_ADDRESS_STRUCTURE  XPmTmrBlk

+  NULL_GAS,                                                                 // EFI_ACPI_5_1_GENERIC_ADDRESS_STRUCTURE  XGpe0Blk

+  NULL_GAS,                                                                 // EFI_ACPI_5_1_GENERIC_ADDRESS_STRUCTURE  XGpe1Blk

+  NULL_GAS,                                                                 // EFI_ACPI_5_1_GENERIC_ADDRESS_STRUCTURE  SleepControlReg

+  NULL_GAS                                                                  // EFI_ACPI_5_1_GENERIC_ADDRESS_STRUCTURE  SleepStatusReg

 };

 

 //

diff --git a/Platform/RaspberryPi/RPi3/AcpiTables/Gtdt.aslc b/Platform/RaspberryPi/RPi3/AcpiTables/Gtdt.aslc
index 6551315a..0cd6be8c 100644
--- a/Platform/RaspberryPi/RPi3/AcpiTables/Gtdt.aslc
+++ b/Platform/RaspberryPi/RPi3/AcpiTables/Gtdt.aslc
@@ -1,27 +1,56 @@
 /** @file

- *

- *  Generic Timer Description Table (GTDT)

- *  Automatically generated by AutoAcpi

- *

- *  Copyright (c) Microsoft Corporation. All rights reserved.

- *

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

- *

- **/

-

-UINT8 Gtdt[80] = {

-  0x47, 0x54, 0x44, 0x54, 0x50, 0x00, 0x00, 0x00, 0x01, 0x00,

-  0x4D, 0x53, 0x46, 0x54, 0x20, 0x20, 0x45, 0x44, 0x4B, 0x32,

-  0x20, 0x20, 0x20, 0x20, 0x01, 0x00, 0x00, 0x00, 0x4D, 0x53,

-  0x46, 0x54, 0x01, 0x00, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x40,

-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,

-  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,

-  0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

+*  Generic Timer Description Table (GTDT)

+*

+*  Copyright (c) 2018, Linaro Limited. All rights reserved.

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

+*

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

+*

+**/

+

+#include <IndustryStandard/Acpi.h>

+#include <Library/AcpiLib.h>

+#include <Library/PcdLib.h>

+

+#include "AcpiTables.h"

+

+#define RPI_SYSTEM_TIMER_BASE_ADDRESS   0x4000001C

+#define RPI_GTDT_GLOBAL_FLAGS           0

+#define RPI_GTDT_GTIMER_FLAGS           EFI_ACPI_5_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_POLARITY

+

+#pragma pack (1)

+

+typedef struct {

+  EFI_ACPI_5_1_GENERIC_TIMER_DESCRIPTION_TABLE Gtdt;

+} EFI_ACPI_5_1_GENERIC_TIMER_DESCRIPTION_TABLES;

+

+#pragma pack ()

+

+EFI_ACPI_5_1_GENERIC_TIMER_DESCRIPTION_TABLES Gtdt = {

+  {

+    ACPI_HEADER(

+      EFI_ACPI_5_1_GENERIC_TIMER_DESCRIPTION_TABLE_SIGNATURE,

+      EFI_ACPI_5_1_GENERIC_TIMER_DESCRIPTION_TABLES,

+      EFI_ACPI_5_1_GENERIC_TIMER_DESCRIPTION_TABLE_REVISION

+    ),

+    RPI_SYSTEM_TIMER_BASE_ADDRESS,                // UINT64  PhysicalAddress

+    0,                                            // UINT32  Reserved

+    FixedPcdGet32 (PcdArmArchTimerSecIntrNum),    // UINT32  SecurePL1TimerGSIV

+    RPI_GTDT_GTIMER_FLAGS,                        // UINT32  SecurePL1TimerFlags

+    FixedPcdGet32 (PcdArmArchTimerIntrNum),       // UINT32  NonSecurePL1TimerGSIV

+    RPI_GTDT_GTIMER_FLAGS,                        // UINT32  NonSecurePL1TimerFlags

+    FixedPcdGet32 (PcdArmArchTimerVirtIntrNum),   // UINT32  VirtualTimerGSIV

+    RPI_GTDT_GTIMER_FLAGS,                        // UINT32  VirtualTimerFlags

+    FixedPcdGet32 (PcdArmArchTimerHypIntrNum),    // UINT32  NonSecurePL2TimerGSIV

+    RPI_GTDT_GTIMER_FLAGS,                        // UINT32  NonSecurePL2TimerFlags

+    0xFFFFFFFFFFFFFFFF,                           // UINT64  CntReadBasePhysicalAddress

+    0,                                            // UINT32  PlatformTimerCount

+    0                                             // UINT32 PlatfromTimerOffset

+  },

 };

 

 //

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

-// data structure from the executable

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

+// from removing the data structure from the executable

 //

 VOID* CONST ReferenceAcpiTable = &Gtdt;

diff --git a/Platform/RaspberryPi/RPi3/AcpiTables/Madt.aslc b/Platform/RaspberryPi/RPi3/AcpiTables/Madt.aslc
index 39cd4c5c..a42ddb89 100644
--- a/Platform/RaspberryPi/RPi3/AcpiTables/Madt.aslc
+++ b/Platform/RaspberryPi/RPi3/AcpiTables/Madt.aslc
@@ -1,52 +1,56 @@
 /** @file

- *

- *  Multiple APIC Description Table (MADT)

- *

- *  Copyright (c) 2018, Andrey Warkentin <andrey.warkentin@gmail.com>

- *  Copyright (c) Microsoft Corporation. All rights reserved.

- *

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

- *

- **/

+*  Multiple APIC Description Table (MADT)

+*

+*  Copyright (c) 2016 Linaro Ltd. All rights reserved.

+*  Copyright (c) 2012 - 2015, ARM Limited. All rights reserved.

+*

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

+*

+**/

 

-/*

- * Even though the BCM283x don't contain a GIC, these

- * GICC definitions enable multi-core support (with PSCI).

- *

- * Mind the signatures in the header, they must be kept.

- */

-UINT8 Madt[] = {

-  0x41, 0x50, 0x49, 0x43, 0x6c, 0x01, 0x00, 0x00, 0x03, 0xaf, 0x42, 0x43,

-  0x32, 0x38, 0x33, 0x36, 0x45, 0x44, 0x4b, 0x32, 0x20, 0x20, 0x20, 0x20,

-  0x01, 0x00, 0x00, 0x00, 0x4d, 0x53, 0x46, 0x54, 0x01, 0x00, 0x00, 0x00,

-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x50, 0x00, 0x00,

-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,

-  0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00,

-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

-  0x01, 0x00, 0x00, 0x00, 0x0b, 0x50, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,

-  0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

-  0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

-  0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

-  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,

-  0x0b, 0x50, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,

-  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00,

-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40,

-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,

-  0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0b, 0x50, 0x00, 0x00,

-  0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,

-  0x00, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00,

-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

-  0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

-  0x01, 0x00, 0x00, 0x00

+#include <IndustryStandard/Acpi.h>

+#include <Library/AcpiLib.h>

+#include <Library/ArmLib.h>

+#include <Library/PcdLib.h>

+

+#include "AcpiTables.h"

+

+//

+// Multiple APIC Description Table

+//

+#pragma pack (1)

+

+typedef struct {

+  EFI_ACPI_5_1_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER   Header;

+  EFI_ACPI_5_1_GIC_STRUCTURE                            GicInterfaces[4];

+  // Do *NOT* add a GIC Distributor on the Pi 3 or Windows 10 won't boot!

+} PI_MULTIPLE_APIC_DESCRIPTION_TABLE;

+

+#pragma pack ()

+

+PI_MULTIPLE_APIC_DESCRIPTION_TABLE Madt = {

+  {

+    ACPI_HEADER (

+      EFI_ACPI_5_1_MULTIPLE_APIC_DESCRIPTION_TABLE_SIGNATURE,

+      PI_MULTIPLE_APIC_DESCRIPTION_TABLE,

+      EFI_ACPI_5_1_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION

+    ),

+    //

+    // MADT specific fields

+    //

+    0, // LocalApicAddress

+    0, // Flags

+  },

+  {

+    EFI_ACPI_5_1_GICC_STRUCTURE_INIT(

+        0, 0, GET_MPID(0, 0), EFI_ACPI_5_1_GIC_ENABLED, 0x09, 0x40000000, 0, 0, 0, 0),

+    EFI_ACPI_5_1_GICC_STRUCTURE_INIT(

+        1, 1, GET_MPID(0, 1), EFI_ACPI_5_1_GIC_ENABLED, 0x09, 0x40000000, 0, 0, 0, 0),

+    EFI_ACPI_5_1_GICC_STRUCTURE_INIT(

+        2, 2, GET_MPID(0, 2), EFI_ACPI_5_1_GIC_ENABLED, 0x09, 0x40000000, 0, 0, 0, 0),

+    EFI_ACPI_5_1_GICC_STRUCTURE_INIT(

+        3, 3, GET_MPID(0, 3), EFI_ACPI_5_1_GIC_ENABLED, 0x09, 0x40000000, 0, 0, 0, 0),

+  },

 };

 

 //

diff --git a/Platform/RaspberryPi/RPi3/RPi3.dsc b/Platform/RaspberryPi/RPi3/RPi3.dsc
index 40fb0879..94d1e5b1 100644
--- a/Platform/RaspberryPi/RPi3/RPi3.dsc
+++ b/Platform/RaspberryPi/RPi3/RPi3.dsc
@@ -328,8 +328,8 @@
   gEmbeddedTokenSpaceGuid.PcdInterruptBaseAddress|0x40000000

   gArmTokenSpaceGuid.PcdArmArchTimerSecIntrNum|0x0

   gArmTokenSpaceGuid.PcdArmArchTimerIntrNum|0x1

-  gArmTokenSpaceGuid.PcdArmArchTimerVirtIntrNum|0x2

-  gArmTokenSpaceGuid.PcdArmArchTimerHypIntrNum|0x3

+  gArmTokenSpaceGuid.PcdArmArchTimerVirtIntrNum|0x3

+  gArmTokenSpaceGuid.PcdArmArchTimerHypIntrNum|0x2

 

 [LibraryClasses.common]

   ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf