AMD/bettong: Add UART support
The function delay in uart8250mem.c is not enough for hudson. I guess there are some problems in lapic_timer(). I uploaded a patch to gerrit to show the way to enable UART feature. http://review.coreboot.org/#/c/12343/4 Currently the HUDSON_UART is unchecked by default. Select HUDSON_UART to enable this feature. The UART is test at BIOS stage. Since it is not a standart UART device, the windows internal UART driver doesnt support it. I guess we need a driver to use it on windows. Change-Id: I4cec833cc2ff8069c82886837f7cbd4483ff11bb Signed-off-by: Zheng Bao <zheng.bao@amd.com> Signed-off-by: Zheng Bao <fishbaozi@gmail.com> Reviewed-on: http://review.coreboot.org/11749 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
parent
ab1e77fb01
commit
2286138561
|
@ -39,6 +39,9 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
|
||||||
if (!cpu_init_detectedx && boot_cpu()) {
|
if (!cpu_init_detectedx && boot_cpu()) {
|
||||||
post_code(0x30);
|
post_code(0x30);
|
||||||
|
|
||||||
|
#if IS_ENABLED(CONFIG_HUDSON_UART)
|
||||||
|
configure_hudson_uart();
|
||||||
|
#endif
|
||||||
post_code(0x31);
|
post_code(0x31);
|
||||||
console_init();
|
console_init();
|
||||||
}
|
}
|
||||||
|
|
|
@ -227,3 +227,19 @@ config AZ_PIN
|
||||||
bit 5,4 - pin 2
|
bit 5,4 - pin 2
|
||||||
bit 7,6 - pin 3
|
bit 7,6 - pin 3
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
config HUDSON_UART
|
||||||
|
bool "UART controller on Kern."
|
||||||
|
default n
|
||||||
|
depends on SOUTHBRIDGE_AMD_PI_KERN
|
||||||
|
select DRIVERS_UART_8250MEM
|
||||||
|
select DRIVERS_UART_8250MEM_32
|
||||||
|
select NO_UART_ON_SUPERIO
|
||||||
|
help
|
||||||
|
There are two UART controllers in Kern.
|
||||||
|
The UART registers are memory-mapped. UART
|
||||||
|
controller 0 registers range from FEDC_6000h
|
||||||
|
to FEDC_6FFFh. UART controller 1 registers
|
||||||
|
range from FEDC_8000h to FEDC_8FFFh.
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -50,6 +50,11 @@ romstage-y += imc.c
|
||||||
ramstage-y += imc.c
|
ramstage-y += imc.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(CONFIG_HUDSON_UART), y)
|
||||||
|
romstage-y += uart.c
|
||||||
|
ramstage-y += uart.c
|
||||||
|
endif
|
||||||
|
|
||||||
smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c smi_util.c
|
smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c smi_util.c
|
||||||
ramstage-$(CONFIG_HAVE_SMI_HANDLER) += smi.c smi_util.c
|
ramstage-$(CONFIG_HAVE_SMI_HANDLER) += smi.c smi_util.c
|
||||||
|
|
||||||
|
|
|
@ -26,6 +26,37 @@
|
||||||
#include "hudson.h"
|
#include "hudson.h"
|
||||||
#include "pci_devs.h"
|
#include "pci_devs.h"
|
||||||
|
|
||||||
|
#if IS_ENABLED(CONFIG_HUDSON_UART)
|
||||||
|
|
||||||
|
#include <cpu/x86/msr.h>
|
||||||
|
#include <delay.h>
|
||||||
|
#include <Fch/Fch.h>
|
||||||
|
|
||||||
|
void configure_hudson_uart(void)
|
||||||
|
{
|
||||||
|
msr_t msr;
|
||||||
|
u8 byte;
|
||||||
|
|
||||||
|
msr = rdmsr(0x1B);
|
||||||
|
msr.lo |= 1 << 11;
|
||||||
|
wrmsr(0x1B, msr);
|
||||||
|
byte = read8((void *)ACPI_MMIO_BASE + AOAC_BASE + FCH_AOAC_REG56 + CONFIG_UART_FOR_CONSOLE * 2);
|
||||||
|
byte |= 1 << 3;
|
||||||
|
write8((void *)ACPI_MMIO_BASE + AOAC_BASE + FCH_AOAC_REG56 + CONFIG_UART_FOR_CONSOLE * 2, byte);
|
||||||
|
byte = read8((void *)ACPI_MMIO_BASE + AOAC_BASE + FCH_AOAC_REG62);
|
||||||
|
byte |= 1 << 3;
|
||||||
|
write8((void *)ACPI_MMIO_BASE + AOAC_BASE + FCH_AOAC_REG62, byte);
|
||||||
|
write8((void *)FCH_IOMUXx89_UART0_RTS_L_EGPIO137, 0);
|
||||||
|
write8((void *)FCH_IOMUXx8A_UART0_TXD_EGPIO138, 0);
|
||||||
|
write8((void *)FCH_IOMUXx8E_UART1_RTS_L_EGPIO142, 0);
|
||||||
|
write8((void *)FCH_IOMUXx8F_UART1_TXD_EGPIO143, 0);
|
||||||
|
|
||||||
|
udelay(2000);
|
||||||
|
write8((void *)0xFEDC6000 + 0x2000 * CONFIG_UART_FOR_CONSOLE + 0x88, 0x01); /* reset UART */
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
void hudson_pci_port80(void)
|
void hudson_pci_port80(void)
|
||||||
{
|
{
|
||||||
u8 byte;
|
u8 byte;
|
||||||
|
|
|
@ -112,6 +112,9 @@ void hudson_clk_output_48Mhz(void);
|
||||||
|
|
||||||
int s3_save_nvram_early(u32 dword, int size, int nvram_pos);
|
int s3_save_nvram_early(u32 dword, int size, int nvram_pos);
|
||||||
int s3_load_nvram_early(int size, u32 *old_dword, int nvram_pos);
|
int s3_load_nvram_early(int size, u32 *old_dword, int nvram_pos);
|
||||||
|
#if IS_ENABLED(CONFIG_HUDSON_UART)
|
||||||
|
void configure_hudson_uart(void);
|
||||||
|
#endif
|
||||||
|
|
||||||
#else
|
#else
|
||||||
void hudson_enable(device_t dev);
|
void hudson_enable(device_t dev);
|
||||||
|
|
Loading…
Reference in New Issue