From 496331a6727d146145f843141e6bc0a1e73b60ff Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Wed, 21 Sep 2022 09:45:47 +0200 Subject: internal.c: Pass `programmer_cfg` to `try_mtd()` Programmer params are now passed via the `programmer_cfg` struct, but the internal programmer did not pass them to the `try_mtd()` function which was still using `NULL`. This problem resulted in a segmentation fault when trying to use the internal programmer. TEST=Make sure internal programmer does not segfault on Haswell ULT. Change-Id: I9e74bd68a1f9509a201dc518dbff96c27d68a3c3 Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/flashrom/+/67752 Tested-by: build bot (Jenkins) Reviewed-by: Thomas Heijligen Reviewed-by: Felix Singer Reviewed-by: Edward O'Callaghan --- include/programmer.h | 9 ++++++--- internal.c | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/include/programmer.h b/include/programmer.h index a7cea5e7..17abfd22 100644 --- a/include/programmer.h +++ b/include/programmer.h @@ -375,12 +375,15 @@ void exit_conf_mode_ite(uint16_t port); void probe_superio_ite(void); int init_superio_ite(const struct programmer_cfg *cfg); -#if CONFIG_LINUX_MTD == 1 /* trivial wrapper to avoid cluttering internal_init() with #if */ -static inline int try_mtd(void) { return programmer_linux_mtd.init(NULL); }; +static inline int try_mtd(const struct programmer_cfg *cfg) +{ +#if CONFIG_LINUX_MTD == 1 + return programmer_linux_mtd.init(cfg); #else -static inline int try_mtd(void) { return 1; }; + return 1; #endif +} /* mcp6x_spi.c */ int mcp6x_spi_init(int want_spi); diff --git a/internal.c b/internal.c index 43aa51bc..6a8db5e6 100644 --- a/internal.c +++ b/internal.c @@ -215,7 +215,7 @@ static int internal_init(const struct programmer_cfg *cfg) */ internal_buses_supported = BUS_NONSPI; - if (try_mtd() == 0) { + if (try_mtd(cfg) == 0) { ret = 0; goto internal_init_exit; } -- cgit v1.2.3