diff options
| author | Lei YU <yulei.sh@bytedance.com> | 2020-12-15 11:53:21 +0300 |
|---|---|---|
| committer | Lei YU <yulei.sh@bytedance.com> | 2021-07-02 09:58:18 +0300 |
| commit | 45701e3b4ae888894713a6804aa902c8e2897f44 (patch) | |
| tree | d4a790d2ede86beef54b10f83a9e1e529e1d8aa1 /meta-bytedance | |
| parent | 9eaaa78e295d4e21c5eb8bcd137876eb767a100d (diff) | |
| download | openbmc-45701e3b4ae888894713a6804aa902c8e2897f44.tar.xz | |
bytedance: g220a: node-manager: Remove total power sensor
The Total_Power sensor is not available on g220a system, add patch to
remove it.
Signed-off-by: Lei YU <yulei.sh@bytedance.com>
Change-Id: Ibc70bec3d56b13740d3f17a666a8d0b0fa7c8429
Diffstat (limited to 'meta-bytedance')
2 files changed, 39 insertions, 0 deletions
diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-node-manager-proxy/0001-Remove-Total_Power-sensor.patch b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-node-manager-proxy/0001-Remove-Total_Power-sensor.patch new file mode 100644 index 000000000..837982da2 --- /dev/null +++ b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-node-manager-proxy/0001-Remove-Total_Power-sensor.patch @@ -0,0 +1,35 @@ +From 086b098ea4160963cd09405fbdf6816bef095d16 Mon Sep 17 00:00:00 2001 +From: Lei YU <yulei.sh@bytedance.com> +Date: Tue, 15 Dec 2020 16:50:31 +0800 +Subject: [PATCH] Remove Total_Power sensor + +The Total_Power sensor is not used on g220a system. Remove it. +The sensor will be replaced by a virtual sensor. + +Tested: Verify the Total_Power sensor is gone on DBus. + +Signed-off-by: Lei YU <yulei.sh@bytedance.com> +--- + NodeManagerProxy.cpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/NodeManagerProxy.cpp b/NodeManagerProxy.cpp +index d9fb760..9dbd5da 100644 +--- a/NodeManagerProxy.cpp ++++ b/NodeManagerProxy.cpp +@@ -120,9 +120,9 @@ void createSensors() + // NM Statistics + // Global power statistics + configuredSensors.push_back(std::make_unique<PowerMetric>(server)); +- configuredSensors.push_back(std::make_unique<GlobalPowerPlatform>( +- server, 0, 2040, "power", "Total_Power", globalPowerStats, +- entirePlatform, 0)); ++// configuredSensors.push_back(std::make_unique<GlobalPowerPlatform>( ++// server, 0, 2040, "power", "Total_Power", globalPowerStats, ++// entirePlatform, 0)); + configuredSensors.push_back( + std::make_unique<GlobalPowerCpu>(server, 0, 510, "power", "CPU_Power", + globalPowerStats, cpuSubsystem, 0)); +-- +2.25.1 + diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb index c1db3a825..1fa04843f 100644 --- a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb +++ b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb @@ -17,3 +17,7 @@ DEPENDS = "sdbusplus \ S = "${WORKDIR}/git/" inherit cmake systemd + +SRC_URI_append = " \ + file://0001-Remove-Total_Power-sensor.patch \ +" |