summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Moore <Robert.Moore@intel.com>2022-10-20 12:54:28 -0700
committerGitHub <noreply@github.com>2022-10-20 12:54:28 -0700
commit6ad6a68084d358ce9d3cc86736f39f47bca1cba4 (patch)
treecd8d2b2674a1efe0db17d03011dfe5e43d8925db
parent085e76126cc0fc31f24489f38e2b2914c36cb3b0 (diff)
parent54b54732c5fc9e0384bcfd531f3c10d3a7b628b5 (diff)
downloadacpica-6ad6a68084d358ce9d3cc86736f39f47bca1cba4.tar.gz
Merge pull request #801 from rmurphy-arm/iort-smmu
IORT: Update for revision E.e
-rw-r--r--source/common/dmtbinfo2.c1
-rw-r--r--source/include/actbl2.h3
2 files changed, 3 insertions, 1 deletions
diff --git a/source/common/dmtbinfo2.c b/source/common/dmtbinfo2.c
index 6ea3bdb05..3676be813 100644
--- a/source/common/dmtbinfo2.c
+++ b/source/common/dmtbinfo2.c
@@ -412,6 +412,7 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoIort4[] =
{ACPI_DMT_FLAG0, ACPI_IORT4_FLAG_OFFSET (Flags, 0), "COHACC Override", 0},
{ACPI_DMT_FLAG1, ACPI_IORT4_FLAG_OFFSET (Flags, 0), "HTTU Override", 0},
{ACPI_DMT_FLAG3, ACPI_IORT4_FLAG_OFFSET (Flags, 0), "Proximity Domain Valid", 0},
+ {ACPI_DMT_FLAG4, ACPI_IORT4_FLAG_OFFSET (Flags, 0), "DeviceID Valid", 0},
{ACPI_DMT_UINT32, ACPI_IORT4_OFFSET (Reserved), "Reserved", 0},
{ACPI_DMT_UINT64, ACPI_IORT4_OFFSET (VatosAddress), "VATOS Address", 0},
{ACPI_DMT_UINT32, ACPI_IORT4_OFFSET (Model), "Model", 0},
diff --git a/source/include/actbl2.h b/source/include/actbl2.h
index 74d292581..4be5f0fce 100644
--- a/source/include/actbl2.h
+++ b/source/include/actbl2.h
@@ -546,7 +546,7 @@ typedef struct acpi_table_ccel
* IORT - IO Remapping Table
*
* Conforms to "IO Remapping Table System Software on ARM Platforms",
- * Document number: ARM DEN 0049E.d, Feb 2022
+ * Document number: ARM DEN 0049E.e, Sep 2022
*
******************************************************************************/
@@ -744,6 +744,7 @@ typedef struct acpi_iort_smmu_v3
#define ACPI_IORT_SMMU_V3_COHACC_OVERRIDE (1)
#define ACPI_IORT_SMMU_V3_HTTU_OVERRIDE (3<<1)
#define ACPI_IORT_SMMU_V3_PXM_VALID (1<<3)
+#define ACPI_IORT_SMMU_V3_DEVICEID_VALID (1<<4)
typedef struct acpi_iort_pmcg
{