From 61f1ca1b31a9a1108e9e7f71e47fdc19beb0490b Mon Sep 17 00:00:00 2001
From: "Jason M. Bills" <jason.m.bills@linux.intel.com>
Date: Wed, 3 Nov 2021 14:40:53 -0700
Subject: Update to internal 0.77

Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
---
 ...-FRU-address-and-add-MUX-mode-configurati.patch | 96 ++++++++++++++++++++++
 .../configuration/entity-manager_%.bbappend        |  3 +-
 2 files changed, 98 insertions(+), 1 deletion(-)
 create mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0006-Change-HSBP-FRU-address-and-add-MUX-mode-configurati.patch

(limited to 'meta-openbmc-mods/meta-common/recipes-phosphor/configuration')

diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0006-Change-HSBP-FRU-address-and-add-MUX-mode-configurati.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0006-Change-HSBP-FRU-address-and-add-MUX-mode-configurati.patch
new file mode 100644
index 000000000..a3d065fd9
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0006-Change-HSBP-FRU-address-and-add-MUX-mode-configurati.patch
@@ -0,0 +1,96 @@
+From 0ece2ae628f6d4ee57319dc7e153680cdddff1d2 Mon Sep 17 00:00:00 2001
+From: AKSHAY RAVEENDRAN K <akshay.raveendran.k@intel.com>
+Date: Sun, 12 Sep 2021 22:21:55 +0000
+Subject: [PATCH] Change HSBP FRU address and add MUX mode configuration
+
+Changed the HSBP EEPROM FRU address according to Hardware
+rework and added the MUX idle mode configuration as
+"Disconnect". The later will keep MUX channel mode in
+disconnected state after the channel is accessed.
+
+Tested:
+1. Detected and read the HSBP EEPROM FRU with new address
+on reworked board.
+2. Confirmed the idle state of MUX channel after it is
+accessed is disconnected, this solved the bad read
+caused by reading multiple buses of different MUXes at
+same time.
+
+Signed-off-by: AKSHAY RAVEENDRAN K <akshay.raveendran.k@intel.com>
+---
+ configurations/F2U8X25 HSBP.json | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/configurations/F2U8X25 HSBP.json b/configurations/F2U8X25 HSBP.json
+index e2eedfa..60e7817 100644
+--- a/configurations/F2U8X25 HSBP.json	
++++ b/configurations/F2U8X25 HSBP.json	
+@@ -16,6 +16,7 @@
+                     "Drive_3",
+                     "Drive_4"
+                 ],
++                "MuxIdleMode": "Disconnect",
+                 "Name": "Drive Mux 1",
+                 "Type": "PCA9546Mux"
+             },
+@@ -28,6 +29,7 @@
+                     "Drive_7",
+                     "Drive_8"
+                 ],
++                "MuxIdleMode": "Disconnect",
+                 "Name": "Drive Mux 2",
+                 "Type": "PCA9546Mux"
+             },
+@@ -65,7 +67,7 @@
+             }
+         ],
+         "Name": "F2U8X25 HSBP 1",
+-        "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'F2U8X25PCIHSBP', 'ADDRESS': 80})",
++        "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'F2U8X25PCIHSBP', 'ADDRESS': 84})",
+         "Type": "Board",
+         "xyz.openbmc_project.Inventory.Decorator.Asset": {
+             "Manufacturer": "$BOARD_MANUFACTURER",
+@@ -91,6 +93,7 @@
+                     "Drive_11",
+                     "Drive_12"
+                 ],
++                "MuxIdleMode": "Disconnect",
+                 "Name": "Drive Mux 3",
+                 "Type": "PCA9546Mux"
+             },
+@@ -103,6 +106,7 @@
+                     "Drive_15",
+                     "Drive_16"
+                 ],
++                "MuxIdleMode": "Disconnect",
+                 "Name": "Drive Mux 4",
+                 "Type": "PCA9546Mux"
+             },
+@@ -140,7 +144,7 @@
+             }
+         ],
+         "Name": "F2U8X25 HSBP 2",
+-        "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'F2U8X25PCIHSBP', 'ADDRESS': 83})",
++        "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'F2U8X25PCIHSBP', 'ADDRESS': 87})",
+         "Type": "Board",
+         "xyz.openbmc_project.Inventory.Decorator.Asset": {
+             "Manufacturer": "$BOARD_MANUFACTURER",
+@@ -166,6 +170,7 @@
+                     "Drive_19",
+                     "Drive_20"
+                 ],
++                "MuxIdleMode": "Disconnect",
+                 "Name": "Drive Mux 5",
+                 "Type": "PCA9546Mux"
+             },
+@@ -178,6 +183,7 @@
+                     "Drive_23",
+                     "Drive_24"
+                 ],
++                "MuxIdleMode": "Disconnect",
+                 "Name": "Drive Mux 6",
+                 "Type": "PCA9546Mux"
+             },
+-- 
+2.17.1
+
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager_%.bbappend
index ff23c5831..a31b5ba93 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager_%.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager_%.bbappend
@@ -1,6 +1,6 @@
 # this is here just to bump faster than upstream
 # SRC_URI = "git://github.com/openbmc/entity-manager.git"
-SRCREV = "e7ac9c9eb1d2e4b052d7f9b082ab4642eab304e9"
+SRCREV = "8bb94ed6c9d64042ef367b5ff679336ff4d75093"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
@@ -8,5 +8,6 @@ SRC_URI += " file://0002-Entity-manager-Add-support-to-update-assetTag.patch \
              file://0003-Add-logs-to-fwVersionIsSame.patch \
              file://0004-Adding-MUX-and-Drives-present-in-HSBP-in-json-config.patch \
              file://0005-Allow-MUX-idle-state-to-be-configured-as-DISCONNECT.patch \
+             file://0006-Change-HSBP-FRU-address-and-add-MUX-mode-configurati.patch \
            "
 
-- 
cgit v1.2.3