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

soc/amd/stoneyridge: clean up southbridge.c 

* Limit dependency on vendorcode header files and use defines from
  iomap.h and southbridge.h
* Factor out to functions, device power-on code for AMBA and UART.

BUG=b:69220826
BRANCH=master
TEST=abuild, build Gardenia, build and boot Grunt

Change-Id: Ibcf4d617e2a0a520a6d7e8d0d758d7a9705a84ea
Signed-off-by: Garrett Kirkendall <garrett.kirkendall@amd.corp-partner.google.com>
Reviewed-on: https://review.coreboot.org/25010
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin Roth <martinroth@google.com>
Reviewed-by: Richard Spiegel <richard.spiegel@silverbackltd.com>
This commit is contained in:
Garrett Kirkendall 2018-03-06 09:23:47 -06:00 committed by Martin Roth
parent d255830418
commit a0ff6fc860
1 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/soc/amd/stoneyridge/southbridge.c
View File

@ -272,23 +272,38 @@ int sb_set_wideio_range(uint16_t start, uint16_t size)
return index; return index;
} }
void configure_stoneyridge_uart(void) static void power_on_aoac_device(int aoac_device_control_register)
{ {
u8 byte, byte2; uint8_t byte;
uint8_t *register_pointer = (uint8_t *)(uintptr_t)AOAC_MMIO_BASE
if (CONFIG_UART_FOR_CONSOLE < 0 || CONFIG_UART_FOR_CONSOLE > 1) + aoac_device_control_register;
return;
/* Power on the UART and AMBA devices */ /* Power on the UART and AMBA devices */
byte = read8((void *)ACPI_MMIO_BASE + AOAC_BASE + FCH_AOAC_REG56 byte = read8(register_pointer);
+ CONFIG_UART_FOR_CONSOLE * 2); byte |= FCH_AOAC_PWR_ON_DEV;
byte |= AOAC_PWR_ON_DEV; write8(register_pointer, byte);
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); static bool is_aoac_device_enabled(int aoac_device_status_register)
byte |= AOAC_PWR_ON_DEV; {
write8((void *)ACPI_MMIO_BASE + AOAC_BASE + FCH_AOAC_REG62, byte); uint8_t byte;
byte = read8((uint8_t *)(uintptr_t)AOAC_MMIO_BASE
+ aoac_device_status_register);
byte &= (FCH_AOAC_PWR_RST_STATE | FCH_AOAC_RST_CLK_OK_STATE);
if (byte == (FCH_AOAC_PWR_RST_STATE | FCH_AOAC_RST_CLK_OK_STATE))
return true;
else
return false;
}
void configure_stoneyridge_uart(void)
{
bool status;
/* Power on the UART and AMBA devices */
power_on_aoac_device(FCH_AOAC_D3_CONTROL_UART0
+ CONFIG_UART_FOR_CONSOLE * 2);
power_on_aoac_device(FCH_AOAC_D3_CONTROL_AMBA);
/* Set the GPIO mux to UART */ /* Set the GPIO mux to UART */
write8((void *)FCH_IOMUXx89_UART0_RTS_L_EGPIO137, 0); write8((void *)FCH_IOMUXx89_UART0_RTS_L_EGPIO137, 0);
@ -299,15 +314,10 @@ void configure_stoneyridge_uart(void)
/* Wait for the UART and AMBA devices to indicate power and clock OK */ /* Wait for the UART and AMBA devices to indicate power and clock OK */
do { do {
udelay(100); udelay(100);
byte = read8((void *)ACPI_MMIO_BASE + AOAC_BASE + FCH_AOAC_REG57 status = is_aoac_device_enabled(FCH_AOAC_D3_STATE_UART0
+ CONFIG_UART_FOR_CONSOLE * 2); + CONFIG_UART_FOR_CONSOLE * 2);
byte &= (A0AC_PWR_RST_STATE | AOAC_RST_CLK_OK_STATE); status &= is_aoac_device_enabled(FCH_AOAC_D3_STATE_AMBA);
byte2 = read8((void *)ACPI_MMIO_BASE + AOAC_BASE } while (!status);
+ FCH_AOAC_REG63);
byte2 &= (A0AC_PWR_RST_STATE | AOAC_RST_CLK_OK_STATE);
} while (!((byte == (A0AC_PWR_RST_STATE | AOAC_RST_CLK_OK_STATE)) &&
(byte2 == (A0AC_PWR_RST_STATE | AOAC_RST_CLK_OK_STATE))));
} }
void sb_pci_port80(void) void sb_pci_port80(void)