Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19d0cfe9 authored by Bob Moore's avatar Bob Moore Committed by Andi Kleen
Browse files

ACPICA: Update DMAR and SRAT table definitions 



Synchronized tables with current specifications.

Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLin Ming <ming.m.lin@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
parent d0e184ab

arch/x86/mm/srat_32.c

+1 −2
Original line number Diff line number Diff line
@@ -156,10 +156,9 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *memory_affinity) 


	num_memory_chunks++;



	printk(KERN_DEBUG "Memory range %08lx to %08lx (type %x)"

	printk(KERN_DEBUG "Memory range %08lx to %08lx"

			  " in proximity domain %02x %s\n",

		start_pfn, end_pfn,

		memory_affinity->memory_type,

		pxm,

		((memory_affinity->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) ?

		 "enabled and removable" : "enabled" ) );

drivers/acpi/numa.c

+2 −2
Original line number Diff line number Diff line
@@ -120,10 +120,10 @@ acpi_table_print_srat_entry(struct acpi_subtable_header *header) 
			struct acpi_srat_mem_affinity *p =

			    (struct acpi_srat_mem_affinity *)header;

			ACPI_DEBUG_PRINT((ACPI_DB_INFO,

					  "SRAT Memory (0x%lx length 0x%lx type 0x%x) in proximity domain %d %s%s\n",

					  "SRAT Memory (0x%lx length 0x%lx) in proximity domain %d %s%s\n",

					  (unsigned long)p->base_address,

					  (unsigned long)p->length,

					  p->memory_type, p->proximity_domain,

					  p->proximity_domain,

					  (p->flags & ACPI_SRAT_MEM_ENABLED)?

					  "enabled" : "disabled",

					  (p->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE)?

include/acpi/actbl1.h

+17 −2
Original line number Diff line number Diff line
@@ -300,6 +300,7 @@ struct acpi_table_dbgp { 
/*******************************************************************************

 *

 * DMAR - DMA Remapping table

 *	  From "Intel Virtualization Technology for Directed I/O", Sept. 2007

 *

 ******************************************************************************/
@@ -382,6 +383,20 @@ struct acpi_dmar_reserved_memory { 


#define ACPI_DMAR_ALLOW_ALL         (1)





/* 2: Root Port ATS Capability Reporting Structure */



struct acpi_dmar_atsr {

       struct acpi_dmar_header header;

       u8 flags;

       u8 reserved;

       u16 segment;

};



/* Flags */



#define ACPI_DMAR_ALL_PORTS	    (1)



/*******************************************************************************

 *

 * ECDT - Embedded Controller Boot Resources Table
@@ -1156,9 +1171,9 @@ struct acpi_srat_mem_affinity { 
	u16 reserved;		/* Reserved, must be zero */

	u64 base_address;

	u64 length;

	u32 memory_type;	/* See acpi_address_range_id */

       u32 reserved1;

	u32 flags;

	u64 reserved1;		/* Reserved, must be zero */

       u64 reserved2;	       /* Reserved, must be zero */

};



/* Flags */