Patch set updated for coreboot: soc/skylake: Move IO decode range out from pch_lpc_init

[Boon Tiong Teo]

Boon Tiong Teo ([e-mail]) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17337

-gerrit

commit 32d54e9c5dd2a9b958d75b2e0170f1811f3d5759
Author: Teo Boon Tiong 
Date:   Thu Nov 10 01:21:23 2016 +0800

soc/skylake: Move IO decode range out from pch_lpc_init

The purpose is to enable IO decode range early before SIO init

Change-Id: I72df16d0a784686d8cadfbee09b5aef60576ac43
    Signed-off-by: Teo Boon Tiong 
---
 src/soc/intel/skylake/bootblock/bootblock.c   |  8 +++++---
 src/soc/intel/skylake/bootblock/pch.c         | 28 ++++++++++++++++-----------
 src/soc/intel/skylake/include/soc/bootblock.h |  1 +
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/soc/intel/skylake/bootblock/bootblock.c b/src/soc/intel/skylake/bootblock/bootblock.c
index b00fcf7..b3aaa90 100644
--- a/src/soc/intel/skylake/bootblock/bootblock.c
+++ b/src/soc/intel/skylake/bootblock/bootblock.c
@@ -27,9 +27,11 @@ void bootblock_soc_early_init(void)
    bootblock_systemagent_early_init();
    bootblock_pch_early_init();
    bootblock_cpu_init();
-
-	if (IS_ENABLED(CONFIG_BOOTBLOCK_CONSOLE))
-		pch_uart_init();
+	pch_early_iorange_init();
+	if (IS_ENABLED(CONFIG_BOOTBLOCK_CONSOLE)) {
+		if (IS_ENABLED(CONFIG_UART_DEBUG))
+			pch_uart_init();
+	}
 }

void bootblock_soc_init(void)
diff --git a/src/soc/intel/skylake/bootblock/pch.c b/src/soc/intel/skylake/bootblock/pch.c
index 22ab109..5b0f7c0 100644
--- a/src/soc/intel/skylake/bootblock/pch.c
+++ b/src/soc/intel/skylake/bootblock/pch.c
@@ -95,17 +95,6 @@ static void pch_enable_lpc(void)
    /* Lookup device tree in romstage */
    const struct device *dev;
    const config_t *config;
-	u16 lpc_en;
-
-	/* IO Decode Range */
-	lpc_en = COMA_RANGE | (COMB_RANGE << 4);
-	pci_write_config16(PCH_DEV_LPC, LPC_IO_DEC, lpc_en);
-	pcr_write16(PID_DMI, R_PCH_PCR_DMI_LPCIOD, lpc_en);
-
-	/* IO Decode Enable */
-	lpc_en = COMA_LPC_EN | KBC_LPC_EN | MC_LPC_EN;
-	pci_write_config16(PCH_DEV_LPC, LPC_EN, lpc_en);
-	pcr_write16(PID_DMI, R_PCH_PCR_DMI_LPCIOE, lpc_en);

dev = dev_find_slot(0, PCI_DEVFN(PCH_DEV_SLOT_LPC, 0));
    if (!dev || !dev->chip_info)
@@ -251,6 +240,23 @@ static void soc_config_rtc(void)
    		B_PCH_PCR_RTC_CONF_UCMOS_EN);
 }

+void pch_early_iorange_init(void)
+{
+	/* Lookup device tree in romstage */
+	u16 lpc_en;
+
+	/* IO Decode Range */
+	lpc_en = COMA_RANGE | (COMB_RANGE << 4);
+	pci_write_config16(PCH_DEV_LPC, LPC_IO_DEC, lpc_en);
+	pcr_write16(PID_DMI, R_PCH_PCR_DMI_LPCIOD, lpc_en);
+
+	/* IO Decode Enable */
+	lpc_en = CNF1_LPC_EN | COMA_LPC_EN | KBC_LPC_EN | MC_LPC_EN;
+	pci_write_config16(PCH_DEV_LPC, LPC_EN, lpc_en);
+	pcr_write16(PID_DMI, R_PCH_PCR_DMI_LPCIOE, lpc_en);
+
+}
+
 void pch_early_init(void)
 {
    /*
diff --git a/src/soc/intel/skylake/include/soc/bootblock.h b/src/soc/intel/skylake/include/soc/bootblock.h
index bacbef8..ea6e76d 100644
--- a/src/soc/intel/skylake/include/soc/bootblock.h
+++ b/src/soc/intel/skylake/include/soc/bootblock.h
@@ -32,6 +32,7 @@ void pch_uart_init(void);
 void enable_smbus(void);
 void i2c_early_init(void);
 void pch_early_init(void);
+void pch_early_iorange_init(void);
 void report_platform_info(void);
 void report_memory_config(void);
 void set_max_freq(void);