Make other CPU relating index start from 1 instead of 0
For end-user friendly number indexing, this commit makes CPU number
index start from 1 instead of 0.
Tested: Dbus interface items relating to CPUs showed CPU1 and CPU2
instead of CPU0 and CPU1.
Change-Id: I29e231ec1832cc584f1b5c9a681ea34a331e7624
Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com>
diff --git a/configurations/STP Baseboard.json b/configurations/STP Baseboard.json
index 93d8ced..769bee9 100644
--- a/configurations/STP Baseboard.json
+++ b/configurations/STP Baseboard.json
@@ -55,7 +55,7 @@
"Type": "IntelFanConnector"
},
{
- "Name": "4U CPU 0 fan connector",
+ "Name": "4U CPU 1 fan connector",
"Pwm": 7,
"Status": "disabled",
"Tachs": [
@@ -64,7 +64,7 @@
"Type": "IntelFanConnector"
},
{
- "Name": "4U CPU 1 fan connector",
+ "Name": "4U CPU 2 fan connector",
"Pwm": 8,
"Status": "disabled",
"Tachs": [
@@ -532,38 +532,6 @@
},
{
"Index": 8,
- "Name": "PVCCIN_CPU0",
- "ScaleFactor": 0.7505,
- "Thresholds": [
- {
- "Direction": "greater than",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 2.151
- },
- {
- "Direction": "greater than",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 2.088
- },
- {
- "Direction": "less than",
- "Name": "lower non critical",
- "Severity": 0,
- "Value": 1.418
- },
- {
- "Direction": "less than",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 1.376
- }
- ],
- "Type": "ADC"
- },
- {
- "Index": 9,
"Name": "PVCCIN_CPU1",
"ScaleFactor": 0.7505,
"Thresholds": [
@@ -595,71 +563,39 @@
"Type": "ADC"
},
{
+ "Index": 9,
+ "Name": "PVCCIN_CPU2",
+ "ScaleFactor": 0.7505,
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 2.151
+ },
+ {
+ "Direction": "greater than",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 2.088
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower non critical",
+ "Severity": 0,
+ "Value": 1.418
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 1.376
+ }
+ ],
+ "Type": "ADC"
+ },
+ {
"Index": 10,
- "Name": "PVDDQ_ABC_CPU0",
- "ScaleFactor": 1.0,
- "Thresholds": [
- {
- "Direction": "greater than",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 1.301
- },
- {
- "Direction": "greater than",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 1.263
- },
- {
- "Direction": "less than",
- "Name": "lower non critical",
- "Severity": 0,
- "Value": 1.138
- },
- {
- "Direction": "less than",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 1.104
- }
- ],
- "Type": "ADC"
- },
- {
- "Index": 11,
- "Name": "PVDDQ_DEF_CPU0",
- "ScaleFactor": 1.0,
- "Thresholds": [
- {
- "Direction": "greater than",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 1.301
- },
- {
- "Direction": "greater than",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 1.263
- },
- {
- "Direction": "less than",
- "Name": "lower non critical",
- "Severity": 0,
- "Value": 1.138
- },
- {
- "Direction": "less than",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 1.104
- }
- ],
- "Type": "ADC"
- },
- {
- "Index": 12,
"Name": "PVDDQ_ABC_CPU1",
"ScaleFactor": 1.0,
"Thresholds": [
@@ -691,7 +627,7 @@
"Type": "ADC"
},
{
- "Index": 13,
+ "Index": 11,
"Name": "PVDDQ_DEF_CPU1",
"ScaleFactor": 1.0,
"Thresholds": [
@@ -723,8 +659,72 @@
"Type": "ADC"
},
{
+ "Index": 12,
+ "Name": "PVDDQ_ABC_CPU2",
+ "ScaleFactor": 1.0,
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 1.301
+ },
+ {
+ "Direction": "greater than",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 1.263
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower non critical",
+ "Severity": 0,
+ "Value": 1.138
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 1.104
+ }
+ ],
+ "Type": "ADC"
+ },
+ {
+ "Index": 13,
+ "Name": "PVDDQ_DEF_CPU2",
+ "ScaleFactor": 1.0,
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 1.301
+ },
+ {
+ "Direction": "greater than",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 1.263
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower non critical",
+ "Severity": 0,
+ "Value": 1.138
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 1.104
+ }
+ ],
+ "Type": "ADC"
+ },
+ {
"Index": 14,
- "Name": "PVCCIO_CPU0",
+ "Name": "PVCCIO_CPU1",
"ScaleFactor": 1.0,
"Thresholds": [
{
@@ -756,7 +756,7 @@
},
{
"Index": 15,
- "Name": "PVCCIO_CPU1",
+ "Name": "PVCCIO_CPU2",
"ScaleFactor": 1.0,
"Thresholds": [
{
diff --git a/configurations/WFT Baseboard.json b/configurations/WFT Baseboard.json
index 02a3ef8..d364481 100644
--- a/configurations/WFT Baseboard.json
+++ b/configurations/WFT Baseboard.json
@@ -422,39 +422,6 @@
},
{
"Index": 8,
- "Name": "PVCCIN_CPU0",
- "PowerState": "On",
- "ScaleFactor": 0.7505,
- "Thresholds": [
- {
- "Direction": "greater than",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 2.151
- },
- {
- "Direction": "greater than",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 2.088
- },
- {
- "Direction": "less than",
- "Name": "lower non critical",
- "Severity": 0,
- "Value": 1.418
- },
- {
- "Direction": "less than",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 1.376
- }
- ],
- "Type": "ADC"
- },
- {
- "Index": 9,
"Name": "PVCCIN_CPU1",
"PowerState": "On",
"ScaleFactor": 0.7505,
@@ -487,39 +454,40 @@
"Type": "ADC"
},
{
- "Index": 14,
- "Name": "PVCCIO_CPU0",
+ "Index": 9,
+ "Name": "PVCCIN_CPU2",
"PowerState": "On",
+ "ScaleFactor": 0.7505,
"Thresholds": [
{
"Direction": "greater than",
"Name": "upper critical",
"Severity": 1,
- "Value": 1.19
+ "Value": 2.151
},
{
"Direction": "greater than",
"Name": "upper non critical",
"Severity": 0,
- "Value": 1.155
+ "Value": 2.088
},
{
"Direction": "less than",
"Name": "lower non critical",
"Severity": 0,
- "Value": 0.752
+ "Value": 1.418
},
{
"Direction": "less than",
"Name": "lower critical",
"Severity": 1,
- "Value": 0.729
+ "Value": 1.376
}
],
"Type": "ADC"
},
{
- "Index": 15,
+ "Index": 14,
"Name": "PVCCIO_CPU1",
"PowerState": "On",
"Thresholds": [
@@ -551,39 +519,39 @@
"Type": "ADC"
},
{
- "Index": 10,
- "Name": "PVDQ_ABC_CPU0",
+ "Index": 15,
+ "Name": "PVCCIO_CPU2",
"PowerState": "On",
"Thresholds": [
{
"Direction": "greater than",
"Name": "upper critical",
"Severity": 1,
- "Value": 1.301
+ "Value": 1.19
},
{
"Direction": "greater than",
"Name": "upper non critical",
"Severity": 0,
- "Value": 1.263
+ "Value": 1.155
},
{
"Direction": "less than",
"Name": "lower non critical",
"Severity": 0,
- "Value": 1.138
+ "Value": 0.752
},
{
"Direction": "less than",
"Name": "lower critical",
"Severity": 1,
- "Value": 1.104
+ "Value": 0.729
}
],
"Type": "ADC"
},
{
- "Index": 12,
+ "Index": 10,
"Name": "PVDQ_ABC_CPU1",
"PowerState": "On",
"Thresholds": [
@@ -615,8 +583,40 @@
"Type": "ADC"
},
{
+ "Index": 12,
+ "Name": "PVDQ_ABC_CPU2",
+ "PowerState": "On",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 1.301
+ },
+ {
+ "Direction": "greater than",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 1.263
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower non critical",
+ "Severity": 0,
+ "Value": 1.138
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 1.104
+ }
+ ],
+ "Type": "ADC"
+ },
+ {
"Index": 11,
- "Name": "PVDQ_DEF_CPU0",
+ "Name": "PVDQ_DEF_CPU1",
"PowerState": "On",
"Thresholds": [
{
@@ -648,7 +648,7 @@
},
{
"Index": 13,
- "Name": "PVDQ_DEF_CPU1",
+ "Name": "PVDQ_DEF_CPU2",
"PowerState": "On",
"Thresholds": [
{
@@ -860,9 +860,9 @@
"ILimitMax": 100,
"ILimitMin": 30,
"Inputs": [
- "Core \\d+ CPU0"
+ "Core \\d+ CPU1"
],
- "Name": "CPU0",
+ "Name": "CPU1",
"NegativeHysteresis": 5.0,
"OutLimitMax": 100,
"OutLimitMin": 30,
@@ -885,9 +885,9 @@
"ILimitMax": 100,
"ILimitMin": 30,
"Inputs": [
- "Core \\d+ CPU1"
+ "Core \\d+ CPU2"
],
- "Name": "CPU1",
+ "Name": "CPU2",
"NegativeHysteresis": 5.0,
"OutLimitMax": 100,
"OutLimitMin": 30,