openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-30 16:33:41 +02:00
Code Issues Releases Wiki Activity

ichspi.c: Make ich_set_bbar() parameteric on ich_generation

Browse Source 
Work towards dropping ich_generation global usage and make
the ich_set_bbar() function pure.

Change-Id: I6da6dccb413cbafa2fbaca213574f22c7a258139
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/43500
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Edward O'Callaghan 2020-07-16 15:37:26 +10:00 committed by Edward O'Callaghan
parent 556fe8d53d
commit 4c9b416379
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ichspi.c
View File

@ -714,10 +714,10 @@ static int ich_missing_opcodes(void)
* Try to set BBAR (BIOS Base Address Register), but read back the value in case * Try to set BBAR (BIOS Base Address Register), but read back the value in case
* it didn't stick. * it didn't stick.
*/ */
static void ich_set_bbar(uint32_t min_addr) static void ich_set_bbar(uint32_t min_addr, enum ich_chipset ich_gen)
{ {
int bbar_off; int bbar_off;
switch (ich_generation) { switch (ich_gen) {
case CHIPSET_ICH7: case CHIPSET_ICH7:
case CHIPSET_TUNNEL_CREEK: case CHIPSET_TUNNEL_CREEK:
case CHIPSET_CENTERTON: case CHIPSET_CENTERTON:
@ -1811,7 +1811,7 @@ int ich_init_spi(void *spibar, enum ich_chipset ich_gen)
ichspi_lock = 1; ichspi_lock = 1;
} }
ich_init_opcodes(ich_gen); ich_init_opcodes(ich_gen);
ich_set_bbar(0); ich_set_bbar(0, ich_gen);
register_spi_master(&spi_master_ich7); register_spi_master(&spi_master_ich7);
break; break;
case CHIPSET_ICH8: case CHIPSET_ICH8:
@ -1946,7 +1946,7 @@ int ich_init_spi(void *spibar, enum ich_chipset ich_gen)
default: default:
ichspi_bbar = mmio_readl(ich_spibar + ICH9_REG_BBAR); ichspi_bbar = mmio_readl(ich_spibar + ICH9_REG_BBAR);
msg_pdbg("0x%x: 0x%08x (BBAR)\n", ICH9_REG_BBAR, ichspi_bbar); msg_pdbg("0x%x: 0x%08x (BBAR)\n", ICH9_REG_BBAR, ichspi_bbar);
ich_set_bbar(0); ich_set_bbar(0, ich_gen);
break; break;
} }
@ -2099,7 +2099,7 @@ int via_init_spi(uint32_t mmio_base)
ichspi_lock = 1; ichspi_lock = 1;
} }
ich_set_bbar(0); ich_set_bbar(0, ich_generation);
ich_init_opcodes(ich_generation); ich_init_opcodes(ich_generation);
return 0; return 0;