diff options
Diffstat (limited to 'meta-openbmc-mods/meta-ast2500')
5 files changed, 78 insertions, 28 deletions
diff --git a/meta-openbmc-mods/meta-ast2500/conf/machine/include/intel-ast2500.inc b/meta-openbmc-mods/meta-ast2500/conf/machine/include/intel-ast2500.inc index 1889831c8..3e7bd152f 100644 --- a/meta-openbmc-mods/meta-ast2500/conf/machine/include/intel-ast2500.inc +++ b/meta-openbmc-mods/meta-ast2500/conf/machine/include/intel-ast2500.inc @@ -1,5 +1,8 @@ KMACHINE = "aspeed" -KERNEL_DEVICETREE = "${KMACHINE}-bmc-intel-ast2500.dtb" +KERNEL_DEVICETREE = " \ + ${KMACHINE}-bmc-intel-ast2500.dtb \ + ${KMACHINE}-bmc-intel-s2600wf.dtb \ + " require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-si-common.inc diff --git a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0045-Apply-WDT1-2-reset-mask-to-reset-needed-controller.patch b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0045-Apply-WDT1-2-reset-mask-to-reset-needed-controller.patch index ea7a582df..94e93db7f 100644 --- a/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0045-Apply-WDT1-2-reset-mask-to-reset-needed-controller.patch +++ b/meta-openbmc-mods/meta-ast2500/recipes-bsp/u-boot/files/0045-Apply-WDT1-2-reset-mask-to-reset-needed-controller.patch @@ -23,13 +23,12 @@ in order to avoid the host hang. 1. SDRAM controller 2. AHB Bridges 3. Graphics CRT controller -4. Reset Video Engine -5. LPC controller -6. CRT mode 2D Engine -7. PWM controller -8. MCTP Controller -9. X- DMA Controller -10. SPI controller +4. LPC controller +5. CRT mode 2D Engine +6. PWM controller +7. MCTP Controller +8. X- DMA Controller +9. SPI controller Quick Step to reproduce: Stop the BMC in uboot and add below bootcmd command @@ -71,10 +70,10 @@ index b404353..97253f4 100644 str r1, [r0] ldr r0, =0x1e78501c @ restore normal mask setting - ldr r1, =0x023FFFF3 @ added 2016.09.06 -+ ldr r1, =0x023CD773 @ Changed 2020.06.18 ++ ldr r1, =0x023CDF73 @ Changed 2020.06.18 + str r1, [r0] + ldr r0, =0x1e78503c @ restore normal mask setting -+ ldr r1, =0x023CD773 @ Changed 2020.07.08 ++ ldr r1, =0x023CDF73 @ Changed 2020.07.08 str r1, [r0] b bypass_first_reset diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/CPC-Baseboard.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/CPC-Baseboard.json index 44eda0e66..94e7e7daa 100644 --- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/CPC-Baseboard.json +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/CPC-Baseboard.json @@ -981,6 +981,30 @@ "Type": "IpmbSensor" }, { + "Address": 190, + "Class": "MESensor", + "Name": "Host Cpu Utilization", + "SensorType": "utilization", + "ScaleValue": 0.392, + "Type": "IpmbSensor" + }, + { + "Address": 191, + "Class": "MESensor", + "Name": "Host Pci Bandwidth Utilization", + "SensorType": "utilization", + "ScaleValue": 0.392, + "Type": "IpmbSensor" + }, + { + "Address": 192, + "Class": "MESensor", + "Name": "Host Memory Bandwidth Utilization", + "SensorType": "utilization", + "ScaleValue": 0.392, + "Type": "IpmbSensor" + }, + { "Address": "0x71", "Bus": 2, "ChannelNames": [ @@ -1433,7 +1457,7 @@ "Class": "temp", "FFGainCoefficient": 0.0, "FFOffCoefficient": 0.0, - "ICoefficient": -1.0, + "ICoefficient": -0.2, "ILimitMax": 100, "ILimitMin": 30, "Inputs": [ @@ -1444,9 +1468,9 @@ "OutLimitMax": 100, "OutLimitMin": 30, "Outputs": [], - "PCoefficient": -0.15, + "PCoefficient": -0.1, "PositiveHysteresis": 0.0, - "SetPoint": 80.0, + "SetPoint": 75.0, "SlewNeg": -1, "SlewPos": 0.0, "Type": "Pid", @@ -1458,7 +1482,7 @@ "Class": "temp", "FFGainCoefficient": 0.0, "FFOffCoefficient": 0.0, - "ICoefficient": -1.0, + "ICoefficient": -0.2, "ILimitMax": 100, "ILimitMin": 30, "Inputs": [ @@ -1469,9 +1493,9 @@ "OutLimitMax": 100, "OutLimitMin": 30, "Outputs": [], - "PCoefficient": -0.15, + "PCoefficient": -0.1, "PositiveHysteresis": 0.0, - "SetPoint": 80.0, + "SetPoint": 75.0, "SlewNeg": -1, "SlewPos": 0.0, "Type": "Pid", diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json index 12790632e..83e6deabe 100644 --- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WC-Baseboard.json @@ -2041,7 +2041,7 @@ "Class": "temp", "FFGainCoefficient": 0.0, "FFOffCoefficient": 0.0, - "ICoefficient": -1.0, + "ICoefficient": -0.2, "ILimitMax": 100, "ILimitMin": 30, "Inputs": [ @@ -2052,9 +2052,9 @@ "OutLimitMax": 100, "OutLimitMin": 30, "Outputs": [], - "PCoefficient": -0.15, + "PCoefficient": -0.1, "PositiveHysteresis": 0.0, - "SetPoint": 80.0, + "SetPoint": 75.0, "SlewNeg": -1, "SlewPos": 0.0, "Type": "Pid", @@ -2066,7 +2066,7 @@ "Class": "temp", "FFGainCoefficient": 0.0, "FFOffCoefficient": 0.0, - "ICoefficient": -1.0, + "ICoefficient": -2.0, "ILimitMax": 100, "ILimitMin": 30, "Inputs": [ @@ -2077,9 +2077,9 @@ "OutLimitMax": 100, "OutLimitMin": 30, "Outputs": [], - "PCoefficient": -0.15, + "PCoefficient": -0.1, "PositiveHysteresis": 0.0, - "SetPoint": 80.0, + "SetPoint": 75.0, "SlewNeg": -1, "SlewPos": 0.0, "Type": "Pid", diff --git a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json index 7b128099f..573f1aec6 100644 --- a/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json +++ b/meta-openbmc-mods/meta-ast2500/recipes-phosphor/configuration/entity-manager/WP-Baseboard.json @@ -1567,6 +1567,30 @@ "Type": "IpmbSensor" }, { + "Address": 190, + "Class": "MESensor", + "Name": "Host Cpu Utilization", + "SensorType": "utilization", + "ScaleValue": 0.392, + "Type": "IpmbSensor" + }, + { + "Address": 191, + "Class": "MESensor", + "Name": "Host Pci Bandwidth Utilization", + "SensorType": "utilization", + "ScaleValue": 0.392, + "Type": "IpmbSensor" + }, + { + "Address": 192, + "Class": "MESensor", + "Name": "Host Memory Bandwidth Utilization", + "SensorType": "utilization", + "ScaleValue": 0.392, + "Type": "IpmbSensor" + }, + { "EthIndex": 0, "Name": "Dedicated Management NIC", "Type": "NIC" @@ -2008,7 +2032,7 @@ "Class": "temp", "FFGainCoefficient": 0.0, "FFOffCoefficient": 0.0, - "ICoefficient": -1.0, + "ICoefficient": -0.2, "ILimitMax": 100, "ILimitMin": 30, "Inputs": [ @@ -2019,9 +2043,9 @@ "OutLimitMax": 100, "OutLimitMin": 30, "Outputs": [], - "PCoefficient": -0.15, + "PCoefficient": -0.1, "PositiveHysteresis": 0.0, - "SetPoint": 80.0, + "SetPoint": 75.0, "SlewNeg": -1, "SlewPos": 0.0, "Type": "Pid", @@ -2033,7 +2057,7 @@ "Class": "temp", "FFGainCoefficient": 0.0, "FFOffCoefficient": 0.0, - "ICoefficient": -1.0, + "ICoefficient": -0.2, "ILimitMax": 100, "ILimitMin": 30, "Inputs": [ @@ -2044,9 +2068,9 @@ "OutLimitMax": 100, "OutLimitMin": 30, "Outputs": [], - "PCoefficient": -0.15, + "PCoefficient": -0.1, "PositiveHysteresis": 0.0, - "SetPoint": 80.0, + "SetPoint": 75.0, "SlewNeg": -1, "SlewPos": 0.0, "Type": "Pid", |