memory hotplug prototype for ia64

PATCH New Fumihiro Tersawa 1 participant 1 message Apr 20, 2004 ACPI

Share & tools

Fumihiro Tersawa

author

2004-04-20 06:07 UTC #0 lore raw

PATCH 2/2 memory hotplug prototype for ia64

This is a patch to emulate NUMA node to test the memory hotplug on ia64 non NUMA machines.
As an example, it use the Dummy SRAT table(dummysrat.h) to emulate 2 Nodes for 1 Node machine of the following compositions:
- 2CPUs
- 8GB memory

It is necessary to correct Dummy SRAT table according to your machine's compositions(CPU number, Memory size).

NOTICE:
- APIC ID(in Processor Local APIC/SAPIC Affinity Structure) It is necessary to make to match with lsapic_id of ACPI.

- Memory range(in Memory Affinity Structure)
It is necessary to establish to contain all the physical addresses of EFI memory map.

drivers/acpi/dummysrat.h +39 -0

diff -duprN linux-2.6.5/drivers/acpi/dummysrat.h linux-2.6.5-dummysrat/drivers/acpi/dummysrat.h
@@ -0,0 +1,39 @@
+/*
+ * Dummy SRAT table
+ *
+ * Copyright (C) 2004 Fumitake Abe <[email protected]>
+ *
+ */
+unsigned char SratTable[] =
+{
+	0x53,0x52,0x41,0x54,0xf0,0x00,0x00,0x00,  /* 00000000  "SRAT...." */
+	0x01,0x00,0x4f,0x45,0x4d,0x49,0x44,0x00,  /* 00000008  "..OEMID." */
+	0x4f,0x45,0x4d,0x54,0x42,0x4c,0x00,0x00,  /* 00000010  "OEMTBL.." */
+	0x00,0x00,0x00,0x00,0x61,0x73,0x6c,0x00,  /* 00000018  "....asl." */
+	0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000020  "........" */
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000028  "........" */
+	0x00,0x10,0x00,0xc2,0x01,0x00,0x00,0x00,  /* 00000030  "........" */
+	0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000038  "........" */
+	0x00,0x10,0x01,0xc0,0x01,0x00,0x00,0x00,  /* 00000040  "........" */
+	0x18,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000048  "........" */
+	0x01,0x28,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000050  ".(......" */
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000058  "........" */
+	0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x00,  /* 00000060  "........" */
+	0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,  /* 00000068  "........" */
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000070  "........" */
+	0x01,0x28,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000078  ".(......" */
+	0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x00,  /* 00000080  "........" */
+	0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,  /* 00000088  "........" */
+	0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,  /* 00000090  "........" */
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 00000098  "........" */
+	0x01,0x28,0x01,0x00,0x00,0x00,0x00,0x00,  /* 000000a0  ".(......" */
+	0x00,0x00,0x00,0x80,0x01,0x00,0x00,0x00,  /* 000000a8  "........" */
+	0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x00,  /* 000000b0  "........" */
+	0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,  /* 000000b8  "........" */
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 000000c0  "........" */
+	0x01,0x28,0x01,0x00,0x00,0x00,0x00,0x00,  /* 000000c8  ".(......" */
+	0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,  /* 000000d0  "........" */
+	0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,  /* 000000d8  "........" */
+	0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,  /* 000000e0  "........" */
+	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,  /* 000000e8  "........" */
+};

drivers/acpi/numa.c +2 -0

diff -duprN linux-2.6.5/drivers/acpi/numa.c linux-2.6.5-dummysrat/drivers/acpi/numa.c
@@ -48,6 +48,7 @@ acpi_table_print_srat_entry (
 	if (!header)
 		return;
 
+#ifndef CONFIG_MEMHOTPLUG
 	switch (header->type) {
 
 	case ACPI_SRAT_PROCESSOR_AFFINITY:

@@ -77,6 +78,7 @@ acpi_table_print_srat_entry (
 			header->type);
 		break;
 	}
+#endif
 }

drivers/acpi/tables.c +21 -0

diff -duprN linux-2.6.5/drivers/acpi/tables.c linux-2.6.5-dummysrat/drivers/acpi/tables.c
@@ -34,6 +34,9 @@
 #include <linux/errno.h>
 #include <linux/acpi.h>
 #include <linux/bootmem.h>
+#ifdef CONFIG_MEMHOTPLUG
+#include "dummysrat.h"
+#endif
 
 #define PREFIX			"ACPI: "

@@ -315,6 +318,14 @@ acpi_table_parse_madt_family (
 	if (!handler)
 		return -EINVAL;
 
+#ifdef CONFIG_MEMHOTPLUG
+	if (id == ACPI_SRAT) {
+		madt = (void *)SratTable;
+		madt_end = (unsigned long)madt + sizeof(SratTable);
+		goto do_parse;
+	}
+#endif
+
 	/* Locate the MADT (if exists). There should only be one. */
 
 	for (i = 0; i < sdt_count; i++) {

@@ -338,6 +349,9 @@ acpi_table_parse_madt_family (
 
 	madt_end = (unsigned long) madt + sdt_entry[i].size;
 
+#ifdef CONFIG_MEMHOTPLUG
+do_parse:
+#endif
 	/* Parse all entries looking for a match. */
 
 	entry = (acpi_table_entry_header *)

@@ -383,6 +397,13 @@ acpi_table_parse (
 	if (!handler)
 		return -EINVAL;
 
+#ifdef CONFIG_MEMHOTPLUG
+	if (id == ACPI_SRAT) {
+		handler(ia64_tpa((unsigned long)SratTable), sizeof(SratTable));
+		return 1;
+	}
+#endif
+
 	for (i = 0; i < sdt_count; i++) {
 		if (sdt_entry[i].id != id)
 			continue;