[coreboot-gerrit] Change in coreboot[master]: soc/amd/stoneyridge: Set undocumented misc register

[Raul Rangel (Code Review)]

Raul Rangel has uploaded this change for review. ( https://review.coreboot.org/27876


Change subject: soc/amd/stoneyridge: Set undocumented misc register
......................................................................

soc/amd/stoneyridge: Set undocumented misc register

By setting this register in bootblock AmdInitEnv will no longer trigger
a reset in romstage. This fixes a few vboot test failures and also
speeds up boot time.

BUG=b:111610455
TEST=Built grunt and made sure bootblock only happens once on cold boot,
and S3 resume.

Change-Id: Ie19f7a14deaef45ac63156bec6946273c1b9447e
Signed-off-by: Raul E Rangel <rrangel at chromium.org>
---
M src/soc/amd/stoneyridge/southbridge.c
1 file changed, 21 insertions(+), 3 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/76/27876/1

diff --git a/src/soc/amd/stoneyridge/southbridge.c b/src/soc/amd/stoneyridge/southbridge.c
index 348d5f1..c75aefd 100644
--- a/src/soc/amd/stoneyridge/southbridge.c
+++ b/src/soc/amd/stoneyridge/southbridge.c
@@ -556,7 +556,7 @@
 	}
 }
 
-static void setup_spread_spectrum(void)
+static void setup_spread_spectrum(int *reboot)
 {
 	uint16_t rstcfg = pm_read16(PWR_RESET_CFG);
 
@@ -606,11 +606,24 @@
 	cntl1 |= CG1PLL_FBDIV_TEST;
 	misc_write32(MISC_CLK_CNTL1, cntl1);
 
-	soft_reset();
+	*reboot |= 1;
+}
+
+static void setup_misc(int *reboot)
+{
+	uint32_t reg = misc_read32(0x50);
+	if (!(reg & (1 << 16))) {
+		reg |= 1 << 16;
+
+		misc_write32(0x50, reg);
+		*reboot |= 1;
+	}
 }
 
 void bootblock_fch_early_init(void)
 {
+	int reboot = 0;
+
 	sb_enable_rom();
 	sb_lpc_port80();
 	sb_lpc_decode();
@@ -619,7 +632,12 @@
 	sb_disable_4dw_burst(); /* Must be disabled on CZ(ST) */
 	sb_acpi_mmio_decode();
 	sb_enable_cf9_io();
-	setup_spread_spectrum();
+	setup_spread_spectrum(&reboot);
+	setup_misc(&reboot);
+
+	if (reboot)
+		soft_reset();
+
 	sb_enable_legacy_io();
 	enable_aoac_devices();
 }

-- 
To view, visit https://review.coreboot.org/27876
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie19f7a14deaef45ac63156bec6946273c1b9447e
Gerrit-Change-Number: 27876
Gerrit-PatchSet: 1
Gerrit-Owner: Raul Rangel <rrangel at chromium.org>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20180806/b6c7398d/attachment-0001.html>