From d6f3dd83dc7d8bb66e29c489e82d4736779d7b6f Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Wed, 27 Dec 2017 00:12:35 +0100 Subject: nb/intel/x4x: Disable watchdog, halt TCO timer and clear timeout MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Especially on ICH7 failing to do so results in i2c block read being unusable. On ICH10 this problem doesn't manifest itself that much. This moves disabling the watchdog reboot to the northbridge code like i945 (even though it technically is southbridge stuff). TESTED on Intel DG41WV: hacking on raminit is much nicer since no need to do a hard power down for +4s are needed to clear the timeouts. Change-Id: Icfd3789312704f61000a417f23a121d02d2e7fbe Signed-off-by: Arthur Heymans Reviewed-on: https://review.coreboot.org/22997 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber Reviewed-by: Kyösti Mälkki Reviewed-by: Felix Held --- src/mainboard/asrock/g41c-gs/romstage.c | 3 --- src/mainboard/foxconn/g41s-k/romstage.c | 3 --- src/mainboard/gigabyte/ga-g41m-es2l/romstage.c | 3 --- src/mainboard/intel/dg43gt/romstage.c | 3 --- 4 files changed, 12 deletions(-) (limited to 'src/mainboard') diff --git a/src/mainboard/asrock/g41c-gs/romstage.c b/src/mainboard/asrock/g41c-gs/romstage.c index dd885db94d..24a5cfde39 100644 --- a/src/mainboard/asrock/g41c-gs/romstage.c +++ b/src/mainboard/asrock/g41c-gs/romstage.c @@ -87,9 +87,6 @@ void mainboard_romstage_entry(unsigned long bist) timestamp_init(get_initial_timestamp()); timestamp_add_now(TS_START_ROMSTAGE); - /* Disable watchdog timer */ - RCBA32(0x3410) = RCBA32(0x3410) | 0x20; - /* Set southbridge and Super I/O GPIOs. */ ich7_enable_lpc(); mb_lpc_setup(); diff --git a/src/mainboard/foxconn/g41s-k/romstage.c b/src/mainboard/foxconn/g41s-k/romstage.c index 2a704a3c66..ba07e45e99 100644 --- a/src/mainboard/foxconn/g41s-k/romstage.c +++ b/src/mainboard/foxconn/g41s-k/romstage.c @@ -91,9 +91,6 @@ void mainboard_romstage_entry(unsigned long bist) timestamp_init(get_initial_timestamp()); timestamp_add_now(TS_START_ROMSTAGE); - /* Disable watchdog timer. */ - RCBA32(GCS) = RCBA32(GCS) | 0x20; - /* Set up southbridge and Super I/O GPIOs. */ ich7_enable_lpc(); mb_lpc_setup(); diff --git a/src/mainboard/gigabyte/ga-g41m-es2l/romstage.c b/src/mainboard/gigabyte/ga-g41m-es2l/romstage.c index 67d3eb1310..e71e00cf52 100644 --- a/src/mainboard/gigabyte/ga-g41m-es2l/romstage.c +++ b/src/mainboard/gigabyte/ga-g41m-es2l/romstage.c @@ -140,9 +140,6 @@ void mainboard_romstage_entry(unsigned long bist) timestamp_init(get_initial_timestamp()); timestamp_add_now(TS_START_ROMSTAGE); - /* Disable watchdog timer */ - RCBA32(0x3410) = RCBA32(0x3410) | 0x20; - /* Set southbridge and Super I/O GPIOs. */ ich7_enable_lpc(); mb_gpio_init(); diff --git a/src/mainboard/intel/dg43gt/romstage.c b/src/mainboard/intel/dg43gt/romstage.c index 6944b1819e..d3b2b6aec4 100644 --- a/src/mainboard/intel/dg43gt/romstage.c +++ b/src/mainboard/intel/dg43gt/romstage.c @@ -75,9 +75,6 @@ void mainboard_romstage_entry(unsigned long bist) timestamp_init(get_initial_timestamp()); timestamp_add_now(TS_START_ROMSTAGE); - /* Disable watchdog timer */ - RCBA32(0x3410) = RCBA32(0x3410) | 0x20; - /* Set southbridge and Super I/O GPIOs. */ ich10_enable_lpc(); mb_gpio_init(); -- cgit v1.2.3