Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extract shutdown handlers from the detach methods of elanpar(4) 

and elanpex(4).  Register them using pmf_device_register1().  This
ensures that neither comBIOS nor NetBSD will hang during boot,
after I reboot a Soekris net45xx.
This commit is contained in:
dyoung 2008-03-04 22:07:05 +00:00
parent 14218c181b
commit be2348a67e
1 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
sys/arch/i386/pci/elan520.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: elan520.c,v 1.25 2008/03/03 04:16:26 dyoung Exp $ */
/* $NetBSD: elan520.c,v 1.26 2008/03/04 22:07:05 dyoung Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -47,7 +47,7 @@
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: elan520.c,v 1.25 2008/03/03 04:16:26 dyoung Exp $");
__KERNEL_RCSID(0, "$NetBSD: elan520.c,v 1.26 2008/03/04 22:07:05 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -120,6 +120,8 @@ static void elanpex_intr_establish(device_t, struct elansc_softc *);
static void elanpar_intr_establish(device_t, struct elansc_softc *);
static void elanpex_intr_disestablish(struct elansc_softc *);
static void elanpar_intr_disestablish(struct elansc_softc *);
static bool elanpar_shutdown(device_t, int);
static bool elanpex_shutdown(device_t, int);
static void
elansc_childdetached(device_t self, device_t child)
@ -821,13 +823,15 @@ elanpex_attach(device_t parent, device_t self, void *aux)
pci_conf_read(sc->sc_pc, sc->sc_tag, PCI_COMMAND_STATUS_REG) |
PCI_COMMAND_PARITY_ENABLE|PCI_COMMAND_SERR_ENABLE);
if (!pmf_device_register(self, elanpex_suspend, elanpex_resume))
if (!pmf_device_register1(self, elanpex_suspend, elanpex_resume,
elanpex_shutdown))
aprint_error_dev(self, "could not establish power hooks\n");
}
static void
elanpex_intr_disestablish(struct elansc_softc *sc)
static bool
elanpex_shutdown(device_t self, int flags)
{
struct elansc_softc *sc = device_private(device_parent(self));
uint8_t sysarbctl;
uint16_t pcihostmap, mstirq, tgtirq;
@ -857,6 +861,14 @@ elanpex_intr_disestablish(struct elansc_softc *sc)
bus_space_write_2(sc->sc_memt, sc->sc_memh, MMCR_PCIHOSTMAP,
pcihostmap);
return true;
}
static void
elanpex_intr_disestablish(struct elansc_softc *sc)
{
elanpex_shutdown(sc->sc_pex, 0);
if (elansc_pcinmi)
nmi_disestablish(sc->sc_eih);
else
@ -904,6 +916,22 @@ elanpar_intr_establish(device_t self, struct elansc_softc *sc)
bus_space_write_1(sc->sc_memt, sc->sc_memh, MMCR_ADDDECCTL, adddecctl);
}
static bool
elanpar_shutdown(device_t self, int flags)
{
struct elansc_softc *sc = device_private(device_parent(self));
if (sc->sc_textpar != -1) {
elansc_disable_par(sc->sc_memt, sc->sc_memh, sc->sc_textpar);
sc->sc_textpar = -1;
}
if (sc->sc_pg0par != -1) {
elansc_disable_par(sc->sc_memt, sc->sc_memh, sc->sc_pg0par);
sc->sc_pg0par = -1;
}
return true;
}
static void
elanpar_attach(device_t parent, device_t self, void *aux)
{
@ -922,7 +950,8 @@ elanpar_attach(device_t parent, device_t self, void *aux)
elansc_print_1(self, sc, MMCR_ADDDECCTL);
if (!pmf_device_register(self, elanpar_suspend, elanpar_resume))
if (!pmf_device_register1(self, elanpar_suspend, elanpar_resume,
elanpar_shutdown))
aprint_error_dev(self, "could not establish power hooks\n");
}
@ -959,14 +988,7 @@ elanpar_detach(device_t self, int flags)
pmf_device_deregister(self);
if (sc->sc_textpar != -1) {
elansc_disable_par(sc->sc_memt, sc->sc_memh, sc->sc_textpar);
sc->sc_textpar = -1;
}
if (sc->sc_pg0par != -1) {
elansc_disable_par(sc->sc_memt, sc->sc_memh, sc->sc_pg0par);
sc->sc_pg0par = -1;
}
elanpar_shutdown(self, 0);
elanpar_intr_disestablish(sc);