From 71c6e81590b16a0750a8460febbd73e765ec78fb Mon Sep 17 00:00:00 2001 From: deraadt Date: Fri, 23 Jul 2010 02:50:04 +0000 Subject: [PATCH] For suspend/reume, ATI IXP chips (might) need 0x40-0x56 saved.. but these the 6 registers already saved --- sys/dev/pci/pciide.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c index 529fec17576..1a3ad01afcc 100644 --- a/sys/dev/pci/pciide.c +++ b/sys/dev/pci/pciide.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pciide.c,v 1.309 2010/07/22 18:11:16 deraadt Exp $ */ +/* $OpenBSD: pciide.c,v 1.310 2010/07/23 02:50:04 deraadt Exp $ */ /* $NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $ */ /* @@ -1432,10 +1432,6 @@ pciide_activate(struct device *self, int act) sc->sc_tag, ICH5_SATA_PI); sc->sc_save2[2] = pciide_pci_read(sc->sc_pc, sc->sc_tag, ICH_SATA_PCS); - } else if (sc->sc_pp->chip_map == piix_chip_map) { - /* nothing to save */ - } else if (sc->sc_pp->chip_map == phison_chip_map) { - /* nothing to save */ } break; case DVACT_RESUME: @@ -1460,6 +1456,8 @@ pciide_activate(struct device *self, int act) /* nothing more to restore */ } else if (sc->sc_pp->chip_map == phison_chip_map) { /* nothing more to restore */ + } else if (sc->sc_pp->chip_map == ixp_chip_map) { + /* nothing to restore (0x40 - 0x56) */ } else { printf("%s: restore for unknown chip map %x\n", sc->sc_wdcdev.sc_dev.dv_xname, -- 2.20.1