From 2bee8cf898007687c58ddb29eb119b461704f18a Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Wed, 10 Nov 2010 15:25:18 +0000 Subject: 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 Acked-by: Michael Karcher --- gfxnvidia.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'gfxnvidia.c') diff --git a/gfxnvidia.c b/gfxnvidia.c index 782538085..b6dc5f49a 100644 --- a/gfxnvidia.c +++ b/gfxnvidia.c @@ -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; -- cgit v1.2.3