Skip to content

Commit

Permalink
bcma: invalidate the mapped core over suspend/resume
Browse files Browse the repository at this point in the history
commit 28e7d21 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>
  • Loading branch information
rmilecki authored and gregkh committed Jan 26, 2012
1 parent 8967b2b commit c893fe0
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/bcma/host_pci.c
Expand Up @@ -227,11 +227,14 @@ static void bcma_host_pci_remove(struct pci_dev *dev)
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int bcma_host_pci_suspend(struct pci_dev *dev, pm_message_t state) static int bcma_host_pci_suspend(struct pci_dev *dev, pm_message_t state)
{ {
struct bcma_bus *bus = pci_get_drvdata(dev);

/* Host specific */ /* Host specific */
pci_save_state(dev); pci_save_state(dev);
pci_disable_device(dev); pci_disable_device(dev);
pci_set_power_state(dev, pci_choose_state(dev, state)); pci_set_power_state(dev, pci_choose_state(dev, state));


bus->mapped_core = NULL;
return 0; return 0;
} }


Expand Down

0 comments on commit c893fe0

Please sign in to comment.