d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move code to shutdown the pcic_pci_shutdown. Call it on system

Browse Source 
shutdown and also before we get going with the device initialization.
This may fix the hangs some people are seeing on warmboot.  It appears
that some machines will reset the cardbus bridge on boot, while others
don't.  So we turn off the card, and ack the interrupts (which likely
is a nop in the shutdown case since we're still fielding interrupts).
This should turn off the interrupts.

Since I don't have hardware that hangs on reboot, I'm committing this
without testing that aspect of the patch (it causes no harm on my
Dell).
This commit is contained in:
Warner Losh 2001-08-24 07:43:35 +00:00
parent 9bec31a4c0
commit 662460d3d5
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=82260
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
sys/pccard/pcic_pci.c
View File

@ -667,6 +667,27 @@ pcic_pci_probe(device_t dev)
return (0);
}
static void
pcic_pci_shutdown(device_t dev)
{
struct pcic_softc *sc;
struct pcic_slot *sp;
sc = (struct pcic_softc *) device_get_softc(dev);
sp = &sc->slots[0];
/*
* Turn off the power to the slot before we do anything
* with it.
*/
sp->putb(sp, PCIC_INT_GEN, 0);
sp->putb(sp, PCIC_POWER, 0);
/* Ack any pending interrupts */
bus_space_write_4(sp->bst, sp->bsh, 0, 0xffffffff);
sp->getb(sp, PCIC_STAT_CHG);
}
/*
* General PCI based card dispatch routine. Right now
* it only understands the Ricoh, CL-PD6832 and TI parts. It does
@ -744,17 +765,8 @@ pcic_pci_attach(device_t dev)
sc->csc_route = pcic_intr_path;
sc->func_route = pcic_intr_path;
/*
* Turn off the power to the slot before we do anything
* with it.
*/
sp->putb(sp, PCIC_INT_GEN, 0);
sp->putb(sp, PCIC_POWER, 0);
/* Ack any pending interrupts */
bus_space_write_4(sp->bst, sp->bsh, 0, 0xffffffff);
sp->getb(sp, PCIC_STAT_CHG);
pcic_pci_shutdown(dev);
if (itm && itm->init)
itm->init(dev);
else
@ -791,7 +803,7 @@ pcic_pci_attach(device_t dev)
static int
pcic_pci_detach(device_t dev)
{
return (0);
return (EBUSY); /* Can't detach this device */
}
/*
@ -837,7 +849,7 @@ static device_method_t pcic_pci_methods[] = {
DEVMETHOD(device_detach, pcic_pci_detach),
DEVMETHOD(device_suspend, bus_generic_suspend),
DEVMETHOD(device_resume, bus_generic_resume),
DEVMETHOD(device_shutdown, bus_generic_shutdown),
DEVMETHOD(device_shutdown, pcic_pci_shutdown),
/* Bus interface */
DEVMETHOD(bus_print_child, bus_generic_print_child),