diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-05-26 22:54:18 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-05-27 03:02:18 +0300 |
| commit | 58cf8b1a7389d20494c909b3542beeb987c69581 (patch) | |
| tree | 345a0053ae99b25a9d8f14a0fc497aed583b736f /meta-openbmc-mods/meta-ast2500 | |
| parent | 028c1a3663f63db3fdf4b92e6f091506c1c784f9 (diff) | |
| download | openbmc-58cf8b1a7389d20494c909b3542beeb987c69581.tar.xz | |
Update to internal 0.56
Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
Diffstat (limited to 'meta-openbmc-mods/meta-ast2500')
3 files changed, 41 insertions, 2 deletions
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 ea6aff1d9..bfcec8c9f 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 @@ -2403,7 +2403,7 @@ ], "Name": "WC Baseboard", "Probe": [ - "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'WilsonCity'})", + "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'WilsonCity.*'})", "OR", "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': '.*WC'})" ], @@ -2421,4 +2421,4 @@ "ProductId": 145 }, "xyz.openbmc_project.Inventory.Item.System": {} -}
\ No newline at end of file +} diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/sensors/dbus-sensors/0001-Only-allow-drive-sensors-on-bus-2-for-ast2500.patch b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/sensors/dbus-sensors/0001-Only-allow-drive-sensors-on-bus-2-for-ast2500.patch new file mode 100644 index 000000000..ea7ca092c --- /dev/null +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/sensors/dbus-sensors/0001-Only-allow-drive-sensors-on-bus-2-for-ast2500.patch @@ -0,0 +1,36 @@ +From d06d0a8fabd699fc1cab4fbd6e4572ce0b22a905 Mon Sep 17 00:00:00 2001 +From: James Feist <james.feist@linux.intel.com> +Date: Thu, 23 Apr 2020 14:01:38 -0700 +Subject: [PATCH 1/1] Only allow drive sensors on bus 2 for ast2500 + +CPLD doesn't allow multi-master, so readings wont work. +Put in a work-around to only allow bus 2 transactions. + +Tested: Only valid sensors were installed. + +Change-Id: Ib9e75ffd0dd64cf548d15cce9a6052332ac5ec43 +Signed-off-by: James Feist <james.feist@linux.intel.com> +--- + src/NVMeSensorMain.cpp | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/NVMeSensorMain.cpp b/src/NVMeSensorMain.cpp +index 1858ea9..844f061 100644 +--- a/src/NVMeSensorMain.cpp ++++ b/src/NVMeSensorMain.cpp +@@ -111,6 +111,12 @@ void createSensors(boost::asio::io_service& io, + rootBus = std::stoi(rootName.substr(0, dash)); + } + ++ // HACK: cpld on current products doesn't allow multi-master ++ if (rootBus != 2) ++ { ++ continue; ++ } ++ + std::shared_ptr<NVMeContext> context; + auto findRoot = nvmeDeviceMap.find(rootBus); + if (findRoot != nvmeDeviceMap.end()) +-- +2.17.1 + diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/sensors/dbus-sensors_%.bbappend b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/sensors/dbus-sensors_%.bbappend new file mode 100644 index 000000000..1c8817772 --- /dev/null +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/sensors/dbus-sensors_%.bbappend @@ -0,0 +1,3 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += "file://0001-Only-allow-drive-sensors-on-bus-2-for-ast2500.patch" |