Update to internal 7-31-19

Signed-off-by: Ed Tanous <ed.tanous@intel.com>

4 files changed, 212 insertions, 111 deletions

diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/CYP-baseboard.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/CYP-baseboard.json
index 2bbaa0238..42e313568 100644..100755
--- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/CYP-baseboard.json
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/CYP-baseboard.json
@@ -224,6 +224,12 @@
             "Type": "ADC"
         },
         {
+            "BridgeGpio": [
+                {
+                    "Name": "P3VBAT_BRIDGE_EN",
+                    "Polarity": "High"
+                }
+            ],
             "Index": 7,
             "Name": "P3VBAT",
             "ScaleFactor": 0.3333,
@@ -661,20 +667,6 @@
         },
         {
             "Direction": "Input",
-            "Index": 48,
-            "Name": "Cpu Err2",
-            "Polarity": "Low",
-            "Type": "Gpio"
-        },
-        {
-            "Direction": "Input",
-            "Index": 49,
-            "Name": "Cpu Caterr",
-            "Polarity": "Low",
-            "Type": "Gpio"
-        },
-        {
-            "Direction": "Input",
             "Index": 50,
             "Name": "PCH Thermaltrip",
             "Polarity": "Low",
@@ -1150,6 +1142,90 @@
             "Type": "Gpio"
         },
         {
+            "Address": "0x71",
+            "Bus": 2,
+            "ChannelNames": [
+                "M2_Slot1",
+                "M2_Slot2",
+                "",
+                ""
+            ],
+            "Name": "M.2 Mux",
+            "Type": "PCA9543Mux"
+        },
+        {
+            "Address": "0x70",
+            "Bus": 4,
+            "ChannelNames": [
+                "U2_Slot1",
+                "U2_Slot2",
+                "U2_Slot3",
+                "U2_Slot4"
+            ],
+            "Name": "HSBP 1 Mux",
+            "Type": "PCA9546Mux"
+        },
+        {
+            "Address": "0x74",
+            "Bus": 4,
+            "ChannelNames": [
+                "U2_Slot5",
+                "U2_Slot6",
+                "U2_Slot7",
+                "U2_Slot8"
+            ],
+            "Name": "HSBP 1 Mux2",
+            "Type": "PCA9546Mux"
+        },
+        {
+            "Address": "0x77",
+            "Bus": 4,
+            "ChannelNames": [
+                "U2_Slot1",
+                "U2_Slot2",
+                "U2_Slot3",
+                "U2_Slot4"
+            ],
+            "Name": "HSBP 2 Mux",
+            "Type": "PCA9546Mux"
+        },
+        {
+            "Address": "0x73",
+            "Bus": 4,
+            "ChannelNames": [
+                "U2_Slot5",
+                "U2_Slot6",
+                "U2_Slot7",
+                "U2_Slot8"
+            ],
+            "Name": "HSBP 2 Mux2",
+            "Type": "PCA9546Mux"
+        },
+        {
+            "Address": "0x76",
+            "Bus": 4,
+            "ChannelNames": [
+                "U2_Slot1",
+                "U2_Slot2",
+                "U2_Slot3",
+                "U2_Slot4"
+            ],
+            "Name": "HSBP 3 Mux",
+            "Type": "PCA9546Mux"
+        },
+        {
+            "Address": "0x72",
+            "Bus": 4,
+            "ChannelNames": [
+                "U2_Slot5",
+                "U2_Slot6",
+                "U2_Slot7",
+                "U2_Slot8"
+            ],
+            "Name": "HSBP 3 Mux2",
+            "Type": "PCA9546Mux"
+        },
+        {
             "Address": "0x4D",
             "Bus": 6,
             "Name": "CPU0 VR Temp",
@@ -1343,13 +1419,17 @@
         }
     ],
     "Name": "CYP Baseboard",
-    "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*CYP'})",
-    "Type": "Board",
+    "Probe": [
+        "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'M50CYP2SB2U'})",
+        "OR",
+        "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*CYP'})"
+    ],
     "ProductId": 152,
+    "Type": "Board",
     "xyz.openbmc_project.Inventory.Decorator.Asset": {
         "Manufacturer": "$PRODUCT_MANUFACTURER",
         "Model": "$PRODUCT_PRODUCT_NAME",
         "PartNumber": "$PRODUCT_PART_NUMBER",
         "SerialNumber": "$PRODUCT_SERIAL_NUMBER"
     }
-}
+}
\ No newline at end of file
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/TNP-baseboard.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/TNP-baseboard.json
index 39e101e77..235e7965a 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/TNP-baseboard.json
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/TNP-baseboard.json
@@ -193,6 +193,12 @@
             "Type": "ADC"
         },
         {
+            "BridgeGpio": [
+                {
+                    "Name": "P3VBAT_BRIDGE_EN",
+                    "Polarity": "High"
+                }
+            ],
             "Index": 7,
             "Name": "P3VBAT",
             "ScaleFactor": 0.3333,
@@ -558,33 +564,12 @@
         },
         {
             "Direction": "Input",
-            "Index": 49,
-            "Name": "Cpu Caterr",
-            "Polarity": "Low",
-            "Type": "Gpio"
-        },
-        {
-            "Direction": "Input",
-            "Index": 48,
-            "Name": "Cpu Err2",
-            "Polarity": "Low",
-            "Type": "Gpio"
-        },
-        {
-            "Direction": "Input",
             "Index": 63,
             "Name": "PU 240VA Status",
             "Polarity": "Low",
             "Type": "Gpio"
         },
         {
-            "Direction": "Out",
-            "Index": 208,
-            "Name": "P3v3bat BridgeEn",
-            "Polarity": "High",
-            "Type": "Gpio"
-        },
-        {
             "Direction": "Input",
             "Index": 214,
             "Name": "Nmi Button",
@@ -1687,6 +1672,39 @@
             "Type": "IpmbSensor"
         },
         {
+            "Address": "0x20",
+            "Bus": 10,
+            "Class": "NodePower",
+            "Name": "Node Power",
+            "Thresholds": [
+                {
+                    "Direction": "greater than",
+                    "Name": "upper critical",
+                    "Severity": 1,
+                    "Value": 255
+                },
+                {
+                    "Direction": "greater than",
+                    "Name": "upper non critical",
+                    "Severity": 0,
+                    "Value": 250
+                },
+                {
+                    "Direction": "less than",
+                    "Name": "lower non critical",
+                    "Severity": 0,
+                    "Value": 5
+                },
+                {
+                    "Direction": "less than",
+                    "Name": "lower critical",
+                    "Severity": 1,
+                    "Value": 0
+                }
+            ],
+            "Type": "MP5920"
+        },
+        {
             "GpioPins": [
                 27,
                 26
@@ -1818,7 +1836,11 @@
         }
     ],
     "Name": "TNP Baseboard",
-    "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*TNP'})",
+    "Probe": [
+        "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'D50TNP1SB'})",
+        "OR",
+        "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*TNP'})"
+    ],
     "ProductId": 153,
     "Type": "Board",
     "xyz.openbmc_project.Inventory.Decorator.Asset": {
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json
index ce98132d6..9431c30a6 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json
@@ -162,7 +162,12 @@
             "Type": "ADC"
         },
         {
-            "BridgeGpio": 208,
+            "BridgeGpio": [
+                {
+                    "Name": "P3VBAT_BRIDGE_EN",
+                    "Polarity": "High"
+                }
+            ],
             "Index": 7,
             "Name": "P3VBAT",
             "ScaleFactor": 0.3333,
@@ -656,13 +661,6 @@
             "Type": "FanRedundancy"
         },
         {
-            "Direction": "Out",
-            "Index": 208,
-            "Name": "Bridge P3VBAT",
-            "Polarity": "Low",
-            "Type": "Gpio"
-        },
-        {
             "Direction": "Input",
             "Index": 40,
             "Name": "NMI Input",
@@ -671,20 +669,6 @@
         },
         {
             "Direction": "Input",
-            "Index": 48,
-            "Name": "CPU ERR2",
-            "Polarity": "High",
-            "Type": "Gpio"
-        },
-        {
-            "Direction": "Input",
-            "Index": 49,
-            "Name": "CPU CATERR",
-            "Polarity": "High",
-            "Type": "Gpio"
-        },
-        {
-            "Direction": "Input",
             "Index": 214,
             "Name": "SMI Input",
             "Polarity": "High",
@@ -1197,7 +1181,7 @@
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 65.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -1439,7 +1423,7 @@
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 80.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -1464,7 +1448,7 @@
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 80.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -1490,7 +1474,7 @@
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 80.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -1515,7 +1499,7 @@
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 80.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -1541,7 +1525,7 @@
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 80.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -1567,7 +1551,7 @@
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 80.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -1592,7 +1576,7 @@
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 80.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -1669,7 +1653,7 @@
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 75.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -1686,16 +1670,18 @@
             "ILimitMax": 100,
             "ILimitMin": 30,
             "Inputs": [
-                "VR 1 Temp"
+                "CPU1 VR Mem ABCD Temp",
+                "CPU1 VR Mem ABCD Temp",
+                "CPU1 VR P1V8"
             ],
-            "Name": "VR 1 Temp",
+            "Name": "CPU 1 VR Temp",
             "NegativeHysteresis": 5.0,
             "OutLimitMax": 100,
             "OutLimitMin": 30,
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 85.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -1711,16 +1697,18 @@
             "ILimitMax": 100,
             "ILimitMin": 30,
             "Inputs": [
-                "VR 2 Temp"
+                "CPU2 VR Mem ABCD Temp",
+                "CPU2 VR Mem ABCD Temp",
+                "CPU2 VR P1V8"
             ],
-            "Name": "VR 2 Temp",
+            "Name": "CPU 2 VR Temp",
             "NegativeHysteresis": 5.0,
             "OutLimitMax": 100,
             "OutLimitMin": 30,
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 85.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -2036,7 +2024,11 @@
         }
     ],
     "Name": "WC Baseboard",
-    "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*WC'})",
+    "Probe": [
+        "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'WilsonCity'})",
+        "OR",
+        "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*WC'})"
+    ],
     "ProductId": 145,
     "Type": "Board",
     "xyz.openbmc_project.Inventory.Decorator.Asset": {
@@ -2044,5 +2036,9 @@
         "Model": "$PRODUCT_PRODUCT_NAME",
         "PartNumber": "$PRODUCT_PART_NUMBER",
         "SerialNumber": "$PRODUCT_SERIAL_NUMBER"
-    }
+    },
+    "xyz.openbmc_project.Inventory.Decorator.AssetTag": {
+        "AssetTag": "$PRODUCT_ASSET_TAG"
+    },
+    "xyz.openbmc_project.Inventory.Item.System": {}
 }
\ No newline at end of file
diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json
index 923924a0b..7da6fe261 100644
--- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json
+++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json
@@ -162,7 +162,12 @@
             "Type": "ADC"
         },
         {
-            "BridgeGpio": 208,
+            "BridgeGpio": [
+                {
+                    "Name": "P3VBAT_BRIDGE_EN",
+                    "Polarity": "High"
+                }
+            ],
             "Index": 7,
             "Name": "P3VBAT",
             "ScaleFactor": 0.3333,
@@ -656,20 +661,6 @@
             "Type": "FanRedundancy"
         },
         {
-            "Direction": "Out",
-            "Index": 208,
-            "Name": "Bridge P3VBAT",
-            "Polarity": "Low",
-            "Type": "Gpio"
-        },
-        {
-            "Direction": "Input",
-            "Index": 49,
-            "Name": "CPU CATERR",
-            "Polarity": "High",
-            "Type": "Gpio"
-        },
-        {
             "Direction": "Input",
             "Index": 214,
             "Name": "SMI Input",
@@ -1183,7 +1174,7 @@
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 65.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -1425,7 +1416,7 @@
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 80.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -1450,7 +1441,7 @@
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 80.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -1476,7 +1467,7 @@
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 80.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -1501,7 +1492,7 @@
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 80.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -1527,7 +1518,7 @@
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 80.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -1553,7 +1544,7 @@
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 80.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -1578,7 +1569,7 @@
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 80.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -1655,7 +1646,7 @@
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 75.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -1672,16 +1663,18 @@
             "ILimitMax": 100,
             "ILimitMin": 30,
             "Inputs": [
-                "VR 1 Temp"
+                "CPU1 VR Mem ABCD Temp",
+                "CPU1 VR Mem ABCD Temp",
+                "CPU1 VR P1V8"
             ],
-            "Name": "VR 1 Temp",
+            "Name": "CPU 1 VR Temp",
             "NegativeHysteresis": 5.0,
             "OutLimitMax": 100,
             "OutLimitMin": 30,
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 85.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -1697,16 +1690,18 @@
             "ILimitMax": 100,
             "ILimitMin": 30,
             "Inputs": [
-                "VR 2 Temp"
+                "CPU2 VR Mem ABCD Temp",
+                "CPU2 VR Mem ABCD Temp",
+                "CPU2 VR P1V8"
             ],
-            "Name": "VR 2 Temp",
+            "Name": "CPU 2 VR Temp",
             "NegativeHysteresis": 5.0,
             "OutLimitMax": 100,
             "OutLimitMin": 30,
             "Outputs": [],
             "PCoefficient": -0.15,
             "PositiveHysteresis": 0.0,
-            "SetPoint": 60.0,
+            "SetPoint": 85.0,
             "SlewNeg": -1,
             "SlewPos": 0.0,
             "Type": "Pid",
@@ -2022,7 +2017,11 @@
         }
     ],
     "Name": "WP Baseboard",
-    "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*WP'})",
+    "Probe": [
+        "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'WilsonPoint'})",
+        "OR",
+        "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*WP'})"
+    ],
     "ProductId": 154,
     "Type": "Board",
     "xyz.openbmc_project.Inventory.Decorator.Asset": {
@@ -2030,5 +2029,9 @@
         "Model": "$PRODUCT_PRODUCT_NAME",
         "PartNumber": "$PRODUCT_PART_NUMBER",
         "SerialNumber": "$PRODUCT_SERIAL_NUMBER"
-    }
-}
+    },
+    "xyz.openbmc_project.Inventory.Decorator.AssetTag": {
+        "AssetTag": "$PRODUCT_ASSET_TAG"
+    },
+    "xyz.openbmc_project.Inventory.Item.System": {}
+}
\ No newline at end of file