|
 |
e6b9b5 |
From 5c69f583963c01afefeff967416ea79fbfafd1f6 Mon Sep 17 00:00:00 2001
|
|
|
e6b9b5 |
From: Dan Callaghan <dcallagh@redhat.com>
|
|
|
e6b9b5 |
Date: Wed, 11 Jul 2018 13:34:55 +1000
|
|
|
e6b9b5 |
Subject: [PATCH 4/8] Fix DIMM info for older IBM POWER systems
|
|
|
e6b9b5 |
|
|
|
e6b9b5 |
Commit f95aa917 applied the patch from #695, adding the
|
|
|
e6b9b5 |
scan_devtree_memory_ibm() function, but it called the function in the
|
|
|
e6b9b5 |
wrong place. The function finds memory-controller@* nodes on older IBM
|
|
|
e6b9b5 |
POWER systems, not newer OPAL firmware based ones.
|
|
|
e6b9b5 |
|
|
|
e6b9b5 |
This patch has the side effect of reordering CPU nodes before memory
|
|
|
e6b9b5 |
nodes on non-IBM device-tree-based hardware (like Calxeda Highbank and
|
|
|
e6b9b5 |
other unusual stuff). That is in line with other platforms.
|
|
|
e6b9b5 |
|
|
|
e6b9b5 |
---
|
|
|
e6b9b5 |
src/core/device-tree.cc | 7 +++----
|
|
|
e6b9b5 |
1 file changed, 3 insertions(+), 4 deletions(-)
|
|
|
e6b9b5 |
|
|
|
e6b9b5 |
diff --git a/src/core/device-tree.cc b/src/core/device-tree.cc
|
|
|
e6b9b5 |
index 642b3c54ece1..23ef797788cb 100644
|
|
|
e6b9b5 |
--- a/src/core/device-tree.cc
|
|
|
e6b9b5 |
+++ b/src/core/device-tree.cc
|
|
|
e6b9b5 |
@@ -1395,7 +1395,6 @@ bool scan_device_tree(hwNode & n)
|
|
|
e6b9b5 |
core->addHint("icon", string("board"));
|
|
|
e6b9b5 |
scan_devtree_root(*core);
|
|
|
e6b9b5 |
scan_devtree_cpu_power(*core);
|
|
|
e6b9b5 |
- scan_devtree_memory_ibm(*core);
|
|
|
e6b9b5 |
scan_devtree_memory_powernv(*core);
|
|
|
e6b9b5 |
scan_devtree_firmware_powernv(*core);
|
|
|
e6b9b5 |
n.addCapability("powernv", "Non-virtualized");
|
|
|
e6b9b5 |
@@ -1448,12 +1447,12 @@ bool scan_device_tree(hwNode & n)
|
|
|
e6b9b5 |
if (exists(DEVICETREE "/ibm,lpar-capable")) {
|
|
|
e6b9b5 |
n.setDescription("pSeries LPAR");
|
|
|
e6b9b5 |
scan_devtree_cpu_power(*core);
|
|
|
e6b9b5 |
- scan_devtree_memory(*core);
|
|
|
e6b9b5 |
}
|
|
|
e6b9b5 |
else {
|
|
|
e6b9b5 |
- scan_devtree_memory(*core);
|
|
|
e6b9b5 |
scan_devtree_cpu(*core);
|
|
|
e6b9b5 |
- }
|
|
|
e6b9b5 |
+ }
|
|
|
e6b9b5 |
+ scan_devtree_memory(*core);
|
|
|
e6b9b5 |
+ scan_devtree_memory_ibm(*core);
|
|
|
e6b9b5 |
}
|
|
|
e6b9b5 |
}
|
|
|
e6b9b5 |
|
|
|
e6b9b5 |
--
|
|
|
e6b9b5 |
2.17.1
|
|
|
e6b9b5 |
|