[V2,1/5,STABLE] bcma: invalidate the mapped core over suspend/resume

Message ID 1326495522-6024-1-git-send-email-zajec5@gmail.com
State Not Applicable, archived
Delegated to: David Miller
Headers show

Commit Message

Rafał Miłecki Jan. 13, 2012, 10:58 p.m.
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.

Cc: stable@vger.kernel.org
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
We don't call drivers suspend/resume handlers with this patch but this
at least fixes lockup. Having non-working driver after resume is still
better than having locked up machine.
 drivers/bcma/host_pci.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)


diff --git a/drivers/bcma/host_pci.c b/drivers/bcma/host_pci.c
index 443b83a..c1ca9e3 100644
--- a/drivers/bcma/host_pci.c
+++ b/drivers/bcma/host_pci.c
@@ -237,11 +237,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_set_power_state(dev, pci_choose_state(dev, state));
+	bus->mapped_core = NULL;
 	return 0;