[coreboot-gerrit] Change in coreboot[master]: ec/ene_kb3940q: correct ACPI battery data fed into ToString()

[Martin Roth (Code Review)]

Martin Roth has submitted this change and it was merged. ( https://review.coreboot.org/19961 )

Change subject: ec/ene_kb3940q: correct ACPI battery data fed into ToString()
......................................................................

ec/ene_kb3940q: correct ACPI battery data fed into ToString()

ToString() requires the input buffer data to be null-terminated,
but the data returned by the EC is not, leading Windows to fail
to report any battery data at all.  Correct this by concatenating
a null terminator (0x00) to the end of the buffer data before
inputting to ToString() where needed

TEST: boot Windows on google/butterfly, observe battery data
reported correctly.

Change-Id: I395cc7fbdf26c8cc816e47107e552c0533580fa1
Signed-off-by: Matt DeVillier <matt.devillier at gmail.com>
Reviewed-on: https://review.coreboot.org/19961
Tested-by: build bot (Jenkins) <no-reply at coreboot.org>
Reviewed-by: Martin Roth <martinroth at google.com>
---
M src/ec/quanta/ene_kb3940q/acpi/battery.asl
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Martin Roth: Looks good to me, approved



diff --git a/src/ec/quanta/ene_kb3940q/acpi/battery.asl b/src/ec/quanta/ene_kb3940q/acpi/battery.asl
index bcc9a98..dd9ba2f 100644
--- a/src/ec/quanta/ene_kb3940q/acpi/battery.asl
+++ b/src/ec/quanta/ene_kb3940q/acpi/battery.asl
@@ -90,9 +90,9 @@
 		Store(Local0, Index(PBIF, 5))
 		Multiply(Local1, 0x05, Local0)
 		Store (Local0, Index (PBIF, 6))
-		Store (ToString(BATD), Index (PBIF, 9)) // Model Number
+		Store (ToString(Concatenate(BATD, 0x00)), Index (PBIF, 9)) // Model Number
 		Store (ToDecimalString(BSN0), Index (PBIF, 10)) // Serial Number
-		Store (ToString(BCHM), Index (PBIF, 11)) // Battery Type
+		Store (ToString(Concatenate(BCHM, 0x00)), Index (PBIF, 11)) // Battery Type
 		Store (\BATV, Index (PBIF, 12)) // OEM information
 
 		Return (PBIF)

-- 
To view, visit https://review.coreboot.org/19961
To unsubscribe, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I395cc7fbdf26c8cc816e47107e552c0533580fa1
Gerrit-Change-Number: 19961
Gerrit-PatchSet: 2
Gerrit-Owner: Matt DeVillier <matt.devillier at gmail.com>
Gerrit-Reviewer: Martin Roth <martinroth at google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply at coreboot.org>