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

soc/amd/stoneyridge: move early I2C init to early_fch.c 

Since the I2C controller is part of the FCH, move the early
initialization from bootblock.c to early_fch.c which also matches what
the newer AMD SoCs do.

TEST=Successfully boots on google/liara and all I2C/cr50/TPM functions
appear to work properly

Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: I22d3a8888eaa34ea612da719c408c0083769e806
Reviewed-on: https://review.coreboot.org/c/coreboot/+/66866
Reviewed-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com>
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Felix Held 2022-08-18 19:06:50 +02:00
parent f7d86f21e1
commit 02b61ae9c0
2 changed files with 33 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/soc/amd/stoneyridge/bootblock.c
View File

@ -12,15 +12,12 @@
#include <amdblocks/agesawrapper_call.h> #include <amdblocks/agesawrapper_call.h>
#include <amdblocks/amd_pci_mmconf.h> #include <amdblocks/amd_pci_mmconf.h>
#include <amdblocks/biosram.h> #include <amdblocks/biosram.h>
#include <amdblocks/i2c.h>
#include <soc/pci_devs.h> #include <soc/pci_devs.h>
#include <soc/cpu.h> #include <soc/cpu.h>
#include <soc/southbridge.h> #include <soc/southbridge.h>
#include <timestamp.h> #include <timestamp.h>
#include <halt.h> #include <halt.h>
#include "chip.h"
#if CONFIG_PI_AGESA_TEMP_RAM_BASE < 0x100000 #if CONFIG_PI_AGESA_TEMP_RAM_BASE < 0x100000
#error "Error: CONFIG_PI_AGESA_TEMP_RAM_BASE must be >= 1MB" #error "Error: CONFIG_PI_AGESA_TEMP_RAM_BASE must be >= 1MB"
#endif #endif
@ -28,14 +25,6 @@
#error "Error: CONFIG_PI_AGESA_CAR_HEAP_BASE must be >= 1MB" #error "Error: CONFIG_PI_AGESA_CAR_HEAP_BASE must be >= 1MB"
#endif #endif
/* Table to switch SCL pins to outputs to initially reset the I2C peripherals */
static const struct soc_i2c_scl_pin i2c_scl_pins[] = {
I2C_RESET_SCL_PIN(I2C0_SCL_PIN, GPIO_I2C0_SCL),
I2C_RESET_SCL_PIN(I2C1_SCL_PIN, GPIO_I2C1_SCL),
I2C_RESET_SCL_PIN(I2C2_SCL_PIN, GPIO_I2C2_SCL),
I2C_RESET_SCL_PIN(I2C3_SCL_PIN, GPIO_I2C3_SCL),
};
/* Set the MMIO Configuration Base Address, Bus Range, and misc MTRRs. */ /* Set the MMIO Configuration Base Address, Bus Range, and misc MTRRs. */
static void amd_initmmio(void) static void amd_initmmio(void)
{ {
@ -64,17 +53,6 @@ static void amd_initmmio(void)
CONFIG_PI_AGESA_HEAP_SIZE, MTRR_TYPE_UNCACHEABLE); CONFIG_PI_AGESA_HEAP_SIZE, MTRR_TYPE_UNCACHEABLE);
} }
static void reset_i2c_peripherals(void)
{
const struct soc_amd_stoneyridge_config *cfg = config_of_soc();
struct soc_i2c_peripheral_reset_info reset_info;
reset_info.i2c_scl_reset_mask = cfg->i2c_scl_reset & GPIO_I2C_MASK;
reset_info.i2c_scl = i2c_scl_pins;
reset_info.num_pins = ARRAY_SIZE(i2c_scl_pins);
sb_reset_i2c_peripherals(&reset_info);
}
asmlinkage void bootblock_c_entry(uint64_t base_timestamp) asmlinkage void bootblock_c_entry(uint64_t base_timestamp)
{ {
enable_pci_mmconf(); enable_pci_mmconf();
@ -102,16 +80,6 @@ void bootblock_soc_early_init(void)
void bootblock_soc_init(void) void bootblock_soc_init(void)
{ {
/*
* This call (sb_reset_i2c_peripherals) was originally early at
* bootblock_c_entry, but had to be moved here. There was an
* unexplained delay in the middle of the i2c transaction when
* we had it in bootblock_c_entry. Moving it to this point
* (or adding delays) fixes the issue. It seems like the processor
* just pauses but we don't know why.
*/
reset_i2c_peripherals();
if (CONFIG(AMD_SOC_CONSOLE_UART)) if (CONFIG(AMD_SOC_CONSOLE_UART))
assert(CONFIG_UART_FOR_CONSOLE >= 0 assert(CONFIG_UART_FOR_CONSOLE >= 0
&& CONFIG_UART_FOR_CONSOLE <= 1); && CONFIG_UART_FOR_CONSOLE <= 1);
@ -120,7 +88,4 @@ void bootblock_soc_init(void)
printk(BIOS_DEBUG, "Family_Model: %08x\n", val); printk(BIOS_DEBUG, "Family_Model: %08x\n", val);
bootblock_fch_init(); bootblock_fch_init();
/* Initialize any early i2c buses. */
i2c_soc_early_init();
} }

33
src/soc/amd/stoneyridge/early_fch.c
View File

@ -1,6 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#include <amdblocks/acpimmio.h> #include <amdblocks/acpimmio.h>
#include <amdblocks/i2c.h>
#include <amdblocks/lpc.h> #include <amdblocks/lpc.h>
#include <amdblocks/pmlib.h> #include <amdblocks/pmlib.h>
#include <amdblocks/reset.h> #include <amdblocks/reset.h>
@ -9,6 +10,16 @@
#include <soc/southbridge.h> #include <soc/southbridge.h>
#include <types.h> #include <types.h>
#include "chip.h"
/* Table to switch SCL pins to outputs to initially reset the I2C peripherals */
static const struct soc_i2c_scl_pin i2c_scl_pins[] = {
I2C_RESET_SCL_PIN(I2C0_SCL_PIN, GPIO_I2C0_SCL),
I2C_RESET_SCL_PIN(I2C1_SCL_PIN, GPIO_I2C1_SCL),
I2C_RESET_SCL_PIN(I2C2_SCL_PIN, GPIO_I2C2_SCL),
I2C_RESET_SCL_PIN(I2C3_SCL_PIN, GPIO_I2C3_SCL),
};
static void sb_lpc_decode(void) static void sb_lpc_decode(void)
{ {
u32 tmp = 0; u32 tmp = 0;
@ -100,6 +111,17 @@ static void setup_misc(int *reboot)
} }
} }
static void reset_i2c_peripherals(void)
{
const struct soc_amd_stoneyridge_config *cfg = config_of_soc();
struct soc_i2c_peripheral_reset_info reset_info;
reset_info.i2c_scl_reset_mask = cfg->i2c_scl_reset & GPIO_I2C_MASK;
reset_info.i2c_scl = i2c_scl_pins;
reset_info.num_pins = ARRAY_SIZE(i2c_scl_pins);
sb_reset_i2c_peripherals(&reset_info);
}
/* Before console init */ /* Before console init */
void bootblock_fch_early_init(void) void bootblock_fch_early_init(void)
{ {
@ -132,8 +154,19 @@ void bootblock_fch_early_init(void)
/* After console init */ /* After console init */
void bootblock_fch_init(void) void bootblock_fch_init(void)
{ {
/*
* This call (sb_reset_i2c_peripherals) was originally early at
* bootblock_c_entry, but had to be moved here. There was an
* unexplained delay in the middle of the i2c transaction when
* we had it in bootblock_c_entry. Moving it to this point
* (or adding delays) fixes the issue. It seems like the processor
* just pauses but we don't know why.
*/
reset_i2c_peripherals();
pm_set_power_failure_state(); pm_set_power_failure_state();
fch_print_pmxc0_status(); fch_print_pmxc0_status();
/* Initialize any early i2c buses. */
i2c_soc_early_init();
show_spi_speeds_and_modes(); show_spi_speeds_and_modes();
} }