P11 JSON:Refactored Rainier 1S4U system JSON #465

souvik1914581 · 2024-11-08T14:46:00Z

This commit has rainier 1S4U system JSON refactored with the following changes:

Add devTree tag.
Add backupRestoreConfigPath tag.
Add serviceName in every parent FRU and sub FRU section.
Updated inventoryPath tag with complete path.
Removed unused tag "gpioI2CAddress"
Removed busType, driverType as we have systemCmd tag which has command to bind.
Added Slot interface to all NVMe drives
Modified preAction and PostFailAction sections as per P11 code and added postAction if required for following FRUs:
1. Control panel display
2. PCIe4 x16 or PCIe5 x8 adapter
3. OpenCAPI adapter
4. PCIe5 x8 adapter (pcie_card7)
5. PCIe5 x8 adapter (pcie_card9)
6. PCIe5 x8 adapter (pcie_card11)
7. PCIe4 x8 adapter
Added systemCmd bind preAction section for DIMMs 0-7

TODO:

Add postAction section wherever required.
GPIO presence preAction section for DIMMs has not been added as presence-cpx GPIO lines are not defined in Rainier .dts file (https://github.com/openbmc/linux/blob/dev-6.6/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-rainier.dts)

Test:

This JSON file has not been tested yet due to unavailability of Rainier
1S4U system.

Change-Id: Id25da9126e97a33a902eecfb1291f2cf17cec712

This commit has rainier 1S4U system JSON refactored with the following changes: 1. Add devTree tag. 2. Add backupRestoreConfigPath tag. 3. Add serviceName in every parent FRU and sub FRU section. 4. Updated inventoryPath tag with complete path. 5. Removed unused tag "gpioI2CAddress" 6. Removed busType, driverType as we have systemCmd tag which has command to bind. 7. Modified preAction and PostFailAction sections as per P11 code and added postAction if required for following FRUs: 1. Control panel display 2. PCIe4 x16 or PCIe5 x8 adapter 3. OpenCAPI adapter 4. PCIe5 x8 adapter (pcie_card7) 5. PCIe5 x8 adapter (pcie_card9) 6. PCIe5 x8 adapter (pcie_card11) 7. PCIe4 x8 adapter TODO: 8. Added postAction section wherever required. 9. Added preAction section for dimm Test: This JSON file has not been tested yet due to unavailability of Rainier 1S4U system. Change-Id: Id25da9126e97a33a902eecfb1291f2cf17cec712 Signed-off-by: Souvik Roy <[email protected]>

This commit has rainier 1S4U system JSON refactored with the following changes: 1. Add devTree tag. 2. Add backupRestoreConfigPath tag. 3. Add serviceName in every parent FRU and sub FRU section. 4. Updated inventoryPath tag with complete path. 5. Removed unused tag "gpioI2CAddress" 6. Removed busType, driverType as we have systemCmd tag which has command to bind. 7. Added Slot interface to all NVMe drives 8. Modified preAction and PostFailAction sections as per P11 code and added postAction if required for following FRUs: 1. Control panel display 2. PCIe4 x16 or PCIe5 x8 adapter 3. OpenCAPI adapter 4. PCIe5 x8 adapter (pcie_card7) 5. PCIe5 x8 adapter (pcie_card9) 6. PCIe5 x8 adapter (pcie_card11) 7. PCIe4 x8 adapter TODO: 8. Added postAction section wherever required. 9. Added preAction section for dimm Test: This JSON file has not been tested yet due to unavailability of Rainier 1S4U system. Change-Id: Id25da9126e97a33a902eecfb1291f2cf17cec712 Signed-off-by: Souvik Roy <[email protected]>

This commit has rainier 1S4U system JSON refactored with the following changes: 1. Add devTree tag. 2. Add backupRestoreConfigPath tag. 3. Add serviceName in every parent FRU and sub FRU section. 4. Updated inventoryPath tag with complete path. 5. Removed unused tag "gpioI2CAddress" 6. Removed busType, driverType as we have systemCmd tag which has command to bind. 7. Added Slot interface to all NVMe drives 8. Modified preAction and PostFailAction sections as per P11 code and added postAction if required for following FRUs: 1. Control panel display 2. PCIe4 x16 or PCIe5 x8 adapter 3. OpenCAPI adapter 4. PCIe5 x8 adapter (pcie_card7) 5. PCIe5 x8 adapter (pcie_card9) 6. PCIe5 x8 adapter (pcie_card11) 7. PCIe4 x8 adapter 9. Added systemCmd bind preAction section for dimms 0-7 TODO: 8. Added postAction section wherever required. 9. Add GPIO presence preAction section for dimms. Test: This JSON file has not been tested yet due to unavailability of Rainier 1S4U system. Change-Id: Id25da9126e97a33a902eecfb1291f2cf17cec712 Signed-off-by: Souvik Roy <[email protected]>

This commit has rainier 1S4U system JSON refactored with the following changes: 1. Add devTree tag. 2. Add backupRestoreConfigPath tag. 3. Add serviceName in every parent FRU and sub FRU section. 4. Updated inventoryPath tag with complete path. 5. Removed unused tag "gpioI2CAddress" 6. Removed busType, driverType as we have systemCmd tag which has command to bind. 7. Added Slot interface to all NVMe drives 8. Modified preAction and PostFailAction sections as per P11 code and added postAction if required for following FRUs: 1. Control panel display 2. PCIe4 x16 or PCIe5 x8 adapter 3. OpenCAPI adapter 4. PCIe5 x8 adapter (pcie_card7) 5. PCIe5 x8 adapter (pcie_card9) 6. PCIe5 x8 adapter (pcie_card11) 7. PCIe4 x8 adapter 9. Added systemCmd bind preAction section for dimms 0-7 TODO: 10. GPIO presence preAction for DIMMs has not been added as "presence-cpx" GPIO lines are not defined in Rainier .dts file. Test: This JSON file has not been tested yet due to unavailability of Rainier 1S4U system. Change-Id: Id25da9126e97a33a902eecfb1291f2cf17cec712 Signed-off-by: Souvik Roy <[email protected]>

PriyangaRamasamy

Missing presence gpio info for frus like cpu, vrm, tpm, etc.. please check

PriyangaRamasamy · 2024-11-11T06:22:00Z

configuration/ibm/5001002.json

@@ -0,0 +1,3232 @@
+{


name of the JSON should be 50001002.json. Please rename.

PriyangaRamasamy · 2024-11-11T06:22:25Z

configuration/ibm/5001002.json

@@ -0,0 +1,3232 @@
+{
+    "devTree": "conf-aspeed-bmc-ibm-rainier-1s4u.dtb",
+    "backupRestoreConfigPath": "/usr/share/vpd/backup_restore_5001002.json",


Please rename to : /usr/share/vpd/backup_restore_50001002.json"

PriyangaRamasamy · 2024-11-11T07:23:33Z

configuration/ibm/50001002.json

+                        }
+                    }
+                },
+                "postAction": {


Post action is required to bind led driver of Bear river/Bear lake cable card. This slot at location C11 , supports JBOF card only. which doesn't have LED driver to bind. so post action is not required here.

P0-C11 slot supports "NVMe JBOF" and "Cable Card" ?

Also, master branch JSON

openpower-vpd-parser/config/ibm/50001002.json

Line 1409 in e0e1549

"pcaChipAddress": "30-0061",

has pcaChipAddress defined?

PriyangaRamasamy · 2024-11-11T07:24:08Z

configuration/ibm/50001002.json

+                        }
+                    }
+                },
+                "postAction": {


This slot @ C8 also supports JBOF card only. so postAction not required.

P0-C8 slot supports "NVMe JBOF" and "OpenCAPI"?
Also, master branch JSON

openpower-vpd-parser/config/ibm/50001002.json

Line 1516 in e0e1549

"pcaChipAddress": "28-0061",

has pcaChipAddress defined?

don't go with pcaChipAddress from older JSON. As per workbook, C8 supports either NVMe JBOF card or open capi and not cable card.

PriyangaRamasamy · 2024-11-11T07:25:38Z

configuration/ibm/50001002.json

+                "serviceName": "xyz.openbmc_project.Inventory.Manager",
+                "inherit": false,
+                "embedded": false,
+                "devAddress": "13-0050",


you can remove devAddress wherever present.

PriyangaRamasamy · 2024-11-11T07:34:11Z

configuration/ibm/50001002.json

+        "/sys/bus/i2c/drivers/at24/111-0050/eeprom": [
+            {
+                "inventoryPath": "/xyz/openbmc_project/inventory/system/chassis/motherboard/dimm0",
+                "serviceName": "xyz.openbmc_project.Inventory.Manager",


powerOffOnly = true is missing for DDIMMs. please add

This commit has rainier 1S4U system JSON refactored with the following changes: 1. Add devTree tag. 2. Add backupRestoreConfigPath tag. 3. Add serviceName in every parent FRU and sub FRU section. 4. Updated inventoryPath tag with complete path. 5. Removed unused tag "gpioI2CAddress" 6. Removed busType, driverType as we have systemCmd tag which has command to bind. 7. Added Slot interface to all NVMe drives 8. Modified preAction and PostFailAction sections as per P11 code and added postAction if required for following FRUs: 1. Control panel display 2. PCIe4 x16 or PCIe5 x8 adapter 3. OpenCAPI adapter 4. PCIe5 x8 adapter (pcie_card7) 5. PCIe5 x8 adapter (pcie_card9) 6. PCIe5 x8 adapter (pcie_card11) 7. PCIe4 x8 adapter 9. Added systemCmd bind preAction section for dimms 0-7 TODO: 10. GPIO presence preAction for DIMMs has not been added as "presence-cpx" GPIO lines are not defined in Rainier .dts file. Test: This JSON file has not been tested yet due to unavailability of Rainier 1S4U system. Change-Id: Id25da9126e97a33a902eecfb1291f2cf17cec712 Signed-off-by: Souvik Roy <[email protected]>

souvik1914581 · 2024-11-11T10:05:41Z

Missing presence gpio info for frus like cpu, vrm, tpm, etc.. please check

The workbook specifies presence GPIO lines for CPU and VRM, but the same are not there in the .dts file : https://github.com/openbmc/linux/blob/dev-6.6/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-rainier.dts

jinuthomas · 2024-11-13T06:38:39Z

configuration/ibm/50001002.json

+                            "value": 1
+                        },
+                        "systemCmd": {
+                            "cmd": "echo 25-0053 > /sys/bus/i2c/drivers/at24/bind"


where did you get this value from ?

50001002.json in the master branch had a devAddress tag which was used to bind the driver.
We no longer use devAddress tag in the P11_Dev JSONs and instead hard code the address in the cmd

openpower-vpd-parser/config/ibm/50001002.json

Line 1290 in e0e1549

"devAddress": "25-0053",

Workbook says "No card currently exists" for PCIe C6, also there is no "green box" for VPD line for C6. Should we ignore Slot C6 then?

As for the address calculation, I will take the example of PCIe C7,
as per Workbook, C6, C7, C9 and C8 are on I2C7 of AST2600.

Looking at the .dts file, we need to look at &i2c6 on the .dts , since BMC FW starts at I2C0
https://github.com/openbmc/linux/blob/5f8b7d4b2e9604d03ae06f1a2dd5a1f34c33e533/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-rainier.dts#L510

.dts tells us i2c6 has 3 TI TMP275 temperature sensors and a NXP PCA9546 (4-channel I2C-bus switch with reset)

From workbook, "VPD Green box", C7 VPD EEPROM is on A4 A4 >> 1 = 0x52 (Right shift because BMC FW uses 7 bit addressing)

If we look for 0x52 under i2c6 in the .dts, C7 is on i2c6mux0chn1 whose register address is 0x4D
0x4D >> 1 = 0x26

So for accessing C7's EEPROM via Linux user space, we need to bind the device at 26-0052 to the at24 driver, so we are doing echo 26-0052 > /sys/bus/i2c/drivers/at24/bind

souvik1914581 force-pushed the sr_rainier1S4UJson branch from bca5fad to 857830c Compare November 8, 2024 14:47

souvik1914581 force-pushed the sr_rainier1S4UJson branch from 857830c to 4c5d8c2 Compare November 8, 2024 14:49

souvik1914581 requested a review from PriyangaRamasamy November 8, 2024 14:49

souvik1914581 force-pushed the sr_rainier1S4UJson branch from 4c5d8c2 to db5db8a Compare November 9, 2024 05:30

souvik1914581 force-pushed the sr_rainier1S4UJson branch from db5db8a to 96afe04 Compare November 9, 2024 12:43

souvik1914581 force-pushed the sr_rainier1S4UJson branch 2 times, most recently from a58604e to ce945d5 Compare November 9, 2024 14:44

souvik1914581 force-pushed the sr_rainier1S4UJson branch from ce945d5 to 8bf1f1e Compare November 9, 2024 16:14

souvik1914581 force-pushed the sr_rainier1S4UJson branch from 8bf1f1e to 763962f Compare November 9, 2024 16:23

souvik1914581 force-pushed the sr_rainier1S4UJson branch from 763962f to af0c906 Compare November 9, 2024 16:26

souvik1914581 requested review from jinuthomas, SunnySrivastava1984, RekhaAparna01 and branupama November 9, 2024 16:26

souvik1914581 force-pushed the sr_rainier1S4UJson branch from af0c906 to b854718 Compare November 11, 2024 07:09

PriyangaRamasamy suggested changes Nov 11, 2024

View reviewed changes

souvik1914581 force-pushed the sr_rainier1S4UJson branch from b854718 to 3d60601 Compare November 11, 2024 09:40

souvik1914581 force-pushed the sr_rainier1S4UJson branch from 3d60601 to bd7ebf4 Compare November 11, 2024 09:44

souvik1914581 force-pushed the sr_rainier1S4UJson branch from bd7ebf4 to d8c1570 Compare November 11, 2024 09:46

PriyangaRamasamy self-requested a review November 11, 2024 10:39

PriyangaRamasamy approved these changes Nov 11, 2024

View reviewed changes

jinuthomas requested changes Nov 13, 2024

View reviewed changes

souvik1914581 requested a review from jinuthomas November 13, 2024 07:36

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

P11 JSON:Refactored Rainier 1S4U system JSON #465

P11 JSON:Refactored Rainier 1S4U system JSON #465

souvik1914581 commented Nov 8, 2024 •

edited

Loading

PriyangaRamasamy left a comment

PriyangaRamasamy Nov 11, 2024

souvik1914581 Nov 11, 2024

PriyangaRamasamy Nov 11, 2024

souvik1914581 Nov 11, 2024

PriyangaRamasamy Nov 11, 2024

souvik1914581 Nov 11, 2024 •

edited

Loading

PriyangaRamasamy Nov 11, 2024

souvik1914581 Nov 11, 2024 •

edited

Loading

PriyangaRamasamy Nov 11, 2024

PriyangaRamasamy Nov 11, 2024

souvik1914581 Nov 11, 2024

PriyangaRamasamy Nov 11, 2024

souvik1914581 Nov 11, 2024

souvik1914581 commented Nov 11, 2024 •

edited

Loading

jinuthomas Nov 13, 2024

souvik1914581 Nov 13, 2024

souvik1914581 Nov 13, 2024 •

edited

Loading

P11 JSON:Refactored Rainier 1S4U system JSON #465

Are you sure you want to change the base?

P11 JSON:Refactored Rainier 1S4U system JSON #465

Conversation

souvik1914581 commented Nov 8, 2024 • edited Loading

PriyangaRamasamy left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

souvik1914581 Nov 11, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

souvik1914581 Nov 11, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

souvik1914581 commented Nov 11, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

souvik1914581 Nov 13, 2024 • edited Loading

Choose a reason for hiding this comment

souvik1914581 commented Nov 8, 2024 •

edited

Loading

souvik1914581 Nov 11, 2024 •

edited

Loading

souvik1914581 Nov 11, 2024 •

edited

Loading

souvik1914581 commented Nov 11, 2024 •

edited

Loading

souvik1914581 Nov 13, 2024 •

edited

Loading