diff options
| author | Ed Tanous <ed.tanous@intel.com> | 2019-08-19 21:16:19 +0300 |
|---|---|---|
| committer | Ed Tanous <ed@tanous.net> | 2019-08-20 18:56:17 +0300 |
| commit | 35e295e2a161fcf146ea031de53431b2888521fa (patch) | |
| tree | a0c78943fef5c085f371aaa840d46edecc1f2e95 /meta-openbmc-mods/meta-common/recipes-phosphor/sensors | |
| parent | 9856ac69064742544fafad307d3ee4544385ffa2 (diff) | |
| download | openbmc-35e295e2a161fcf146ea031de53431b2888521fa.tar.xz | |
Sync to internal 8-19-2019
Signed-off-by: Ed Tanous <ed.tanous@intel.com>
Diffstat (limited to 'meta-openbmc-mods/meta-common/recipes-phosphor/sensors')
2 files changed, 54 insertions, 1 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0001-Add-WA-enable-disable-control-code-into-cpusensor.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0001-Add-WA-enable-disable-control-code-into-cpusensor.patch new file mode 100644 index 000000000..1e1fc9625 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0001-Add-WA-enable-disable-control-code-into-cpusensor.patch @@ -0,0 +1,50 @@ +From f9b4545af42fc673f81d043a8512db8ebfe58660 Mon Sep 17 00:00:00 2001 +From: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com> +Date: Fri, 2 Aug 2019 12:02:58 -0700 +Subject: [PATCH] Add WA enable/disable control code into cpusensor + +This commit adds a PECI WA enable/disable control code. If 'UseWA' +isn't in CPU configuration or the setting is 0, the WA will be +disabled by writing 'N' on the peci_core module parameter. + +This is a temporary WA. + +Change-Id: I73ae9ac49c9382f3ebdc800c360e078418b124e9 +Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com> +--- + src/CPUSensorMain.cpp | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +diff --git a/src/CPUSensorMain.cpp b/src/CPUSensorMain.cpp +index 2a3ff16f8294..b4085fd1038d 100644 +--- a/src/CPUSensorMain.cpp ++++ b/src/CPUSensorMain.cpp +@@ -629,6 +629,25 @@ bool getCpuConfig( + std::cout << "type: " << type << "\n"; + } + ++ // Temporary WA ++ uint64_t useWA = 0; ++ auto findUseWA = config.second.find("UseWA"); ++ if (findUseWA != config.second.end()) ++ { ++ useWA = std::visit(VariantToUnsignedIntVisitor(), ++ findUseWA->second); ++ } ++ if (useWA == 0) ++ { ++ std::ofstream deviceFile( ++ "/sys/module/peci_core/parameters/use_wa"); ++ if (deviceFile.good()) ++ { ++ deviceFile << 'N'; ++ } ++ deviceFile.close(); ++ } ++ + cpuConfigs.emplace(bus, addr, name, State::OFF); + } + } +-- +2.7.4 + diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors_%.bbappend index 3e3282f6f..082c87055 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors_%.bbappend @@ -1,7 +1,10 @@ -SRCREV = "1cbd1c6da17a85ec7213744cf2d1e56fcba3e34e" +SRCREV = "7fa475d3f27ec6c37503ff7ec0496acc2215da29" SRC_URI = "git://github.com/openbmc/dbus-sensors.git" DEPENDS_append = " libgpiod" +FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" +SRC_URI += "file://0001-Add-WA-enable-disable-control-code-into-cpusensor.patch" + #todo(cheng) remove this when synced upstream SYSTEMD_SERVICE_${PN} += " xyz.openbmc_project.mcutempsensor.service" |