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

Be even more careful about cleaning up the socket at boot time. 

Also, nuke the windows when the socket is disabled.  (They might be deallocated
and reallocated, and would thus cause a conflict.)
This commit is contained in:
mycroft 2000-02-25 20:45:43 +00:00
parent caa3932441
commit 49f1a84ad6
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/dev/ic/i82365.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: i82365.c,v 1.51 2000/02/25 05:26:17 mycroft Exp $ */
/* $NetBSD: i82365.c,v 1.52 2000/02/25 20:45:43 mycroft Exp $ */
#define PCICDEBUG
@ -360,14 +360,11 @@ pcic_attach_socket_finish(h)
struct pcic_handle *h;
{
struct pcic_softc *sc = (struct pcic_softc *)h->ph_parent;
int reg;
int reg, intr;
DPRINTF(("%s: attach finish socket %ld\n", h->ph_parent->dv_xname,
(long) (h - &sc->handle[0])));
/* zero out the address windows */
pcic_write(h, PCIC_ADDRWIN_ENABLE, 0);
/*
* Set up a powerhook to ensure it continues to interrupt on
* card detect even after suspend.
@ -385,9 +382,15 @@ pcic_attach_socket_finish(h)
pcic_write(h, PCIC_CSC_INTR, reg);
/* steer above mgmt interrupt to configured place */
reg = pcic_read(h, PCIC_INTR);
reg &= ~PCIC_INTR_ENABLE;
pcic_write(h, PCIC_INTR, reg);
intr = pcic_read(h, PCIC_INTR);
intr &= ~(PCIC_INTR_IRQ_MASK | PCIC_INTR_ENABLE);
pcic_write(h, PCIC_INTR, intr);
/* power down the socket */
pcic_write(h, PCIC_PWRCTL, 0);
/* zero out the address windows */
pcic_write(h, PCIC_ADDRWIN_ENABLE, 0);
/* clear possible card detect interrupt */
pcic_read(h, PCIC_CSC);
@ -1464,6 +1467,9 @@ pcic_chip_socket_disable(pch)
/* power down the socket */
pcic_write(h, PCIC_PWRCTL, 0);
/* zero out the address windows */
pcic_write(h, PCIC_ADDRWIN_ENABLE, 0);
h->flags &= ~PCIC_FLAG_ENABLED;
}