From bf078825d137b0e1a1ec02ddd4e6d08670a6783c Mon Sep 17 00:00:00 2001
From: George Hung <george.hung@quantatw.com>
Date: Fri, 11 Jun 2021 13:23:25 +0800
Subject: meta-quanta: gbs: Modified pid sensor type from margin to temp

- Remove read-margin-temp files and codes
- Modified sensor type in pid json to temp
    setpoint set to target temp
    Kp set to Kp * scalar
    Ki set to Ki * scalar
- Pre-detect nvme present status in fan-table-init.sh,
  and delete settings if nvme present is false.

Signed-off-by: George Hung <george.hung@quantatw.com>
Change-Id: Iba4ac164a7a39ca1be109301402911d432294997
---
 .../fans/read-margin-temp/config-margin.json.in    | 408 ---------------------
 .../fans/read-margin-temp/read-margin-temp-wait.sh |  70 ----
 .../fans/read-margin-temp_%.bbappend               |  17 -
 3 files changed, 495 deletions(-)
 delete mode 100644 meta-quanta/meta-gbs/recipes-quanta/fans/read-margin-temp/config-margin.json.in
 delete mode 100644 meta-quanta/meta-gbs/recipes-quanta/fans/read-margin-temp/read-margin-temp-wait.sh
 delete mode 100644 meta-quanta/meta-gbs/recipes-quanta/fans/read-margin-temp_%.bbappend

(limited to 'meta-quanta/meta-gbs/recipes-quanta')

diff --git a/meta-quanta/meta-gbs/recipes-quanta/fans/read-margin-temp/config-margin.json.in b/meta-quanta/meta-gbs/recipes-quanta/fans/read-margin-temp/config-margin.json.in
deleted file mode 100644
index a5ff4979b..000000000
--- a/meta-quanta/meta-gbs/recipes-quanta/fans/read-margin-temp/config-margin.json.in
+++ /dev/null
@@ -1,408 +0,0 @@
-{
-    "sensors" : [
-        {
-            "name": "cputemp",
-            "unit": "degree",
-            "type": "dbus",
-            "path": "/xyz/openbmc_project/sensors/temperature/cputemp",
-            "parameters": {
-                "type": "",
-                "maxTemp": 95000,
-                "path": "",
-                "sysLabel": "",
-                "targetTemp": -1,
-                "targetTempOffset": -15000,
-                "scalar": 1.0
-            }
-        },
-        {
-            "name": "nvme0",
-            "unit": "degree",
-            "type": "dbus",
-            "path": "/xyz/openbmc_project/sensors/temperature/nvme0",
-            "parameters": {
-                "type": "",
-                "maxTemp": @WCTemp00@,
-                "path": "",
-                "sysLabel": "",
-                "targetTemp": -1,
-                "targetTempOffset": -7000,
-                "scalar": 1.0
-            }
-        },
-        {
-            "name": "nvme1",
-            "unit": "degree",
-            "type": "dbus",
-            "path": "/xyz/openbmc_project/sensors/temperature/nvme1",
-            "parameters": {
-                "type": "",
-                "maxTemp": @WCTemp01@,
-                "path": "",
-                "sysLabel": "",
-                "targetTemp": -1,
-                "targetTempOffset": -7000,
-                "scalar": 1.0
-            }
-        },
-        {
-            "name": "nvme2",
-            "unit": "degree",
-            "type": "dbus",
-            "path": "/xyz/openbmc_project/sensors/temperature/nvme2",
-            "parameters": {
-                "type": "",
-                "maxTemp": @WCTemp02@,
-                "path": "",
-                "sysLabel": "",
-                "targetTemp": -1,
-                "targetTempOffset": -7000,
-                "scalar": 1.0
-            }
-        },
-        {
-            "name": "nvme3",
-            "unit": "degree",
-            "type": "dbus",
-            "path": "/xyz/openbmc_project/sensors/temperature/nvme3",
-            "parameters": {
-                "type": "",
-                "maxTemp": @WCTemp03@,
-                "path": "",
-                "sysLabel": "",
-                "targetTemp": -1,
-                "targetTempOffset": -7000,
-                "scalar": 1.0
-            }
-        },
-        {
-            "name": "nvme4",
-            "unit": "degree",
-            "type": "dbus",
-            "path": "/xyz/openbmc_project/sensors/temperature/nvme4",
-            "parameters": {
-                "type": "",
-                "maxTemp": @WCTemp04@,
-                "path": "",
-                "sysLabel": "",
-                "targetTemp": -1,
-                "targetTempOffset": -7000,
-                "scalar": 1.0
-            }
-        },
-        {
-            "name": "nvme5",
-            "unit": "degree",
-            "type": "dbus",
-            "path": "/xyz/openbmc_project/sensors/temperature/nvme5",
-            "parameters": {
-                "type": "",
-                "maxTemp": @WCTemp05@,
-                "path": "",
-                "sysLabel": "",
-                "targetTemp": -1,
-                "targetTempOffset": -7000,
-                "scalar": 1.0
-            }
-        },
-        {
-            "name": "nvme6",
-            "unit": "degree",
-            "type": "dbus",
-            "path": "/xyz/openbmc_project/sensors/temperature/nvme6",
-            "parameters": {
-                "type": "",
-                "maxTemp": @WCTemp06@,
-                "path": "",
-                "sysLabel": "",
-                "targetTemp": -1,
-                "targetTempOffset": -7000,
-                "scalar": 1.0
-            }
-        },
-        {
-            "name": "nvme7",
-            "unit": "degree",
-            "type": "dbus",
-            "path": "/xyz/openbmc_project/sensors/temperature/nvme7",
-            "parameters": {
-                "type": "",
-                "maxTemp": @WCTemp07@,
-                "path": "",
-                "sysLabel": "",
-                "targetTemp": -1,
-                "targetTempOffset": -7000,
-                "scalar": 1.0
-            }
-        },
-        {
-            "name": "nvme8",
-            "unit": "degree",
-            "type": "dbus",
-            "path": "/xyz/openbmc_project/sensors/temperature/nvme8",
-            "parameters": {
-                "type": "",
-                "maxTemp": @WCTemp08@,
-                "path": "",
-                "sysLabel": "",
-                "targetTemp": -1,
-                "targetTempOffset": -7000,
-                "scalar": 1.0
-            }
-        },
-        {
-            "name": "nvme9",
-            "unit": "degree",
-            "type": "dbus",
-            "path": "/xyz/openbmc_project/sensors/temperature/nvme9",
-            "parameters": {
-                "type": "",
-                "maxTemp": @WCTemp09@,
-                "path": "",
-                "sysLabel": "",
-                "targetTemp": -1,
-                "targetTempOffset": -7000,
-                "scalar": 1.0
-            }
-        },
-        {
-            "name": "nvme10",
-            "unit": "degree",
-            "type": "dbus",
-            "path": "/xyz/openbmc_project/sensors/temperature/nvme10",
-            "parameters": {
-                "type": "",
-                "maxTemp": @WCTemp10@,
-                "path": "",
-                "sysLabel": "",
-                "targetTemp": -1,
-                "targetTempOffset": -7000,
-                "scalar": 1.0
-            }
-        },
-        {
-            "name": "nvme11",
-            "unit": "degree",
-            "type": "dbus",
-            "path": "/xyz/openbmc_project/sensors/temperature/nvme11",
-            "parameters": {
-                "type": "",
-                "maxTemp": @WCTemp11@,
-                "path": "",
-                "sysLabel": "",
-                "targetTemp": -1,
-                "targetTempOffset": -7000,
-                "scalar": 1.0
-            }
-        },
-        {
-            "name": "nvme12",
-            "unit": "degree",
-            "type": "dbus",
-            "path": "/xyz/openbmc_project/sensors/temperature/nvme12",
-            "parameters": {
-                "type": "",
-                "maxTemp": @WCTemp12@,
-                "path": "",
-                "sysLabel": "",
-                "targetTemp": -1,
-                "targetTempOffset": -7000,
-                "scalar": 1.0
-            }
-        },
-        {
-            "name": "nvme13",
-            "unit": "degree",
-            "type": "dbus",
-            "path": "/xyz/openbmc_project/sensors/temperature/nvme13",
-            "parameters": {
-                "type": "",
-                "maxTemp": @WCTemp13@,
-                "path": "",
-                "sysLabel": "",
-                "targetTemp": -1,
-                "targetTempOffset": -7000,
-                "scalar": 1.0
-            }
-        },
-        {
-            "name": "nvme14",
-            "unit": "degree",
-            "type": "dbus",
-            "path": "/xyz/openbmc_project/sensors/temperature/nvme14",
-            "parameters": {
-                "type": "",
-                "maxTemp": @WCTemp14@,
-                "path": "",
-                "sysLabel": "",
-                "targetTemp": -1,
-                "targetTempOffset": -7000,
-                "scalar": 1.0
-            }
-        },
-        {
-            "name": "nvme15",
-            "unit": "degree",
-            "type": "dbus",
-            "path": "/xyz/openbmc_project/sensors/temperature/nvme15",
-            "parameters": {
-                "type": "",
-                "maxTemp": @WCTemp15@,
-                "path": "",
-                "sysLabel": "",
-                "targetTemp": -1,
-                "targetTempOffset": -7000,
-                "scalar": 1.0
-            }
-        },
-        {
-            "name": "vddcr_cpu",
-            "unit": "degree",
-            "type": "dbus",
-            "path": "/xyz/openbmc_project/sensors/temperature/vddcr_cpu",
-            "parameters": {
-                "type": "",
-                "maxTemp": 100000,
-                "path": "",
-                "sysLabel": "",
-                "targetTemp": 90000,
-                "targetTempOffset": 0,
-                "scalar": 1.0
-            }
-        },
-        {
-            "name": "vddcr_soc",
-            "unit": "degree",
-            "type": "dbus",
-            "path": "/xyz/openbmc_project/sensors/temperature/vddcr_soc",
-            "parameters": {
-                "type": "",
-                "maxTemp": 100000,
-                "path": "",
-                "sysLabel": "",
-                "targetTemp": 90000,
-                "targetTempOffset": 0,
-                "scalar": 1.0
-            }
-        },
-        {
-            "name": "vddio_abcd",
-            "unit": "degree",
-            "type": "dbus",
-            "path": "/xyz/openbmc_project/sensors/temperature/vddio_abcd",
-            "parameters": {
-                "type": "",
-                "maxTemp": 100000,
-                "path": "",
-                "sysLabel": "",
-                "targetTemp": 90000,
-                "targetTempOffset": 0,
-                "scalar": 1.0
-            }
-        },
-        {
-            "name": "vddio_efgh",
-            "unit": "degree",
-            "type": "dbus",
-            "path": "/xyz/openbmc_project/sensors/temperature/vddio_efgh",
-            "parameters": {
-                "type": "",
-                "maxTemp": 100000,
-                "path": "",
-                "sysLabel": "",
-                "targetTemp": 90000,
-                "targetTempOffset": 0,
-                "scalar": 1.0
-            }
-        },
-        {
-            "name": "p12v_mobo",
-            "unit": "degree",
-            "type": "dbus",
-            "path": "/xyz/openbmc_project/sensors/temperature/p12v_mobo",
-            "parameters": {
-                "type": "",
-                "maxTemp": 114000,
-                "path": "",
-                "sysLabel": "",
-                "targetTemp": 90000,
-                "targetTempOffset": 0,
-                "scalar": 1.0
-            }
-        },
-        {
-            "name": "powerseq_temp",
-            "unit": "degree",
-            "type": "dbus",
-            "path": "/xyz/openbmc_project/sensors/temperature/powerseq_temp",
-            "parameters": {
-                "type": "",
-                "maxTemp": 99000,
-                "path": "",
-                "sysLabel": "",
-                "targetTemp": 90000,
-                "targetTempOffset": 0,
-                "scalar": 1.0
-            }
-        },
-        {
-            "name": "p12v_fan",
-            "unit": "degree",
-            "type": "dbus",
-            "path": "/xyz/openbmc_project/sensors/temperature/p12v_fan",
-            "parameters": {
-                "type": "",
-                "maxTemp": 114000,
-                "path": "",
-                "sysLabel": "",
-                "targetTemp": 90000,
-                "targetTempOffset": 0,
-                "scalar": 1.0
-            }
-        }
-    ],
-    "skus" : [
-        {
-            "num": 1,
-            "zones": [
-                {
-                    "id": 0,
-                    "zoneSetpoint": 10000,
-                    "target": "/xyz/openbmc_project/extsensors/margin/cputemp",
-                    "components": [
-                        "cputemp"
-                    ]
-                },
-                {
-                    "id": 1,
-                    "zoneSetpoint": 10000,
-                    "target": "/xyz/openbmc_project/extsensors/margin/zone0_vr",
-                    "components": [
-                        "vddcr_cpu",
-                        "vddcr_soc",
-                        "vddio_abcd",
-                        "vddio_efgh",
-                        "p12v_mobo",
-                        "powerseq_temp"
-                    ]
-                },
-                {
-                    "id": 2,
-                    "zoneSetpoint": 10000,
-                    "target": "/xyz/openbmc_project/extsensors/margin/nvme",
-                    "components": [
-                        @nvmeList@
-                    ]
-                },
-                {
-                    "id": 3,
-                    "zoneSetpoint": 10000,
-                    "target": "/xyz/openbmc_project/extsensors/margin/p12v_fan",
-                    "components": [
-                        "p12v_fan"
-                    ]
-                }
-            ]
-        }
-    ]
-}
diff --git a/meta-quanta/meta-gbs/recipes-quanta/fans/read-margin-temp/read-margin-temp-wait.sh b/meta-quanta/meta-gbs/recipes-quanta/fans/read-margin-temp/read-margin-temp-wait.sh
deleted file mode 100644
index 0937a9fb8..000000000
--- a/meta-quanta/meta-gbs/recipes-quanta/fans/read-margin-temp/read-margin-temp-wait.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-
-MARGIN_TABLE_FILE_IN="/usr/share/read-margin-temp/config-margin.json.in"
-TEMP_FILE="$(mktemp)"
-cp "$MARGIN_TABLE_FILE_IN" "$TEMP_FILE"
-
-target_num="$(cat $TEMP_FILE | grep '"target"' | wc -l)"
-
-# wait target dbus
-for ((i = 0; i < ${target_num}; i++)); do
-    line_num=$((i+1))
-    path="$(cat $TEMP_FILE | grep '"target"' | head -n ${line_num} | tail -n +${line_num} | cut -d '"' -f 4)"
-    mapper wait $path
-done
-
-nvmePath="/xyz/openbmc_project/sensors/temperature/nvme"
-nvmeInventoryPath="/xyz/openbmc_project/inventory/system/chassis/motherboard/nvme"
-nvmeList=""
-# Get and Set WCTEMP
-for ((i = 0; i < 16; i++)); do
-    name="@WCTemp$(printf "%02d" $i)@"
-    wcTemp=72000
-    presentState="$(busctl get-property \
-        xyz.openbmc_project.Inventory.Manager \
-        ${nvmeInventoryPath}${i} \
-        xyz.openbmc_project.Inventory.Item \
-        Present | awk '{print $2}')"
-
-    if [[ "$presentState" == "true" ]]; then
-        actualWCTemp=0
-        for ((j = 0; j < 3; j++)); do
-            actualWCTemp="$(
-                busctl get-property xyz.openbmc_project.nvme.manager \
-                    ${nvmePath}${i} \
-                    xyz.openbmc_project.Sensor.Threshold.Critical \
-                    CriticalHigh | awk '{print $2}'
-            )"
-            if [[ "${actualWCTemp}" -ne 0 ]]; then
-                break
-            fi
-
-            echo "${nvmePath}${i} WCTemp was read to be 0, retrying after 1 sec sleep"
-            sleep 1
-        done
-
-        if [[ "${actualWCTemp}" -ne 0 ]]; then
-            wcTemp="$((actualWCTemp * 1000))"
-        else
-            echo "${nvmePath}${i} WCTemp was read to be 0, using default WCTemp: ${wcTemp}"
-        fi
-
-        if [[ -z "$nvmeList" ]]; then
-            nvmeList="\"nvme"${i}"\""
-        else
-            nvmeList="${nvmeList}"", \"nvme"${i}"\""
-        fi
-    fi
-
-    sed -i "s/$name/${wcTemp}/g" "$TEMP_FILE"
-done
-
-sed -i "s/@nvmeList@/${nvmeList}/g" "$TEMP_FILE"
-
-# Use shell parameter expansion to trim the ".in" suffix
-mv "$TEMP_FILE" "${MARGIN_TABLE_FILE_IN%".in"}"
-
-# start read margin temp
-/usr/bin/read-margin-temp &
-
-exit 0
diff --git a/meta-quanta/meta-gbs/recipes-quanta/fans/read-margin-temp_%.bbappend b/meta-quanta/meta-gbs/recipes-quanta/fans/read-margin-temp_%.bbappend
deleted file mode 100644
index 981c0d2ca..000000000
--- a/meta-quanta/meta-gbs/recipes-quanta/fans/read-margin-temp_%.bbappend
+++ /dev/null
@@ -1,17 +0,0 @@
-FILESEXTRAPATHS_prepend_gbs := "${THISDIR}/${PN}:"
-
-SRC_URI_append_gbs = " file://config-margin.json.in \
-                       file://read-margin-temp-wait.sh \
-                     "
-
-FILES_${PN}_append_gbs = " ${bindir}/read-margin-temp-wait.sh"
-FILES_${PN}_append_gbs = " ${datadir}/read-margin-temp/config-margin.json.in"
-
-do_install_append_gbs() {
-    install -d ${D}${bindir}
-    install -m 0755 ${WORKDIR}/read-margin-temp-wait.sh ${D}${bindir}
-
-    install -d ${D}${datadir}/read-margin-temp
-    install -m 0644 -D ${WORKDIR}/config-margin.json.in \
-        ${D}${datadir}/${PN}/
-}
-- 
cgit v1.2.3