mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-17 06:48:07 +00:00
Koen Kooi
646ff9d602
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
67 lines
2.1 KiB
Diff
67 lines
2.1 KiB
Diff
From 8f15cb284e8a758b4040fd87729b365bb7805dbb Mon Sep 17 00:00:00 2001
|
|
From: Kurt Garloff <kurt@garloff.de>
|
|
Date: Tue, 17 Jan 2012 04:18:02 -0500
|
|
Subject: [PATCH 100/129] ACPI: Store SRAT table revision
|
|
|
|
commit 8df0eb7c9d96f9e82f233ee8b74e0f0c8471f868 upstream.
|
|
|
|
In SRAT v1, we had 8bit proximity domain (PXM) fields; SRAT v2 provides
|
|
32bits for these. The new fields were reserved before.
|
|
According to the ACPI spec, the OS must disregrard reserved fields.
|
|
In order to know whether or not, we must know what version the SRAT
|
|
table has.
|
|
|
|
This patch stores the SRAT table revision for later consumption
|
|
by arch specific __init functions.
|
|
|
|
Signed-off-by: Kurt Garloff <kurt@garloff.de>
|
|
Signed-off-by: Len Brown <len.brown@intel.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
|
|
---
|
|
drivers/acpi/numa.c | 6 ++++++
|
|
include/acpi/acpi_numa.h | 1 +
|
|
2 files changed, 7 insertions(+)
|
|
|
|
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
|
|
index 3b5c318..e56f3be 100644
|
|
--- a/drivers/acpi/numa.c
|
|
+++ b/drivers/acpi/numa.c
|
|
@@ -45,6 +45,8 @@ static int pxm_to_node_map[MAX_PXM_DOMAINS]
|
|
static int node_to_pxm_map[MAX_NUMNODES]
|
|
= { [0 ... MAX_NUMNODES - 1] = PXM_INVAL };
|
|
|
|
+unsigned char acpi_srat_revision __initdata;
|
|
+
|
|
int pxm_to_node(int pxm)
|
|
{
|
|
if (pxm < 0)
|
|
@@ -255,9 +257,13 @@ acpi_parse_memory_affinity(struct acpi_subtable_header * header,
|
|
|
|
static int __init acpi_parse_srat(struct acpi_table_header *table)
|
|
{
|
|
+ struct acpi_table_srat *srat;
|
|
if (!table)
|
|
return -EINVAL;
|
|
|
|
+ srat = (struct acpi_table_srat *)table;
|
|
+ acpi_srat_revision = srat->header.revision;
|
|
+
|
|
/* Real work done in acpi_table_parse_srat below. */
|
|
|
|
return 0;
|
|
diff --git a/include/acpi/acpi_numa.h b/include/acpi/acpi_numa.h
|
|
index 1739726..451823c 100644
|
|
--- a/include/acpi/acpi_numa.h
|
|
+++ b/include/acpi/acpi_numa.h
|
|
@@ -15,6 +15,7 @@ extern int pxm_to_node(int);
|
|
extern int node_to_pxm(int);
|
|
extern void __acpi_map_pxm_to_node(int, int);
|
|
extern int acpi_map_pxm_to_node(int);
|
|
+extern unsigned char acpi_srat_revision;
|
|
|
|
#endif /* CONFIG_ACPI_NUMA */
|
|
#endif /* __ACP_NUMA_H */
|
|
--
|
|
1.7.9.5
|
|
|