soc/amd/stoneyridge: use common fch_spi_early_init

All SPI interface setup related functionality that Stoneyridge
implemented in its southbridge code is already present in the common AMD
SoC code, so use that code instead.

The common fch_spi_early_init function requires the SPI controller's
base address to be set, so call lpc_set_spibase(SPI_BASE_ADDRESS) right
before it. fch_spi_early_init then calls lpc_enable_spi_rom and
lpc_enable_spi_prefetch which can be removed from the board code now.
Next it calls fch_spi_configure_4dw_burst which does the same as the now
removed sb_disable_4dw_burst function when
SOC_AMD_COMMON_BLOCK_SPI_4DW_BURST is set to n which is the default.
This option can also only be set to y for SoCs that aren't Stoneyridge.
Finally fch_spi_early_init calls fch_spi_config_modes which configures
the SPI mode and speed settings according to the Kconfig settings and
the settings in the amdfw part. On Kahlee this was done by calls to
sb_read_mode and sb_set_spi100 before. The previous patch added the
remaining Kconfig settings, so the resulting register values don't
change in the non-EM100 case. In the EM100 case the TPM speed is changed
from 64 to 16 MHz.

TEST=Both the non-EM100 mode with a real SPI flash and the EM100 mode
with a first-generation EM100 results in Google/Barla reaching the
payload and the show_spi_speeds_and_modes call in bootblock prints the
expected settings:

relevant bootblock console output in non-EM100 case:

SPI normal read speed: 33.33 MHz
SPI fast read speed: 66.66 Mhz
SPI alt read speed: 66.66 Mhz
SPI TPM read speed: 66.66 Mhz
SPI100: Enabled
SPI Read Mode: Dual IO (1-2-2)

relevant bootblock console output in EM100 case:

SPI normal read speed: 16.66 MHz
SPI fast read speed: 16.66 MHz
SPI alt read speed: 16.66 MHz
SPI TPM read speed: 16.66 MHz
SPI100: Enabled
SPI Read Mode: Normal Read (up to 33M)

Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: I8f37a3b040808d6a5a8e07d39b6d4a1e1981355c
Reviewed-on: https://review.coreboot.org/c/coreboot/+/59968
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>

1 files changed, 0 insertions, 26 deletions

diff --git a/src/mainboard/google/kahlee/bootblock/bootblock.c b/src/mainboard/google/kahlee/bootblock/bootblock.c
index 9b456c8ed5..0ee9b58110 100644
--- a/src/mainboard/google/kahlee/bootblock/bootblock.c
+++ b/src/mainboard/google/kahlee/bootblock/bootblock.c
@@ -25,32 +25,6 @@ void bootblock_mainboard_early_init(void)
 
 void bootblock_mainboard_init(void)
 {
-	if (CONFIG(EM100)) {
-		/*
-		 * We should be able to rely on defaults, but it seems safer
-		 * to explicitly set up these registers.
-		 */
-		sb_read_mode(SPI_READ_MODE_NOM);
-		sb_set_spi100(SPI_SPEED_16M,		/* Normal */
-				SPI_SPEED_16M,		/* Fast   */
-				SPI_SPEED_16M,		/* AltIO  */
-				SPI_SPEED_66M);		/* TPM    */
-	} else {
-		/*
-		* W25Q128FW Setup
-		* Normal Read 40MHz
-		* Fast Read 104MHz
-		* Dual Read IO (1-2-2)
-		*/
-		sb_read_mode(SPI_READ_MODE_DUAL122);
-
-		/* Set SPI speeds before verstage. Needed for TPM */
-		sb_set_spi100(SPI_SPEED_33M,		/* Normal */
-				SPI_SPEED_66M,		/* Fast   */
-				SPI_SPEED_66M,		/* AltIO  */
-				SPI_SPEED_66M);		/* TPM    */
-	}
-
 	/* Setup TPM decode before verstage */
 	lpc_tpm_decode_spi();
 }