summaryrefslogtreecommitdiffstats
path: root/drkaiser.c
diff options
context:
space:
mode:
authorCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2010-11-10 15:25:18 +0000
committerCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2010-11-10 15:25:18 +0000
commit820df8425b6ed329c51058b234dfca74459b8e8b (patch)
treeb219ae51fc082062a2a0dd28a5a65c4559bc166e /drkaiser.c
parent61cafb74d2aecdad679df3890acdfe3e91cc45e4 (diff)
downloadflashrom-820df8425b6ed329c51058b234dfca74459b8e8b.zip
flashrom-820df8425b6ed329c51058b234dfca74459b8e8b.tar.gz
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>
Diffstat (limited to 'drkaiser.c')
-rw-r--r--drkaiser.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drkaiser.c b/drkaiser.c
index 5f5e580..984dbdd 100644
--- a/drkaiser.c
+++ b/drkaiser.c
@@ -47,7 +47,7 @@ int drkaiser_init(void)
drkaiser_pcidev);
/* Write magic register to enable flash write. */
- pci_write_word(pcidev_dev, PCI_MAGIC_DRKAISER_ADDR,
+ rpci_write_word(pcidev_dev, PCI_MAGIC_DRKAISER_ADDR,
PCI_MAGIC_DRKAISER_VALUE);
/* Map 128KB flash memory window. */
@@ -61,8 +61,7 @@ int drkaiser_init(void)
int drkaiser_shutdown(void)
{
- /* Write protect the flash again. */
- pci_write_word(pcidev_dev, PCI_MAGIC_DRKAISER_ADDR, 0);
+ /* Flash write is disabled automatically by PCI restore. */
pci_cleanup(pacc);
release_io_perms();
return 0;
OpenPOWER on IntegriCloud