[flashrom-gerrit] [S] Change in flashrom[master]: chipset_enable.c: plumb programmer_cfg into sb600 and ich init

[Anastasia Klimchuk (Code Review)]

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/66674 )

Change subject: chipset_enable.c: plumb programmer_cfg into sb600 and ich init
......................................................................

chipset_enable.c: plumb programmer_cfg into sb600 and ich init

Change-Id: Ic25014cbb983bda6e949bc62e30f2cca51f57a4c
Signed-off-by: Edward O'Callaghan 
Reviewed-on: https://review.coreboot.org/c/flashrom/+/66674
Tested-by: build bot (Jenkins) 
Reviewed-by: Anastasia Klimchuk 
Reviewed-by: Felix Singer 
---
M chipset_enable.c
1 file changed, 19 insertions(+), 5 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Felix Singer: Looks good to me, approved
  Anastasia Klimchuk: Looks good to me, approved

diff --git a/chipset_enable.c b/chipset_enable.c
index d8aa53d..e205a83 100644
--- a/chipset_enable.c
+++ b/chipset_enable.c
@@ -428,7 +428,7 @@
    	break;
    }

-	char *idsel = extract_programmer_param_str(NULL, "fwh_idsel"); /* TODO(quasisec): pass prog_param */
+	char *idsel = extract_programmer_param_str(cfg, "fwh_idsel");
    if (idsel && strlen(idsel)) {
    	if (!implemented) {
    		msg_perr("Error: fwh_idsel= specified, but (yet) unsupported on this chipset.\n");
@@ -816,7 +816,7 @@
    void *spibar = rcrb + spibar_offset;

/* This adds BUS_SPI */
-	int ret_spi = ich_init_spi(NULL, spibar, ich_generation); /* TODO(quasisec): pass prog_param */
+	int ret_spi = ich_init_spi(cfg, spibar, ich_generation);
    if (ret_spi == ERROR_FATAL)
    	return ret_spi;

@@ -960,7 +960,7 @@
    msg_pdbg("SPIBAR = 0x%0*" PRIxPTR " (phys = 0x%08x)\n", PRIxPTR_WIDTH, (uintptr_t)spibar, phys_spibar);

/* This adds BUS_SPI */
-	const int ret_spi = ich_init_spi(NULL, spibar, pch_generation); /* TODO(quasisec): pass prog_param */
+	const int ret_spi = ich_init_spi(cfg, spibar, pch_generation);
    if (ret_spi != ERROR_FATAL) {
    	if (ret_bc || ret_spi)
    		ret = ERROR_NONFATAL;
@@ -1077,7 +1077,7 @@
     */
    enable_flash_ich_bios_cntl_memmapped(ich_generation, spibar + 0xFC);

-	int ret_spi = ich_init_spi(NULL, spibar, ich_generation); /* TODO(quasisec): pass prog_param */
+	int ret_spi = ich_init_spi(cfg, spibar, ich_generation);
    if (ret_spi == ERROR_FATAL)
    	return ret_spi;

@@ -1407,7 +1407,7 @@

internal_buses_supported &= BUS_LPC | BUS_FWH;

-	ret = sb600_probe_spi(NULL, dev); /* TODO(quasisec): pass prog_param */
+	ret = sb600_probe_spi(cfg, dev);

/* Read ROM strap override register. */
    OUTB(0x8f, 0xcd6);