https://ezix.org/src/pkg/lshw/pulls/20 fixes DIMM info for older IBM …

…POWER Also changes the ordering of devices for Calxeda Highbank to have CPU before memory, which is in line with everything else.
beaker-project · Jul 11, 2018 · 40efc32 · 40efc32
1 parent b2f3479
commit 40efc32
Show file tree

Hide file tree

Showing 2 changed files with 70 additions and 34 deletions.
diff --git a/testdata/calxeda-highbank/expected.xml b/testdata/calxeda-highbank/expected.xml
@@ -18,39 +18,10 @@
    <hints>
     <hint name="icon" value="board" />
    </hints>
-    <node id="memory" claimed="true" class="memory">
-     <description>System memory</description>
-     <physid>0</physid>
-     <size units="bytes">4287627264</size>
-     <hints>
-      <hint name="icon" value="memory" />
-     </hints>
-      <node id="bank" claimed="true" class="memory">
-       <description>DDR3L</description>
-       <product>1067</product>
-       <vendor>Samsung</vendor>
-       <physid>0</physid>
-       <version>0000,11 50,01</version>
-       <serial>[REMOVED]</serial>
-       <slot>SLOT_0</slot>
-       <size units="bytes">4287627264</size>
-       <clock units="Hz">1333333333</clock>
-       <configuration>
-        <setting id="errordetection" value="ecc" />
-       </configuration>
-       <capabilities>
-        <capability id="ecc" />
-        <capability id="spd-1.1" />
-       </capabilities>
-       <hints>
-        <hint name="icon" value="memory" />
-       </hints>
-      </node>
-    </node>
     <node id="cpu:0" claimed="true" class="processor">
      <description>CPU</description>
      <product>cpu</product>
-     <physid>1</physid>
+     <physid>0</physid>
      <businfo>cpu@0</businfo>
      <capabilities>
       <capability id="half" >Unknown</capability>
@@ -72,7 +43,7 @@
     <node id="cpu:1" claimed="true" class="processor">
      <description>CPU</description>
      <product>cpu</product>
-     <physid>2</physid>
+     <physid>1</physid>
      <businfo>cpu@1</businfo>
      <capabilities>
       <capability id="half" >Unknown</capability>
@@ -94,7 +65,7 @@
     <node id="cpu:2" claimed="true" class="processor">
      <description>CPU</description>
      <product>cpu</product>
-     <physid>3</physid>
+     <physid>2</physid>
      <businfo>cpu@2</businfo>
      <capabilities>
       <capability id="half" >Unknown</capability>
@@ -116,7 +87,7 @@
     <node id="cpu:3" claimed="true" class="processor">
      <description>CPU</description>
      <product>cpu</product>
-     <physid>4</physid>
+     <physid>3</physid>
      <businfo>cpu@3</businfo>
      <capabilities>
       <capability id="half" >Unknown</capability>
@@ -135,6 +106,35 @@
       <hint name="logo" value="arm" />
      </hints>
     </node>
+    <node id="memory" claimed="true" class="memory">
+     <description>System memory</description>
+     <physid>4</physid>
+     <size units="bytes">4287627264</size>
+     <hints>
+      <hint name="icon" value="memory" />
+     </hints>
+      <node id="bank" claimed="true" class="memory">
+       <description>DDR3L</description>
+       <product>1067</product>
+       <vendor>Samsung</vendor>
+       <physid>0</physid>
+       <version>0000,11 50,01</version>
+       <serial>[REMOVED]</serial>
+       <slot>SLOT_0</slot>
+       <size units="bytes">4287627264</size>
+       <clock units="Hz">1333333333</clock>
+       <configuration>
+        <setting id="errordetection" value="ecc" />
+       </configuration>
+       <capabilities>
+        <capability id="ecc" />
+        <capability id="spd-1.1" />
+       </capabilities>
+       <hints>
+        <hint name="icon" value="memory" />
+       </hints>
+      </node>
+    </node>
   </node>
 </node>
 </list>
diff --git a/testdata/ibm-js20/expected.xml b/testdata/ibm-js20/expected.xml
@@ -88,10 +88,46 @@
     <node id="memory" claimed="true" class="memory">
      <description>System memory</description>
      <physid>4</physid>
-     <size units="bytes">2048720896</size>
+     <size units="bytes">2147483648</size>
      <hints>
       <hint name="icon" value="memory" />
      </hints>
+      <node id="bank:0" claimed="true" class="memory">
+       <description>DIMM DDR SDRAM</description>
+       <physid>0</physid>
+       <slot>U8842.P3A.23GFC6X-P1-C1</slot>
+       <size units="bytes">536870912</size>
+       <hints>
+        <hint name="icon" value="memory" />
+       </hints>
+      </node>
+      <node id="bank:1" claimed="true" class="memory">
+       <description>DIMM DDR SDRAM</description>
+       <physid>1</physid>
+       <slot>U8842.P3A.23GFC6X-P1-C2</slot>
+       <size units="bytes">536870912</size>
+       <hints>
+        <hint name="icon" value="memory" />
+       </hints>
+      </node>
+      <node id="bank:2" claimed="true" class="memory">
+       <description>DIMM DDR SDRAM</description>
+       <physid>2</physid>
+       <slot>U8842.P3A.23GFC6X-P1-C3</slot>
+       <size units="bytes">536870912</size>
+       <hints>
+        <hint name="icon" value="memory" />
+       </hints>
+      </node>
+      <node id="bank:3" claimed="true" class="memory">
+       <description>DIMM DDR SDRAM</description>
+       <physid>3</physid>
+       <slot>U8842.P3A.23GFC6X-P1-C4</slot>
+       <size units="bytes">536870912</size>
+       <hints>
+        <hint name="icon" value="memory" />
+       </hints>
+      </node>
     </node>
     <node id="pci:0" claimed="true" class="bridge" handle="PCIBUS:0000:11" modalias="pci:v00001022d00007450sv00000000sd00000000bc06sc04i00">
      <description>PCI bridge</description>