diff options
| author | Thomas Abraham <thomas.abraham@arm.com> | 2020-11-28 18:05:18 +0530 |
|---|---|---|
| committer | Thomas Abraham <thomas.abraham@arm.com> | 2020-11-28 18:05:18 +0530 |
| commit | 9949ae4137eb036bd831a3b464a24788058c64af (patch) | |
| tree | 73f1cefa29ce97303f714611eca3f8cc0d34bc93 | |
| parent | ed9b760105125278b6be77a3b7c49bd321b9693e (diff) | |
Revert "platform/rdn1edge: add smmu node in the iort acpi table"RD-INFRA-2020.11.30refinfra
This reverts commit c62082bd606fb60cbe976f3d00029eb4535b4a41. With this
applied, WinPE boot fails. So until the reason for this is found out,
revert this patch.
Signed-off-by: Thomas Abraham <thomas.abraham@arm.com>
| -rw-r--r-- | Platform/ARM/SgiPkg/AcpiTables/Iort.aslc | 80 |
1 files changed, 15 insertions, 65 deletions
diff --git a/Platform/ARM/SgiPkg/AcpiTables/Iort.aslc b/Platform/ARM/SgiPkg/AcpiTables/Iort.aslc index 788f369e..58ec31dd 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/Iort.aslc +++ b/Platform/ARM/SgiPkg/AcpiTables/Iort.aslc @@ -22,12 +22,6 @@ typedef struct typedef struct
{
- EFI_ACPI_6_0_IO_REMAPPING_SMMU3_NODE SmmuNode;
- EFI_ACPI_6_0_IO_REMAPPING_ID_TABLE SmmuIdMap[2];
-} ARM_EFI_ACPI_6_0_IO_REMAPPING_SMMU3_NODE;
-
-typedef struct
-{
EFI_ACPI_6_0_IO_REMAPPING_RC_NODE RcNode;
EFI_ACPI_6_0_IO_REMAPPING_ID_TABLE RcIdMap;
} ARM_EFI_ACPI_6_0_IO_REMAPPING_RC_NODE;
@@ -36,7 +30,6 @@ typedef struct {
EFI_ACPI_6_0_IO_REMAPPING_TABLE Header;
ARM_EFI_ACPI_6_0_IO_REMAPPING_ITS_NODE ItsNode;
- ARM_EFI_ACPI_6_0_IO_REMAPPING_SMMU3_NODE SmmuNode;
ARM_EFI_ACPI_6_0_IO_REMAPPING_RC_NODE RcNode;
} ARM_EFI_ACPI_6_0_IO_REMAPPING_TABLE;
@@ -52,70 +45,27 @@ ARM_EFI_ACPI_6_0_IO_REMAPPING_TABLE Iort = ARM_EFI_ACPI_6_0_IO_REMAPPING_TABLE,
EFI_ACPI_IO_REMAPPING_TABLE_REVISION
),
- 3, // NumNodes
+ 2, // NumNodes
sizeof (EFI_ACPI_6_0_IO_REMAPPING_TABLE), // NodeOffset
0, // Reserved
},
- // ARM_EFI_ACPI_6_0_IO_REMAPPING_ITS_NODE
- {
- // EFI_ACPI_6_0_IO_REMAPPING_ITS_NODE
- {
- // EFI_ACPI_6_0_IO_REMAPPING_NODE
- {
- EFI_ACPI_IORT_TYPE_ITS_GROUP, // Type
- sizeof (ARM_EFI_ACPI_6_0_IO_REMAPPING_ITS_NODE), // Length
- 0, // Revision
- 0, // Reserved
- 0, // NumIdMappings
- 0, // IdReference
- },
- 1, //ITS count
- },
- 0, // GIC ITS Identifiers
- },
- // SMMU - CCIX
+ // ARM_EFI_ACPI_6_0_IO_REMAPPING_ITS_NODE
+ {
+ // EFI_ACPI_6_0_IO_REMAPPING_ITS_NODE
{
- // EFI_ACPI_6_0_IO_REMAPPING_SMMU3_NODE
- {
- // EFI_ACPI_6_0_IO_REMAPPING_NODE
- {
- EFI_ACPI_IORT_TYPE_SMMUv3, // Type
- sizeof (ARM_EFI_ACPI_6_0_IO_REMAPPING_SMMU3_NODE), // Length
- 2, // Revision
- 0, // Reserved
- 2, // NumIdMapping
- __builtin_offsetof (ARM_EFI_ACPI_6_0_IO_REMAPPING_SMMU3_NODE, SmmuIdMap), // IdReference
- },
- 0x4F000000, // Base address
- EFI_ACPI_IORT_SMMUv3_FLAG_COHAC_OVERRIDE, // Flags
- 0, // Reserved
- 0, // VATOS address
- EFI_ACPI_IORT_SMMUv3_MODEL_GENERIC, // SMMUv3 Model
- 260, // Event
- 0, // Pri
- 262, // Gerror
- 261, // Sync
- 0, // Proximity domain
- 1, // DevIDMappingIndex
- },
- // EFI_ACPI_6_0_IO_REMAPPING_ID_TABLE
+ // EFI_ACPI_6_0_IO_REMAPPING_NODE
{
- {
- 0x0000, // InputBase
- 0xffff, // NumIds
- 0x0000, // OutputBase
- __builtin_offsetof (ARM_EFI_ACPI_6_0_IO_REMAPPING_TABLE, ItsNode), // OutputReference
- 0, // Flags
- },
- {
- 0x0, // InputBase
- 0x1, // NumIds
- 0x10000, // OutputBase
- __builtin_offsetof (ARM_EFI_ACPI_6_0_IO_REMAPPING_TABLE, ItsNode), // OutputReference
- EFI_ACPI_IORT_ID_MAPPING_FLAGS_SINGLE, // Flags
- },
+ EFI_ACPI_IORT_TYPE_ITS_GROUP, // Type
+ sizeof (ARM_EFI_ACPI_6_0_IO_REMAPPING_ITS_NODE), // Length
+ 0, // Revision
+ 0, // Reserved
+ 0, // NumIdMappings
+ 0, // IdReference
},
+ 1, // GIC ITS Identifiers
},
+ 0,
+ },
// ARM_EFI_ACPI_6_0_IO_REMAPPING_RC_NODE
{
// EFI_ACPI_6_0_IO_REMAPPING_RC_NODE
@@ -141,7 +91,7 @@ ARM_EFI_ACPI_6_0_IO_REMAPPING_TABLE Iort = 0x0000, // InputBase
0xffff, // NumIds
0x0000, // OutputBase
- OFFSET_OF (ARM_EFI_ACPI_6_0_IO_REMAPPING_TABLE, SmmuNode), // OutputReference
+ OFFSET_OF (ARM_EFI_ACPI_6_0_IO_REMAPPING_TABLE, ItsNode), // OutputReference
0, // Flags
}
}
|