mirror of
https://review.coreboot.org/flashrom.git
synced 2025-07-02 14:33:18 +02:00
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 <dhendrix@google.com> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
This commit is contained in:

committed by
David Hendricks

parent
9d9a104233
commit
8bb2021d77
22
satasii.c
22
satasii.c
@ -26,6 +26,8 @@
|
||||
|
||||
#define PCI_VENDOR_ID_SII 0x1095
|
||||
|
||||
#define SATASII_MEMMAP_SIZE 0x100
|
||||
|
||||
uint8_t *sii_bar;
|
||||
static uint16_t id;
|
||||
|
||||
@ -40,6 +42,14 @@ const struct pcidev_status satas_sii[] = {
|
||||
{},
|
||||
};
|
||||
|
||||
static int satasii_shutdown(void *data)
|
||||
{
|
||||
physunmap(sii_bar, SATASII_MEMMAP_SIZE);
|
||||
pci_cleanup(pacc);
|
||||
release_io_perms();
|
||||
return 0;
|
||||
}
|
||||
|
||||
int satasii_init(void)
|
||||
{
|
||||
uint32_t addr;
|
||||
@ -59,7 +69,8 @@ int satasii_init(void)
|
||||
reg_offset = 0x50;
|
||||
}
|
||||
|
||||
sii_bar = physmap("SATA SIL registers", addr, 0x100) + reg_offset;
|
||||
sii_bar = physmap("SATA SIL registers", addr, SATASII_MEMMAP_SIZE) +
|
||||
reg_offset;
|
||||
|
||||
/* Check if ROM cycle are OK. */
|
||||
if ((id != 0x0680) && (!(pci_mmio_readl(sii_bar) & (1 << 26))))
|
||||
@ -67,13 +78,8 @@ int satasii_init(void)
|
||||
|
||||
buses_supported = CHIP_BUSTYPE_PARALLEL;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int satasii_shutdown(void)
|
||||
{
|
||||
pci_cleanup(pacc);
|
||||
release_io_perms();
|
||||
if (register_shutdown(satasii_shutdown, NULL))
|
||||
return 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user