x86: use acpi_numa_init to parse on 32-bit numa (1c6e5503) · Commits · e / devices / android_kernel_oneplus_sm7250

arch/x86/kernel/setup_32.c

+25 −11

Original line number	Original line	Diff line number	Diff line
	@@ -59,6 +59,7 @@
	#include <asm/setup.h>		#include <asm/setup.h>
	#include <asm/arch_hooks.h>		#include <asm/arch_hooks.h>
	#include <asm/sections.h>		#include <asm/sections.h>
			#include <asm/dmi.h>
	#include <asm/io_apic.h>		#include <asm/io_apic.h>
	#include <asm/ist.h>		#include <asm/ist.h>
	#include <asm/io.h>		#include <asm/io.h>
	@@ -184,6 +185,12 @@ int bootloader_type;
	/* user-defined highmem size */		/* user-defined highmem size */
	static unsigned int highmem_pages = -1;		static unsigned int highmem_pages = -1;

			/*
			* Early DMI memory
			*/
			int dmi_alloc_index;
			char dmi_alloc_data[DMI_MAX_DATA];

	/*		/*
	* Setup options		* Setup options
	*/		*/
	@@ -775,6 +782,24 @@ void __init setup_arch(char **cmdline_p)
	max_pfn = e820_end_of_ram();		max_pfn = e820_end_of_ram();
	}		}

			dmi_scan_machine();

			io_delay_init();

			#ifdef CONFIG_ACPI
			/*
			* Parse the ACPI tables for possible boot-time SMP configuration.
			*/
			acpi_boot_table_init();
			#endif

			#ifdef CONFIG_ACPI_NUMA
			/*
			* Parse SRAT to discover nodes.
			*/
			acpi_numa_init();
			#endif

	max_low_pfn = setup_memory();		max_low_pfn = setup_memory();

	#ifdef CONFIG_ACPI_SLEEP		#ifdef CONFIG_ACPI_SLEEP
	@@ -841,10 +866,6 @@ void __init setup_arch(char **cmdline_p)

	paravirt_post_allocator_init();		paravirt_post_allocator_init();

	dmi_scan_machine();

	io_delay_init();

	#ifdef CONFIG_X86_SMP		#ifdef CONFIG_X86_SMP
	/*		/*
	* setup to use the early static init tables during kernel startup		* setup to use the early static init tables during kernel startup
	@@ -861,13 +882,6 @@ void __init setup_arch(char **cmdline_p)
	generic_apic_probe();		generic_apic_probe();
	#endif		#endif

	#ifdef CONFIG_ACPI
	/*
	* Parse the ACPI tables for possible boot-time SMP configuration.
	*/
	acpi_boot_table_init();
	#endif

	early_quirks();		early_quirks();

	#ifdef CONFIG_ACPI		#ifdef CONFIG_ACPI

arch/x86/kernel/srat_32.c

+49 −151

Original line number	Original line	Diff line number	Diff line
	@@ -42,7 +42,7 @@
	#define BMAP_TEST(bmap, bit) ((bmap)[NODE_ARRAY_INDEX(bit)] & (1 << NODE_ARRAY_OFFSET(bit)))		#define BMAP_TEST(bmap, bit) ((bmap)[NODE_ARRAY_INDEX(bit)] & (1 << NODE_ARRAY_OFFSET(bit)))
	/* bitmap length; _PXM is at most 255 */		/* bitmap length; _PXM is at most 255 */
	#define PXM_BITMAP_LEN (MAX_PXM_DOMAINS / 8)		#define PXM_BITMAP_LEN (MAX_PXM_DOMAINS / 8)
	static u8 pxm_bitmap[PXM_BITMAP_LEN]; /* bitmap of proximity domains */		static u8 __initdata pxm_bitmap[PXM_BITMAP_LEN]; /* bitmap of proximity domains */

	#define MAX_CHUNKS_PER_NODE 3		#define MAX_CHUNKS_PER_NODE 3
	#define MAXCHUNKS (MAX_CHUNKS_PER_NODE * MAX_NUMNODES)		#define MAXCHUNKS (MAX_CHUNKS_PER_NODE * MAX_NUMNODES)
	@@ -53,16 +53,37 @@ struct node_memory_chunk_s {
	u8 nid; // which cnode contains this chunk?		u8 nid; // which cnode contains this chunk?
	u8 bank; // which mem bank on this node		u8 bank; // which mem bank on this node
	};		};
	static struct node_memory_chunk_s node_memory_chunk[MAXCHUNKS];		static struct node_memory_chunk_s __initdata node_memory_chunk[MAXCHUNKS];

	static int num_memory_chunks; /* total number of memory chunks */		static int __initdata num_memory_chunks; /* total number of memory chunks */
	static u8 __initdata apicid_to_pxm[MAX_APICID];		static u8 __initdata apicid_to_pxm[MAX_APICID];

			int numa_off __initdata;
			int acpi_numa __initdata;

			static __init void bad_srat(void)
			{
			printk(KERN_ERR "SRAT: SRAT not used.\n");
			acpi_numa = -1;
			num_memory_chunks = 0;
			}

			static __init inline int srat_disabled(void)
			{
			return numa_off \|\| acpi_numa < 0;
			}

	/* Identify CPU proximity domains */		/* Identify CPU proximity domains */
	static void __init parse_cpu_affinity_structure(char *p)		void __init
			acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *cpu_affinity)
	{		{
	struct acpi_srat_cpu_affinity *cpu_affinity =		if (srat_disabled())
	(struct acpi_srat_cpu_affinity *) p;		return;
			if (cpu_affinity->header.length !=
			sizeof(struct acpi_srat_cpu_affinity)) {
			bad_srat();
			return;
			}

	if ((cpu_affinity->flags & ACPI_SRAT_CPU_ENABLED) == 0)		if ((cpu_affinity->flags & ACPI_SRAT_CPU_ENABLED) == 0)
	return; /* empty entry */		return; /* empty entry */
	@@ -80,14 +101,21 @@ static void __init parse_cpu_affinity_structure(char *p)
	* Identify memory proximity domains and hot-remove capabilities.		* Identify memory proximity domains and hot-remove capabilities.
	* Fill node memory chunk list structure.		* Fill node memory chunk list structure.
	*/		*/
	static void __init parse_memory_affinity_structure (char *sratp)		void __init
			acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *memory_affinity)
	{		{
	unsigned long long paddr, size;		unsigned long long paddr, size;
	unsigned long start_pfn, end_pfn;		unsigned long start_pfn, end_pfn;
	u8 pxm;		u8 pxm;
	struct node_memory_chunk_s p, q, *pend;		struct node_memory_chunk_s p, q, *pend;
	struct acpi_srat_mem_affinity *memory_affinity =
	(struct acpi_srat_mem_affinity *) sratp;		if (srat_disabled())
			return;
			if (memory_affinity->header.length !=
			sizeof(struct acpi_srat_mem_affinity)) {
			bad_srat();
			return;
			}

	if ((memory_affinity->flags & ACPI_SRAT_MEM_ENABLED) == 0)		if ((memory_affinity->flags & ACPI_SRAT_MEM_ENABLED) == 0)
	return; /* empty entry */		return; /* empty entry */
	@@ -135,6 +163,14 @@ static void __init parse_memory_affinity_structure (char *sratp)
	"enabled and removable" : "enabled" ) );		"enabled and removable" : "enabled" ) );
	}		}

			/* Callback for SLIT parsing */
			void __init acpi_numa_slit_init(struct acpi_table_slit *slit)
			{
			}

			void acpi_numa_arch_fixup(void)
			{
			}
	/*		/*
	* The SRAT table always lists ascending addresses, so can always		* The SRAT table always lists ascending addresses, so can always
	* assume that the first "start" address that you see is the real		* assume that the first "start" address that you see is the real
	@@ -167,39 +203,13 @@ static __init void node_read_chunk(int nid, struct node_memory_chunk_s *memory_c
	node_end_pfn[nid] = memory_chunk->end_pfn;		node_end_pfn[nid] = memory_chunk->end_pfn;
	}		}

	/* Parse the ACPI Static Resource Affinity Table */		int __init get_memcfg_from_srat(void)
	static int __init acpi20_parse_srat(struct acpi_table_srat *sratp)
	{		{
	u8 start, end, *p;
	int i, j, nid;		int i, j, nid;

	start = (u8 )(&(sratp->reserved) + 1); / skip header */
	p = start;
	end = (u8 *)sratp + sratp->header.length;

	memset(pxm_bitmap, 0, sizeof(pxm_bitmap)); /* init proximity domain bitmap */		if (srat_disabled())
	memset(node_memory_chunk, 0, sizeof(node_memory_chunk));		goto out_fail;

	num_memory_chunks = 0;
	while (p < end) {
	switch (*p) {
	case ACPI_SRAT_TYPE_CPU_AFFINITY:
	parse_cpu_affinity_structure(p);
	break;
	case ACPI_SRAT_TYPE_MEMORY_AFFINITY:
	parse_memory_affinity_structure(p);
	break;
	default:
	printk("ACPI 2.0 SRAT: unknown entry skipped: type=0x%02X, len=%d\n", p[0], p[1]);
	break;
	}
	p += p[1];
	if (p[1] == 0) {
	printk("acpi20_parse_srat: Entry length value is zero;"
	" can't parse any further!\n");
	break;
	}
	}

	if (num_memory_chunks == 0) {		if (num_memory_chunks == 0) {
	printk("could not finy any ACPI SRAT memory areas.\n");		printk("could not finy any ACPI SRAT memory areas.\n");
	@@ -258,118 +268,6 @@ static int __init acpi20_parse_srat(struct acpi_table_srat *sratp)
	}		}
	return 1;		return 1;
	out_fail:		out_fail:
	return 0;
	}

	struct acpi_static_rsdt {
	struct acpi_table_rsdt table;
	u32 padding[32]; /* Allow for 32 more table entries */
	};

	int __init get_memcfg_from_srat(void)
	{
	struct acpi_table_header *header = NULL;
	struct acpi_table_rsdp *rsdp = NULL;
	struct acpi_table_rsdt *rsdt = NULL;
	acpi_native_uint rsdp_address = 0;
	struct acpi_static_rsdt saved_rsdt;
	int tables = 0;
	int i = 0;

	rsdp_address = acpi_os_get_root_pointer();
	if (!rsdp_address) {
	printk("%s: System description tables not found\n",
	__func__);
	goto out_err;
	}

	printk("%s: assigning address to rsdp\n", __func__);
	rsdp = (struct acpi_table_rsdp *)(u32)rsdp_address;
	if (!rsdp) {
	printk("%s: Didn't find ACPI root!\n", __func__);
	goto out_err;
	}

	printk(KERN_INFO "%.8s v%d [%.6s]\n", rsdp->signature, rsdp->revision,
	rsdp->oem_id);

	if (strncmp(rsdp->signature, ACPI_SIG_RSDP,strlen(ACPI_SIG_RSDP))) {
	printk(KERN_WARNING "%s: RSDP table signature incorrect\n", __func__);
	goto out_err;
	}

	rsdt = (struct acpi_table_rsdt *)
	early_ioremap(rsdp->rsdt_physical_address, sizeof(saved_rsdt));

	if (!rsdt) {
	printk(KERN_WARNING
	"%s: ACPI: Invalid root system description tables (RSDT)\n",
	__func__);
	goto out_err;
	}

	header = &rsdt->header;

	if (strncmp(header->signature, ACPI_SIG_RSDT, strlen(ACPI_SIG_RSDT))) {
	printk(KERN_WARNING "ACPI: RSDT signature incorrect\n");
	early_iounmap(rsdt, sizeof(saved_rsdt));
	goto out_err;
	}

	/*
	* The number of tables is computed by taking the
	* size of all entries (header size minus total
	* size of RSDT) divided by the size of each entry
	* (4-byte table pointers).
	*/
	tables = (header->length - sizeof(struct acpi_table_header)) / sizeof(u32);

	if (!tables)
	goto out_err;

	memcpy(&saved_rsdt, rsdt, sizeof(saved_rsdt));
	early_iounmap(rsdt, sizeof(saved_rsdt));
	if (saved_rsdt.table.header.length > sizeof(saved_rsdt)) {
	printk(KERN_WARNING "ACPI: Too big length in RSDT: %d\n",
	saved_rsdt.table.header.length);
	goto out_err;
	}

	printk("Begin SRAT table scan....%d\n", tables);

	for (i = 0; i < tables; i++){
	int result;
	u32 length;
	/* Map in header, then map in full table length. */
	header = (struct acpi_table_header *)
	early_ioremap(saved_rsdt.table.table_offset_entry[i], sizeof(struct acpi_table_header));
	if (!header)
	break;

	printk(KERN_INFO "ACPI: %4.4s %08lX, %04X\n",
	header->signature,
	(unsigned long)saved_rsdt.table.table_offset_entry[i],
	header->length);

	if (strncmp((char *) &header->signature, ACPI_SIG_SRAT, 4)) {
	early_iounmap(header, sizeof(struct acpi_table_header));
	continue;
	}

	length = header->length;
	early_iounmap(header, sizeof(struct acpi_table_header));
	header = (struct acpi_table_header *)
	early_ioremap(saved_rsdt.table.table_offset_entry[i], length);
	if (!header)
	break;

	/* we've found the srat table. don't need to look at any more tables */
	result = acpi20_parse_srat((struct acpi_table_srat *)header);
	early_iounmap(header, length);
	return result;
	}
	out_err:
	remove_all_active_ranges();
	printk("failed to get NUMA memory information from SRAT table\n");		printk("failed to get NUMA memory information from SRAT table\n");
	return 0;		return 0;
	}		}

include/asm-x86/acpi.h

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -161,9 +161,7 @@ struct bootnode;
	#ifdef CONFIG_ACPI_NUMA		#ifdef CONFIG_ACPI_NUMA
	extern int acpi_numa;		extern int acpi_numa;
	extern int acpi_scan_nodes(unsigned long start, unsigned long end);		extern int acpi_scan_nodes(unsigned long start, unsigned long end);
	#ifdef CONFIG_X86_64
	#define NR_NODE_MEMBLKS (MAX_NUMNODES*2)		#define NR_NODE_MEMBLKS (MAX_NUMNODES*2)
	#endif
	extern void acpi_fake_nodes(const struct bootnode *fake_nodes,		extern void acpi_fake_nodes(const struct bootnode *fake_nodes,
	int num_nodes);		int num_nodes);
	#else		#else

include/asm-x86/dmi.h

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -3,12 +3,6 @@

	#include <asm/io.h>		#include <asm/io.h>

	#ifdef CONFIG_X86_32

	#define dmi_alloc alloc_bootmem

	#else /* CONFIG_X86_32 */

	#define DMI_MAX_DATA 2048		#define DMI_MAX_DATA 2048

	extern int dmi_alloc_index;		extern int dmi_alloc_index;
	@@ -25,8 +19,6 @@ static inline void *dmi_alloc(unsigned len)
	return dmi_alloc_data + idx;		return dmi_alloc_data + idx;
	}		}

	#endif

	/* Use early IO mappings for DMI because it's initialized early */		/* Use early IO mappings for DMI because it's initialized early */
	#define dmi_ioremap early_ioremap		#define dmi_ioremap early_ioremap
	#define dmi_iounmap early_iounmap		#define dmi_iounmap early_iounmap