Add new cpus and dimmsfeature/new_dimm_cpu

8 files changed, 543 insertions, 6 deletions

diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-cpu.bb b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-cpu.bb
index e627c4e939..dc951ec014 100644
--- a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-cpu.bb
+++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-cpu.bb
@@ -9,10 +9,14 @@ inherit phosphor-inventory-manager
 PROVIDES += "virtual/phosphor-inventory-manager-cpu"
 S = "${WORKDIR}"
 
-SRC_URI = "file://cpu.yaml"
+SRC_URI = "file://cpu0.yaml \
+           file://cpu1.yaml \
+          "
 
 do_install() {
-        install -D cpu.yaml ${D}${base_datadir}/events.d/cpu.yaml
+        install -D cpu0.yaml ${D}${base_datadir}/events.d/cpu0.yaml
+        install -D cpu1.yaml ${D}${base_datadir}/events.d/cpu1.yaml
 }
 
-FILES:${PN} += "${base_datadir}/events.d/cpu.yaml"
+FILES:${PN} += "${base_datadir}/events.d/cpu0.yaml"
+FILES:${PN} += "${base_datadir}/events.d/cpu1.yaml"
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-cpu/cpu.yaml b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-cpu/cpu0.yaml
index d2863b548d..d2863b548d 100644
--- a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-cpu/cpu.yaml
+++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-cpu/cpu0.yaml
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-cpu/cpu1.yaml b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-cpu/cpu1.yaml
new file mode 100644
index 0000000000..35a8d5abb5
--- /dev/null
+++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-cpu/cpu1.yaml
@@ -0,0 +1,148 @@
+events:
+    - name: Add Cpu interface
+      description: >
+          Add the cpu interface on the cpu inventory path
+      type: startup
+      actions:
+          - name: createObjects
+            objs:
+              /system/chassis/motherboard/cpu1:
+                xyz.openbmc_project.Inventory.Item.Cpu:
+                  Socket:
+                    value: "FCLGA2011-3"
+                    type: string
+                  Family:
+                    value: "XeonCPU-3"
+                    type: string
+                    
+          - name: createObjects
+            objs:
+              /system/chassis/motherboard/cpu1:      
+                xyz.openbmc_project.Inventory.Decorator.Asset:        
+                  Manufacturer:
+                    value: "Manufacturer"
+                    type: string       
+                  PartNumber:
+                    value: "PartNumber"
+                    type: string      
+                  SerialNumber:
+                    value: "SerialNumber"
+                    type: string       
+                  BuildDate:
+                    value: "BuildDate"
+                    type: string      
+                  Model:
+                    value: "Model"
+                    type: string       
+                  SubModel:
+                    value: "SubModel"
+                    type: string     
+                  SparePartNumber:
+                    value: "SparePartNumber"
+                    type: string 
+                    
+          - name: createObjects
+            objs:
+              /system/chassis/motherboard/cpu1: 
+                xyz.openbmc_project.Inventory.Decorator.AssetTag:
+                  AssetTag:
+                    value: "AssetTag"
+                    type: string 
+                    
+          - name: createObjects
+            objs:
+              /system/chassis/motherboard/cpu1/core0:      
+                xyz.openbmc_project.Inventory.Item.CpuCore:
+                
+          - name: createObjects
+            objs:
+              /system/chassis/motherboard/cpu1/core0:      
+                xyz.openbmc_project.Inventory.Decorator.Asset:        
+                  Manufacturer:
+                    value: "Manufacturer"
+                    type: string   
+                    
+          - name: setProperty
+            interface: xyz.openbmc_project.Inventory.Item.Cpu
+            property: EffectiveFamily    
+            paths:
+                - /system/chassis/motherboard/cpu1
+            value:
+              type: uint16
+              value: 888
+              
+          - name: setProperty   
+            interface: xyz.openbmc_project.Inventory.Item.Cpu  
+            property: EffectiveModel    
+            paths:
+                - /system/chassis/motherboard/cpu1
+            value:
+              type: uint16
+              value: 321
+              
+          - name: setProperty   
+            interface: xyz.openbmc_project.Inventory.Item.Cpu  
+            property: Id    
+            paths:
+                - /system/chassis/motherboard/cpu1
+            value:
+              type: uint64
+              value: 7008
+
+          - name: setProperty   
+            interface: xyz.openbmc_project.Inventory.Item.Cpu  
+            property: MaxSpeedInMhz    
+            paths:
+                - /system/chassis/motherboard/cpu1
+            value:
+              type: uint32
+              value: 4200
+              
+          - name: setProperty   
+            interface: xyz.openbmc_project.Inventory.Item.Cpu  
+            property: CoreCount    
+            paths:
+                - /system/chassis/motherboard/cpu1
+            value:
+              type: uint16
+              value: 1234
+              
+          - name: setProperty   
+            interface: xyz.openbmc_project.Inventory.Item.Cpu  
+            property: ThreadCount    
+            paths:
+                - /system/chassis/motherboard/cpu1
+            value:
+              type: uint16
+              value: 152
+              
+          - name: setProperty   
+            interface: xyz.openbmc_project.Inventory.Item.Cpu  
+            property: Step    
+            paths:
+                - /system/chassis/motherboard/cpu1
+            value:
+              type: uint16
+              value: 999
+              
+          - name: setProperty   
+            interface: xyz.openbmc_project.Inventory.Item.Cpu  
+            property: Microcode    
+            paths:
+                - /system/chassis/motherboard/cpu1
+            value:
+              type: uint32
+              value: 111
+              
+          - name: setProperty   
+            interface: xyz.openbmc_project.Inventory.Item.CpuCore  
+            property: Microcode    
+            paths:
+                - /system/chassis/motherboard/cpu1/core0
+            value:
+              type: uint32
+              value: 111
+              
+              
+              
+              
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-dimm.bb b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-dimm.bb
index a7fce85394..4098311450 100644
--- a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-dimm.bb
+++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-dimm.bb
@@ -9,10 +9,20 @@ inherit phosphor-inventory-manager
 PROVIDES += "virtual/phosphor-inventory-manager-dimm"
 S = "${WORKDIR}"
 
-SRC_URI = "file://dimm.yaml"
+SRC_URI = "file://dimm0.yaml \
+           file://dimm1.yaml \
+           file://dimm2.yaml \
+           file://dimm3.yaml \
+          "
 
 do_install() {
-        install -D dimm.yaml ${D}${base_datadir}/events.d/dimm.yaml
+        install -D dimm0.yaml ${D}${base_datadir}/events.d/dimm0.yaml
+        install -D dimm1.yaml ${D}${base_datadir}/events.d/dimm1.yaml
+        install -D dimm2.yaml ${D}${base_datadir}/events.d/dimm2.yaml
+        install -D dimm3.yaml ${D}${base_datadir}/events.d/dimm3.yaml
 }
 
-FILES:${PN} += "${base_datadir}/events.d/dimm.yaml"
+FILES:${PN} += "${base_datadir}/events.d/dimm0.yaml"
+FILES:${PN} += "${base_datadir}/events.d/dimm1.yaml"
+FILES:${PN} += "${base_datadir}/events.d/dimm2.yaml"
+FILES:${PN} += "${base_datadir}/events.d/dimm3.yaml"
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-dimm/dimm.yaml b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-dimm/dimm0.yaml
index 6331d50b00..6331d50b00 100644
--- a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-dimm/dimm.yaml
+++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-dimm/dimm0.yaml
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-dimm/dimm1.yaml b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-dimm/dimm1.yaml
new file mode 100644
index 0000000000..8f245821ca
--- /dev/null
+++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-dimm/dimm1.yaml
@@ -0,0 +1,125 @@
+events:
+    - name: Add Dimm interface
+      description: >
+          Add the dimm interface on the cpu inventory path
+      type: startup
+      actions:
+          - name: createObjects
+            objs:
+              /system/chassis/motherboard/dimm1:
+                xyz.openbmc_project.Inventory.Item.Dimm:
+                  MemoryDeviceLocator:
+                    value: "CPU1_DIMM_B1"
+                    type: string
+                  MemoryTypeDetail:
+                    value: "Synchronous, Static column"
+                    type: string
+                    
+          - name: createObjects
+            objs:
+              /system/chassis/motherboard/dimm1:      
+                xyz.openbmc_project.Inventory.Decorator.Asset:        
+                  Manufacturer:
+                    value: "Manufacturer"
+                    type: string       
+                  PartNumber:
+                    value: "PartNumber"
+                    type: string      
+                  SerialNumber:
+                    value: "SerialNumber"
+                    type: string       
+                  BuildDate:
+                    value: "BuildDate"
+                    type: string      
+                  Model:
+                    value: "Model"
+                    type: string       
+                  SubModel:
+                    value: "SubModel"
+                    type: string     
+                  SparePartNumber:
+                    value: "SparePartNumber"
+                    type: string 
+                    
+          - name: createObjects
+            objs:
+              /system/chassis/motherboard/dimm1: 
+                xyz.openbmc_project.Inventory.Decorator.AssetTag:
+                  AssetTag:
+                    value: "AssetTag"
+                    type: string 
+                    
+          - name: setProperty
+            interface: xyz.openbmc_project.Inventory.Item.Dimm
+            property: MemoryDataWidth    
+            paths:
+                - /system/chassis/motherboard/dimm1
+            value:
+              type: uint16
+              value: 256
+              
+          - name: setProperty
+            interface: xyz.openbmc_project.Inventory.Item.Dimm
+            property: MemorySizeInKB    
+            paths:
+                - /system/chassis/motherboard/dimm1
+            value:
+              type: size
+              value: 32000
+              
+          - name: setProperty   
+            interface: xyz.openbmc_project.Inventory.Item.Dimm  
+            property: MaxMemorySpeedInMhz    
+            paths:
+                - /system/chassis/motherboard/dimm1
+            value:
+              type: uint16
+              value: 2600
+              
+          - name: setProperty   
+            interface: xyz.openbmc_project.Inventory.Item.Dimm  
+            property: MemoryConfiguredSpeedInMhz    
+            paths:
+                - /system/chassis/motherboard/dimm1
+            value:
+              type: uint16
+              value: 2600
+
+          - name: setProperty
+            interface: xyz.openbmc_project.Inventory.Item.Dimm  
+            property: CASLatencies    
+            paths:
+                - /system/chassis/motherboard/dimm1
+            value:
+              type: uint16
+              value: 21
+              
+          - name: setProperty   
+            interface: xyz.openbmc_project.Inventory.Item.Dimm  
+            property: RevisionCode    
+            paths:
+                - /system/chassis/motherboard/dimm1
+            value:
+              type: uint16
+              value: 5
+              
+          - name: setProperty   
+            interface: xyz.openbmc_project.Inventory.Item.Dimm  
+            property: MemoryTotalWidth    
+            paths:
+                - /system/chassis/motherboard/dimm1
+            value:
+              type: uint16
+              value: 255
+              
+          - name: setProperty   
+            interface: xyz.openbmc_project.Inventory.Item.Dimm  
+            property: MemoryAttributes    
+            paths:
+                - /system/chassis/motherboard/dimm1
+            value:
+              type: byte
+              value: 0x10
+              
+              
+              
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-dimm/dimm2.yaml b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-dimm/dimm2.yaml
new file mode 100644
index 0000000000..1bf7d867a0
--- /dev/null
+++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-dimm/dimm2.yaml
@@ -0,0 +1,125 @@
+events:
+    - name: Add Dimm interface
+      description: >
+          Add the dimm interface on the cpu inventory path
+      type: startup
+      actions:
+          - name: createObjects
+            objs:
+              /system/chassis/motherboard/dimm2:
+                xyz.openbmc_project.Inventory.Item.Dimm:
+                  MemoryDeviceLocator:
+                    value: "CPU1_DIMM_B1"
+                    type: string
+                  MemoryTypeDetail:
+                    value: "Synchronous, Static column"
+                    type: string
+                    
+          - name: createObjects
+            objs:
+              /system/chassis/motherboard/dimm2:      
+                xyz.openbmc_project.Inventory.Decorator.Asset:        
+                  Manufacturer:
+                    value: "Manufacturer"
+                    type: string       
+                  PartNumber:
+                    value: "PartNumber"
+                    type: string      
+                  SerialNumber:
+                    value: "SerialNumber"
+                    type: string       
+                  BuildDate:
+                    value: "BuildDate"
+                    type: string      
+                  Model:
+                    value: "Model"
+                    type: string       
+                  SubModel:
+                    value: "SubModel"
+                    type: string     
+                  SparePartNumber:
+                    value: "SparePartNumber"
+                    type: string 
+                    
+          - name: createObjects
+            objs:
+              /system/chassis/motherboard/dimm2: 
+                xyz.openbmc_project.Inventory.Decorator.AssetTag:
+                  AssetTag:
+                    value: "AssetTag"
+                    type: string 
+                    
+          - name: setProperty
+            interface: xyz.openbmc_project.Inventory.Item.Dimm
+            property: MemoryDataWidth    
+            paths:
+                - /system/chassis/motherboard/dimm2
+            value:
+              type: uint16
+              value: 256
+              
+          - name: setProperty
+            interface: xyz.openbmc_project.Inventory.Item.Dimm
+            property: MemorySizeInKB    
+            paths:
+                - /system/chassis/motherboard/dimm2
+            value:
+              type: size
+              value: 32000
+              
+          - name: setProperty   
+            interface: xyz.openbmc_project.Inventory.Item.Dimm  
+            property: MaxMemorySpeedInMhz    
+            paths:
+                - /system/chassis/motherboard/dimm2
+            value:
+              type: uint16
+              value: 2600
+              
+          - name: setProperty   
+            interface: xyz.openbmc_project.Inventory.Item.Dimm  
+            property: MemoryConfiguredSpeedInMhz    
+            paths:
+                - /system/chassis/motherboard/dimm2
+            value:
+              type: uint16
+              value: 2600
+
+          - name: setProperty
+            interface: xyz.openbmc_project.Inventory.Item.Dimm  
+            property: CASLatencies    
+            paths:
+                - /system/chassis/motherboard/dimm2
+            value:
+              type: uint16
+              value: 21
+              
+          - name: setProperty   
+            interface: xyz.openbmc_project.Inventory.Item.Dimm  
+            property: RevisionCode    
+            paths:
+                - /system/chassis/motherboard/dimm2
+            value:
+              type: uint16
+              value: 5
+              
+          - name: setProperty   
+            interface: xyz.openbmc_project.Inventory.Item.Dimm  
+            property: MemoryTotalWidth    
+            paths:
+                - /system/chassis/motherboard/dimm2
+            value:
+              type: uint16
+              value: 255
+              
+          - name: setProperty   
+            interface: xyz.openbmc_project.Inventory.Item.Dimm  
+            property: MemoryAttributes    
+            paths:
+                - /system/chassis/motherboard/dimm2
+            value:
+              type: byte
+              value: 0x10
+              
+              
+              
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-dimm/dimm3.yaml b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-dimm/dimm3.yaml
new file mode 100644
index 0000000000..e1dfb1e4d9
--- /dev/null
+++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-dimm/dimm3.yaml
@@ -0,0 +1,125 @@
+events:
+    - name: Add Dimm interface
+      description: >
+          Add the dimm interface on the cpu inventory path
+      type: startup
+      actions:
+          - name: createObjects
+            objs:
+              /system/chassis/motherboard/dimm3:
+                xyz.openbmc_project.Inventory.Item.Dimm:
+                  MemoryDeviceLocator:
+                    value: "CPU1_DIMM_B1"
+                    type: string
+                  MemoryTypeDetail:
+                    value: "Synchronous, Static column"
+                    type: string
+                    
+          - name: createObjects
+            objs:
+              /system/chassis/motherboard/dimm3:      
+                xyz.openbmc_project.Inventory.Decorator.Asset:        
+                  Manufacturer:
+                    value: "Manufacturer"
+                    type: string       
+                  PartNumber:
+                    value: "PartNumber"
+                    type: string      
+                  SerialNumber:
+                    value: "SerialNumber"
+                    type: string       
+                  BuildDate:
+                    value: "BuildDate"
+                    type: string      
+                  Model:
+                    value: "Model"
+                    type: string       
+                  SubModel:
+                    value: "SubModel"
+                    type: string     
+                  SparePartNumber:
+                    value: "SparePartNumber"
+                    type: string 
+                    
+          - name: createObjects
+            objs:
+              /system/chassis/motherboard/dimm3: 
+                xyz.openbmc_project.Inventory.Decorator.AssetTag:
+                  AssetTag:
+                    value: "AssetTag"
+                    type: string 
+                    
+          - name: setProperty
+            interface: xyz.openbmc_project.Inventory.Item.Dimm
+            property: MemoryDataWidth    
+            paths:
+                - /system/chassis/motherboard/dimm3
+            value:
+              type: uint16
+              value: 256
+              
+          - name: setProperty
+            interface: xyz.openbmc_project.Inventory.Item.Dimm
+            property: MemorySizeInKB    
+            paths:
+                - /system/chassis/motherboard/dimm3
+            value:
+              type: size
+              value: 32000
+              
+          - name: setProperty   
+            interface: xyz.openbmc_project.Inventory.Item.Dimm  
+            property: MaxMemorySpeedInMhz    
+            paths:
+                - /system/chassis/motherboard/dimm3
+            value:
+              type: uint16
+              value: 2600
+              
+          - name: setProperty   
+            interface: xyz.openbmc_project.Inventory.Item.Dimm  
+            property: MemoryConfiguredSpeedInMhz    
+            paths:
+                - /system/chassis/motherboard/dimm3
+            value:
+              type: uint16
+              value: 2600
+
+          - name: setProperty
+            interface: xyz.openbmc_project.Inventory.Item.Dimm  
+            property: CASLatencies    
+            paths:
+                - /system/chassis/motherboard/dimm3
+            value:
+              type: uint16
+              value: 21
+              
+          - name: setProperty   
+            interface: xyz.openbmc_project.Inventory.Item.Dimm  
+            property: RevisionCode    
+            paths:
+                - /system/chassis/motherboard/dimm3
+            value:
+              type: uint16
+              value: 5
+              
+          - name: setProperty   
+            interface: xyz.openbmc_project.Inventory.Item.Dimm  
+            property: MemoryTotalWidth    
+            paths:
+                - /system/chassis/motherboard/dimm3
+            value:
+              type: uint16
+              value: 255
+              
+          - name: setProperty   
+            interface: xyz.openbmc_project.Inventory.Item.Dimm  
+            property: MemoryAttributes    
+            paths:
+                - /system/chassis/motherboard/dimm3
+            value:
+              type: byte
+              value: 0x10
+              
+              
+