<p>Alexey Derlaft has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/23177">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ec/lenovo/h8: Enable battery thresholds for more platforms, add boundary checks<br><br>Change-Id: Ie785819c73df1fe1600c99a0c997f3c24081964b<br>Signed-off-by: Alexey Kharlamov <der@2-47.ru><br>---<br>M src/ec/lenovo/h8/acpi/ec.asl<br>M src/ec/lenovo/h8/acpi/tp_acpi_bat_24.asl<br>M src/ec/lenovo/h8/acpi/tp_acpi_bat_b0.asl<br>M src/mainboard/lenovo/t400/Kconfig<br>M src/mainboard/lenovo/t420/Kconfig<br>M src/mainboard/lenovo/t420s/Kconfig<br>M src/mainboard/lenovo/t430/Kconfig<br>M src/mainboard/lenovo/t430s/Kconfig<br>8 files changed, 24 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/77/23177/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/ec/lenovo/h8/acpi/ec.asl b/src/ec/lenovo/h8/acpi/ec.asl</span><br><span>index ed122d7..345d113 100644</span><br><span>--- a/src/ec/lenovo/h8/acpi/ec.asl</span><br><span>+++ b/src/ec/lenovo/h8/acpi/ec.asl</span><br><span>@@ -438,7 +438,7 @@</span><br><span> }</span><br><span> </span><br><span> #if IS_ENABLED(CONFIG_IMPLEMENTS_ACPI_H8_BAT_TRESHOLDS)</span><br><span style="color: hsl(0, 100%, 40%);">- #include "tp_acpi_bat.asl"</span><br><span style="color: hsl(120, 100%, 40%);">+ #include "tp_acpi_bat.asl"</span><br><span> #endif</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/ec/lenovo/h8/acpi/tp_acpi_bat_24.asl b/src/ec/lenovo/h8/acpi/tp_acpi_bat_24.asl</span><br><span>index 6a15ac6..9c5e6ca 100644</span><br><span>--- a/src/ec/lenovo/h8/acpi/tp_acpi_bat_24.asl</span><br><span>+++ b/src/ec/lenovo/h8/acpi/tp_acpi_bat_24.asl</span><br><span>@@ -37,7 +37,7 @@</span><br><span> */</span><br><span> Method (SETT, 2, NotSerialized)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- if (Arg0 <= 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (Arg0 <= 1 && Arg1 <= 100) {</span><br><span> BSTP = Arg0</span><br><span> TSH0 = Arg1 | 0x80</span><br><span> }</span><br><span>@@ -61,7 +61,7 @@</span><br><span> */</span><br><span> Method (SETT, 2, NotSerialized)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- if (Arg0 <= 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (Arg0 <= 1 && Arg1 <= 100) {</span><br><span> BSTP = Arg0</span><br><span> TSH1 = Arg1 | 0x80</span><br><span> }</span><br><span>diff --git a/src/ec/lenovo/h8/acpi/tp_acpi_bat_b0.asl b/src/ec/lenovo/h8/acpi/tp_acpi_bat_b0.asl</span><br><span>index 6c568de..8040b17 100644</span><br><span>--- a/src/ec/lenovo/h8/acpi/tp_acpi_bat_b0.asl</span><br><span>+++ b/src/ec/lenovo/h8/acpi/tp_acpi_bat_b0.asl</span><br><span>@@ -38,12 +38,14 @@</span><br><span> */</span><br><span> Method (SETT, 2, NotSerialized)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- if (Arg0 == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- TSL0 = Arg1</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (Arg0 == 1) {</span><br><span style="color: hsl(0, 100%, 40%);">- TSH0 = Arg1</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (Arg1 <= 100) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (Arg0 == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ TSL0 = Arg1</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (Arg0 == 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ TSH0 = Arg1</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> /* Get threshold on battery0, Arg0: (0 start, 1 stop) chargning */</span><br><span> Method (GETT, 1, NotSerialized)</span><br><span>@@ -66,12 +68,14 @@</span><br><span> */</span><br><span> Method (SETT, 2, NotSerialized)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- if (Arg0 == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- TSL1 = Arg1</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (Arg0 == 1) {</span><br><span style="color: hsl(0, 100%, 40%);">- TSH1 = Arg1</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (Arg1 <= 100) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (Arg0 == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ TSL1 = Arg1</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (Arg0 == 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ TSH1 = Arg1</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> /* Get threshold on battery1, Arg0: (0 start, 1 stop) chargning */</span><br><span> Method (GETT, 1, NotSerialized)</span><br><span>diff --git a/src/mainboard/lenovo/t400/Kconfig b/src/mainboard/lenovo/t400/Kconfig</span><br><span>index 8eb5fc5..6c9b1d3 100644</span><br><span>--- a/src/mainboard/lenovo/t400/Kconfig</span><br><span>+++ b/src/mainboard/lenovo/t400/Kconfig</span><br><span>@@ -8,6 +8,7 @@</span><br><span> select SOUTHBRIDGE_INTEL_I82801IX</span><br><span> select EC_LENOVO_PMH7</span><br><span> select EC_LENOVO_H8</span><br><span style="color: hsl(120, 100%, 40%);">+ select IMPLEMENTS_ACPI_H8_BAT_TRESHOLDS_24</span><br><span> select H8_DOCK_EARLY_INIT</span><br><span> select BOARD_ROMSIZE_KB_8192</span><br><span> select DRIVERS_GENERIC_IOAPIC</span><br><span>diff --git a/src/mainboard/lenovo/t420/Kconfig b/src/mainboard/lenovo/t420/Kconfig</span><br><span>index c0b4752..c2044e7 100644</span><br><span>--- a/src/mainboard/lenovo/t420/Kconfig</span><br><span>+++ b/src/mainboard/lenovo/t420/Kconfig</span><br><span>@@ -9,6 +9,7 @@</span><br><span> select SOUTHBRIDGE_INTEL_BD82X6X</span><br><span> select EC_LENOVO_PMH7</span><br><span> select EC_LENOVO_H8</span><br><span style="color: hsl(120, 100%, 40%);">+ select IMPLEMENTS_ACPI_H8_BAT_TRESHOLDS_B0</span><br><span> select NO_UART_ON_SUPERIO</span><br><span> select BOARD_ROMSIZE_KB_8192</span><br><span> select HAVE_ACPI_TABLES</span><br><span>diff --git a/src/mainboard/lenovo/t420s/Kconfig b/src/mainboard/lenovo/t420s/Kconfig</span><br><span>index 08052b1..ab579fb 100644</span><br><span>--- a/src/mainboard/lenovo/t420s/Kconfig</span><br><span>+++ b/src/mainboard/lenovo/t420s/Kconfig</span><br><span>@@ -9,6 +9,7 @@</span><br><span> select SOUTHBRIDGE_INTEL_BD82X6X</span><br><span> select EC_LENOVO_PMH7</span><br><span> select EC_LENOVO_H8</span><br><span style="color: hsl(120, 100%, 40%);">+ select IMPLEMENTS_ACPI_H8_BAT_TRESHOLDS_B0</span><br><span> select NO_UART_ON_SUPERIO</span><br><span> select BOARD_ROMSIZE_KB_8192</span><br><span> select HAVE_ACPI_TABLES</span><br><span>diff --git a/src/mainboard/lenovo/t430/Kconfig b/src/mainboard/lenovo/t430/Kconfig</span><br><span>index a621fdb..8d759c0 100644</span><br><span>--- a/src/mainboard/lenovo/t430/Kconfig</span><br><span>+++ b/src/mainboard/lenovo/t430/Kconfig</span><br><span>@@ -6,6 +6,7 @@</span><br><span> select CPU_INTEL_SOCKET_RPGA989</span><br><span> select DRIVERS_RICOH_RCE822</span><br><span> select EC_LENOVO_H8</span><br><span style="color: hsl(120, 100%, 40%);">+ select IMPLEMENTS_ACPI_H8_BAT_TRESHOLDS_B0</span><br><span> select EC_LENOVO_PMH7</span><br><span> select NO_UART_ON_SUPERIO</span><br><span> select HAVE_ACPI_RESUME</span><br><span>diff --git a/src/mainboard/lenovo/t430s/Kconfig b/src/mainboard/lenovo/t430s/Kconfig</span><br><span>index f45fb0d..5f68d90 100644</span><br><span>--- a/src/mainboard/lenovo/t430s/Kconfig</span><br><span>+++ b/src/mainboard/lenovo/t430s/Kconfig</span><br><span>@@ -9,6 +9,7 @@</span><br><span> select SOUTHBRIDGE_INTEL_C216</span><br><span> select EC_LENOVO_PMH7</span><br><span> select EC_LENOVO_H8</span><br><span style="color: hsl(120, 100%, 40%);">+ select IMPLEMENTS_ACPI_H8_BAT_TRESHOLDS_B0</span><br><span> select NO_UART_ON_SUPERIO</span><br><span> select BOARD_ROMSIZE_KB_16384</span><br><span> select HAVE_ACPI_TABLES</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/23177">change 23177</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/23177"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ie785819c73df1fe1600c99a0c997f3c24081964b </div>
<div style="display:none"> Gerrit-Change-Number: 23177 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Alexey Derlaft <derlafff@ya.ru> </div>