GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/intel/cannonlake: Fix IO decode setup 

This change makes the early IO decode setup mirror that of other
Intel SOCs and fixes issues with COM1 not being enabled properly.

Tested by successfully successfully receiving serial output from
an 8250IO UART device at the standard 0x3f8 base address.

Change-Id: I9bd894fea62b78b81e5c80b5e88a539ebddac2df
Signed-off-by: Duncan Laurie <dlaurie@google.com>
Reviewed-on: https://review.coreboot.org/c/29671
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Lijian Zhao <lijian.zhao@intel.com>
This commit is contained in:
Duncan Laurie 2018-11-17 12:13:59 -07:00 committed by Duncan Laurie
parent 3eb720c36e
commit 2aef7f3cec
1 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/soc/intel/cannonlake/bootblock/pch.c
View File

@ -46,6 +46,9 @@
#define PCR_PSFX_TO_SHDW_PCIEN_IOEN 0x01 #define PCR_PSFX_TO_SHDW_PCIEN_IOEN 0x01
#define PCR_PSFX_T0_SHDW_PCIEN 0x1C #define PCR_PSFX_T0_SHDW_PCIEN 0x1C
#define PCR_DMI_DMICTL 0x2234
#define PCR_DMI_DMICTL_SRLOCK (1 << 31)
#define PCR_DMI_ACPIBA 0x27B4 #define PCR_DMI_ACPIBA 0x27B4
#define PCR_DMI_ACPIBDID 0x27B8 #define PCR_DMI_ACPIBDID 0x27B8
#define PCR_DMI_PMBASEA 0x27AC #define PCR_DMI_PMBASEA 0x27AC
@ -168,23 +171,38 @@ static void soc_config_tco(void)
outw(tcocnt, tcobase + TCO1_CNT); outw(tcocnt, tcobase + TCO1_CNT);
} }
void pch_early_iorange_init(void) static int pch_check_decode_enable(void)
{ {
uint16_t dec_rng, dec_en = 0; uint32_t dmi_control;
/* IO Decode Range */ /*
if (IS_ENABLED(CONFIG_DRIVERS_UART_8250IO) && * This cycle decoding is only allowed to set when
IS_ENABLED(CONFIG_UART_DEBUG)) { * DMICTL.SRLOCK is 0.
dec_rng = COMA_RANGE | (COMB_RANGE << 4); */
dec_en = COMA_LPC_EN | COMB_LPC_EN; dmi_control = pcr_read32(PID_DMI, PCR_DMI_DMICTL);
pci_write_config16(PCH_DEV_LPC, LPC_IO_DEC, dec_rng); if (dmi_control & PCR_DMI_DMICTL_SRLOCK)
pcr_write16(PID_DMI, PCR_DMI_LPCIOD, dec_rng); return -1;
return 0;
} }
void pch_early_iorange_init(void)
{
uint16_t io_enables = LPC_IOE_SUPERIO_2E_2F | LPC_IOE_KBC_60_64 |
LPC_IOE_EC_62_66 | LPC_IOE_LGE_200;
/* IO Decode Range */
if (IS_ENABLED(CONFIG_DRIVERS_UART_8250IO))
lpc_io_setup_comm_a_b();
/* IO Decode Enable */ /* IO Decode Enable */
dec_en |= SE_LPC_EN | KBC_LPC_EN | MC1_LPC_EN | GAMEL_LPC_EN; if (pch_check_decode_enable() == 0) {
pci_write_config16(PCH_DEV_LPC, LPC_EN, dec_en); io_enables = lpc_enable_fixed_io_ranges(io_enables);
pcr_write16(PID_DMI, PCR_DMI_LPCIOE, dec_en); /*
* Set up LPC IO Enables PCR[DMI] + 2774h [15:0] to the same
* value program in LPC PCI offset 82h.
*/
pcr_write16(PID_DMI, PCR_DMI_LPCIOE, io_enables);
}
/* Program generic IO Decode Range */ /* Program generic IO Decode Range */
pch_enable_lpc(); pch_enable_lpc();