From c0fefa8084b31c523efbeb2cce10c4afab2016d5 Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Tue, 25 Oct 2022 09:34:32 +1100 Subject: ichspi.c: derive hsfc_fcycle from ctx in ich_start_hwseq_xfer() Allow helpers to derive driver specific data from the driver specific context instead of being a closure over a static global variable. Change-Id: Ib0ccf4b32fd1e2be2ecc3a4a4c6e397c8e901a0a Signed-off-by: Edward O'Callaghan Reviewed-on: https://review.coreboot.org/c/flashrom/+/68773 Tested-by: build bot (Jenkins) Reviewed-by: Felix Singer Reviewed-by: Subrata Banik --- ichspi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ichspi.c b/ichspi.c index 5d9fe0c7c..bbd2c91d6 100644 --- a/ichspi.c +++ b/ichspi.c @@ -1350,6 +1350,7 @@ static void ich_start_hwseq_xfer(const struct flashctx *flash, uint32_t addr_mask) { uint16_t hsfc; + struct hwseq_data *hwseq_data = get_hwseq_data_from_context(flash); /* Sets flash_addr in FADDR */ ich_hwseq_set_addr(flash_addr, addr_mask); @@ -1359,7 +1360,7 @@ static void ich_start_hwseq_xfer(const struct flashctx *flash, /* Set up transaction parameters. */ hsfc = REGREAD16(ICH9_REG_HSFC); - hsfc &= ~g_hwseq_data.hsfc_fcycle; /* clear operation */ + hsfc &= ~hwseq_data->hsfc_fcycle; /* clear operation */ hsfc |= hsfc_cycle; hsfc |= HSFC_FDBC_VAL(len - 1); hsfc |= HSFC_FGO; /* start */ -- cgit v1.2.3