1
0
mirror of https://review.coreboot.org/flashrom.git synced 2025-07-02 14:33:18 +02:00

Revert PCI config space writes on shutdown

This means all chipset enables etc. will be undone on shutdown.
Reversible PCI config space writes now use rpci_write_*().
PCI config space writes which are one-shot (e.g. communication via
config space) should continue to use the permanent pci_write_*
variants.

Extend the number of available register_shutdown slots to 32.

Corresponding to flashrom svn r1232.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Michael Karcher <flashrom@mkarcher.dialup.fu-berlin.de>
This commit is contained in:
Carl-Daniel Hailfinger
2010-11-10 15:25:18 +00:00
parent caf2d42d9a
commit 2bee8cf898
7 changed files with 118 additions and 65 deletions

View File

@ -75,7 +75,7 @@ int gfxnvidia_init(void)
/* Allow access to flash interface (will disable screen). */
reg32 = pci_read_long(pcidev_dev, 0x50);
reg32 &= ~(1 << 0);
pci_write_long(pcidev_dev, 0x50, reg32);
rpci_write_long(pcidev_dev, 0x50, reg32);
nvidia_bar = physmap("NVIDIA", io_base_addr, 16 * 1024 * 1024);
@ -89,13 +89,9 @@ int gfxnvidia_init(void)
int gfxnvidia_shutdown(void)
{
uint32_t reg32;
/* Disallow access to flash interface (and re-enable screen). */
reg32 = pci_read_long(pcidev_dev, 0x50);
reg32 |= (1 << 0);
pci_write_long(pcidev_dev, 0x50, reg32);
/* Flash interface access is disabled (and screen enabled) automatically
* by PCI restore.
*/
pci_cleanup(pacc);
release_io_perms();
return 0;