mirror of
https://review.coreboot.org/flashrom.git
synced 2025-06-30 21:52:36 +02:00
Automatically release I/O permissions on shutdown
Get_io_perms() is renamed to rget_io_perms() and automatically registers a function to release I/O permissions on shutdown. Actually release I/O permissions on Solaris and iopl()-supporting operating systems like Linux. This patch fixes quite a few programmers which forgot to release I/O permissions on shutdown, and it simplifies the shutdown and error handling code for all others. Do not call exit(1) if I/O permissions are denied and return an error instead. This part of the patch was written by Niklas Söderlund. Corresponding to flashrom svn r1551. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> Signed-off-by: Niklas Söderlund <niso@kth.se> Acked-by: Michael Karcher <flashrom@mkarcher.dialup.fu-berlin.de>
This commit is contained in:
@ -64,7 +64,6 @@ static int nicintel_shutdown(void *data)
|
||||
physunmap(nicintel_control_bar, NICINTEL_CONTROL_MEMMAP_SIZE);
|
||||
physunmap(nicintel_bar, NICINTEL_MEMMAP_SIZE);
|
||||
pci_cleanup(pacc);
|
||||
release_io_perms();
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -73,9 +72,10 @@ int nicintel_init(void)
|
||||
uintptr_t addr;
|
||||
|
||||
/* Needed only for PCI accesses on some platforms.
|
||||
* FIXME: Refactor that into get_mem_perms/get_io_perms/get_pci_perms?
|
||||
* FIXME: Refactor that into get_mem_perms/rget_io_perms/get_pci_perms?
|
||||
*/
|
||||
get_io_perms();
|
||||
if (rget_io_perms())
|
||||
return 1;
|
||||
|
||||
/* No need to check for errors, pcidev_init() will not return in case
|
||||
* of errors.
|
||||
@ -118,7 +118,6 @@ error_out_unmap:
|
||||
physunmap(nicintel_bar, NICINTEL_MEMMAP_SIZE);
|
||||
error_out:
|
||||
pci_cleanup(pacc);
|
||||
release_io_perms();
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user