meta-quanta: gbs: update thermal config to R01

1. update fine tuned PID parameters
2. update sensors threshold

(From meta-quanta rev: 52b5953cf0c8c16d34bb8fa7b676316335dbf06e)

Signed-off-by: George Hung <george.hung@quantatw.com>
Change-Id: Icf6f74543552cf511d64fb6bb35bec279f7d0846
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>

15 files changed, 293 insertions, 102 deletions

diff --git a/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/config.json b/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/config.json
index d014380b1..5a4cd1b23 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/config.json
+++ b/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/config.json
@@ -1,5 +1,5 @@
 {
-    "version" : "R00",
+    "version" : "R01",
     "sensors" : [
         {
             "name": "fan0",
@@ -62,9 +62,9 @@
             "timeout": 0
         },
         {
-            "name": "real_fleeting0",
+            "name": "cputemp",
             "type": "margin",
-            "readPath": "/xyz/openbmc_project/extsensors/margin/real_fleeting0",
+            "readPath": "/xyz/openbmc_project/extsensors/margin/cputemp",
             "writePath": "",
             "min": 0,
             "max": 0,
@@ -72,9 +72,29 @@
             "timeout": 0
         },
         {
-            "name": "real_fleeting1",
+            "name": "zone0_vr",
             "type": "margin",
-            "readPath": "/xyz/openbmc_project/extsensors/margin/real_fleeting1",
+            "readPath": "/xyz/openbmc_project/extsensors/margin/zone0_vr",
+            "writePath": "",
+            "min": 0,
+            "max": 0,
+            "ignoreDbusMinMax": true,
+            "timeout": 0
+        },
+        {
+            "name": "nvme",
+            "type": "margin",
+            "readPath": "/xyz/openbmc_project/extsensors/margin/nvme",
+            "writePath": "",
+            "min": 0,
+            "max": 0,
+            "ignoreDbusMinMax": true,
+            "timeout": 0
+        },
+        {
+            "name": "p12v_fan",
+            "type": "margin",
+            "readPath": "/xyz/openbmc_project/extsensors/margin/p12v_fan",
             "writePath": "",
             "min": 0,
             "max": 0,
@@ -101,7 +121,7 @@
                         "feedFwdGainCoeff": 0.0056,
                         "integralLimit_min": 0.0,
                         "integralLimit_max": 0.0,
-                        "outLim_min": 20.0,
+                        "outLim_min": 10.0,
                         "outLim_max": 100.0,
                         "slewNeg": 0.0,
                         "slewPos": 0.0
@@ -120,26 +140,89 @@
                         "feedFwdGainCoeff": 0.0056,
                         "integralLimit_min": 0.0,
                         "integralLimit_max": 0.0,
-                        "outLim_min": 20.0,
+                        "outLim_min": 10.0,
                         "outLim_max": 100.0,
                         "slewNeg": 0.0,
                         "slewPos": 0.0
                     }
                 },
                 {
-                    "name": "real_fleeting0",
+                    "name": "cputemp",
+                    "type": "margin",
+                    "inputs": ["cputemp"],
+                    "setpoint": 10.0,
+                    "pid": {
+                        "samplePeriod": 1.0,
+                        "proportionalCoeff": 714.0,
+                        "integralCoeff": 18.0,
+                        "feedFwdOffsetCoeff": 0.0,
+                        "feedFwdGainCoeff": 0.0,
+                        "integralLimit_min": 1786.0,
+                        "integralLimit_max": 18000.0,
+                        "outLim_min": 1786.0,
+                        "outLim_max": 18000.0,
+                        "slewNeg": 0.0,
+                        "slewPos": 0.0,
+                        "positiveHysteresis": 0.0,
+                        "negativeHysteresis": 0.0
+                    }
+                },
+                {
+                    "name": "zone0_vr",
+                    "type": "margin",
+                    "inputs": ["zone0_vr"],
+                    "setpoint": 10.0,
+                    "pid": {
+                        "samplePeriod": 1.0,
+                        "proportionalCoeff": 536.0,
+                        "integralCoeff": 9.0,
+                        "feedFwdOffsetCoeff": 0.0,
+                        "feedFwdGainCoeff": 0.0,
+                        "integralLimit_min": 1786.0,
+                        "integralLimit_max": 18000.0,
+                        "outLim_min": 1786.0,
+                        "outLim_max": 18000.0,
+                        "slewNeg": 0.0,
+                        "slewPos": 0.0,
+                        "positiveHysteresis": 0.0,
+                        "negativeHysteresis": 0.0
+                    }
+                },
+                {
+                    "name": "fleeting0",
+                    "type": "margin",
+                    "inputs": ["fleeting0"],
+                    "setpoint": 10.0,
+                    "pid": {
+                        "samplePeriod": 1.0,
+                        "proportionalCoeff": 536.0,
+                        "integralCoeff": 9.0,
+                        "feedFwdOffsetCoeff": 0.0,
+                        "feedFwdGainCoeff": 0.0,
+                        "integralLimit_min": 1786.0,
+                        "integralLimit_max": 18000.0,
+                        "outLim_min": 1786.0,
+                        "outLim_max": 18000.0,
+                        "slewNeg": 0.0,
+                        "slewPos": 0.0,
+                        "positiveHysteresis": 0.0,
+                        "negativeHysteresis": 0.0
+                    }
+                },
+                {
+                    "name": "fleeting1",
                     "type": "margin",
-                    "inputs": ["real_fleeting0"],
+                    "inputs": ["fleeting1"],
                     "setpoint": 10.0,
                     "pid": {
                         "samplePeriod": 1.0,
-                        "proportionalCoeff": 225.0,
-                        "integralCoeff": 45.0,
+                        "proportionalCoeff": 536.0,
+                        "integralCoeff": 18.0,
                         "feedFwdOffsetCoeff": 0.0,
                         "feedFwdGainCoeff": 0.0,
-                        "integralLimit_min": 2500.0,
+                        "integralLimit_min": 1786.0,
                         "integralLimit_max": 18000.0,
-                        "outLim_min": 2500.0,
+                        "outLim_min": 1786.0,
                         "outLim_max": 18000.0,
                         "slewNeg": 0.0,
                         "slewPos": 0.0,
@@ -167,7 +250,7 @@
                         "feedFwdGainCoeff": 0.0056,
                         "integralLimit_min": 0.0,
                         "integralLimit_max": 0.0,
-                        "outLim_min": 20.0,
+                        "outLim_min": 10.0,
                         "outLim_max": 100.0,
                         "slewNeg": 0.0,
                         "slewPos": 0.0
@@ -186,7 +269,7 @@
                         "feedFwdGainCoeff": 0.0056,
                         "integralLimit_min": 0.0,
                         "integralLimit_max": 0.0,
-                        "outLim_min": 20.0,
+                        "outLim_min": 10.0,
                         "outLim_max": 100.0,
                         "slewNeg": 0.0,
                         "slewPos": 0.0
@@ -205,26 +288,47 @@
                         "feedFwdGainCoeff": 0.0056,
                         "integralLimit_min": 0.0,
                         "integralLimit_max": 0.0,
-                        "outLim_min": 20.0,
+                        "outLim_min": 10.0,
                         "outLim_max": 100.0,
                         "slewNeg": 0.0,
                         "slewPos": 0.0
                     }
                 },
                 {
-                    "name": "real_fleeting1",
+                    "name": "nvme",
+                    "type": "margin",
+                    "inputs": ["nvme"],
+                    "setpoint": 10.0,
+                    "pid": {
+                        "samplePeriod": 1.0,
+                        "proportionalCoeff": 1786.0,
+                        "integralCoeff": 36.0,
+                        "feedFwdOffsetCoeff": 0.0,
+                        "feedFwdGainCoeff": 0.0,
+                        "integralLimit_min": 1786.0,
+                        "integralLimit_max": 18000.0,
+                        "outLim_min": 1786.0,
+                        "outLim_max": 18000.0,
+                        "slewNeg": 0.0,
+                        "slewPos": 0.0,
+                        "positiveHysteresis": 0.0,
+                        "negativeHysteresis": 0.0
+                    }
+                },
+                {
+                    "name": "p12v_fan",
                     "type": "margin",
-                    "inputs": ["real_fleeting1"],
+                    "inputs": ["p12v_fan"],
                     "setpoint": 10.0,
                     "pid": {
                         "samplePeriod": 1.0,
-                        "proportionalCoeff": 225.0,
-                        "integralCoeff": 45.0,
+                        "proportionalCoeff": 268.0,
+                        "integralCoeff": 4.0,
                         "feedFwdOffsetCoeff": 0.0,
                         "feedFwdGainCoeff": 0.0,
-                        "integralLimit_min": 2500.0,
+                        "integralLimit_min": 1786.0,
                         "integralLimit_max": 18000.0,
-                        "outLim_min": 2500.0,
+                        "outLim_min": 1786.0,
                         "outLim_max": 18000.0,
                         "slewNeg": 0.0,
                         "slewPos": 0.0,
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@82000/sbtsi@4c.conf b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@82000/sbtsi@4c.conf
index de988aa65..6dcada7b1 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@82000/sbtsi@4c.conf
+++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@82000/sbtsi@4c.conf
@@ -1,8 +1,8 @@
 LABEL_temp1 = "cputemp"
-CRITHI_temp1 = "85000"
-CRITLO_temp1 = "5000"
-WARNHI_temp1 = "85000"
-WARNLO_temp1 = "5000"
+CRITHI_temp1 = "95000"
+CRITLO_temp1 = "0"
+WARNHI_temp1 = "95000"
+WARNLO_temp1 = "0"
 MINVALUE_temp1 = "-128"
 MAXVALUE_temp1 = "127"
 ASYNC_READ_TIMEOUT_temp1 = "500"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@85000/i2c-switch@71/i2c@0/max31725@54.conf b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@85000/i2c-switch@71/i2c@0/max31725@54.conf
index b8ba115d1..839a7c610 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@85000/i2c-switch@71/i2c@0/max31725@54.conf
+++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@85000/i2c-switch@71/i2c@0/max31725@54.conf
@@ -1,8 +1,8 @@
 LABEL_temp1 = "i2cool_0"
-CRITHI_temp1 = "70000"
-CRITLO_temp1 = "5000"
-WARNHI_temp1 = "70000"
-WARNLO_temp1 = "5000"
+CRITHI_temp1 = "35000"
+CRITLO_temp1 = "0"
+WARNHI_temp1 = "35000"
+WARNLO_temp1 = "0"
 MINVALUE_temp1 = "-128"
 MAXVALUE_temp1 = "127"
 ASYNC_READ_TIMEOUT_temp1 = "500"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@85000/i2c-switch@71/i2c@1/max31725@55.conf b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@85000/i2c-switch@71/i2c@1/max31725@55.conf
index a798fc9bc..174c62b98 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@85000/i2c-switch@71/i2c@1/max31725@55.conf
+++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@85000/i2c-switch@71/i2c@1/max31725@55.conf
@@ -1,8 +1,8 @@
 LABEL_temp1 = "i2cool_1"
 CRITHI_temp1 = "70000"
-CRITLO_temp1 = "5000"
+CRITLO_temp1 = "0"
 WARNHI_temp1 = "70000"
-WARNLO_temp1 = "5000"
+WARNLO_temp1 = "0"
 MINVALUE_temp1 = "-128"
 MAXVALUE_temp1 = "127"
 ASYNC_READ_TIMEOUT_temp1 = "500"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@85000/i2c-switch@71/i2c@2/max31725@5d.conf b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@85000/i2c-switch@71/i2c@2/max31725@5d.conf
index a51043876..3fb0ceeeb 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@85000/i2c-switch@71/i2c@2/max31725@5d.conf
+++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@85000/i2c-switch@71/i2c@2/max31725@5d.conf
@@ -1,8 +1,8 @@
 LABEL_temp1 = "i2cool_2"
 CRITHI_temp1 = "70000"
-CRITLO_temp1 = "5000"
+CRITLO_temp1 = "0"
 WARNHI_temp1 = "70000"
-WARNLO_temp1 = "5000"
+WARNLO_temp1 = "0"
 MINVALUE_temp1 = "-128"
 MAXVALUE_temp1 = "127"
 ASYNC_READ_TIMEOUT_temp1 = "500"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@0/vrm@60.conf b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@0/vrm@60.conf
index 4f5ac3f67..580eeecf8 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@0/vrm@60.conf
+++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@0/vrm@60.conf
@@ -38,8 +38,8 @@ PWRONMON_curr2 = "ON"
 
 LABEL_temp1= "vddcr_cpu"
 WARNLO_temp1= "0"
-WARNHI_temp1= "125000"
-CRITHI_temp1 = "125000"
+WARNHI_temp1= "100000"
+CRITHI_temp1 = "100000"
 CRITLO_temp1 = "0"
 MINVALUE_temp1 = "-128"
 MAXVALUE_temp1 = "127"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@1/vrm@61.conf b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@1/vrm@61.conf
index de3ba4d0b..f21c32a24 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@1/vrm@61.conf
+++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@1/vrm@61.conf
@@ -38,8 +38,8 @@ PWRONMON_curr2 = "ON"
 
 LABEL_temp1= "vddcr_soc"
 WARNLO_temp1= "0"
-WARNHI_temp1= "125000"
-CRITHI_temp1 = "125000"
+WARNHI_temp1= "100000"
+CRITHI_temp1 = "100000"
 CRITLO_temp1 = "0"
 MINVALUE_temp1 = "-128"
 MAXVALUE_temp1 = "127"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@2/vrm@63.conf b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@2/vrm@63.conf
index 80be07d42..9cd9a129b 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@2/vrm@63.conf
+++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@2/vrm@63.conf
@@ -38,8 +38,8 @@ PWRONMON_curr2 = "ON"
 
 LABEL_temp1= "vddio_efgh"
 WARNLO_temp1= "0"
-WARNHI_temp1= "125000"
-CRITHI_temp1 = "125000"
+WARNHI_temp1= "100000"
+CRITHI_temp1 = "100000"
 CRITLO_temp1 = "0"
 MINVALUE_temp1 = "-128"
 MAXVALUE_temp1 = "127"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@3/vrm@45.conf b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@3/vrm@45.conf
index 2ae8f21f2..762af173b 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@3/vrm@45.conf
+++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@89000/i2c-switch@71/i2c@3/vrm@45.conf
@@ -38,8 +38,8 @@ PWRONMON_curr2 = "ON"
 
 LABEL_temp1= "vddio_abcd"
 WARNLO_temp1= "0"
-WARNHI_temp1= "125000"
-CRITHI_temp1 = "125000"
+WARNHI_temp1= "100000"
+CRITHI_temp1 = "100000"
 CRITLO_temp1 = "0"
 MINVALUE_temp1 = "-128"
 MAXVALUE_temp1 = "127"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/max34451@4e.conf b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/max34451@4e.conf
index 353075ab3..9a8a80390 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/max34451@4e.conf
+++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/max34451@4e.conf
@@ -110,10 +110,10 @@ MAXVALUE_in12 = "6"
 PWRONMON_in12 = "ON"
 
 LABEL_temp1 = "powerseq_temp"
-CRITHI_temp1 = "85000"
-CRITLO_temp1 = "5000"
-WARNHI_temp1 = "85000"
-WARNLO_temp1 = "5000"
+CRITHI_temp1 = "99000"
+CRITLO_temp1 = "0"
+WARNHI_temp1 = "99000"
+WARNLO_temp1 = "0"
 MINVALUE_temp1 = "-128"
 MAXVALUE_temp1 = "127"
 ASYNC_READ_TIMEOUT_temp1 = "500"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5d.conf b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5d.conf
index 0ef7d600a..427cdabe0 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5d.conf
+++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5d.conf
@@ -42,8 +42,8 @@ PWRONMON_curr2 = "ON"
 
 LABEL_temp1= "p12v_fan"
 WARNLO_temp1= "0"
-WARNHI_temp1= "125000"
-CRITHI_temp1 = "125000"
+WARNHI_temp1= "114000"
+CRITHI_temp1 = "114000"
 CRITLO_temp1 = "0"
 MINVALUE_temp1 = "-128"
 MAXVALUE_temp1 = "127"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5e.conf b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5e.conf
index a795a743e..c1612d13b 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5e.conf
+++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/i2c@8c000/vrm@5e.conf
@@ -42,8 +42,8 @@ PWRONMON_curr2 = "ON"
 
 LABEL_temp1= "p12v_mobo"
 WARNLO_temp1= "0"
-WARNHI_temp1= "125000"
-CRITHI_temp1 = "125000"
+WARNHI_temp1= "114000"
+CRITHI_temp1 = "114000"
 CRITLO_temp1 = "0"
 MINVALUE_temp1 = "-128"
 MAXVALUE_temp1 = "127"
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-nvme/nvme_config.json b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-nvme/nvme_config.json
index 9a114d385..306e74e2a 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-nvme/nvme_config.json
+++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-nvme/nvme_config.json
@@ -163,9 +163,9 @@
     ],
     "threshold": [
         {
-            "criticalHigh": 70,
+            "criticalHigh": 77,
             "criticalLow": 0,
-            "warningHigh": 70,
+            "warningHigh": 77,
             "warningLow": 0,
             "maxValue": 127,
             "minValue": -128
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-nvme/nvme_json_rewrite.sh b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-nvme/nvme_json_rewrite.sh
index 27ca98dc5..91dcb5cb3 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-nvme/nvme_json_rewrite.sh
+++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-nvme/nvme_json_rewrite.sh
@@ -202,9 +202,9 @@ cat > $TARGET_FILE_NAME << EOF1
     ],
     "threshold": [
         {
-            "criticalHigh": 70,
+            "criticalHigh": 77,
             "criticalLow": 0,
-            "warningHigh": 70,
+            "warningHigh": 77,
             "warningLow": 0,
             "maxValue": 127,
             "minValue": -128
diff --git a/meta-quanta/meta-gbs/recipes-quanta/fans/read-margin-temp/config-margin.json b/meta-quanta/meta-gbs/recipes-quanta/fans/read-margin-temp/config-margin.json
index 6b73e34b8..36ed8a0e7 100644
--- a/meta-quanta/meta-gbs/recipes-quanta/fans/read-margin-temp/config-margin.json
+++ b/meta-quanta/meta-gbs/recipes-quanta/fans/read-margin-temp/config-margin.json
@@ -6,9 +6,9 @@
             "type": "dbus",
             "path": "/xyz/openbmc_project/sensors/temperature/cputemp",
             "parameters": {
-                "type": "file",
-                "maxTemp": -1,
-                "path": "/sys/devices/platform/ahb/ahb:apb/f0082000.i2c/i2c-2/2-004c/hwmon/cpu_hwmon/temp1_max",
+                "type": "",
+                "maxTemp": 95000,
+                "path": "",
                 "sysLabel": "",
                 "targetTemp": -1,
                 "targetTempOffset": -10000,
@@ -22,10 +22,10 @@
             "path": "/xyz/openbmc_project/sensors/temperature/nvme0",
             "parameters": {
                 "type": "",
-                "maxTemp": 70000,
+                "maxTemp": 77000,
                 "path": "",
                 "sysLabel": "",
-                "targetTemp": 60000,
+                "targetTemp": 67000,
                 "targetTempOffset": 0,
                 "scalar": 1.0
             }
@@ -37,10 +37,10 @@
             "path": "/xyz/openbmc_project/sensors/temperature/nvme1",
             "parameters": {
                 "type": "",
-                "maxTemp": 70000,
+                "maxTemp": 77000,
                 "path": "",
                 "sysLabel": "",
-                "targetTemp": 60000,
+                "targetTemp": 67000,
                 "targetTempOffset": 0,
                 "scalar": 1.0
             }
@@ -52,10 +52,10 @@
             "path": "/xyz/openbmc_project/sensors/temperature/nvme2",
             "parameters": {
                 "type": "",
-                "maxTemp": 70000,
+                "maxTemp": 77000,
                 "path": "",
                 "sysLabel": "",
-                "targetTemp": 60000,
+                "targetTemp": 67000,
                 "targetTempOffset": 0,
                 "scalar": 1.0
             }
@@ -67,10 +67,10 @@
             "path": "/xyz/openbmc_project/sensors/temperature/nvme3",
             "parameters": {
                 "type": "",
-                "maxTemp": 70000,
+                "maxTemp": 77000,
                 "path": "",
                 "sysLabel": "",
-                "targetTemp": 60000,
+                "targetTemp": 67000,
                 "targetTempOffset": 0,
                 "scalar": 1.0
             }
@@ -82,10 +82,10 @@
             "path": "/xyz/openbmc_project/sensors/temperature/nvme4",
             "parameters": {
                 "type": "",
-                "maxTemp": 70000,
+                "maxTemp": 77000,
                 "path": "",
                 "sysLabel": "",
-                "targetTemp": 60000,
+                "targetTemp": 67000,
                 "targetTempOffset": 0,
                 "scalar": 1.0
             }
@@ -97,10 +97,10 @@
             "path": "/xyz/openbmc_project/sensors/temperature/nvme5",
             "parameters": {
                 "type": "",
-                "maxTemp": 70000,
+                "maxTemp": 77000,
                 "path": "",
                 "sysLabel": "",
-                "targetTemp": 60000,
+                "targetTemp": 67000,
                 "targetTempOffset": 0,
                 "scalar": 1.0
             }
@@ -112,10 +112,10 @@
             "path": "/xyz/openbmc_project/sensors/temperature/nvme6",
             "parameters": {
                 "type": "",
-                "maxTemp": 70000,
+                "maxTemp": 77000,
                 "path": "",
                 "sysLabel": "",
-                "targetTemp": 60000,
+                "targetTemp": 67000,
                 "targetTempOffset": 0,
                 "scalar": 1.0
             }
@@ -127,10 +127,10 @@
             "path": "/xyz/openbmc_project/sensors/temperature/nvme7",
             "parameters": {
                 "type": "",
-                "maxTemp": 70000,
+                "maxTemp": 77000,
                 "path": "",
                 "sysLabel": "",
-                "targetTemp": 60000,
+                "targetTemp": 67000,
                 "targetTempOffset": 0,
                 "scalar": 1.0
             }
@@ -142,10 +142,10 @@
             "path": "/xyz/openbmc_project/sensors/temperature/nvme8",
             "parameters": {
                 "type": "",
-                "maxTemp": 70000,
+                "maxTemp": 77000,
                 "path": "",
                 "sysLabel": "",
-                "targetTemp": 60000,
+                "targetTemp": 67000,
                 "targetTempOffset": 0,
                 "scalar": 1.0
             }
@@ -157,10 +157,10 @@
             "path": "/xyz/openbmc_project/sensors/temperature/nvme9",
             "parameters": {
                 "type": "",
-                "maxTemp": 70000,
+                "maxTemp": 77000,
                 "path": "",
                 "sysLabel": "",
-                "targetTemp": 60000,
+                "targetTemp": 67000,
                 "targetTempOffset": 0,
                 "scalar": 1.0
             }
@@ -172,10 +172,10 @@
             "path": "/xyz/openbmc_project/sensors/temperature/nvme10",
             "parameters": {
                 "type": "",
-                "maxTemp": 70000,
+                "maxTemp": 77000,
                 "path": "",
                 "sysLabel": "",
-                "targetTemp": 60000,
+                "targetTemp": 67000,
                 "targetTempOffset": 0,
                 "scalar": 1.0
             }
@@ -187,10 +187,10 @@
             "path": "/xyz/openbmc_project/sensors/temperature/nvme11",
             "parameters": {
                 "type": "",
-                "maxTemp": 70000,
+                "maxTemp": 77000,
                 "path": "",
                 "sysLabel": "",
-                "targetTemp": 60000,
+                "targetTemp": 67000,
                 "targetTempOffset": 0,
                 "scalar": 1.0
             }
@@ -202,10 +202,10 @@
             "path": "/xyz/openbmc_project/sensors/temperature/nvme12",
             "parameters": {
                 "type": "",
-                "maxTemp": 70000,
+                "maxTemp": 77000,
                 "path": "",
                 "sysLabel": "",
-                "targetTemp": 60000,
+                "targetTemp": 67000,
                 "targetTempOffset": 0,
                 "scalar": 1.0
             }
@@ -217,10 +217,10 @@
             "path": "/xyz/openbmc_project/sensors/temperature/nvme13",
             "parameters": {
                 "type": "",
-                "maxTemp": 70000,
+                "maxTemp": 77000,
                 "path": "",
                 "sysLabel": "",
-                "targetTemp": 60000,
+                "targetTemp": 67000,
                 "targetTempOffset": 0,
                 "scalar": 1.0
             }
@@ -232,10 +232,10 @@
             "path": "/xyz/openbmc_project/sensors/temperature/nvme14",
             "parameters": {
                 "type": "",
-                "maxTemp": 70000,
+                "maxTemp": 77000,
                 "path": "",
                 "sysLabel": "",
-                "targetTemp": 60000,
+                "targetTemp": 67000,
                 "targetTempOffset": 0,
                 "scalar": 1.0
             }
@@ -247,40 +247,115 @@
             "path": "/xyz/openbmc_project/sensors/temperature/nvme15",
             "parameters": {
                 "type": "",
-                "maxTemp": 70000,
+                "maxTemp": 77000,
                 "path": "",
                 "sysLabel": "",
-                "targetTemp": 60000,
+                "targetTemp": 67000,
                 "targetTempOffset": 0,
                 "scalar": 1.0
             }
         },
         {
-            "name": "fleeting0",
-            "unit": "millimargin",
+            "name": "vddcr_cpu",
+            "unit": "millidegree",
             "type": "dbus",
-            "path": "/xyz/openbmc_project/extsensors/margin/fleeting0",
+            "path": "/xyz/openbmc_project/sensors/temperature/vddcr_cpu",
             "parameters": {
                 "type": "",
-                "maxTemp": 0,
+                "maxTemp": 100000,
                 "path": "",
                 "sysLabel": "",
-                "targetTemp": 0,
+                "targetTemp": 90000,
                 "targetTempOffset": 0,
                 "scalar": 1.0
             }
         },
         {
-            "name": "fleeting1",
-            "unit": "millimargin",
+            "name": "vddcr_soc",
+            "unit": "millidegree",
             "type": "dbus",
-            "path": "/xyz/openbmc_project/extsensors/margin/fleeting1",
+            "path": "/xyz/openbmc_project/sensors/temperature/vddcr_soc",
             "parameters": {
                 "type": "",
-                "maxTemp": 0,
+                "maxTemp": 100000,
                 "path": "",
                 "sysLabel": "",
-                "targetTemp": 0,
+                "targetTemp": 90000,
+                "targetTempOffset": 0,
+                "scalar": 1.0
+            }
+        },
+        {
+            "name": "vddio_abcd",
+            "unit": "millidegree",
+            "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": "millidegree",
+            "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": "millidegree",
+            "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": "millidegree",
+            "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": "millidegree",
+            "type": "dbus",
+            "path": "/xyz/openbmc_project/sensors/temperature/p12v_fan",
+            "parameters": {
+                "type": "",
+                "maxTemp": 114000,
+                "path": "",
+                "sysLabel": "",
+                "targetTemp": 90000,
                 "targetTempOffset": 0,
                 "scalar": 1.0
             }
@@ -293,14 +368,26 @@
                 {
                     "id": 0,
                     "zoneSetpoint": 10000,
-                    "target": "/xyz/openbmc_project/extsensors/margin/real_fleeting0",
-                    "components": ["cputemp", "fleeting0"]
+                    "target": "/xyz/openbmc_project/extsensors/margin/cputemp",
+                    "components": ["cputemp"]
                 },
                 {
                     "id": 1,
                     "zoneSetpoint": 10000,
-                    "target": "/xyz/openbmc_project/extsensors/margin/real_fleeting1",
+                    "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": ["nvme0", "nvme1", "nvme2", "nvme3", "nvme4", "nvme5", "nvme6", "nvme7", "nvme8", "nvme9", "nvme10", "nvme11", "nvme12", "nvme13", "nvme14", "nvme15"]
+                },
+                {
+                    "id": 3,
+                    "zoneSetpoint": 10000,
+                    "target": "/xyz/openbmc_project/extsensors/margin/p12v_fan",
+                    "components": ["p12v_fan"]
                 }
             ]
         }