diff options
| author | Teo Boon Tiong <boon.tiong.teo@intel.com> | 2016-11-10 01:21:23 +0800 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2016-11-30 16:57:42 +0100 |
| commit | 544dac692a3a9a22187316a139e1326c76ce7a6f (patch) | |
| tree | 57ce5b108f5cf834633bc2012f2c901a255ecf91 | |
| parent | 0068dfdcc8c2a80508cdd44909d9a2561a30a0e5 (diff) | |
| download | coreboot-544dac692a3a9a22187316a139e1326c76ce7a6f.tar.xz | |
soc/skylake: Move IO decode range out from pch_lpc_init
1. Move existing IO decode range from pch_lpc_init to early
stage before SIO init.
2. At the same time, enable SIO decode range (0x2e/0x2f)
for platform which use super IO.
Change-Id: I72df16d0a784686d8cadfbee09b5aef60576ac43
Signed-off-by: Teo Boon Tiong <boon.tiong.teo@intel.com>
Reviewed-on: https://review.coreboot.org/17337
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
| -rw-r--r-- | src/soc/intel/skylake/bootblock/bootblock.c | 1 | ||||
| -rw-r--r-- | src/soc/intel/skylake/bootblock/pch.c | 27 | ||||
| -rw-r--r-- | src/soc/intel/skylake/include/soc/bootblock.h | 1 |
3 files changed, 18 insertions, 11 deletions
diff --git a/src/soc/intel/skylake/bootblock/bootblock.c b/src/soc/intel/skylake/bootblock/bootblock.c index ea41b4bcb2..93a031f0f5 100644 --- a/src/soc/intel/skylake/bootblock/bootblock.c +++ b/src/soc/intel/skylake/bootblock/bootblock.c @@ -27,6 +27,7 @@ void bootblock_soc_early_init(void) bootblock_systemagent_early_init(); bootblock_pch_early_init(); bootblock_cpu_init(); + pch_early_iorange_init(); if (IS_ENABLED(CONFIG_UART_DEBUG)) pch_uart_init(); diff --git a/src/soc/intel/skylake/bootblock/pch.c b/src/soc/intel/skylake/bootblock/pch.c index 371dd63685..6279cf2b6d 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) @@ -272,6 +261,22 @@ static void enable_heci(void) pci_write_config8(dev, PCI_COMMAND, pcireg); } +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 4895912092..df81d3f3fc 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); |