|
 |
df7b7f |
From 6a75f4e52f0a356d54e1cd06f99f91d21bd03663 Mon Sep 17 00:00:00 2001
|
|
|
df7b7f |
From: Chandni Verma <chandni@linux.vnet.ibm.com>
|
|
|
df7b7f |
Date: Thu, 14 Jul 2016 23:46:42 +0530
|
|
|
df7b7f |
Subject: [PATCH 20/43] devtree: Display CPU nodes before memory
|
|
|
df7b7f |
|
|
|
df7b7f |
Present lshw displays memory node before cpu node for Power System. But
|
|
|
df7b7f |
on x86, it displays cpu before memory. Lets use same output format on
|
|
|
df7b7f |
x86 and Power Systems.
|
|
|
df7b7f |
|
|
|
df7b7f |
Note that I've made sure it doesn't hurt other platforms (like Apple)
|
|
|
df7b7f |
which has device tree.
|
|
|
df7b7f |
|
|
|
df7b7f |
Signed-off-by: Chandni Verma <chandni@linux.vnet.ibm.com>
|
|
|
df7b7f |
[Made sure this patch doesn't impact non-IBM Power systems,
|
|
|
df7b7f |
updated description - Vasant]
|
|
|
df7b7f |
Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
|
|
|
df7b7f |
---
|
|
|
df7b7f |
src/core/device-tree.cc | 11 +++++++----
|
|
|
df7b7f |
1 file changed, 7 insertions(+), 4 deletions(-)
|
|
|
df7b7f |
|
|
|
df7b7f |
diff --git a/src/core/device-tree.cc b/src/core/device-tree.cc
|
|
|
df7b7f |
index 700dff0..b8feb12 100644
|
|
|
df7b7f |
--- a/src/core/device-tree.cc
|
|
|
df7b7f |
+++ b/src/core/device-tree.cc
|
|
|
df7b7f |
@@ -931,8 +931,8 @@ bool scan_device_tree(hwNode & n)
|
|
|
df7b7f |
{
|
|
|
df7b7f |
core->addHint("icon", string("board"));
|
|
|
df7b7f |
scan_devtree_root(*core);
|
|
|
df7b7f |
- scan_devtree_memory_powernv(*core);
|
|
|
df7b7f |
scan_devtree_cpu_power(*core);
|
|
|
df7b7f |
+ scan_devtree_memory_powernv(*core);
|
|
|
df7b7f |
n.addCapability("powernv", "Non-virtualized");
|
|
|
df7b7f |
n.addCapability("opal", "OPAL firmware");
|
|
|
df7b7f |
}
|
|
|
df7b7f |
@@ -982,11 +982,14 @@ bool scan_device_tree(hwNode & n)
|
|
|
df7b7f |
core->addHint("icon", string("board"));
|
|
|
df7b7f |
scan_devtree_root(*core);
|
|
|
df7b7f |
scan_devtree_bootrom(*core);
|
|
|
df7b7f |
- scan_devtree_memory(*core);
|
|
|
df7b7f |
- if (exists(DEVICETREE "/ibm,lpar-capable"))
|
|
|
df7b7f |
+ if (exists(DEVICETREE "/ibm,lpar-capable")) {
|
|
|
df7b7f |
scan_devtree_cpu_power(*core);
|
|
|
df7b7f |
- else
|
|
|
df7b7f |
+ scan_devtree_memory(*core);
|
|
|
df7b7f |
+ }
|
|
|
df7b7f |
+ else {
|
|
|
df7b7f |
+ scan_devtree_memory(*core);
|
|
|
df7b7f |
scan_devtree_cpu(*core);
|
|
|
df7b7f |
+ }
|
|
|
df7b7f |
}
|
|
|
df7b7f |
}
|
|
|
df7b7f |
|
|
|
df7b7f |
--
|
|
|
df7b7f |
2.10.2
|
|
|
df7b7f |
|