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

soc/intel/icelake: Fix IO decode setup 

Make pch_early_iorange_init() function similar to
soc/intel/cannonlake/bootblock/pch.c while fixing below issue:

* COM1 not being enabled properly.

TEST=Able to get serial output from an 8250IO UART device at
the standard 0x3f8 base address.

Change-Id: I5ab02f46d27e667be3d9328d94b634ef04038d2f
Signed-off-by: Subrata Banik <subrata.banik@intel.com>
Reviewed-on: https://review.coreboot.org/c/29835
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aamir Bohra <aamir.bohra@intel.com>
This commit is contained in:
Subrata Banik 2018-11-26 15:43:18 +05:30 committed by Patrick Georgi
parent 190e5bee4a
commit 1c329a05de
2 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/soc/intel/icelake/bootblock/pch.c
View File

@ -43,6 +43,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
@ -146,24 +149,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) {
LPC_IOE_KBC_60_64; io_enables = lpc_enable_fixed_io_ranges(io_enables);
pci_write_config16(PCH_DEV_LPC, LPC_EN, dec_en); /*
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();

10
src/soc/intel/icelake/include/soc/lpc.h
View File

@ -32,16 +32,6 @@
#define COMA_RANGE 0x0 /* 0x3F8 - 0x3FF COM1*/ #define COMA_RANGE 0x0 /* 0x3F8 - 0x3FF COM1*/
#define COMB_RANGE 0x1 /* 0x2F8 - 0x2FF COM2*/ #define COMB_RANGE 0x1 /* 0x2F8 - 0x2FF COM2*/
#define LPC_EN 0x82 /* LPC IF Enables Register */ #define LPC_EN 0x82 /* LPC IF Enables Register */
#define MC2_LPC_EN (1 << 13) /* 0x4e/0x4f */
#define SE_LPC_EN (1 << 12) /* 0x2e/0x2f */
#define MC1_LPC_EN (1 << 11) /* 0x62/0x66 */
#define KBC_LPC_EN (1 << 10) /* 0x60/0x64 */
#define GAMEH_LPC_EN (1 << 9) /* 0x208/0x20f */
#define GAMEL_LPC_EN (1 << 8) /* 0x200/0x207 */
#define FDD_LPC_EN (1 << 3) /* Floppy Drive Enable */
#define LPT_LPC_EN (1 << 2) /* Parallel Port Enable */
#define COMB_LPC_EN (1 << 1) /* Com Port B Enable */
#define COMA_LPC_EN (1 << 0) /* Com Port A Enable */
#define LPC_GEN1_DEC 0x84 /* LPC IF Generic Decode Range 1 */ #define LPC_GEN1_DEC 0x84 /* LPC IF Generic Decode Range 1 */
#define LPC_GEN2_DEC 0x88 /* LPC IF Generic Decode Range 2 */ #define LPC_GEN2_DEC 0x88 /* LPC IF Generic Decode Range 2 */
#define LPC_GEN3_DEC 0x8c /* LPC IF Generic Decode Range 3 */ #define LPC_GEN3_DEC 0x8c /* LPC IF Generic Decode Range 3 */