diff options
Diffstat (limited to 'meta-openbmc-mods/meta-common/recipes-x86/chassis')
2 files changed, 18 insertions, 18 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-x86/chassis/x86-power-control/0001-Extend-VR-Watchdog-timeout.patch b/meta-openbmc-mods/meta-common/recipes-x86/chassis/x86-power-control/0001-Extend-VR-Watchdog-timeout.patch index 61d3105b2..15de955c0 100644 --- a/meta-openbmc-mods/meta-common/recipes-x86/chassis/x86-power-control/0001-Extend-VR-Watchdog-timeout.patch +++ b/meta-openbmc-mods/meta-common/recipes-x86/chassis/x86-power-control/0001-Extend-VR-Watchdog-timeout.patch @@ -1,32 +1,32 @@ -From 9617412472669eef5d3ed66c05468646d8e8a951 Mon Sep 17 00:00:00 2001 +From 540836801f4ab5e8be9703d2c1350e988b2ccc1f Mon Sep 17 00:00:00 2001 From: "Jason M. Bills" <jason.m.bills@linux.intel.com> Date: Thu, 11 Jun 2020 13:00:15 -0700 Subject: [PATCH] Extend VR Watchdog timeout The VR watchdog reset is causing issues on platforms such as Cooper City that take longer to assert CPU Power Good. This -extends the timeout to 15s to hold off the reset for Cooper +extends the timeout to 12s to hold off the reset for Cooper City. Change-Id: I9658b4ead6d9bf8eaa30e4aeb9f1d56c2f2187d3 Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com> --- - power-control-x86/src/power_control.cpp | 2 +- + power-control-x86/config/power-config-host0.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/power-control-x86/src/power_control.cpp b/power-control-x86/src/power_control.cpp -index b891c8c..b6ee6f1 100644 ---- a/power-control-x86/src/power_control.cpp -+++ b/power-control-x86/src/power_control.cpp -@@ -53,7 +53,7 @@ const static constexpr int powerPulseTimeMs = 200; - const static constexpr int forceOffPulseTimeMs = 15000; - const static constexpr int resetPulseTimeMs = 500; - const static constexpr int powerCycleTimeMs = 5000; --const static constexpr int sioPowerGoodWatchdogTimeMs = 1000; -+const static constexpr int sioPowerGoodWatchdogTimeMs = 12000; - const static constexpr int psPowerOKWatchdogTimeMs = 8000; - const static constexpr int gracefulPowerOffTimeMs = 60000; - const static constexpr int warmResetCheckTimeMs = 500; +diff --git a/power-control-x86/config/power-config-host0.json b/power-control-x86/config/power-config-host0.json +index ca9a86a..f579c2b 100644 +--- a/power-control-x86/config/power-config-host0.json ++++ b/power-control-x86/config/power-config-host0.json +@@ -18,7 +18,7 @@ + "ForceOffPulseMs": 15000, + "ResetPulseMs": 500, + "PowerCycleMs": 5000, +- "SioPowerGoodWatchdogMs": 1000, ++ "SioPowerGoodWatchdogMs": 12000, + "PsPowerOKWatchdogMs": 8000, + "GracefulPowerOffS": 300, + "WarmResetCheckMs": 500, -- -2.7.4 +2.17.1 diff --git a/meta-openbmc-mods/meta-common/recipes-x86/chassis/x86-power-control_%.bbappend b/meta-openbmc-mods/meta-common/recipes-x86/chassis/x86-power-control_%.bbappend index 26c96db24..93a32164d 100755 --- a/meta-openbmc-mods/meta-common/recipes-x86/chassis/x86-power-control_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-x86/chassis/x86-power-control_%.bbappend @@ -1,6 +1,6 @@ # Enable downstream autobump SRC_URI = "git://github.com/openbmc/x86-power-control.git;protocol=ssh" -SRCREV = "92caa4c639903ef076e2f09e985291781edd927d" +SRCREV = "afd04f0283bfc4854c0100c56ccf8bc1c10c799a" FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" |