From 5a97be363a269b364569be8223369d9a5bf92292 Mon Sep 17 00:00:00 2001 From: Anastasia Klimchuk Date: Mon, 5 Jul 2021 09:18:06 +1000 Subject: spi_master: Add shutdown function in spi_master struct With this, register_spi_master can take care of register_shutdown as well, and every spi master only needs to call register_spi_master instead of calling both register_spi_master and register_shutdown. Testing: In dummyflasher, comment out free(data) in shutdown. Test fails with error: ../dummyflasher.c:949: note: block 0x55e0727a6e40 allocated here ERROR: dummy_init_and_shutdown_test_success leaked 1 block(s) Means, shutdown function is invoked for drivers with "old" API (so, transitioning from old to new API is not breaking anything). Next patches in the chain converts spi masters to use new API. BUG=b:185191942 TEST=builds and ninja test Change-Id: I2dc80dceca2f8204bcd0dad1f51753d7e79f1af5 Signed-off-by: Anastasia Klimchuk Reviewed-on: https://review.coreboot.org/c/flashrom/+/55932 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber --- programmer.h | 1 + spi.c | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/programmer.h b/programmer.h index 95e2cdaf..ec559872 100644 --- a/programmer.h +++ b/programmer.h @@ -356,6 +356,7 @@ struct spi_master { int (*read)(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); int (*write_256)(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int (*write_aai)(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); + int (*shutdown)(void *data); void *data; }; diff --git a/spi.c b/spi.c index 4ac39145..f2e91c4d 100644 --- a/spi.c +++ b/spi.c @@ -135,6 +135,13 @@ int register_spi_master(const struct spi_master *mst, void *data) { struct registered_master rmst = {0}; + if (mst->shutdown) { + if (register_shutdown(mst->shutdown, data)) { + mst->shutdown(data); /* cleanup */ + return 1; + } + } + if (!mst->write_aai || !mst->write_256 || !mst->read || !mst->command || !mst->multicommand || ((mst->command == default_spi_send_command) && -- cgit v1.2.3