summaryrefslogtreecommitdiffstats
path: root/atahpt.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
commit2bee8cf898007687c58ddb29eb119b461704f18a (patch)
treeb219ae51fc082062a2a0dd28a5a65c4559bc166e /atahpt.c
parentcaf2d42d9a9654477bcbb27e2e3c5a8ab5fe7971 (diff)
downloadast2050-flashrom-2bee8cf898007687c58ddb29eb119b461704f18a.zip
ast2050-flashrom-2bee8cf898007687c58ddb29eb119b461704f18a.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 'atahpt.c')
-rw-r--r--atahpt.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/atahpt.c b/atahpt.c
index 2552697..eac056e 100644
--- a/atahpt.c
+++ b/atahpt.c
@@ -50,7 +50,7 @@ int atahpt_init(void)
/* Enable flash access. */
reg32 = pci_read_long(pcidev_dev, REG_FLASH_ACCESS);
reg32 |= (1 << 24);
- pci_write_long(pcidev_dev, REG_FLASH_ACCESS, reg32);
+ rpci_write_long(pcidev_dev, REG_FLASH_ACCESS, reg32);
buses_supported = CHIP_BUSTYPE_PARALLEL;
@@ -59,13 +59,7 @@ int atahpt_init(void)
int atahpt_shutdown(void)
{
- uint32_t reg32;
-
- /* Disable flash access again. */
- reg32 = pci_read_long(pcidev_dev, REG_FLASH_ACCESS);
- reg32 &= ~(1 << 24);
- pci_write_long(pcidev_dev, REG_FLASH_ACCESS, reg32);
-
+ /* Flash access is disabled automatically by PCI restore. */
pci_cleanup(pacc);
release_io_perms();
return 0;
OpenPOWER on IntegriCloud