2005-04-17 06:20:36 +08:00
|
|
|
/*
|
|
|
|
* (C) Copyright David Brownell 2000-2002
|
2008-01-31 07:21:33 +08:00
|
|
|
*
|
2005-04-17 06:20:36 +08:00
|
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
|
|
* under the terms of the GNU General Public License as published by the
|
|
|
|
* Free Software Foundation; either version 2 of the License, or (at your
|
|
|
|
* option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful, but
|
|
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
|
|
|
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
|
|
* for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
|
|
* Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/pci.h>
|
2005-11-24 07:45:42 +08:00
|
|
|
#include <linux/usb.h>
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <asm/io.h>
|
|
|
|
#include <asm/irq.h>
|
2005-11-24 07:45:42 +08:00
|
|
|
|
|
|
|
#ifdef CONFIG_PPC_PMAC
|
|
|
|
#include <asm/machdep.h>
|
|
|
|
#include <asm/pmac_feature.h>
|
|
|
|
#include <asm/pci-bridge.h>
|
|
|
|
#include <asm/prom.h>
|
|
|
|
#endif
|
2005-09-23 13:38:16 +08:00
|
|
|
|
|
|
|
#include "usb.h"
|
2005-04-17 06:20:36 +08:00
|
|
|
#include "hcd.h"
|
|
|
|
|
|
|
|
|
2005-04-19 08:39:22 +08:00
|
|
|
/* PCI-based HCs are common, but plenty of non-PCI HCs are used too */
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------------------*/
|
|
|
|
|
|
|
|
/* configure so an HC device and id are always provided */
|
|
|
|
/* always called with process context; sleeping is OK */
|
|
|
|
|
|
|
|
/**
|
|
|
|
* usb_hcd_pci_probe - initialize PCI-based HCDs
|
|
|
|
* @dev: USB Host Controller being probed
|
|
|
|
* @id: pci hotplug id connecting controller to HCD framework
|
|
|
|
* Context: !in_interrupt()
|
|
|
|
*
|
|
|
|
* Allocates basic PCI resources for this USB host controller, and
|
|
|
|
* then invokes the start() method for the HCD associated with it
|
|
|
|
* through the hotplug entry's driver_data.
|
|
|
|
*
|
|
|
|
* Store this function in the HCD's struct pci_driver as probe().
|
|
|
|
*/
|
2008-01-31 07:21:33 +08:00
|
|
|
int usb_hcd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
struct hc_driver *driver;
|
|
|
|
struct usb_hcd *hcd;
|
|
|
|
int retval;
|
|
|
|
|
|
|
|
if (usb_disabled())
|
|
|
|
return -ENODEV;
|
|
|
|
|
2008-01-31 07:21:33 +08:00
|
|
|
if (!id)
|
|
|
|
return -EINVAL;
|
|
|
|
driver = (struct hc_driver *)id->driver_data;
|
|
|
|
if (!driver)
|
2005-04-17 06:20:36 +08:00
|
|
|
return -EINVAL;
|
|
|
|
|
2008-01-31 07:21:33 +08:00
|
|
|
if (pci_enable_device(dev) < 0)
|
2005-04-17 06:20:36 +08:00
|
|
|
return -ENODEV;
|
2005-04-19 08:39:22 +08:00
|
|
|
dev->current_state = PCI_D0;
|
2008-01-31 07:21:33 +08:00
|
|
|
|
|
|
|
if (!dev->irq) {
|
|
|
|
dev_err(&dev->dev,
|
2005-04-17 06:20:36 +08:00
|
|
|
"Found HC with no IRQ. Check BIOS/PCI %s setup!\n",
|
|
|
|
pci_name(dev));
|
2008-01-31 07:21:33 +08:00
|
|
|
retval = -ENODEV;
|
2005-04-17 06:20:36 +08:00
|
|
|
goto err1;
|
2008-01-31 07:21:33 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2008-01-31 07:21:33 +08:00
|
|
|
hcd = usb_create_hcd(driver, &dev->dev, pci_name(dev));
|
2005-04-17 06:20:36 +08:00
|
|
|
if (!hcd) {
|
|
|
|
retval = -ENOMEM;
|
|
|
|
goto err1;
|
|
|
|
}
|
|
|
|
|
2008-01-31 07:21:33 +08:00
|
|
|
if (driver->flags & HCD_MEMORY) {
|
|
|
|
/* EHCI, OHCI */
|
|
|
|
hcd->rsrc_start = pci_resource_start(dev, 0);
|
|
|
|
hcd->rsrc_len = pci_resource_len(dev, 0);
|
|
|
|
if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len,
|
2005-04-17 06:20:36 +08:00
|
|
|
driver->description)) {
|
2008-01-31 07:21:33 +08:00
|
|
|
dev_dbg(&dev->dev, "controller already in use\n");
|
2005-04-17 06:20:36 +08:00
|
|
|
retval = -EBUSY;
|
|
|
|
goto err2;
|
|
|
|
}
|
2008-01-31 07:21:33 +08:00
|
|
|
hcd->regs = ioremap_nocache(hcd->rsrc_start, hcd->rsrc_len);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (hcd->regs == NULL) {
|
2008-01-31 07:21:33 +08:00
|
|
|
dev_dbg(&dev->dev, "error mapping memory\n");
|
2005-04-17 06:20:36 +08:00
|
|
|
retval = -EFAULT;
|
|
|
|
goto err3;
|
|
|
|
}
|
|
|
|
|
2008-01-31 07:21:33 +08:00
|
|
|
} else {
|
|
|
|
/* UHCI */
|
2005-04-17 06:20:36 +08:00
|
|
|
int region;
|
|
|
|
|
|
|
|
for (region = 0; region < PCI_ROM_RESOURCE; region++) {
|
2008-01-31 07:21:33 +08:00
|
|
|
if (!(pci_resource_flags(dev, region) &
|
2005-04-17 06:20:36 +08:00
|
|
|
IORESOURCE_IO))
|
|
|
|
continue;
|
|
|
|
|
2008-01-31 07:21:33 +08:00
|
|
|
hcd->rsrc_start = pci_resource_start(dev, region);
|
|
|
|
hcd->rsrc_len = pci_resource_len(dev, region);
|
|
|
|
if (request_region(hcd->rsrc_start, hcd->rsrc_len,
|
2005-04-17 06:20:36 +08:00
|
|
|
driver->description))
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (region == PCI_ROM_RESOURCE) {
|
2008-01-31 07:21:33 +08:00
|
|
|
dev_dbg(&dev->dev, "no i/o regions available\n");
|
2005-04-17 06:20:36 +08:00
|
|
|
retval = -EBUSY;
|
|
|
|
goto err1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-01-31 07:21:33 +08:00
|
|
|
pci_set_master(dev);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-12-07 03:47:08 +08:00
|
|
|
retval = usb_add_hcd(hcd, dev->irq, IRQF_DISABLED | IRQF_SHARED);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (retval != 0)
|
|
|
|
goto err4;
|
|
|
|
return retval;
|
|
|
|
|
|
|
|
err4:
|
|
|
|
if (driver->flags & HCD_MEMORY) {
|
2008-01-31 07:21:33 +08:00
|
|
|
iounmap(hcd->regs);
|
2005-04-17 06:20:36 +08:00
|
|
|
err3:
|
2008-01-31 07:21:33 +08:00
|
|
|
release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
|
2005-04-17 06:20:36 +08:00
|
|
|
} else
|
2008-01-31 07:21:33 +08:00
|
|
|
release_region(hcd->rsrc_start, hcd->rsrc_len);
|
2005-04-17 06:20:36 +08:00
|
|
|
err2:
|
2008-01-31 07:21:33 +08:00
|
|
|
usb_put_hcd(hcd);
|
2005-04-17 06:20:36 +08:00
|
|
|
err1:
|
2008-01-31 07:21:33 +08:00
|
|
|
pci_disable_device(dev);
|
|
|
|
dev_err(&dev->dev, "init %s fail, %d\n", pci_name(dev), retval);
|
2005-04-17 06:20:36 +08:00
|
|
|
return retval;
|
2008-01-31 07:21:33 +08:00
|
|
|
}
|
2008-01-26 01:12:21 +08:00
|
|
|
EXPORT_SYMBOL_GPL(usb_hcd_pci_probe);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
|
|
|
/* may be called without controller electrically present */
|
|
|
|
/* may be called with controller, bus, and devices active */
|
|
|
|
|
|
|
|
/**
|
|
|
|
* usb_hcd_pci_remove - shutdown processing for PCI-based HCDs
|
|
|
|
* @dev: USB Host Controller being removed
|
|
|
|
* Context: !in_interrupt()
|
|
|
|
*
|
|
|
|
* Reverses the effect of usb_hcd_pci_probe(), first invoking
|
|
|
|
* the HCD's stop() method. It is always called from a thread
|
|
|
|
* context, normally "rmmod", "apmd", or something similar.
|
|
|
|
*
|
|
|
|
* Store this function in the HCD's struct pci_driver as remove().
|
|
|
|
*/
|
2008-01-31 07:21:33 +08:00
|
|
|
void usb_hcd_pci_remove(struct pci_dev *dev)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
struct usb_hcd *hcd;
|
|
|
|
|
|
|
|
hcd = pci_get_drvdata(dev);
|
|
|
|
if (!hcd)
|
|
|
|
return;
|
|
|
|
|
2008-01-31 07:21:33 +08:00
|
|
|
usb_remove_hcd(hcd);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (hcd->driver->flags & HCD_MEMORY) {
|
2008-01-31 07:21:33 +08:00
|
|
|
iounmap(hcd->regs);
|
|
|
|
release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
|
2005-04-17 06:20:36 +08:00
|
|
|
} else {
|
2008-01-31 07:21:33 +08:00
|
|
|
release_region(hcd->rsrc_start, hcd->rsrc_len);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2008-01-31 07:21:33 +08:00
|
|
|
usb_put_hcd(hcd);
|
2005-04-17 06:20:36 +08:00
|
|
|
pci_disable_device(dev);
|
|
|
|
}
|
2008-01-26 01:12:21 +08:00
|
|
|
EXPORT_SYMBOL_GPL(usb_hcd_pci_remove);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
|
|
|
#ifdef CONFIG_PM
|
|
|
|
|
|
|
|
/**
|
|
|
|
* usb_hcd_pci_suspend - power management suspend of a PCI-based HCD
|
|
|
|
* @dev: USB Host Controller being suspended
|
2005-04-19 08:39:22 +08:00
|
|
|
* @message: semantics in flux
|
2005-04-17 06:20:36 +08:00
|
|
|
*
|
|
|
|
* Store this function in the HCD's struct pci_driver as suspend().
|
|
|
|
*/
|
2008-01-31 07:21:33 +08:00
|
|
|
int usb_hcd_pci_suspend(struct pci_dev *dev, pm_message_t message)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
struct usb_hcd *hcd;
|
|
|
|
int retval = 0;
|
|
|
|
int has_pci_pm;
|
|
|
|
|
|
|
|
hcd = pci_get_drvdata(dev);
|
|
|
|
|
2005-09-23 13:38:16 +08:00
|
|
|
/* Root hub suspend should have stopped all downstream traffic,
|
|
|
|
* and all bus master traffic. And done so for both the interface
|
|
|
|
* and the stub usb_device (which we check here). But maybe it
|
|
|
|
* didn't; writing sysfs power/state files ignores such rules...
|
|
|
|
*
|
|
|
|
* We must ignore the FREEZE vs SUSPEND distinction here, because
|
|
|
|
* otherwise the swsusp will save (and restore) garbage state.
|
|
|
|
*/
|
2007-05-04 23:54:28 +08:00
|
|
|
if (!(hcd->state == HC_STATE_SUSPENDED ||
|
|
|
|
hcd->state == HC_STATE_HALT))
|
2005-09-23 13:38:16 +08:00
|
|
|
return -EBUSY;
|
|
|
|
|
2008-04-04 06:03:06 +08:00
|
|
|
if (hcd->driver->pci_suspend) {
|
|
|
|
retval = hcd->driver->pci_suspend(hcd, message);
|
|
|
|
suspend_report_result(hcd->driver->pci_suspend, retval);
|
2006-03-23 17:38:34 +08:00
|
|
|
if (retval)
|
2005-09-23 13:38:16 +08:00
|
|
|
goto done;
|
|
|
|
}
|
[PATCH] USB: Fix USB suspend/resume crasher (#2)
This patch closes the IRQ race and makes various other OHCI & EHCI code
path safer vs. suspend/resume.
I've been able to (finally !) successfully suspend and resume various
Mac models, with or without USB mouse plugged, or plugging while asleep,
or unplugging while asleep etc... all without a crash.
Alan, please verify the UHCI bit I did, I only verified that it builds.
It's very simple so I wouldn't expect any issue there. If you aren't
confident, then just drop the hunks that change uhci-hcd.c
I also made the patch a little bit more "safer" by making sure the store
to the interrupt register that disables interrupts is not posted before
I set the flag and drop the spinlock.
Without this patch, you cannot reliably sleep/wakeup any recent Mac, and
I suspect PCs have some more sneaky issues too (they don't frankly crash
with machine checks because x86 tend to silently swallow PCI errors but
that won't last afaik, at least PCI Express will blow up in those
situations, but the USB code may still misbehave).
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-11-25 06:59:46 +08:00
|
|
|
synchronize_irq(dev->irq);
|
2005-09-23 13:38:16 +08:00
|
|
|
|
2005-04-19 08:39:22 +08:00
|
|
|
/* FIXME until the generic PM interfaces change a lot more, this
|
|
|
|
* can't use PCI D1 and D2 states. For example, the confusion
|
|
|
|
* between messages and states will need to vanish, and messages
|
|
|
|
* will need to provide a target system state again.
|
|
|
|
*
|
|
|
|
* It'll be important to learn characteristics of the target state,
|
|
|
|
* especially on embedded hardware where the HCD will often be in
|
|
|
|
* charge of an external VBUS power supply and one or more clocks.
|
|
|
|
* Some target system states will leave them active; others won't.
|
|
|
|
* (With PCI, that's often handled by platform BIOS code.)
|
|
|
|
*/
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/* even when the PCI layer rejects some of the PCI calls
|
|
|
|
* below, HCs can try global suspend and reduce DMA traffic.
|
|
|
|
* PM-sensitive HCDs may already have done this.
|
|
|
|
*/
|
|
|
|
has_pci_pm = pci_find_capability(dev, PCI_CAP_ID_PM);
|
|
|
|
|
2005-09-23 13:38:16 +08:00
|
|
|
/* Downstream ports from this root hub should already be quiesced, so
|
|
|
|
* there will be no DMA activity. Now we can shut down the upstream
|
|
|
|
* link (except maybe for PME# resume signaling) and enter some PCI
|
|
|
|
* low power state, if the hardware allows.
|
2005-04-17 06:20:36 +08:00
|
|
|
*/
|
2005-09-23 13:38:16 +08:00
|
|
|
if (hcd->state == HC_STATE_SUSPENDED) {
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2005-04-19 08:39:22 +08:00
|
|
|
/* no DMA or IRQs except when HC is active */
|
|
|
|
if (dev->current_state == PCI_D0) {
|
2008-01-31 07:21:33 +08:00
|
|
|
pci_save_state(dev);
|
|
|
|
pci_disable_device(dev);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2007-11-20 04:57:45 +08:00
|
|
|
if (message.event == PM_EVENT_FREEZE ||
|
|
|
|
message.event == PM_EVENT_PRETHAW) {
|
|
|
|
dev_dbg(hcd->self.controller, "--> no state change\n");
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
if (!has_pci_pm) {
|
2008-01-31 07:21:33 +08:00
|
|
|
dev_dbg(hcd->self.controller, "--> PCI D0/legacy\n");
|
2005-09-23 13:38:16 +08:00
|
|
|
goto done;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
2005-04-19 08:39:22 +08:00
|
|
|
/* NOTE: dev->current_state becomes nonzero only here, and
|
|
|
|
* only for devices that support PCI PM. Also, exiting
|
|
|
|
* PCI_D3 (but not PCI_D1 or PCI_D2) is allowed to reset
|
|
|
|
* some device state (e.g. as part of clock reinit).
|
2005-04-17 06:20:36 +08:00
|
|
|
*/
|
2008-01-31 07:21:33 +08:00
|
|
|
retval = pci_set_power_state(dev, PCI_D3hot);
|
2006-03-23 17:38:34 +08:00
|
|
|
suspend_report_result(pci_set_power_state, retval);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (retval == 0) {
|
2006-01-25 00:40:27 +08:00
|
|
|
int wake = device_can_wakeup(&hcd->self.root_hub->dev);
|
|
|
|
|
|
|
|
wake = wake && device_may_wakeup(hcd->self.controller);
|
|
|
|
|
2008-01-31 07:21:33 +08:00
|
|
|
dev_dbg(hcd->self.controller, "--> PCI D3%s\n",
|
2006-01-25 00:40:27 +08:00
|
|
|
wake ? "/wakeup" : "");
|
2005-09-23 13:38:16 +08:00
|
|
|
|
|
|
|
/* Ignore these return values. We rely on pci code to
|
|
|
|
* reject requests the hardware can't implement, rather
|
|
|
|
* than coding the same thing.
|
|
|
|
*/
|
2008-01-31 07:21:33 +08:00
|
|
|
(void) pci_enable_wake(dev, PCI_D3hot, wake);
|
|
|
|
(void) pci_enable_wake(dev, PCI_D3cold, wake);
|
2005-09-23 13:38:16 +08:00
|
|
|
} else {
|
2008-01-31 07:21:33 +08:00
|
|
|
dev_dbg(&dev->dev, "PCI D3 suspend fail, %d\n",
|
2005-04-19 08:39:22 +08:00
|
|
|
retval);
|
2008-01-31 07:21:33 +08:00
|
|
|
(void) usb_hcd_pci_resume(dev);
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2005-09-23 13:38:16 +08:00
|
|
|
|
2006-08-15 14:11:06 +08:00
|
|
|
} else if (hcd->state != HC_STATE_HALT) {
|
2008-01-31 07:21:33 +08:00
|
|
|
dev_dbg(hcd->self.controller, "hcd state %d; not suspended\n",
|
2005-04-17 06:20:36 +08:00
|
|
|
hcd->state);
|
2005-04-19 08:39:22 +08:00
|
|
|
WARN_ON(1);
|
2005-04-17 06:20:36 +08:00
|
|
|
retval = -EINVAL;
|
|
|
|
}
|
|
|
|
|
2005-09-23 13:38:16 +08:00
|
|
|
done:
|
2005-11-24 07:45:42 +08:00
|
|
|
if (retval == 0) {
|
|
|
|
#ifdef CONFIG_PPC_PMAC
|
|
|
|
/* Disable ASIC clocks for USB */
|
2006-03-28 20:15:54 +08:00
|
|
|
if (machine_is(powermac)) {
|
2005-11-24 07:45:42 +08:00
|
|
|
struct device_node *of_node;
|
|
|
|
|
2008-01-31 07:21:33 +08:00
|
|
|
of_node = pci_device_to_OF_node(dev);
|
2005-11-24 07:45:42 +08:00
|
|
|
if (of_node)
|
|
|
|
pmac_call_feature(PMAC_FTR_USB_ENABLE,
|
|
|
|
of_node, 0, 0);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
return retval;
|
|
|
|
}
|
2008-01-26 01:12:21 +08:00
|
|
|
EXPORT_SYMBOL_GPL(usb_hcd_pci_suspend);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/**
|
|
|
|
* usb_hcd_pci_resume - power management resume of a PCI-based HCD
|
|
|
|
* @dev: USB Host Controller being resumed
|
|
|
|
*
|
|
|
|
* Store this function in the HCD's struct pci_driver as resume().
|
|
|
|
*/
|
2008-01-31 07:21:33 +08:00
|
|
|
int usb_hcd_pci_resume(struct pci_dev *dev)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
struct usb_hcd *hcd;
|
|
|
|
int retval;
|
|
|
|
|
|
|
|
hcd = pci_get_drvdata(dev);
|
|
|
|
if (hcd->state != HC_STATE_SUSPENDED) {
|
2008-01-31 07:21:33 +08:00
|
|
|
dev_dbg(hcd->self.controller,
|
2005-04-17 06:20:36 +08:00
|
|
|
"can't resume, not suspended!\n");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-11-24 07:45:42 +08:00
|
|
|
#ifdef CONFIG_PPC_PMAC
|
|
|
|
/* Reenable ASIC clocks for USB */
|
2006-03-28 20:15:54 +08:00
|
|
|
if (machine_is(powermac)) {
|
2005-11-24 07:45:42 +08:00
|
|
|
struct device_node *of_node;
|
|
|
|
|
2008-01-31 07:21:33 +08:00
|
|
|
of_node = pci_device_to_OF_node(dev);
|
2005-11-24 07:45:42 +08:00
|
|
|
if (of_node)
|
2008-01-31 07:21:33 +08:00
|
|
|
pmac_call_feature(PMAC_FTR_USB_ENABLE,
|
2005-11-24 07:45:42 +08:00
|
|
|
of_node, 0, 1);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2005-04-19 08:39:22 +08:00
|
|
|
/* NOTE: chip docs cover clean "real suspend" cases (what Linux
|
|
|
|
* calls "standby", "suspend to RAM", and so on). There are also
|
|
|
|
* dirty cases when swsusp fakes a suspend in "shutdown" mode.
|
|
|
|
*/
|
|
|
|
if (dev->current_state != PCI_D0) {
|
|
|
|
#ifdef DEBUG
|
|
|
|
int pci_pm;
|
|
|
|
u16 pmcr;
|
|
|
|
|
|
|
|
pci_pm = pci_find_capability(dev, PCI_CAP_ID_PM);
|
|
|
|
pci_read_config_word(dev, pci_pm + PCI_PM_CTRL, &pmcr);
|
|
|
|
pmcr &= PCI_PM_CTRL_STATE_MASK;
|
|
|
|
if (pmcr) {
|
|
|
|
/* Clean case: power to USB and to HC registers was
|
|
|
|
* maintained; remote wakeup is easy.
|
|
|
|
*/
|
|
|
|
dev_dbg(hcd->self.controller, "resume from PCI D%d\n",
|
|
|
|
pmcr);
|
|
|
|
} else {
|
|
|
|
/* Clean: HC lost Vcc power, D0 uninitialized
|
|
|
|
* + Vaux may have preserved port and transceiver
|
|
|
|
* state ... for remote wakeup from D3cold
|
|
|
|
* + or not; HCD must reinit + re-enumerate
|
|
|
|
*
|
|
|
|
* Dirty: D0 semi-initialized cases with swsusp
|
|
|
|
* + after BIOS init
|
|
|
|
* + after Linux init (HCD statically linked)
|
|
|
|
*/
|
|
|
|
dev_dbg(hcd->self.controller,
|
|
|
|
"PCI D0, from previous PCI D%d\n",
|
|
|
|
dev->current_state);
|
|
|
|
}
|
|
|
|
#endif
|
2005-09-23 13:38:16 +08:00
|
|
|
/* yes, ignore these results too... */
|
2008-01-31 07:21:33 +08:00
|
|
|
(void) pci_enable_wake(dev, dev->current_state, 0);
|
|
|
|
(void) pci_enable_wake(dev, PCI_D3cold, 0);
|
2005-04-19 08:39:22 +08:00
|
|
|
} else {
|
|
|
|
/* Same basic cases: clean (powered/not), dirty */
|
|
|
|
dev_dbg(hcd->self.controller, "PCI legacy resume\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
/* NOTE: the PCI API itself is asymmetric here. We don't need to
|
|
|
|
* pci_set_power_state(PCI_D0) since that's part of re-enabling;
|
|
|
|
* but that won't re-enable bus mastering. Yet pci_disable_device()
|
|
|
|
* explicitly disables bus mastering...
|
|
|
|
*/
|
2008-01-31 07:21:33 +08:00
|
|
|
retval = pci_enable_device(dev);
|
2005-04-19 08:39:22 +08:00
|
|
|
if (retval < 0) {
|
2008-01-31 07:21:33 +08:00
|
|
|
dev_err(hcd->self.controller,
|
2005-04-19 08:39:22 +08:00
|
|
|
"can't re-enable after resume, %d!\n", retval);
|
|
|
|
return retval;
|
|
|
|
}
|
2008-01-31 07:21:33 +08:00
|
|
|
pci_set_master(dev);
|
|
|
|
pci_restore_state(dev);
|
2005-04-19 08:39:22 +08:00
|
|
|
|
[PATCH] USB: Fix USB suspend/resume crasher (#2)
This patch closes the IRQ race and makes various other OHCI & EHCI code
path safer vs. suspend/resume.
I've been able to (finally !) successfully suspend and resume various
Mac models, with or without USB mouse plugged, or plugging while asleep,
or unplugging while asleep etc... all without a crash.
Alan, please verify the UHCI bit I did, I only verified that it builds.
It's very simple so I wouldn't expect any issue there. If you aren't
confident, then just drop the hunks that change uhci-hcd.c
I also made the patch a little bit more "safer" by making sure the store
to the interrupt register that disables interrupts is not posted before
I set the flag and drop the spinlock.
Without this patch, you cannot reliably sleep/wakeup any recent Mac, and
I suspect PCs have some more sneaky issues too (they don't frankly crash
with machine checks because x86 tend to silently swallow PCI errors but
that won't last afaik, at least PCI Express will blow up in those
situations, but the USB code may still misbehave).
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-11-25 06:59:46 +08:00
|
|
|
clear_bit(HCD_FLAG_SAW_IRQ, &hcd->flags);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2008-04-04 06:03:06 +08:00
|
|
|
if (hcd->driver->pci_resume) {
|
|
|
|
retval = hcd->driver->pci_resume(hcd);
|
2005-09-23 13:38:16 +08:00
|
|
|
if (retval) {
|
2008-01-31 07:21:33 +08:00
|
|
|
dev_err(hcd->self.controller,
|
2005-09-23 13:38:16 +08:00
|
|
|
"PCI post-resume error %d!\n", retval);
|
2008-01-31 07:21:33 +08:00
|
|
|
usb_hc_died(hcd);
|
2005-09-23 13:38:16 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
return retval;
|
|
|
|
}
|
2008-01-26 01:12:21 +08:00
|
|
|
EXPORT_SYMBOL_GPL(usb_hcd_pci_resume);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
#endif /* CONFIG_PM */
|
|
|
|
|
USB: Properly unregister reboot notifier in case of failure in ehci hcd
If some problem occurs during ehci startup, for instance, request_irq fails,
echi hcd driver tries it best to cleanup, but fails to unregister reboot
notifier, which in turn leads to crash on reboot/poweroff.
The following patch resolves this problem by not using reboot notifiers
anymore, but instead making ehci/ohci driver get its own shutdown method. For
PCI, it is done through pci glue, for everything else through platform driver
glue.
One downside: sa1111 does not use platform driver stuff, and does not have its
own shutdown hook, so no 'shutdown' is called for it now. I'm not sure if it
is really necessary on that platform, though.
Signed-off-by: Aleks Gorelov <dared1st@yahoo.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2006-08-09 08:24:08 +08:00
|
|
|
/**
|
|
|
|
* usb_hcd_pci_shutdown - shutdown host controller
|
|
|
|
* @dev: USB Host Controller being shutdown
|
|
|
|
*/
|
2008-01-31 07:21:33 +08:00
|
|
|
void usb_hcd_pci_shutdown(struct pci_dev *dev)
|
USB: Properly unregister reboot notifier in case of failure in ehci hcd
If some problem occurs during ehci startup, for instance, request_irq fails,
echi hcd driver tries it best to cleanup, but fails to unregister reboot
notifier, which in turn leads to crash on reboot/poweroff.
The following patch resolves this problem by not using reboot notifiers
anymore, but instead making ehci/ohci driver get its own shutdown method. For
PCI, it is done through pci glue, for everything else through platform driver
glue.
One downside: sa1111 does not use platform driver stuff, and does not have its
own shutdown hook, so no 'shutdown' is called for it now. I'm not sure if it
is really necessary on that platform, though.
Signed-off-by: Aleks Gorelov <dared1st@yahoo.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2006-08-09 08:24:08 +08:00
|
|
|
{
|
|
|
|
struct usb_hcd *hcd;
|
|
|
|
|
|
|
|
hcd = pci_get_drvdata(dev);
|
|
|
|
if (!hcd)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (hcd->driver->shutdown)
|
|
|
|
hcd->driver->shutdown(hcd);
|
|
|
|
}
|
2008-01-26 01:12:21 +08:00
|
|
|
EXPORT_SYMBOL_GPL(usb_hcd_pci_shutdown);
|
2005-04-17 06:20:36 +08:00
|
|
|
|