New patch to review for coreboot: 42747cf winbond/w83627dhg: Fix logical device power down in ACPI
Nico Huber (nico.huber@secunet.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3590
-gerrit
commit 42747cff716b336afc431029e21e1ee366418568 Author: Nico Huber nico.huber@secunet.com Date: Mon Jul 1 16:29:16 2013 +0200
winbond/w83627dhg: Fix logical device power down in ACPI
The W83627DHG has some power managements bits to power down individual logical devices. These are called `* Power Down`. Counterintuitively and in contrast to `Immediate Power Down` (bit to power down the whole chip), these bits are set when the respective logical device is powered.
Unfortunately, our ACPI code set them wrong which led to disabled devices after a S3 suspend/resume. Adding an option how to set the PM bits and setting them to zero for the W83627DHG, corrects it.
Tested with kontron/ktqm77.
Change-Id: I8a472d480d4277721bd17c9f7c2ce44fa84e8ae2 Signed-off-by: Nico Huber nico.huber@secunet.com --- src/superio/acpi/pnp.asl | 12 ++++++------ src/superio/acpi/pnp_generic.asl | 8 +++++--- src/superio/acpi/pnp_uart.asl | 10 ++++++---- src/superio/winbond/w83627dhg/acpi/superio.asl | 6 ++++++ 4 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/src/superio/acpi/pnp.asl b/src/superio/acpi/pnp.asl index ba3882a..0637c04 100644 --- a/src/superio/acpi/pnp.asl +++ b/src/superio/acpi/pnp.asl @@ -90,25 +90,25 @@ * PM_LDN The logical device number to access the PM_REG * bit */ -#define PNP_GENERIC_PSC(PM_REG, PM_LDN) \ +#define PNP_GENERIC_PSC(PM_REG, PM_VAL, PM_LDN) \ Store(^^_PSC (), Local0)\ If (Local0) { Return (Local0) }\ ENTER_CONFIG_MODE (PM_LDN)\ Store (PM_REG, Local0)\ EXIT_CONFIG_MODE ()\ - If (Local0) { Return (1) }\ + If (LEqual(Local0, PM_VAL)) { Return (1) }\ Else { Return (0) }\
/* Disable power saving mode */ -#define PNP_GENERIC_PS0(PM_REG, PM_LDN) \ +#define PNP_GENERIC_PS0(PM_REG, PM_VAL, PM_LDN) \ ENTER_CONFIG_MODE (PM_LDN)\ - Store (Zero, PM_REG)\ + Store (Not(PM_VAL), PM_REG)\ EXIT_CONFIG_MODE ()
/* Enable power saving mode */ -#define PNP_GENERIC_PS1(PM_REG, PM_LDN) \ +#define PNP_GENERIC_PS1(PM_REG, PM_VAL, PM_LDN) \ ENTER_CONFIG_MODE (PM_LDN)\ - Store (One, PM_REG)\ + Store (PM_VAL, PM_REG)\ EXIT_CONFIG_MODE ()
diff --git a/src/superio/acpi/pnp_generic.asl b/src/superio/acpi/pnp_generic.asl index f7a9b13..74fd028 100644 --- a/src/superio/acpi/pnp_generic.asl +++ b/src/superio/acpi/pnp_generic.asl @@ -31,6 +31,8 @@ * name (DDN) of this device (e.g. "COM1", optional) * SUPERIO_PNP_PM_REG Identifier of a 1-bit register to power down * the logical device (optional) + * SUPERIO_PNP_PM_VAL The value for SUPERIO_PNP_PM_REG to power the logical + * device down (required if SUPERIO_PNP_PM_REG is defined) * SUPERIO_PNP_PM_LDN The logical device number to access the PM_REG * bit (required if SUPERIO_PNP_PM_REG is defined) * SUPERIO_PNP_IO0 The alignment and length of the first PnP i/o @@ -73,15 +75,15 @@ Device (SUPERIO_ID(PN, SUPERIO_PNP_LDN)) {
#ifdef SUPERIO_PNP_PM_REG Method (_PSC) { - PNP_GENERIC_PSC(SUPERIO_PNP_PM_REG, SUPERIO_PNP_PM_LDN) + PNP_GENERIC_PSC(SUPERIO_PNP_PM_REG, SUPERIO_PNP_PM_VAL, SUPERIO_PNP_PM_LDN) }
Method (_PS0) { - PNP_GENERIC_PS0(SUPERIO_PNP_PM_REG, SUPERIO_PNP_PM_LDN) + PNP_GENERIC_PS0(SUPERIO_PNP_PM_REG, SUPERIO_PNP_PM_VAL, SUPERIO_PNP_PM_LDN) }
Method (_PS1) { - PNP_GENERIC_PS1(SUPERIO_PNP_PM_REG, SUPERIO_PNP_PM_LDN) + PNP_GENERIC_PS1(SUPERIO_PNP_PM_REG, SUPERIO_PNP_PM_VAL, SUPERIO_PNP_PM_LDN) } #else Method (_PSC) { diff --git a/src/superio/acpi/pnp_uart.asl b/src/superio/acpi/pnp_uart.asl index c826106..8ddecbf 100644 --- a/src/superio/acpi/pnp_uart.asl +++ b/src/superio/acpi/pnp_uart.asl @@ -32,7 +32,9 @@ * name (DDN) of this uart (e.g. "COM1", optional) * SUPERIO_UART_PM_REG Identifier of a 1-bit register to power down * the UART (optional) - * SUPERIO_UART_PM_LDN The logical device number to access the PM_REG + * SUPERIO_UART_PM_VAL The value for SUPERIO_UART_PM_REG to power the logical + * device down (required if SUPERIO_UART_PM_REG is defined) + * SUPERIO_UART_PM_LDN The logical device number to access the PM_REG * bit (required if SUPERIO_UART_PM_REG is defined) */
@@ -65,15 +67,15 @@ Device (SUPERIO_ID(SER, SUPERIO_UART_LDN)) {
#ifdef SUPERIO_UART_PM_REG Method (_PSC) { - PNP_GENERIC_PSC(SUPERIO_UART_PM_REG, SUPERIO_UART_PM_LDN) + PNP_GENERIC_PSC(SUPERIO_UART_PM_REG, SUPERIO_UART_PM_VAL, SUPERIO_UART_PM_LDN) }
Method (_PS0) { - PNP_GENERIC_PS0(SUPERIO_UART_PM_REG, SUPERIO_UART_PM_LDN) + PNP_GENERIC_PS0(SUPERIO_UART_PM_REG, SUPERIO_UART_PM_VAL, SUPERIO_UART_PM_LDN) }
Method (_PS1) { - PNP_GENERIC_PS1(SUPERIO_UART_PM_REG, SUPERIO_UART_PM_LDN) + PNP_GENERIC_PS1(SUPERIO_UART_PM_REG, SUPERIO_UART_PM_VAL, SUPERIO_UART_PM_LDN) } #else Method (_PSC) { diff --git a/src/superio/winbond/w83627dhg/acpi/superio.asl b/src/superio/winbond/w83627dhg/acpi/superio.asl index 417d6fe..7616363 100644 --- a/src/superio/winbond/w83627dhg/acpi/superio.asl +++ b/src/superio/winbond/w83627dhg/acpi/superio.asl @@ -147,9 +147,11 @@ Device(SUPERIO_DEV) { #undef SUPERIO_UART_LDN #undef SUPERIO_UART_DDN #undef SUPERIO_UART_PM_REG + #undef SUPERIO_UART_PM_VAL #undef SUPERIO_UART_PM_LDN #define SUPERIO_UART_LDN 2 #define SUPERIO_UART_PM_REG UAPW + #define SUPERIO_UART_PM_VAL 0 #define SUPERIO_UART_PM_LDN PNP_NO_LDN_CHANGE #include <superio/acpi/pnp_uart.asl> #endif @@ -158,9 +160,11 @@ Device(SUPERIO_DEV) { #undef SUPERIO_UART_LDN #undef SUPERIO_UART_DDN #undef SUPERIO_UART_PM_REG + #undef SUPERIO_UART_PM_VAL #undef SUPERIO_UART_PM_LDN #define SUPERIO_UART_LDN 3 #define SUPERIO_UART_PM_REG UBPW + #define SUPERIO_UART_PM_VAL 0 #define SUPERIO_UART_PM_LDN PNP_NO_LDN_CHANGE #include <superio/acpi/pnp_uart.asl> #endif @@ -180,6 +184,7 @@ Device(SUPERIO_DEV) { #undef SUPERIO_PNP_LDN #undef SUPERIO_PNP_DDN #undef SUPERIO_PNP_PM_REG + #undef SUPERIO_PNP_PM_VAL #undef SUPERIO_PNP_PM_LDN #undef SUPERIO_PNP_IO0 #undef SUPERIO_PNP_IO1 @@ -188,6 +193,7 @@ Device(SUPERIO_DEV) { #undef SUPERIO_PNP_DMA #define SUPERIO_PNP_LDN 11 #define SUPERIO_PNP_PM_REG HWPW + #define SUPERIO_PNP_PM_VAL 0 #define SUPERIO_PNP_PM_LDN PNP_NO_LDN_CHANGE #define SUPERIO_PNP_IO0 0x08, 0x08 #define SUPERIO_PNP_IRQ0 1
-
Nico Huber