GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ec/google/chromeec/acpi: Replace Store(a,b) with ASL 2.0 syntax 

Replace `Store (a, b)` with `b = a`.

Change-Id: I2cdb1c9ae3a33bfc72767ff60d8948054d4e151a
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/70638
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
This commit is contained in:
Felix Singer 2022-12-12 04:54:46 +01:00
parent f45a6c2a50
commit ff6b3af113
3 changed files with 59 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/ec/google/chromeec/acpi/battery.asl
View File

@ -17,8 +17,8 @@ Method (BTSW, 1)
If (Arg0 >= BTCN) { If (Arg0 >= BTCN) {
Return (One) Return (One)
} }
Store (Arg0, \_SB.PCI0.LPCB.EC0.BTID) \_SB.PCI0.LPCB.EC0.BTID = Arg0
Store (5, Local0) // Timeout 5 msec Local0 = 5 // Timeout 5 msec
While (BTIX != Arg0) While (BTIX != Arg0)
{ {
Sleep (1) Sleep (1)
@ -45,9 +45,9 @@ Method (BSTA, 1, Serialized)
} }
If (And(Not(BTSW (Arg0)), BTEX)) { If (And(Not(BTSW (Arg0)), BTEX)) {
Store (0x1F, Local0) Local0 = 0x1F
} Else { } Else {
Store (0x0F, Local0) Local0 = 0x0F
} }
Release (^BATM) Release (^BATM)
@ -68,27 +68,27 @@ Method (BBIF, 2, Serialized)
Return (Arg1) Return (Arg1)
} }
// Last Full Charge Capacity // Last Full Charge Capacity
Store (BTDF, Arg1[2]) Arg1[2] = BTDF
// Design Voltage // Design Voltage
Store (BTDV, Arg1[4]) Arg1[4] = BTDV
// Design Capacity // Design Capacity
Store (BTDA, Local0) Local0 = BTDA
Store (Local0, Arg1[1]) Arg1[1] = Local0
// Design Capacity of Warning // Design Capacity of Warning
Local2 = Local0 * DWRN / 100 Local2 = Local0 * DWRN / 100
Store (Local2, Arg1[5]) Arg1[5] = Local2
// Design Capacity of Low // Design Capacity of Low
Local2 = Local0 * DLOW / 100 Local2 = Local0 * DLOW / 100
Store (Local2, Arg1[6]) Arg1[6] = Local2
// Get battery info from mainboard // Get battery info from mainboard
Store (ToString(Concatenate(BMOD, 0x00)), Arg1[9]) Arg1[9] = ToString(Concatenate(BMOD, 0x00))
Store (ToString(Concatenate(BSER, 0x00)), Arg1[10]) Arg1[10] = ToString(Concatenate(BSER, 0x00))
Store (ToString(Concatenate(BMFG, 0x00)), Arg1[12]) Arg1[12] = ToString(Concatenate(BMFG, 0x00))
Release (^BATM) Release (^BATM)
Return (Arg1) Return (Arg1)
@ -108,30 +108,30 @@ Method (BBIX, 2, Serialized)
Return (Arg1) Return (Arg1)
} }
// Last Full Charge Capacity // Last Full Charge Capacity
Store (BTDF, Arg1[3]) Arg1[3] = BTDF
// Design Voltage // Design Voltage
Store (BTDV, Arg1[5]) Arg1[5] = BTDV
// Design Capacity // Design Capacity
Store (BTDA, Local0) Local0 = BTDA
Store (Local0, Arg1[2]) Arg1[2] = Local0
// Design Capacity of Warning // Design Capacity of Warning
Local2 = Local0 * DWRN / 100 Local2 = Local0 * DWRN / 100
Store (Local2, Arg1[6]) Arg1[6] = Local2
// Design Capacity of Low // Design Capacity of Low
Local2 = Local0 * DLOW / 100 Local2 = Local0 * DLOW / 100
Store (Local2, Arg1[7]) Arg1[7] = Local2
// Cycle Count // Cycle Count
Store (BTCC, Arg1[8]) Arg1[8] = BTCC
// Get battery info from mainboard // Get battery info from mainboard
Store (ToString(Concatenate(BMOD, 0x00)), Arg1[16]) Arg1[16] = ToString(Concatenate(BMOD, 0x00))
Store (ToString(Concatenate(BSER, 0x00)), Arg1[17]) Arg1[17] = ToString(Concatenate(BSER, 0x00))
Store (ToString(Concatenate(BMFG, 0x00)), Arg1[19]) Arg1[19] = ToString(Concatenate(BMFG, 0x00))
Release (^BATM) Release (^BATM)
Return (Arg1) Return (Arg1)
@ -159,29 +159,29 @@ Method (BBST, 4, Serialized)
// bit 1 = charging // bit 1 = charging
// bit 2 = critical level // bit 2 = critical level
// //
Store (Zero, Local1) Local1 = Zero
// Check if AC is present // Check if AC is present
If (ACEX) { If (ACEX) {
If (BFCG) { If (BFCG) {
Store (0x02, Local1) Local1 = 0x02
} ElseIf (BFDC) { } ElseIf (BFDC) {
Store (0x01, Local1) Local1 = 0x01
} }
} Else { } Else {
// Always discharging when on battery power // Always discharging when on battery power
Store (0x01, Local1) Local1 = 0x01
} }
// Check for critical battery level // Check for critical battery level
If (BFCR) { If (BFCR) {
Or (Local1, 0x04, Local1) Or (Local1, 0x04, Local1)
} }
Store (Local1, Arg1[0]) Arg1[0] = Local1
// Notify if battery state has changed since last time // Notify if battery state has changed since last time
If (Local1 != DeRefOf (Arg2)) { If (Local1 != DeRefOf (Arg2)) {
Store (Local1, Arg2) Arg2 = Local1
If (Arg0 == 0) { If (Arg0 == 0) {
Notify (BAT0, 0x80) Notify (BAT0, 0x80)
} }
@ -195,32 +195,32 @@ Method (BBST, 4, Serialized)
// //
// 1: BATTERY PRESENT RATE // 1: BATTERY PRESENT RATE
// //
Store (BTPR, Arg1[1]) Arg1[1] = BTPR
// //
// 2: BATTERY REMAINING CAPACITY // 2: BATTERY REMAINING CAPACITY
// //
Store (BTRA, Local1) Local1 = BTRA
If (Arg3 && ACEX && !(BFDC && BFCG)) { If (Arg3 && ACEX && !(BFDC && BFCG)) {
// On AC power and battery is neither charging // On AC power and battery is neither charging
// nor discharging. Linux expects a full battery // nor discharging. Linux expects a full battery
// to report same capacity as last full charge. // to report same capacity as last full charge.
// https://bugzilla.kernel.org/show_bug.cgi?id=12632 // https://bugzilla.kernel.org/show_bug.cgi?id=12632
Store (BTDF, Local2) Local2 = BTDF
// See if within ~6% of full // See if within ~6% of full
ShiftRight (Local2, 4, Local3) ShiftRight (Local2, 4, Local3)
If (Local1 > Local2 - Local3 && Local1 < Local2 + Local3) If (Local1 > Local2 - Local3 && Local1 < Local2 + Local3)
{ {
Store (Local2, Local1) Local1 = Local2
} }
} }
Store (Local1, Arg1[2]) Arg1[2] = Local1
// //
// 3: BATTERY PRESENT VOLTAGE // 3: BATTERY PRESENT VOLTAGE
// //
Store (BTVO, Arg1[3]) Arg1[3] = BTVO
Release (^BATM) Release (^BATM)
Return (Arg1) Return (Arg1)
@ -285,13 +285,13 @@ Device (BAT0)
// Method to enable full battery workaround // Method to enable full battery workaround
Method (BFWE) Method (BFWE)
{ {
Store (One, BFWK) BFWK = One
} }
// Method to disable full battery workaround // Method to disable full battery workaround
Method (BFWD) Method (BFWD)
{ {
Store (Zero, BFWK) BFWK = Zero
} }
Method (_STA, 0, Serialized) Method (_STA, 0, Serialized)
@ -375,13 +375,13 @@ Device (BAT1)
// Method to enable full battery workaround // Method to enable full battery workaround
Method (BFWE) Method (BFWE)
{ {
Store (One, BFWK) BFWK = One
} }
// Method to disable full battery workaround // Method to disable full battery workaround
Method (BFWD) Method (BFWD)
{ {
Store (Zero, BFWK) BFWK = Zero
} }
Method (_STA, 0, Serialized) Method (_STA, 0, Serialized)

38
src/ec/google/chromeec/acpi/ec.asl
View File

@ -167,7 +167,7 @@ Device (EC0)
Method (_REG, 2, NotSerialized) Method (_REG, 2, NotSerialized)
{ {
// Initialize AC power state // Initialize AC power state
Store (ACEX, \PWRS) \PWRS = ACEX
/* /*
* Call PNOT (Platform Notify) to inform platform code * Call PNOT (Platform Notify) to inform platform code
* about the current AC/battery state. This handles all cases, * about the current AC/battery state. This handles all cases,
@ -178,7 +178,7 @@ Device (EC0)
\PNOT () \PNOT ()
// Initialize LID switch state // Initialize LID switch state
Store (LIDS, \LIDS) \LIDS = LIDS
#if CONFIG(SOC_AMD_COMMON_BLOCK_ACPI_DPTC) #if CONFIG(SOC_AMD_COMMON_BLOCK_ACPI_DPTC)
/* /*
@ -194,7 +194,7 @@ Device (EC0)
/* Read requested temperature and check against EC error values */ /* Read requested temperature and check against EC error values */
Method (TSRD, 1, Serialized) Method (TSRD, 1, Serialized)
{ {
Store (\_SB.PCI0.LPCB.EC0.TINS (Arg0), Local0) Local0 = \_SB.PCI0.LPCB.EC0.TINS (Arg0)
/* Check for sensor not calibrated */ /* Check for sensor not calibrated */
If (Local0 == \_SB.PCI0.LPCB.EC0.TNCA) { If (Local0 == \_SB.PCI0.LPCB.EC0.TNCA) {
@ -234,7 +234,7 @@ Device (EC0)
\_SB.DPTC() \_SB.DPTC()
} }
#endif #endif
Store (LIDS, \LIDS) \LIDS = LIDS
#ifdef EC_ENABLE_LID_SWITCH #ifdef EC_ENABLE_LID_SWITCH
Notify (LID0, 0x80) Notify (LID0, 0x80)
#endif #endif
@ -249,7 +249,7 @@ Device (EC0)
\_SB.DPTC() \_SB.DPTC()
} }
#endif #endif
Store (LIDS, \LIDS) \LIDS = LIDS
Notify (CREC, 0x2) Notify (CREC, 0x2)
#ifdef EC_ENABLE_LID_SWITCH #ifdef EC_ENABLE_LID_SWITCH
Notify (LID0, 0x80) Notify (LID0, 0x80)
@ -266,7 +266,7 @@ Device (EC0)
Method (_Q04, 0, NotSerialized) Method (_Q04, 0, NotSerialized)
{ {
Printf ("EC: AC CONNECTED") Printf ("EC: AC CONNECTED")
Store (ACEX, \PWRS) \PWRS = ACEX
Notify (AC, 0x80) Notify (AC, 0x80)
#ifdef DPTF_ENABLE_CHARGER #ifdef DPTF_ENABLE_CHARGER
If (CondRefOf (\_SB.DPTF.TCHG)) { If (CondRefOf (\_SB.DPTF.TCHG)) {
@ -286,7 +286,7 @@ Device (EC0)
Method (_Q05, 0, NotSerialized) Method (_Q05, 0, NotSerialized)
{ {
Printf ("EC: AC DISCONNECTED") Printf ("EC: AC DISCONNECTED")
Store (ACEX, \PWRS) \PWRS = ACEX
Notify (AC, 0x80) Notify (AC, 0x80)
#ifdef DPTF_ENABLE_CHARGER #ifdef DPTF_ENABLE_CHARGER
If (CondRefOf (\_SB.DPTF.TCHG)) { If (CondRefOf (\_SB.DPTF.TCHG)) {
@ -481,7 +481,7 @@ Device (EC0)
} }
/* Set sensor ID */ /* Set sensor ID */
Store (ToInteger (Arg0), ^PATI) ^PATI = ToInteger (Arg0)
/* Temperature is passed in 1/10 Kelvin */ /* Temperature is passed in 1/10 Kelvin */
Local1 = ToInteger (Arg1) / 10 Local1 = ToInteger (Arg1) / 10
@ -490,7 +490,7 @@ Device (EC0)
^PATT = Local1 - ^TOFS ^PATT = Local1 - ^TOFS
/* Set commit value with SELECT=0 and ENABLE=1 */ /* Set commit value with SELECT=0 and ENABLE=1 */
Store (0x02, ^PATC) ^PATC = 0x02
Release (^PATM) Release (^PATM)
Return (1) Return (1)
@ -508,7 +508,7 @@ Device (EC0)
} }
/* Set sensor ID */ /* Set sensor ID */
Store (ToInteger (Arg0), ^PATI) ^PATI = ToInteger (Arg0)
/* Temperature is passed in 1/10 Kelvin */ /* Temperature is passed in 1/10 Kelvin */
Local1 = ToInteger (Arg1) / 10 Local1 = ToInteger (Arg1) / 10
@ -517,7 +517,7 @@ Device (EC0)
^PATT = Local1 - ^TOFS ^PATT = Local1 - ^TOFS
/* Set commit value with SELECT=1 and ENABLE=1 */ /* Set commit value with SELECT=1 and ENABLE=1 */
Store (0x03, ^PATC) ^PATC = 0x03
Release (^PATM) Release (^PATM)
Return (1) Return (1)
@ -532,14 +532,14 @@ Device (EC0)
Return (0) Return (0)
} }
Store (ToInteger (Arg0), ^PATI) ^PATI = ToInteger (Arg0)
Store (0x00, ^PATT) ^PATT = 0x00
/* Disable PAT0 */ /* Disable PAT0 */
Store (0x00, ^PATC) ^PATC = 0x00
/* Disable PAT1 */ /* Disable PAT1 */
Store (0x01, ^PATC) ^PATC = 0x01
Release (^PATM) Release (^PATM)
Return (1) Return (1)
@ -558,7 +558,7 @@ Device (EC0)
#endif #endif
If (!Acquire (^PATM, 1000)) { If (!Acquire (^PATM, 1000)) {
/* Read sensor ID for event */ /* Read sensor ID for event */
Store (^PATI, Local0) Local0 = ^PATI
/* When sensor ID returns 0xFF then no more events */ /* When sensor ID returns 0xFF then no more events */
While (Local0 != EC_TEMP_SENSOR_NOT_PRESENT) While (Local0 != EC_TEMP_SENSOR_NOT_PRESENT)
@ -568,7 +568,7 @@ Device (EC0)
#endif #endif
/* Keep reaading sensor ID for event */ /* Keep reaading sensor ID for event */
Store (^PATI, Local0) Local0 = ^PATI
} }
Release (^PATM) Release (^PATM)
@ -581,7 +581,7 @@ Device (EC0)
*/ */
Method (CHGS, 1, Serialized) Method (CHGS, 1, Serialized)
{ {
Store (ToInteger (Arg0), ^CHGL) ^CHGL = ToInteger (Arg0)
} }
/* /*
@ -589,7 +589,7 @@ Device (EC0)
*/ */
Method (CHGD, 0, Serialized) Method (CHGD, 0, Serialized)
{ {
Store (0xFF, ^CHGL) ^CHGL = 0xFF
} }
/* Read current Tablet mode */ /* Read current Tablet mode */

2
src/ec/google/chromeec/acpi/keyboard_backlight.asl
View File

@ -43,7 +43,7 @@ Scope (\_SB)
/* Write new backlight value */ /* Write new backlight value */
Method (KBCM, 1, NotSerialized) Method (KBCM, 1, NotSerialized)
{ {
Store (Arg0, \_SB.PCI0.LPCB.EC0.KBLV) \_SB.PCI0.LPCB.EC0.KBLV = Arg0
} }
} }
} }