From 18f97faa411078b95d042d207f5fff32bc8ece1d Mon Sep 17 00:00:00 2001 From: P Dheeraj Srujan Kumar Date: Thu, 31 Mar 2022 02:50:48 +0530 Subject: Update to internal 1-0.91 Signed-off-by: P Dheeraj Srujan Kumar --- ...-allow-drive-sensors-on-bus-2-for-ast2500.patch | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'meta-openbmc-mods/meta-ast2500/recipes-phosphor/sensors/dbus-sensors/0001-Only-allow-drive-sensors-on-bus-2-for-ast2500.patch') 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 index ea7ca092c..c28ae6126 100644 --- 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 @@ -1,7 +1,7 @@ -From d06d0a8fabd699fc1cab4fbd6e4572ce0b22a905 Mon Sep 17 00:00:00 2001 +From 8f6c6f3a23c002f5247c407205f3a62dcd0e0c8c Mon Sep 17 00:00:00 2001 From: James Feist Date: Thu, 23 Apr 2020 14:01:38 -0700 -Subject: [PATCH 1/1] Only allow drive sensors on bus 2 for ast2500 +Subject: [PATCH] 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. @@ -15,22 +15,22 @@ Signed-off-by: James Feist 1 file changed, 6 insertions(+) diff --git a/src/NVMeSensorMain.cpp b/src/NVMeSensorMain.cpp -index 1858ea9..844f061 100644 +index 8eaeb57..25edf01 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)); - } +@@ -154,6 +154,12 @@ static void handleSensorConfigurations( + << "\n"; + } -+ // HACK: cpld on current products doesn't allow multi-master -+ if (rootBus != 2) -+ { -+ continue; -+ } ++ // HACK: cpld on current products doesn't allow multi-master ++ if (rootBus != 2) ++ { ++ continue; ++ } + - std::shared_ptr context; - auto findRoot = nvmeDeviceMap.find(rootBus); - if (findRoot != nvmeDeviceMap.end()) + std::shared_ptr sensorPtr = + std::make_shared( + objectServer, io, dbusConnection, *sensorName, -- 2.17.1 -- cgit v1.2.3