ACPICA: Tables: Update for DMAR table changes.

Update table compiler and disassembler for new DMAR fields introduced
in Sept. 2013.

Note that Linux DMAR users need to be updated after applying this change.

[zetalog: changing drivers/iommu/dmar.c accordingly]

Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/include/acpi/actbl2.h b/include/acpi/actbl2.h
index 21314d37cb07..ecff62405f17 100644
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
@@ -396,7 +396,7 @@ struct acpi_table_dbgp {
  *        Version 1
  *
  * Conforms to "Intel Virtualization Technology for Directed I/O",
- * Version 1.2, Sept. 2008
+ * Version 2.2, Sept. 2013
  *
  ******************************************************************************/
 
@@ -423,9 +423,9 @@ struct acpi_dmar_header {
 enum acpi_dmar_type {
         ACPI_DMAR_TYPE_HARDWARE_UNIT = 0,
         ACPI_DMAR_TYPE_RESERVED_MEMORY = 1,
-        ACPI_DMAR_TYPE_ATSR = 2,
-        ACPI_DMAR_HARDWARE_AFFINITY = 3,
-        ACPI_DMAR_TYPE_ANDD = 4,
+        ACPI_DMAR_TYPE_ROOT_ATS = 2,
+        ACPI_DMAR_TYPE_HARDWARE_AFFINITY = 3,
+        ACPI_DMAR_TYPE_NAMESPACE = 4,
         ACPI_DMAR_TYPE_RESERVED = 5     /* 5 and greater are reserved */
 };
 
@@ -439,7 +439,7 @@ struct acpi_dmar_device_scope {
         u8 bus;
 };
 
-/* Values for entry_type in struct acpi_dmar_device_scope */
+/* Values for entry_type in struct acpi_dmar_device_scope - device types */
 
 enum acpi_dmar_scope_type {
         ACPI_DMAR_SCOPE_TYPE_NOT_USED = 0,
@@ -447,7 +447,7 @@ enum acpi_dmar_scope_type {
         ACPI_DMAR_SCOPE_TYPE_BRIDGE = 2,
         ACPI_DMAR_SCOPE_TYPE_IOAPIC = 3,
         ACPI_DMAR_SCOPE_TYPE_HPET = 4,
-        ACPI_DMAR_SCOPE_TYPE_ACPI = 5,
+        ACPI_DMAR_SCOPE_TYPE_NAMESPACE = 5,
         ACPI_DMAR_SCOPE_TYPE_RESERVED = 6       /* 6 and greater are reserved */
 };
 
@@ -516,7 +516,7 @@ struct acpi_dmar_andd {
         struct acpi_dmar_header header;
         u8 reserved[3];
         u8 device_number;
-        char object_name[1];
+        char device_name[1];
 };
 
 /*******************************************************************************