|
 |
df7b7f |
From b409777707752adddbbd9fd33b5388825f8a032e Mon Sep 17 00:00:00 2001
|
|
|
df7b7f |
From: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
|
|
|
df7b7f |
Date: Fri, 21 Oct 2016 11:08:34 +0530
|
|
|
df7b7f |
Subject: [PATCH 22/43] devtree: Fix motherboard model reporting
|
|
|
df7b7f |
|
|
|
df7b7f |
We have 'model' property on all Power System. Some system has
|
|
|
df7b7f |
'model-name' property which is more descriptive.
|
|
|
df7b7f |
|
|
|
df7b7f |
Append 'model-name' info to product instead of overwriting it.
|
|
|
df7b7f |
|
|
|
df7b7f |
Sample output:
|
|
|
df7b7f |
tul176p1
|
|
|
df7b7f |
description: PowerNV
|
|
|
df7b7f |
product: 8286-42A (IBM Power System S824)
|
|
|
df7b7f |
|
|
|
df7b7f |
Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
|
|
|
df7b7f |
---
|
|
|
df7b7f |
src/core/device-tree.cc | 6 +++++-
|
|
|
df7b7f |
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
df7b7f |
|
|
|
df7b7f |
diff --git a/src/core/device-tree.cc b/src/core/device-tree.cc
|
|
|
df7b7f |
index 951535c..c60e49c 100644
|
|
|
df7b7f |
--- a/src/core/device-tree.cc
|
|
|
df7b7f |
+++ b/src/core/device-tree.cc
|
|
|
df7b7f |
@@ -926,7 +926,11 @@ bool scan_device_tree(hwNode & n)
|
|
|
df7b7f |
if (matches(get_string(DEVICETREE "/compatible"), "^ibm,powernv"))
|
|
|
df7b7f |
{
|
|
|
df7b7f |
n.setVendor(get_string(DEVICETREE "/vendor", "IBM"));
|
|
|
df7b7f |
- n.setProduct(get_string(DEVICETREE "/model-name"));
|
|
|
df7b7f |
+
|
|
|
df7b7f |
+ if (exists(DEVICETREE "/model-name"))
|
|
|
df7b7f |
+ n.setProduct(n.getProduct() + " (" +
|
|
|
df7b7f |
+ hw::strip(get_string(DEVICETREE "/model-name")) + ")");
|
|
|
df7b7f |
+
|
|
|
df7b7f |
n.setDescription("PowerNV");
|
|
|
df7b7f |
if (core)
|
|
|
df7b7f |
{
|
|
|
df7b7f |
--
|
|
|
df7b7f |
2.10.2
|
|
|
df7b7f |
|