diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-07-10 01:11:22 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-07-10 20:11:31 +0300 |
| commit | d071adf43ac87f21dde2f84287120960c723962c (patch) | |
| tree | 05a1d365e0faa6ce8570b2d0c2d0f100dc8df1d4 /meta-openbmc-mods/meta-common/recipes-x86 | |
| parent | f24c1e9afc47a421831278b57377951e71494d92 (diff) | |
| download | openbmc-d071adf43ac87f21dde2f84287120960c723962c.tar.xz | |
Update to internal 0.66
Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
Diffstat (limited to 'meta-openbmc-mods/meta-common/recipes-x86')
2 files changed, 37 insertions, 3 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 new file mode 100644 index 000000000..61d3105b2 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-x86/chassis/x86-power-control/0001-Extend-VR-Watchdog-timeout.patch @@ -0,0 +1,32 @@ +From 9617412472669eef5d3ed66c05468646d8e8a951 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 +City. + +Change-Id: I9658b4ead6d9bf8eaa30e4aeb9f1d56c2f2187d3 +Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com> +--- + power-control-x86/src/power_control.cpp | 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; +-- +2.7.4 + 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 600f9e25f..b107c8873 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,3 +1,5 @@ -# Enable downstream autobump -SRC_URI = "git://github.com/openbmc/x86-power-control.git;protocol=ssh" -SRCREV = "35aa665e01cf9d735ba4aeb3818a60caab376692" +FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" + +SRC_URI += " \ + file://0001-Extend-VR-Watchdog-timeout.patch \ + " |