From: Yasunori Goto <y-goto@jp.fujitsu.com>
To: Andrew Morton <akpm@osdl.org>
Cc: "Luck, Tony" <tony.luck@intel.com>,
"Brown, Len" <len.brown@intel.com>, Andi Kleen <ak@suse.de>,
Bob Picco <bob.picco@hp.com>, Paul Jackson <pj@sgi.com>,
Andy Whitcroft <apw@shadowen.org>,
Linux Kernel ML <linux-kernel@vger.kernel.org>,
ACPI-ML <linux-acpi@vger.kernel.org>,
linux-ia64@vger.kernel.org, x86-64 Discuss <discuss@x86-64.org>
Subject: [Patch:001/004] Unify pxm_to_node id ver.2. (generic code)
Date: Wed, 01 Feb 2006 12:36:28 +0000 [thread overview]
Message-ID: <20060201205204.41E8.Y-GOTO@jp.fujitsu.com> (raw)
This is new generic code for pxm_to_node_map.
Signed-off-by: Yasunori Goto <y-goto@jp.fujitsu.com>
drivers/acpi/numa.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++
include/acpi/acpi_numa.h | 18 ++++++++++++++++
include/linux/acpi.h | 1
3 files changed, 69 insertions(+)
Index: pxm_ver2/drivers/acpi/numa.c
=================================--- pxm_ver2.orig/drivers/acpi/numa.c 2006-02-01 18:53:46.000000000 +0900
+++ pxm_ver2/drivers/acpi/numa.c 2006-02-01 18:53:53.000000000 +0900
@@ -36,12 +36,62 @@
#define _COMPONENT ACPI_NUMA
ACPI_MODULE_NAME("numa")
+static nodemask_t nodes_found_map = NODE_MASK_NONE;
+#define PXM_INVAL 0xff
+#define NID_INVAL 0xff
+
+/* maps to convert between proximity domain and logical node ID */
+u8 __cpuinitdata pxm_to_node_map[MAX_PXM_DOMAINS]
+ = { [0 ... MAX_PXM_DOMAINS - 1] = NID_INVAL };
+u8 __cpuinitdata node_to_pxm_map[MAX_NUMNODES]
+ = { [0 ... MAX_NUMNODES - 1] = PXM_INVAL };
+
extern int __init acpi_table_parse_madt_family(enum acpi_table_id id,
unsigned long madt_size,
int entry_id,
acpi_madt_entry_handler handler,
unsigned int max_entries);
+int __cpuinit pxm_to_node(int pxm)
+{
+ if ((unsigned)pxm >= 256)
+ return -1;
+ /* Extent 0xff to (int)-1 */
+ return (signed char)pxm_to_node_map[pxm];
+}
+
+int __cpuinit node_to_pxm(int node)
+{
+ if ((unsigned)node >= 256)
+ return -1;
+ /* Extent 0xff to (int)-1 */
+ return (signed char)node_to_pxm_map[node];
+}
+
+int __cpuinit acpi_map_pxm_to_node(u8 pxm)
+{
+ u8 node = pxm_to_node_map[pxm];
+
+ if (node = NID_INVAL){
+ if (nodes_weight(nodes_found_map) >= MAX_NUMNODES)
+ return -1;
+ node = first_unset_node(nodes_found_map);
+ pxm_to_node_map[pxm] = node;
+ node_to_pxm_map[node] = pxm;
+ node_set(node, nodes_found_map);
+ }
+
+ return (int)node;
+}
+
+void __cpuinit acpi_unmap_pxm_to_node(int node)
+{
+ u8 pxm = node_to_pxm_map[node];
+ pxm_to_node_map[pxm] = NID_INVAL;
+ node_to_pxm_map[node] = PXM_INVAL;
+ node_clear(node, nodes_found_map);
+}
+
void __init acpi_table_print_srat_entry(acpi_table_entry_header * header)
{
Index: pxm_ver2/include/acpi/acpi_numa.h
=================================--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ pxm_ver2/include/acpi/acpi_numa.h 2006-02-01 18:53:53.000000000 +0900
@@ -0,0 +1,18 @@
+#ifndef __ACPI_NUMA_H
+#define __ACPI_NUMA_H
+
+#ifdef CONFIG_ACPI_NUMA
+#include <linux/kernel.h>
+
+/* Proximity bitmap length; _PXM is at most 255 (8 bit)*/
+#define MAX_PXM_DOMAINS (256)
+extern u8 __cpuinitdata pxm_to_node_map[MAX_PXM_DOMAINS];
+extern u8 __cpuinitdata node_to_pxm_map[MAX_NUMNODES];
+
+extern int __cpuinit pxm_to_node(int);
+extern int __cpuinit node_to_pxm(int);
+extern int __cpuinit acpi_map_pxm_to_node(u8);
+extern void __cpuinit acpi_unmap_pxm_to_node(int);
+
+#endif /* CONFIG_ACPI_NUMA */
+#endif /* __ACP_NUMA_H */
Index: pxm_ver2/include/linux/acpi.h
=================================--- pxm_ver2.orig/include/linux/acpi.h 2006-02-01 18:53:46.000000000 +0900
+++ pxm_ver2/include/linux/acpi.h 2006-02-01 18:53:53.000000000 +0900
@@ -38,6 +38,7 @@
#include <acpi/acpi.h>
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
+#include <acpi/acpi_numa.h>
#include <asm/acpi.h>
--
Yasunori Goto
reply other threads:[~2006-02-01 12:36 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060201205204.41E8.Y-GOTO@jp.fujitsu.com \
--to=y-goto@jp.fujitsu.com \
--cc=ak@suse.de \
--cc=akpm@osdl.org \
--cc=apw@shadowen.org \
--cc=bob.picco@hp.com \
--cc=discuss@x86-64.org \
--cc=len.brown@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pj@sgi.com \
--cc=tony.luck@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox