path: root/internal.c
diff options
authorDavid Hendricks <>2011-06-14 01:35:36 +0000
committerDavid Hendricks <>2011-06-14 01:35:36 +0000
commit8bb2021d77c8ee213b53d671687b7a1179335522 (patch)
treea77cc4239b59731e98cf6c9681b5a7c665613038 /internal.c
parent9d9a1042332cd08aa66eee6f37d80c0f09f47d70 (diff)
Use shutdown callback mechanism to shutdown programmers
This patch attempts to resolve some programmer shutdown ordering issues by having the programmer init functions register shutdown callbacks explicitly wherever it makes most sense. Before, assumptions were made that could lead to the internal programmer's state changing before the external programmer could be shut down properly. Now, each programmer cleans up after itself and (hopefully) performs each operation in the correct order. As a side-effect, this patch gives us a better usage model for reverse operations such as rpci_* and rmmio_*. In the long-run, this should make reversing the initialization process easier to understand, less tedious, and less error-prone. In short, this patch does the following: - Registers a shutdown callback during initialization for each programmer. - Kills the .shutdown function pointer from programmer_entry struct. Also, make most shutdown functions static. - Adds a few minor clean-ups and corrections (e.g. missing physunmap() calls). TODO: Remove forward declaration of serprog_shutdown() (added to simplify diff) Corresponding to flashrom svn r1338. Signed-off-by: David Hendricks <> Acked-by: Carl-Daniel Hailfinger <>
Diffstat (limited to 'internal.c')
1 files changed, 8 insertions, 7 deletions
diff --git a/internal.c b/internal.c
index c9f62c1..32bfb3a 100644
--- a/internal.c
+++ b/internal.c
@@ -127,6 +127,12 @@ int register_superio(struct superio s)
int is_laptop = 0;
int laptop_ok = 0;
+static int internal_shutdown(void *data)
+ release_io_perms();
+ return 0;
int internal_init(void)
@@ -178,6 +184,8 @@ int internal_init(void)
+ if (register_shutdown(internal_shutdown, NULL))
+ return 1;
/* Default to Parallel/LPC/FWH flash devices. If a known host controller
* is found, the init routine sets the buses_supported bitfield.
@@ -287,13 +295,6 @@ int internal_init(void)
return 1;
-int internal_shutdown(void)
- release_io_perms();
- return 0;
void internal_chip_writeb(uint8_t val, chipaddr addr)
OpenPOWER on IntegriCloud