diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2022-11-21 17:27:07 +0200 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2022-11-28 10:09:04 +0000 |
| commit | 307320c23f2c1907ff6cf6fa87608d1155aba05f (patch) | |
| tree | 0db8940fa8deebb85c400c59d5425ebec2b8bf1e /src/southbridge | |
| parent | e8a3af10691a4831a85d8760f7fcb20f78065f78 (diff) | |
sb,soc/intel: Address TCO SECOND_TO_STS name collision
Later soc/intel/common/smbus addresses TCO2_STS as a separate
16-bit register, while baytrail and braswell assumes 32-bit
wide TCO1_STS to extend as TCO2_STS.
In src/soc/intel/denverton_ns:
#define TCO2_STS_SECOND_TO 0x02
In soc/intel/baytrail,braswell:
#define SECOND_TO_STS (1 << 17)
Elsewehere
#define SECOND_TO_STS (1 << 1)
It's expected that we remove the first (1 << 17) case and only
access TCO2_STS as a separate 16-bit register. For now, use
unique names to avoid confusion.
Change-Id: I07cc46a9d600b2bf2f23588b26891268e9ce4de0
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/70044
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Elyes Haouas <ehaouas@noos.fr>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Subrata Banik <subratabanik@google.com>
Diffstat (limited to 'src/southbridge')
| -rw-r--r-- | src/southbridge/intel/bd82x6x/pch.h | 2 | ||||
| -rw-r--r-- | src/southbridge/intel/common/tco.h | 2 | ||||
| -rw-r--r-- | src/southbridge/intel/common/watchdog.c | 2 | ||||
| -rw-r--r-- | src/southbridge/intel/lynxpoint/elog.c | 2 | ||||
| -rw-r--r-- | src/southbridge/intel/lynxpoint/pch.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/southbridge/intel/bd82x6x/pch.h b/src/southbridge/intel/bd82x6x/pch.h index b5e05f6578..3aef48a56b 100644 --- a/src/southbridge/intel/bd82x6x/pch.h +++ b/src/southbridge/intel/bd82x6x/pch.h @@ -469,7 +469,7 @@ void early_usb_init(const struct southbridge_usb_port *portmap); #define TCO1_TIMEOUT (1 << 3) #define DMISCI_STS (1 << 9) #define TCO2_STS 0x66 -#define SECOND_TO_STS (1 << 1) +#define TCO2_STS_SECOND_TO (1 << 1) #define TCO1_CNT 0x68 #define TCO_TMR_HLT (1 << 11) #define TCO_LOCK (1 << 12) diff --git a/src/southbridge/intel/common/tco.h b/src/southbridge/intel/common/tco.h index 4c3f6391b4..168971e431 100644 --- a/src/southbridge/intel/common/tco.h +++ b/src/southbridge/intel/common/tco.h @@ -15,7 +15,7 @@ #define TCO1_STS 0x04 #define TCO1_TIMEOUT (1 << 3) #define TCO2_STS 0x06 -#define SECOND_TO_STS (1 << 1) +#define TCO2_STS_SECOND_TO (1 << 1) #define TCO1_CNT 0x08 #define TCO_TMR_HLT (1 << 11) diff --git a/src/southbridge/intel/common/watchdog.c b/src/southbridge/intel/common/watchdog.c index b40c5fe3b3..a9886916ca 100644 --- a/src/southbridge/intel/common/watchdog.c +++ b/src/southbridge/intel/common/watchdog.c @@ -33,7 +33,7 @@ void watchdog_off(void) /* Clear TCO timeout status. */ write_pmbase16(PMBASE_TCO_OFFSET + TCO1_STS, TCO1_TIMEOUT); - write_pmbase16(PMBASE_TCO_OFFSET + TCO2_STS, SECOND_TO_STS); + write_pmbase16(PMBASE_TCO_OFFSET + TCO2_STS, TCO2_STS_SECOND_TO); printk(BIOS_DEBUG, "ICH-NM10-PCH: watchdog disabled\n"); } diff --git a/src/southbridge/intel/lynxpoint/elog.c b/src/southbridge/intel/lynxpoint/elog.c index 839773a34d..e73a7edf25 100644 --- a/src/southbridge/intel/lynxpoint/elog.c +++ b/src/southbridge/intel/lynxpoint/elog.c @@ -124,7 +124,7 @@ void pch_log_state(void) elog_add_event(ELOG_TYPE_PWROK_FAIL); /* Second TCO Timeout */ - if (tco2_sts & SECOND_TO_STS) + if (tco2_sts & TCO2_STS_SECOND_TO) elog_add_event(ELOG_TYPE_TCO_RESET); /* Power Button Override */ diff --git a/src/southbridge/intel/lynxpoint/pch.h b/src/southbridge/intel/lynxpoint/pch.h index 0d8be7bd9b..35649f600b 100644 --- a/src/southbridge/intel/lynxpoint/pch.h +++ b/src/southbridge/intel/lynxpoint/pch.h @@ -623,7 +623,7 @@ void mainboard_config_rcba(void); #define TCO1_STS 0x64 #define DMISCI_STS (1 << 9) #define TCO2_STS 0x66 -#define SECOND_TO_STS (1 << 1) +#define TCO2_STS_SECOND_TO (1 << 1) #endif #define ALT_GP_SMI_EN2 0x5c |