mirror of
https://github.com/acidanthera/audk.git
synced 2025-07-26 07:04:28 +02:00
ArmPlatformPkg/ArmJunoPkg/AcpiTables: Updated with new ACPI 5.1 Tables & Definitions
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Olivier Martin <olivier.martin@arm.com> Reviewed-by: Graeme Gregory <graeme.gregory@linaro.org> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16654 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Olivier Martin
oliviermartin
parent
7c1712f05a
commit
2596e61a9b
@ -46,3 +46,6 @@
|
|||||||
gArmTokenSpaceGuid.PcdArmArchTimerIntrNum
|
gArmTokenSpaceGuid.PcdArmArchTimerIntrNum
|
||||||
gArmTokenSpaceGuid.PcdArmArchTimerHypIntrNum
|
gArmTokenSpaceGuid.PcdArmArchTimerHypIntrNum
|
||||||
gArmTokenSpaceGuid.PcdArmArchTimerVirtIntrNum
|
gArmTokenSpaceGuid.PcdArmArchTimerVirtIntrNum
|
||||||
|
|
||||||
|
gArmTokenSpaceGuid.PcdGenericWatchdogControlBase
|
||||||
|
gArmTokenSpaceGuid.PcdGenericWatchdogRefreshBase
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
/** @file
|
/** @file
|
||||||
Differentiated System Description Table Fields (DSDT)
|
Differentiated System Description Table Fields (DSDT)
|
||||||
|
|
||||||
Copyright (c) 2014, ARM Ltd. All rights reserved.<BR>
|
Copyright (c) 2014-2015, ARM Ltd. All rights reserved.<BR>
|
||||||
This program and the accompanying materials
|
This program and the accompanying materials
|
||||||
are licensed and made available under the terms and conditions of the BSD License
|
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
|
which accompanies this distribution. The full text of the license may be found at
|
||||||
@ -19,27 +19,27 @@ DefinitionBlock("DsdtTable.aml", "DSDT", 1, "ARMLTD", "ARM-JUNO", EFI_ACPI_ARM_O
|
|||||||
//
|
//
|
||||||
// A57x2-A53x4 Processor declaration
|
// A57x2-A53x4 Processor declaration
|
||||||
//
|
//
|
||||||
Device(CPU0) { // A57-0: Cluster 0, Cpu 0
|
Device(CPU0) { // A53-0: Cluster 1, Cpu 0
|
||||||
Name(_HID, "ACPI0007")
|
Name(_HID, "ACPI0007")
|
||||||
Name(_UID, 0)
|
Name(_UID, 0)
|
||||||
}
|
}
|
||||||
Device(CPU1) { // A57-1: Cluster 0, Cpu 1
|
Device(CPU1) { // A53-1: Cluster 1, Cpu 1
|
||||||
Name(_HID, "ACPI0007")
|
Name(_HID, "ACPI0007")
|
||||||
Name(_UID, 1)
|
Name(_UID, 1)
|
||||||
}
|
}
|
||||||
Device(CPU2) { // A53-0: Cluster 1, Cpu 0
|
Device(CPU2) { // A53-2: Cluster 1, Cpu 2
|
||||||
Name(_HID, "ACPI0007")
|
Name(_HID, "ACPI0007")
|
||||||
Name(_UID, 2)
|
Name(_UID, 2)
|
||||||
}
|
}
|
||||||
Device(CPU3) { // A53-1: Cluster 1, Cpu 1
|
Device(CPU3) { // A53-3: Cluster 1, Cpu 3
|
||||||
Name(_HID, "ACPI0007")
|
Name(_HID, "ACPI0007")
|
||||||
Name(_UID, 3)
|
Name(_UID, 3)
|
||||||
}
|
}
|
||||||
Device(CPU4) { // A53-2: Cluster 1, Cpu 2
|
Device(CPU4) { // A57-0: Cluster 0, Cpu 0
|
||||||
Name(_HID, "ACPI0007")
|
Name(_HID, "ACPI0007")
|
||||||
Name(_UID, 4)
|
Name(_UID, 4)
|
||||||
}
|
}
|
||||||
Device(CPU5) { // A53-3: Cluster 1, Cpu 3
|
Device(CPU5) { // A57-1: Cluster 0, Cpu 1
|
||||||
Name(_HID, "ACPI0007")
|
Name(_HID, "ACPI0007")
|
||||||
Name(_UID, 5)
|
Name(_UID, 5)
|
||||||
}
|
}
|
||||||
@ -63,12 +63,24 @@ DefinitionBlock("DsdtTable.aml", "DSDT", 1, "ARMLTD", "ARM-JUNO", EFI_ACPI_ARM_O
|
|||||||
//
|
//
|
||||||
Device(ETH0) {
|
Device(ETH0) {
|
||||||
Name(_HID, "ARMH9118")
|
Name(_HID, "ARMH9118")
|
||||||
|
Name(_UID, Zero)
|
||||||
Name(_CRS, ResourceTemplate() {
|
Name(_CRS, ResourceTemplate() {
|
||||||
Memory32Fixed(ReadWrite, 0x1A000000, 0x1000)
|
Memory32Fixed(ReadWrite, 0x1A000000, 0x1000)
|
||||||
Interrupt(ResourceConsumer, Level, ActiveHigh, Exclusive) { 192 }
|
Interrupt(ResourceConsumer, Level, ActiveHigh, Exclusive) { 192 }
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// UART PL011
|
||||||
|
Device(COM0) {
|
||||||
|
Name(_HID, "ARMH0011")
|
||||||
|
Name(_CID, "PL011")
|
||||||
|
Name(_UID, Zero)
|
||||||
|
Name(_CRS, ResourceTemplate() {
|
||||||
|
Memory32Fixed(ReadWrite, 0x7FF80000, 0x1000)
|
||||||
|
Interrupt(ResourceConsumer, Level, ActiveHigh, Exclusive) { 115 }
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
// USB Host Controller
|
// USB Host Controller
|
||||||
//
|
//
|
||||||
|
|||||||
@ -17,12 +17,21 @@
|
|||||||
#include <Library/AcpiLib.h>
|
#include <Library/AcpiLib.h>
|
||||||
#include <IndustryStandard/Acpi.h>
|
#include <IndustryStandard/Acpi.h>
|
||||||
|
|
||||||
|
#ifdef ARM_JUNO_ACPI_5_0
|
||||||
EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE Fadt = {
|
EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE Fadt = {
|
||||||
ARM_ACPI_HEADER (
|
ARM_ACPI_HEADER (
|
||||||
EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE,
|
EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE,
|
||||||
EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE,
|
EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE,
|
||||||
EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE_REVISION
|
EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE_REVISION
|
||||||
),
|
),
|
||||||
|
#else
|
||||||
|
EFI_ACPI_5_1_FIXED_ACPI_DESCRIPTION_TABLE Fadt = {
|
||||||
|
ARM_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
|
||||||
|
),
|
||||||
|
#endif
|
||||||
0, // UINT32 FirmwareCtrl
|
0, // UINT32 FirmwareCtrl
|
||||||
0, // UINT32 Dsdt
|
0, // UINT32 Dsdt
|
||||||
EFI_ACPI_RESERVED_BYTE, // UINT8 Reserved0
|
EFI_ACPI_RESERVED_BYTE, // UINT8 Reserved0
|
||||||
@ -63,7 +72,12 @@ EFI_ACPI_5_0_FIXED_ACPI_DESCRIPTION_TABLE Fadt = {
|
|||||||
EFI_ACPI_5_0_HW_REDUCED_ACPI | EFI_ACPI_5_0_LOW_POWER_S0_IDLE_CAPABLE, // UINT32 Flags
|
EFI_ACPI_5_0_HW_REDUCED_ACPI | EFI_ACPI_5_0_LOW_POWER_S0_IDLE_CAPABLE, // UINT32 Flags
|
||||||
NULL_GAS, // EFI_ACPI_5_0_GENERIC_ADDRESS_STRUCTURE ResetReg
|
NULL_GAS, // EFI_ACPI_5_0_GENERIC_ADDRESS_STRUCTURE ResetReg
|
||||||
0, // UINT8 ResetValue
|
0, // UINT8 ResetValue
|
||||||
|
#if ARM_JUNO_ACPI_5_0
|
||||||
{EFI_ACPI_RESERVED_BYTE,EFI_ACPI_RESERVED_BYTE,EFI_ACPI_RESERVED_BYTE}, // UINT8 Reserved2[3]
|
{EFI_ACPI_RESERVED_BYTE,EFI_ACPI_RESERVED_BYTE,EFI_ACPI_RESERVED_BYTE}, // UINT8 Reserved2[3]
|
||||||
|
#else
|
||||||
|
EFI_ACPI_5_1_ARM_PSCI_COMPLIANT, // UINT16 ArmBootArchFlags
|
||||||
|
EFI_ACPI_5_1_FIXED_ACPI_DESCRIPTION_TABLE_MINOR_REVISION, // UINT8 MinorRevision
|
||||||
|
#endif
|
||||||
0, // UINT64 XFirmwareCtrl
|
0, // UINT64 XFirmwareCtrl
|
||||||
0, // UINT64 XDsdt
|
0, // UINT64 XDsdt
|
||||||
NULL_GAS, // EFI_ACPI_5_0_GENERIC_ADDRESS_STRUCTURE XPm1aEvtBlk
|
NULL_GAS, // EFI_ACPI_5_0_GENERIC_ADDRESS_STRUCTURE XPm1aEvtBlk
|
||||||
|
|||||||
@ -28,34 +28,73 @@
|
|||||||
#define GTDT_GLOBAL_FLAGS (GTDT_GLOBAL_FLAGS_MAPPED | GTDT_GLOBAL_FLAGS_LEVEL)
|
#define GTDT_GLOBAL_FLAGS (GTDT_GLOBAL_FLAGS_MAPPED | GTDT_GLOBAL_FLAGS_LEVEL)
|
||||||
#else
|
#else
|
||||||
#define GTDT_GLOBAL_FLAGS (GTDT_GLOBAL_FLAGS_NOT_MAPPED | GTDT_GLOBAL_FLAGS_LEVEL)
|
#define GTDT_GLOBAL_FLAGS (GTDT_GLOBAL_FLAGS_NOT_MAPPED | GTDT_GLOBAL_FLAGS_LEVEL)
|
||||||
#define SYSTEM_TIMER_BASE_ADDRESS 0
|
#define SYSTEM_TIMER_BASE_ADDRESS 0xFFFFFFFFFFFFFFFF
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define GTDT_TIMER_EDGE_TRIGGERED (1 << EFI_ACPI_5_0_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE)
|
#define GTDT_TIMER_EDGE_TRIGGERED EFI_ACPI_5_0_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE
|
||||||
#define GTDT_TIMER_LEVEL_TRIGGERED (0 << EFI_ACPI_5_0_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE)
|
#define GTDT_TIMER_LEVEL_TRIGGERED 0
|
||||||
#define GTDT_TIMER_ACTIVE_LOW (1 << EFI_ACPI_5_0_GTDT_TIMER_FLAG_TIMER_INTERRUPT_POLARITY)
|
#define GTDT_TIMER_ACTIVE_LOW EFI_ACPI_5_0_GTDT_TIMER_FLAG_TIMER_INTERRUPT_POLARITY
|
||||||
#define GTDT_TIMER_ACTIVE_HIGH (0 << EFI_ACPI_5_0_GTDT_TIMER_FLAG_TIMER_INTERRUPT_POLARITY)
|
#define GTDT_TIMER_ACTIVE_HIGH 0
|
||||||
|
|
||||||
#define GTDT_GTIMER_FLAGS (GTDT_TIMER_ACTIVE_LOW | GTDT_TIMER_LEVEL_TRIGGERED)
|
#define GTDT_GTIMER_FLAGS (GTDT_TIMER_ACTIVE_LOW | GTDT_TIMER_LEVEL_TRIGGERED)
|
||||||
|
|
||||||
EFI_ACPI_5_0_GENERIC_TIMER_DESCRIPTION_TABLE Gtdt = {
|
#ifdef ARM_JUNO_ACPI_5_0
|
||||||
|
EFI_ACPI_5_0_GENERIC_TIMER_DESCRIPTION_TABLE Gtdt = {
|
||||||
ARM_ACPI_HEADER(
|
ARM_ACPI_HEADER(
|
||||||
EFI_ACPI_5_0_GENERIC_TIMER_DESCRIPTION_TABLE_SIGNATURE,
|
EFI_ACPI_5_0_GENERIC_TIMER_DESCRIPTION_TABLE_SIGNATURE,
|
||||||
EFI_ACPI_5_0_GENERIC_TIMER_DESCRIPTION_TABLE,
|
EFI_ACPI_5_0_GENERIC_TIMER_DESCRIPTION_TABLE,
|
||||||
EFI_ACPI_5_0_GENERIC_TIMER_DESCRIPTION_TABLE_REVISION
|
EFI_ACPI_5_0_GENERIC_TIMER_DESCRIPTION_TABLE_REVISION
|
||||||
),
|
),
|
||||||
SYSTEM_TIMER_BASE_ADDRESS, // UINT64 PhysicalAddress
|
SYSTEM_TIMER_BASE_ADDRESS, // UINT64 PhysicalAddress
|
||||||
GTDT_GLOBAL_FLAGS, // UINT32 GlobalFlags
|
GTDT_GLOBAL_FLAGS, // UINT32 GlobalFlags
|
||||||
FixedPcdGet32 (PcdArmArchTimerSecIntrNum), // UINT32 SecurePL1TimerGSIV
|
FixedPcdGet32 (PcdArmArchTimerSecIntrNum), // UINT32 SecurePL1TimerGSIV
|
||||||
GTDT_GTIMER_FLAGS, // UINT32 SecurePL1TimerFlags
|
GTDT_GTIMER_FLAGS, // UINT32 SecurePL1TimerFlags
|
||||||
FixedPcdGet32 (PcdArmArchTimerIntrNum), // UINT32 NonSecurePL1TimerGSIV
|
FixedPcdGet32 (PcdArmArchTimerIntrNum), // UINT32 NonSecurePL1TimerGSIV
|
||||||
GTDT_GTIMER_FLAGS, // UINT32 NonSecurePL1TimerFlags
|
GTDT_GTIMER_FLAGS, // UINT32 NonSecurePL1TimerFlags
|
||||||
FixedPcdGet32 (PcdArmArchTimerVirtIntrNum), // UINT32 VirtualTimerGSIV
|
FixedPcdGet32 (PcdArmArchTimerVirtIntrNum), // UINT32 VirtualTimerGSIV
|
||||||
GTDT_GTIMER_FLAGS, // UINT32 VirtualTimerFlags
|
GTDT_GTIMER_FLAGS, // UINT32 VirtualTimerFlags
|
||||||
FixedPcdGet32 (PcdArmArchTimerHypIntrNum), // UINT32 NonSecurePL2TimerGSIV
|
FixedPcdGet32 (PcdArmArchTimerHypIntrNum), // UINT32 NonSecurePL2TimerGSIV
|
||||||
GTDT_GTIMER_FLAGS // UINT32 NonSecurePL2TimerFlags
|
GTDT_GTIMER_FLAGS // UINT32 NonSecurePL2TimerFlags
|
||||||
};
|
};
|
||||||
|
#else
|
||||||
|
#pragma pack (1)
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
EFI_ACPI_5_1_GENERIC_TIMER_DESCRIPTION_TABLE Gtdt;
|
||||||
|
EFI_ACPI_5_1_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE Watchdogs[JUNO_WATCHDOG_COUNT];
|
||||||
|
} EFI_ACPI_5_1_GENERIC_TIMER_DESCRIPTION_TABLES;
|
||||||
|
|
||||||
|
#pragma pack ()
|
||||||
|
|
||||||
|
EFI_ACPI_5_1_GENERIC_TIMER_DESCRIPTION_TABLES Gtdt = {
|
||||||
|
{
|
||||||
|
ARM_ACPI_HEADER(
|
||||||
|
EFI_ACPI_5_1_GENERIC_TIMER_DESCRIPTION_TABLE_SIGNATURE,
|
||||||
|
EFI_ACPI_5_1_GENERIC_TIMER_DESCRIPTION_TABLE,
|
||||||
|
EFI_ACPI_5_1_GENERIC_TIMER_DESCRIPTION_TABLE_REVISION
|
||||||
|
),
|
||||||
|
SYSTEM_TIMER_BASE_ADDRESS, // UINT64 PhysicalAddress
|
||||||
|
0, // UINT32 Reserved
|
||||||
|
FixedPcdGet32 (PcdArmArchTimerSecIntrNum), // UINT32 SecurePL1TimerGSIV
|
||||||
|
GTDT_GTIMER_FLAGS, // UINT32 SecurePL1TimerFlags
|
||||||
|
FixedPcdGet32 (PcdArmArchTimerIntrNum), // UINT32 NonSecurePL1TimerGSIV
|
||||||
|
GTDT_GTIMER_FLAGS, // UINT32 NonSecurePL1TimerFlags
|
||||||
|
FixedPcdGet32 (PcdArmArchTimerVirtIntrNum), // UINT32 VirtualTimerGSIV
|
||||||
|
GTDT_GTIMER_FLAGS, // UINT32 VirtualTimerFlags
|
||||||
|
FixedPcdGet32 (PcdArmArchTimerHypIntrNum), // UINT32 NonSecurePL2TimerGSIV
|
||||||
|
GTDT_GTIMER_FLAGS, // UINT32 NonSecurePL2TimerFlags
|
||||||
|
0xFFFFFFFFFFFFFFFF, // UINT64 CntReadBasePhysicalAddress
|
||||||
|
JUNO_WATCHDOG_COUNT, // UINT32 PlatformTimerCount
|
||||||
|
sizeof (EFI_ACPI_5_1_GENERIC_TIMER_DESCRIPTION_TABLE) // UINT32 PlatfromTimerOffset
|
||||||
|
},
|
||||||
|
{
|
||||||
|
EFI_ACPI_5_1_SBSA_GENERIC_WATCHDOG_STRUCTURE_INIT(
|
||||||
|
FixedPcdGet32 (PcdGenericWatchdogRefreshBase), FixedPcdGet32 (PcdGenericWatchdogControlBase), 93, 0),
|
||||||
|
EFI_ACPI_5_1_SBSA_GENERIC_WATCHDOG_STRUCTURE_INIT(
|
||||||
|
FixedPcdGet32 (PcdGenericWatchdogRefreshBase), FixedPcdGet32 (PcdGenericWatchdogControlBase), 94, EFI_ACPI_5_1_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_SECURE_TIMER)
|
||||||
|
}
|
||||||
|
};
|
||||||
|
#endif
|
||||||
|
|
||||||
VOID*
|
VOID*
|
||||||
ReferenceAcpiTable (
|
ReferenceAcpiTable (
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
/** @file
|
/** @file
|
||||||
* Multiple APIC Description Table (MADT)
|
* Multiple APIC Description Table (MADT)
|
||||||
*
|
*
|
||||||
* Copyright (c) 2012 - 2014, ARM Limited. All rights reserved.
|
* Copyright (c) 2012 - 2015, ARM Limited. All rights reserved.
|
||||||
*
|
*
|
||||||
* This program and the accompanying materials
|
* This program and the accompanying materials
|
||||||
* are licensed and made available under the terms and conditions of the BSD License
|
* are licensed and made available under the terms and conditions of the BSD License
|
||||||
@ -15,53 +15,111 @@
|
|||||||
|
|
||||||
#include "ArmPlatform.h"
|
#include "ArmPlatform.h"
|
||||||
#include <Library/AcpiLib.h>
|
#include <Library/AcpiLib.h>
|
||||||
|
#include <Library/ArmLib.h>
|
||||||
#include <Library/PcdLib.h>
|
#include <Library/PcdLib.h>
|
||||||
#include <IndustryStandard/Acpi.h>
|
#include <IndustryStandard/Acpi.h>
|
||||||
|
|
||||||
#pragma pack (1)
|
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER Header;
|
|
||||||
EFI_ACPI_5_0_GIC_STRUCTURE GicInterfaces[FixedPcdGet32 (PcdCoreCount)];
|
|
||||||
EFI_ACPI_5_0_GIC_DISTRIBUTOR_STRUCTURE GicDistributor;
|
|
||||||
} EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE;
|
|
||||||
|
|
||||||
#pragma pack ()
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// Multiple APIC Description Table
|
// Multiple APIC Description Table
|
||||||
//
|
//
|
||||||
EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE Madt = {
|
#ifdef ARM_JUNO_ACPI_5_0
|
||||||
{
|
#pragma pack (1)
|
||||||
ARM_ACPI_HEADER (
|
|
||||||
EFI_ACPI_1_0_APIC_SIGNATURE,
|
typedef struct {
|
||||||
EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE,
|
EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER Header;
|
||||||
EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION
|
EFI_ACPI_5_0_GIC_STRUCTURE GicInterfaces[FixedPcdGet32 (PcdCoreCount)];
|
||||||
),
|
EFI_ACPI_5_0_GIC_DISTRIBUTOR_STRUCTURE GicDistributor;
|
||||||
//
|
} EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE;
|
||||||
// MADT specific fields
|
|
||||||
//
|
#pragma pack ()
|
||||||
0, // LocalApicAddress
|
|
||||||
0, // Flags
|
EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE Madt = {
|
||||||
},
|
{
|
||||||
{
|
ARM_ACPI_HEADER (
|
||||||
// Format: EFI_ACPI_5_0_GIC_STRUCTURE_INIT(GicId, AcpiCpuId, Flags, PmuIrq, GicBase)
|
EFI_ACPI_1_0_APIC_SIGNATURE,
|
||||||
// Note: The GIC Structure of the primary CPU must be the first entry (see note in 5.2.12.14 GIC Structure of
|
EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE,
|
||||||
// ACPI v5.0).
|
EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION
|
||||||
// On Juno we can change the primary CPU changing the SCC register. It is not currently supported in the
|
),
|
||||||
// Trusted Firmware. When supported, we will need to code to dynamically change the ordering.
|
//
|
||||||
// For now we leave CPU2 (A53-0) at the first position.
|
// MADT specific fields
|
||||||
// The cores from a same cluster are kept together. It is not an ACPI requirement but in case the OSPM uses
|
//
|
||||||
// the ACPI ARM Parking protocol, it might want to wake up the cores in the order of this table.
|
0, // LocalApicAddress
|
||||||
EFI_ACPI_5_0_GIC_STRUCTURE_INIT(2, 2, EFI_ACPI_5_0_GIC_ENABLED, 50, FixedPcdGet32 (PcdGicInterruptInterfaceBase)), // A53-0
|
0, // Flags
|
||||||
EFI_ACPI_5_0_GIC_STRUCTURE_INIT(3, 3, EFI_ACPI_5_0_GIC_ENABLED, 54, FixedPcdGet32 (PcdGicInterruptInterfaceBase)), // A53-1
|
},
|
||||||
EFI_ACPI_5_0_GIC_STRUCTURE_INIT(4, 4, EFI_ACPI_5_0_GIC_ENABLED, 58, FixedPcdGet32 (PcdGicInterruptInterfaceBase)), // A53-2
|
{
|
||||||
EFI_ACPI_5_0_GIC_STRUCTURE_INIT(5, 5, EFI_ACPI_5_0_GIC_ENABLED, 62, FixedPcdGet32 (PcdGicInterruptInterfaceBase)), // A53-3
|
// Format: EFI_ACPI_5_0_GIC_STRUCTURE_INIT(GicId, AcpiCpuId, Flags, PmuIrq, GicBase)
|
||||||
EFI_ACPI_5_0_GIC_STRUCTURE_INIT(0, 0, EFI_ACPI_5_0_GIC_ENABLED, 34, FixedPcdGet32 (PcdGicInterruptInterfaceBase)), // A57-0
|
// Note: The GIC Structure of the primary CPU must be the first entry (see note in 5.2.12.14 GIC Structure of
|
||||||
EFI_ACPI_5_0_GIC_STRUCTURE_INIT(1, 1, EFI_ACPI_5_0_GIC_ENABLED, 38, FixedPcdGet32 (PcdGicInterruptInterfaceBase)) // A57-1
|
// ACPI v5.0).
|
||||||
},
|
// On Juno we can change the primary CPU changing the SCC register. It is not currently supported in the
|
||||||
EFI_ACPI_5_0_GIC_DISTRIBUTOR_INIT(0, FixedPcdGet32 (PcdGicDistributorBase), 0)
|
// Trusted Firmware. When supported, we will need to code to dynamically change the ordering.
|
||||||
};
|
// For now we leave CPU2 (A53-0) at the first position.
|
||||||
|
// The cores from a same cluster are kept together. It is not an ACPI requirement but in case the OSPM uses
|
||||||
|
// the ACPI ARM Parking protocol, it might want to wake up the cores in the order of this table.
|
||||||
|
EFI_ACPI_5_0_GIC_STRUCTURE_INIT(2, 0, EFI_ACPI_5_0_GIC_ENABLED, 50, FixedPcdGet32 (PcdGicInterruptInterfaceBase)), // A53-0
|
||||||
|
EFI_ACPI_5_0_GIC_STRUCTURE_INIT(3, 1, EFI_ACPI_5_0_GIC_ENABLED, 54, FixedPcdGet32 (PcdGicInterruptInterfaceBase)), // A53-1
|
||||||
|
EFI_ACPI_5_0_GIC_STRUCTURE_INIT(4, 2, EFI_ACPI_5_0_GIC_ENABLED, 58, FixedPcdGet32 (PcdGicInterruptInterfaceBase)), // A53-2
|
||||||
|
EFI_ACPI_5_0_GIC_STRUCTURE_INIT(5, 3, EFI_ACPI_5_0_GIC_ENABLED, 62, FixedPcdGet32 (PcdGicInterruptInterfaceBase)), // A53-3
|
||||||
|
EFI_ACPI_5_0_GIC_STRUCTURE_INIT(0, 4, EFI_ACPI_5_0_GIC_ENABLED, 34, FixedPcdGet32 (PcdGicInterruptInterfaceBase)), // A57-0
|
||||||
|
EFI_ACPI_5_0_GIC_STRUCTURE_INIT(1, 5, EFI_ACPI_5_0_GIC_ENABLED, 38, FixedPcdGet32 (PcdGicInterruptInterfaceBase)) // A57-1
|
||||||
|
},
|
||||||
|
EFI_ACPI_5_0_GIC_DISTRIBUTOR_INIT(0, FixedPcdGet32 (PcdGicDistributorBase), 0)
|
||||||
|
};
|
||||||
|
#else
|
||||||
|
#pragma pack (1)
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE_HEADER Header;
|
||||||
|
EFI_ACPI_5_1_GIC_STRUCTURE GicInterfaces[FixedPcdGet32 (PcdCoreCount)];
|
||||||
|
EFI_ACPI_5_0_GIC_DISTRIBUTOR_STRUCTURE GicDistributor;
|
||||||
|
} EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE;
|
||||||
|
|
||||||
|
#pragma pack ()
|
||||||
|
|
||||||
|
EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE Madt = {
|
||||||
|
{
|
||||||
|
ARM_ACPI_HEADER (
|
||||||
|
EFI_ACPI_1_0_APIC_SIGNATURE,
|
||||||
|
EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE,
|
||||||
|
EFI_ACPI_1_0_MULTIPLE_APIC_DESCRIPTION_TABLE_REVISION
|
||||||
|
),
|
||||||
|
//
|
||||||
|
// MADT specific fields
|
||||||
|
//
|
||||||
|
0, // LocalApicAddress
|
||||||
|
0, // Flags
|
||||||
|
},
|
||||||
|
{
|
||||||
|
// Format: EFI_ACPI_5_1_GICC_STRUCTURE_INIT(GicId, AcpiCpuUid, Flags, PmuIrq, GicBase, GicVBase, GicHBase,
|
||||||
|
// GsivId, GicRBase, Mpidr)
|
||||||
|
// Note: The GIC Structure of the primary CPU must be the first entry (see note in 5.2.12.14 GICC Structure of
|
||||||
|
// ACPI v5.1).
|
||||||
|
// On Juno we can change the primary CPU changing the SCC register. It is not currently supported in the
|
||||||
|
// Trusted Firmware. When supported, we will need to code to dynamically change the ordering.
|
||||||
|
// For now we leave CPU2 (A53-0) at the first position.
|
||||||
|
// The cores from a same cluster are kept together. It is not an ACPI requirement but in case the OSPM uses
|
||||||
|
// the ACPI ARM Parking protocol, it might want to wake up the cores in the order of this table.
|
||||||
|
EFI_ACPI_5_1_GICC_STRUCTURE_INIT( // A53-0
|
||||||
|
2, 0, GET_MPID(1, 0), EFI_ACPI_5_0_GIC_ENABLED, 50, FixedPcdGet32 (PcdGicInterruptInterfaceBase),
|
||||||
|
0x2C06F000, 0x2C04F000, 25, 0 /* GicRBase */),
|
||||||
|
EFI_ACPI_5_1_GICC_STRUCTURE_INIT( // A53-1
|
||||||
|
3, 1, GET_MPID(1, 1), EFI_ACPI_5_0_GIC_ENABLED, 54, FixedPcdGet32 (PcdGicInterruptInterfaceBase),
|
||||||
|
0x2C06F000, 0x2C04F000, 25, 0 /* GicRBase */),
|
||||||
|
EFI_ACPI_5_1_GICC_STRUCTURE_INIT( // A53-2
|
||||||
|
4, 2, GET_MPID(1, 2), EFI_ACPI_5_0_GIC_ENABLED, 58, FixedPcdGet32 (PcdGicInterruptInterfaceBase),
|
||||||
|
0x2C06F000, 0x2C04F000, 25, 0 /* GicRBase */),
|
||||||
|
EFI_ACPI_5_1_GICC_STRUCTURE_INIT( // A53-3
|
||||||
|
5, 3, GET_MPID(1, 3), EFI_ACPI_5_0_GIC_ENABLED, 62, FixedPcdGet32 (PcdGicInterruptInterfaceBase),
|
||||||
|
0x2C06F000, 0x2C04F000, 25, 0 /* GicRBase */),
|
||||||
|
EFI_ACPI_5_1_GICC_STRUCTURE_INIT( // A57-0
|
||||||
|
0, 4, GET_MPID(0, 0), EFI_ACPI_5_0_GIC_ENABLED, 34, FixedPcdGet32 (PcdGicInterruptInterfaceBase),
|
||||||
|
0x2C06F000, 0x2C04F000, 25, 0 /* GicRBase */),
|
||||||
|
EFI_ACPI_5_1_GICC_STRUCTURE_INIT( // A57-1
|
||||||
|
1, 5, GET_MPID(0, 1), EFI_ACPI_5_0_GIC_ENABLED, 38, FixedPcdGet32 (PcdGicInterruptInterfaceBase),
|
||||||
|
0x2C06F000, 0x2C04F000, 25, 0 /* GicRBase */),
|
||||||
|
},
|
||||||
|
EFI_ACPI_5_0_GIC_DISTRIBUTOR_INIT(0, FixedPcdGet32 (PcdGicDistributorBase), 0)
|
||||||
|
};
|
||||||
|
#endif
|
||||||
|
|
||||||
VOID*
|
VOID*
|
||||||
ReferenceAcpiTable (
|
ReferenceAcpiTable (
|
||||||
|
|||||||
@ -75,4 +75,9 @@
|
|||||||
EFI_ACPI_ARM_CREATOR_REVISION /* UINT32 CreatorRevision */ \
|
EFI_ACPI_ARM_CREATOR_REVISION /* UINT32 CreatorRevision */ \
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#define JUNO_WATCHDOG_COUNT 2
|
||||||
|
|
||||||
|
// Define if the exported ACPI Tables are based on ACPI 5.0 spec or latest
|
||||||
|
//#define ARM_JUNO_ACPI_5_0
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user