control:Bonnell: Remove hot PCIe cards
It turns out that Bonnell doesn't have any 'hot' pcie cards, so the
floor can just be based on ambient and altitude.
This commit removes the cards from pcie_cards.json and removes any PCIe
floor index values from the mapped_floor action in events.json. It
still leaves the infrastructure to keep things more common with the
other IBM systems, and to make it easier to add in a card if/when a hot
one comes into plan.
There is also a code update needed to allow an empty pcie_cards.json
file.
Tested:
Floors are set appropriately based on the altitude and ambient.
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: I10e6904602c7abf61121f7c610059f164405b758
diff --git a/control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Bonnell/events.json b/control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Bonnell/events.json
index 0b0952e..8d1444a 100644
--- a/control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Bonnell/events.json
+++ b/control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Bonnell/events.json
@@ -782,13 +782,7 @@
"floors": [
{
"parameter": "pcie_floor_index",
- "floors": [
- { "value": 1, "floor": 5130 },
- { "value": 2, "floor": 6130 },
- { "value": 3, "floor": 7130 },
- { "value": 4, "floor": 8130 },
- { "value": 5, "floor": 9130 }
- ]
+ "floors": []
}
]
},
@@ -800,13 +794,7 @@
"floors": [
{
"parameter": "pcie_floor_index",
- "floors": [
- { "value": 1, "floor": 5810 },
- { "value": 2, "floor": 6810 },
- { "value": 3, "floor": 7810 },
- { "value": 4, "floor": 8810 },
- { "value": 5, "floor": 9810 }
- ]
+ "floors": []
}
]
},
@@ -818,13 +806,7 @@
"floors": [
{
"parameter": "pcie_floor_index",
- "floors": [
- { "value": 1, "floor": 6930 },
- { "value": 2, "floor": 7930 },
- { "value": 3, "floor": 8930 },
- { "value": 4, "floor": 9930 },
- { "value": 5, "floor": 10930 }
- ]
+ "floors": []
}
]
},
@@ -836,13 +818,7 @@
"floors": [
{
"parameter": "pcie_floor_index",
- "floors": [
- { "value": 1, "floor": 8940 },
- { "value": 2, "floor": 9940 },
- { "value": 3, "floor": 10940 },
- { "value": 4, "floor": 11940 },
- { "value": 5, "floor": 12940 }
- ]
+ "floors": []
}
]
},
@@ -854,13 +830,7 @@
"floors": [
{
"parameter": "pcie_floor_index",
- "floors": [
- { "value": 1, "floor": 11670 },
- { "value": 2, "floor": 12670 },
- { "value": 3, "floor": 13670 },
- { "value": 4, "floor": 14670 },
- { "value": 5, "floor": 15670 }
- ]
+ "floors": []
}
]
}
diff --git a/control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Bonnell/pcie_cards.json b/control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Bonnell/pcie_cards.json
index 0b881c8..fbc7777 100644
--- a/control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Bonnell/pcie_cards.json
+++ b/control/config_files/p10bmc/com.ibm.Hardware.Chassis.Model.Bonnell/pcie_cards.json
@@ -1,84 +1,3 @@
{
- "cards": [
- {
- "name": "PHYP had errors getting IDs",
- "vendor_id": "0xFFFF",
- "device_id": "0xFFFF",
- "subsystem_vendor_id": "0xFFFF",
- "subsystem_id": "0xFFFF",
- "floor_index": 5
- },
- {
- "name": "Manatee LP",
- "vendor_id": "0x15B3",
- "device_id": "0x101F",
- "subsystem_vendor_id": "0x1014",
- "subsystem_id": "0x06AA",
- "floor_index": 1
- },
- {
- "name": "Manatee - Crypto LP",
- "vendor_id": "0x15B3",
- "device_id": "0x101F",
- "subsystem_vendor_id": "0x1014",
- "subsystem_id": "0x06AB",
- "floor_index": 1
- },
- {
- "name": "Mayo - LP",
- "vendor_id": "0x14E4",
- "device_id": "0x1657",
- "subsystem_vendor_id": "0x1014",
- "subsystem_id": "0x0719",
- "floor_index": 1
- },
- {
- "name": "Shasta - LP",
- "vendor_id": "0x8086",
- "device_id": "0x15FF",
- "subsystem_vendor_id": "0x1014",
- "subsystem_id": "0x0002/0x0000",
- "floor_index": 1
- },
- {
- "name": "Austin - LP",
- "vendor_id": "0x14E4",
- "device_id": "0x1657",
- "subsystem_vendor_id": "0x1014",
- "subsystem_id": "0x0420",
- "floor_index": 1
- },
- {
- "name": "Flavafish - LP",
- "vendor_id": "0x1077",
- "device_id": "0x2281",
- "subsystem_vendor_id": "0x1014",
- "subsystem_id": "0x0651",
- "floor_index": 1
- },
- {
- "name": "BlueFin2 - LP",
- "vendor_id": "0x10DF",
- "device_id": "0xE300",
- "subsystem_vendor_id": "0x1014",
- "subsystem_id": "0x06A0",
- "floor_index": 1
- },
- {
- "name": "Redfish - LP",
- "vendor_id": "0x10DF",
- "device_id": "0xE300",
- "subsystem_vendor_id": "0x1014",
- "subsystem_id": "0x0615",
- "floor_index": 1
- },
- {
- "name": "Pinto - LP",
- "vendor_id": "0x11F8",
- "device_id": "0x8072",
- "subsystem_vendor_id": "0x1014",
- "subsystem_id": "0x06F0",
- "floor_index": 1
- }
- ]
+ "cards": []
}