[coreboot-gerrit] Change in coreboot[master]: soc/intel/apollolake: configure p-unit registers for GLK

[ColeX Nelson (Code Review)]

ColeX Nelson has uploaded a new change for review. ( https://review.coreboot.org/19742 )

Change subject: soc/intel/apollolake: configure p-unit registers for GLK
......................................................................

soc/intel/apollolake: configure p-unit registers for GLK

Tested on GLK w/kernel 4.11.0 using turbostat to observe
p-state residencies with and without load (Octane v2.0).

Change-Id: I02bad173c5c3c16d00ffe58ce73084e5c0c002fe
Signed-off-by: Cole Nelson <colex.nelson at intel.com>
---
M src/soc/intel/apollolake/romstage.c
1 file changed, 4 insertions(+), 6 deletions(-)


  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/42/19742/1

diff --git a/src/soc/intel/apollolake/romstage.c b/src/soc/intel/apollolake/romstage.c
index 641105b..7c44543 100644
--- a/src/soc/intel/apollolake/romstage.c
+++ b/src/soc/intel/apollolake/romstage.c
@@ -119,9 +119,10 @@
  */
 static bool punit_init(void)
 {
-#if !IS_ENABLED(CONFIG_SOC_INTEL_GLK)
 	uint32_t reg;
+#if !IS_ENABLED(CONFIG_SOC_INTEL_GLK)
 	uint32_t data;
+#endif
 	struct stopwatch sw;
 
 	/*
@@ -147,12 +148,12 @@
 	write32((void *)(MCH_BASE_ADDR + PUNIT_THERMAL_DEVICE_IRQ),
 		PUINT_THERMAL_DEVICE_IRQ_VEC_NUMBER |
 		PUINT_THERMAL_DEVICE_IRQ_LOCK);
-
+#if !IS_ENABLED(CONFIG_SOC_INTEL_GLK)
 	data = read32((void *)(MCH_BASE_ADDR + 0x7818));
 	data &= 0xFFFFE01F;
 	data |= 0x20 | 0x200;
 	write32((void *)(MCH_BASE_ADDR + 0x7818), data);
-
+#endif
 	/* Stage0 BIOS Reset Complete (RST_CPL) */
 	write32(bios_rest_cpl, 0x1);
 
@@ -170,9 +171,6 @@
 		udelay(100);
 	}
 	return true;
-#else
-	return false;
-#endif
 }
 
 asmlinkage void car_stage_entry(void)

-- 
To view, visit https://review.coreboot.org/19742
To unsubscribe, visit https://review.coreboot.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I02bad173c5c3c16d00ffe58ce73084e5c0c002fe
Gerrit-PatchSet: 1
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Owner: ColeX Nelson <colex.nelson at intel.com>