bcma: invalidate the mapped core over suspend/resume
authorRafał Miłecki <zajec5@gmail.com>
Fri, 13 Jan 2012 22:58:38 +0000 (23:58 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 26 Jan 2012 00:13:50 +0000 (16:13 -0800)
commit 28e7d218da975f6ae1751e293aed938952c55c98 upstream.

This clears the currently mapped core when suspending, to force
re-mapping after resume. Without that we were touching default core
registers believing some other core is mapped. Such a behaviour
resulted in lockups on some machines.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/bcma/host_pci.c

index 990f5a8..48e06be 100644 (file)
@@ -227,11 +227,14 @@ static void bcma_host_pci_remove(struct pci_dev *dev)
 #ifdef CONFIG_PM
 static int bcma_host_pci_suspend(struct pci_dev *dev, pm_message_t state)
 {
+       struct bcma_bus *bus = pci_get_drvdata(dev);
+
        /* Host specific */
        pci_save_state(dev);
        pci_disable_device(dev);
        pci_set_power_state(dev, pci_choose_state(dev, state));
 
+       bus->mapped_core = NULL;
        return 0;
 }