* [PATCH] bcma: support for suspend and resume
@ 2011-12-09 21:16 ` Rafał Miłecki
0 siblings, 0 replies; 4+ messages in thread
From: Rafał Miłecki @ 2011-12-09 21:16 UTC (permalink / raw)
To: linux-wireless, John W. Linville
Cc: b43-dev, Greg KH, Rafał Miłecki, stable
bcma used to lock up machine without enabling PCI or initializing CC.
Cc: stable at kernel.org
Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com>
---
DC input port stopped working in my notebook. I had to open it and fix.
Guess what has appeared to my eyes... WiFI card in the mini PCIe slot!
For all the years I believed WiFi is integrated with the motherboard!
Taking a chance, I've put BCM43224 and decided to resolve suspend and
resume issue. I've reproduced lock ups and tracked them :)
It fixes lockups, so I believe it has to be Cc to stable.
---
drivers/bcma/bcma_private.h | 3 +++
drivers/bcma/host_pci.c | 37 +++++++++++++++++++++++++++++++++++++
drivers/bcma/main.c | 16 ++++++++++++++++
3 files changed, 56 insertions(+), 0 deletions(-)
diff --git a/drivers/bcma/bcma_private.h b/drivers/bcma/bcma_private.h
index 30a3085..fda56bd 100644
--- a/drivers/bcma/bcma_private.h
+++ b/drivers/bcma/bcma_private.h
@@ -18,6 +18,9 @@ void bcma_bus_unregister(struct bcma_bus *bus);
int __init bcma_bus_early_register(struct bcma_bus *bus,
struct bcma_device *core_cc,
struct bcma_device *core_mips);
+#ifdef CONFIG_PM
+int bcma_bus_resume(struct bcma_bus *bus);
+#endif
/* scan.c */
int bcma_bus_scan(struct bcma_bus *bus);
diff --git a/drivers/bcma/host_pci.c b/drivers/bcma/host_pci.c
index 1b51d8b..990f5a8 100644
--- a/drivers/bcma/host_pci.c
+++ b/drivers/bcma/host_pci.c
@@ -224,6 +224,41 @@ static void bcma_host_pci_remove(struct pci_dev *dev)
pci_set_drvdata(dev, NULL);
}
+#ifdef CONFIG_PM
+static int bcma_host_pci_suspend(struct pci_dev *dev, pm_message_t state)
+{
+ /* Host specific */
+ pci_save_state(dev);
+ pci_disable_device(dev);
+ pci_set_power_state(dev, pci_choose_state(dev, state));
+
+ return 0;
+}
+
+static int bcma_host_pci_resume(struct pci_dev *dev)
+{
+ struct bcma_bus *bus = pci_get_drvdata(dev);
+ int err;
+
+ /* Host specific */
+ pci_set_power_state(dev, 0);
+ err = pci_enable_device(dev);
+ if (err)
+ return err;
+ pci_restore_state(dev);
+
+ /* Bus specific */
+ err = bcma_bus_resume(bus);
+ if (err)
+ return err;
+
+ return 0;
+}
+#else /* CONFIG_PM */
+# define bcma_host_pci_suspend NULL
+# define bcma_host_pci_resume NULL
+#endif /* CONFIG_PM */
+
static DEFINE_PCI_DEVICE_TABLE(bcma_pci_bridge_tbl) = {
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x0576) },
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4331) },
@@ -239,6 +274,8 @@ static struct pci_driver bcma_pci_bridge_driver = {
.id_table = bcma_pci_bridge_tbl,
.probe = bcma_host_pci_probe,
.remove = bcma_host_pci_remove,
+ .suspend = bcma_host_pci_suspend,
+ .resume = bcma_host_pci_resume,
};
int __init bcma_host_pci_init(void)
diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
index 70c84b9..10f92b3 100644
--- a/drivers/bcma/main.c
+++ b/drivers/bcma/main.c
@@ -240,6 +240,22 @@ int __init bcma_bus_early_register(struct bcma_bus *bus,
return 0;
}
+#ifdef CONFIG_PM
+int bcma_bus_resume(struct bcma_bus *bus)
+{
+ struct bcma_device *core;
+
+ /* Init CC core */
+ core = bcma_find_core(bus, BCMA_CORE_CHIPCOMMON);
+ if (core) {
+ bus->drv_cc.setup_done = false;
+ bcma_core_chipcommon_init(&bus->drv_cc);
+ }
+
+ return 0;
+}
+#endif
+
int __bcma_driver_register(struct bcma_driver *drv, struct module *owner)
{
drv->drv.name = drv->name;
--
1.7.3.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] bcma: support for suspend and resume
@ 2011-12-09 21:16 ` Rafał Miłecki
0 siblings, 0 replies; 4+ messages in thread
From: Rafał Miłecki @ 2011-12-09 21:16 UTC (permalink / raw)
To: linux-wireless, John W. Linville
Cc: b43-dev, Greg KH, Rafał Miłecki, stable
bcma used to lock up machine without enabling PCI or initializing CC.
Cc: stable@kernel.org
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---
DC input port stopped working in my notebook. I had to open it and fix.
Guess what has appeared to my eyes... WiFI card in the mini PCIe slot!
For all the years I believed WiFi is integrated with the motherboard!
Taking a chance, I've put BCM43224 and decided to resolve suspend and
resume issue. I've reproduced lock ups and tracked them :)
It fixes lockups, so I believe it has to be Cc to stable.
---
drivers/bcma/bcma_private.h | 3 +++
drivers/bcma/host_pci.c | 37 +++++++++++++++++++++++++++++++++++++
drivers/bcma/main.c | 16 ++++++++++++++++
3 files changed, 56 insertions(+), 0 deletions(-)
diff --git a/drivers/bcma/bcma_private.h b/drivers/bcma/bcma_private.h
index 30a3085..fda56bd 100644
--- a/drivers/bcma/bcma_private.h
+++ b/drivers/bcma/bcma_private.h
@@ -18,6 +18,9 @@ void bcma_bus_unregister(struct bcma_bus *bus);
int __init bcma_bus_early_register(struct bcma_bus *bus,
struct bcma_device *core_cc,
struct bcma_device *core_mips);
+#ifdef CONFIG_PM
+int bcma_bus_resume(struct bcma_bus *bus);
+#endif
/* scan.c */
int bcma_bus_scan(struct bcma_bus *bus);
diff --git a/drivers/bcma/host_pci.c b/drivers/bcma/host_pci.c
index 1b51d8b..990f5a8 100644
--- a/drivers/bcma/host_pci.c
+++ b/drivers/bcma/host_pci.c
@@ -224,6 +224,41 @@ static void bcma_host_pci_remove(struct pci_dev *dev)
pci_set_drvdata(dev, NULL);
}
+#ifdef CONFIG_PM
+static int bcma_host_pci_suspend(struct pci_dev *dev, pm_message_t state)
+{
+ /* Host specific */
+ pci_save_state(dev);
+ pci_disable_device(dev);
+ pci_set_power_state(dev, pci_choose_state(dev, state));
+
+ return 0;
+}
+
+static int bcma_host_pci_resume(struct pci_dev *dev)
+{
+ struct bcma_bus *bus = pci_get_drvdata(dev);
+ int err;
+
+ /* Host specific */
+ pci_set_power_state(dev, 0);
+ err = pci_enable_device(dev);
+ if (err)
+ return err;
+ pci_restore_state(dev);
+
+ /* Bus specific */
+ err = bcma_bus_resume(bus);
+ if (err)
+ return err;
+
+ return 0;
+}
+#else /* CONFIG_PM */
+# define bcma_host_pci_suspend NULL
+# define bcma_host_pci_resume NULL
+#endif /* CONFIG_PM */
+
static DEFINE_PCI_DEVICE_TABLE(bcma_pci_bridge_tbl) = {
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x0576) },
{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4331) },
@@ -239,6 +274,8 @@ static struct pci_driver bcma_pci_bridge_driver = {
.id_table = bcma_pci_bridge_tbl,
.probe = bcma_host_pci_probe,
.remove = bcma_host_pci_remove,
+ .suspend = bcma_host_pci_suspend,
+ .resume = bcma_host_pci_resume,
};
int __init bcma_host_pci_init(void)
diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
index 70c84b9..10f92b3 100644
--- a/drivers/bcma/main.c
+++ b/drivers/bcma/main.c
@@ -240,6 +240,22 @@ int __init bcma_bus_early_register(struct bcma_bus *bus,
return 0;
}
+#ifdef CONFIG_PM
+int bcma_bus_resume(struct bcma_bus *bus)
+{
+ struct bcma_device *core;
+
+ /* Init CC core */
+ core = bcma_find_core(bus, BCMA_CORE_CHIPCOMMON);
+ if (core) {
+ bus->drv_cc.setup_done = false;
+ bcma_core_chipcommon_init(&bus->drv_cc);
+ }
+
+ return 0;
+}
+#endif
+
int __bcma_driver_register(struct bcma_driver *drv, struct module *owner)
{
drv->drv.name = drv->name;
--
1.7.3.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] bcma: support for suspend and resume
2011-12-09 21:16 ` Rafał Miłecki
(?)
@ 2011-12-09 21:45 ` Greg KH
2011-12-09 21:54 ` [PATCH] MAINTAINERS: stable: Update address Joe Perches
-1 siblings, 1 reply; 4+ messages in thread
From: Greg KH @ 2011-12-09 21:45 UTC (permalink / raw)
To: Rafał Miłecki; +Cc: linux-wireless, John W. Linville, b43-dev, stable
On Fri, Dec 09, 2011 at 10:16:07PM +0100, Rafał Miłecki wrote:
> bcma used to lock up machine without enabling PCI or initializing CC.
>
> Cc: stable@kernel.org
This address is gone, please use stable@vger.kernel.org in the future.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] MAINTAINERS: stable: Update address
2011-12-09 21:45 ` Greg KH
@ 2011-12-09 21:54 ` Joe Perches
0 siblings, 0 replies; 4+ messages in thread
From: Joe Perches @ 2011-12-09 21:54 UTC (permalink / raw)
To: Greg KH, Andrew Morton
Cc: Rafał Miłecki, linux-wireless, John W. Linville,
b43-dev, stable
The old address hasn't worked since the great intrusion of August 2011.
CC: Greg KH <gregkh@suse.de>
Signed-off-by: Joe Perches <joe@perches.com>
---
MAINTAINERS | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index b4f1802..99f61ce 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6251,7 +6251,7 @@ F: arch/alpha/kernel/srm_env.c
STABLE BRANCH
M: Greg Kroah-Hartman <greg@kroah.com>
-L: stable@kernel.org
+L: stable@vger.kernel.org
S: Maintained
STAGING SUBSYSTEM
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-12-09 21:54 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-09 21:16 [PATCH] bcma: support for suspend and resume Rafał Miłecki
2011-12-09 21:16 ` Rafał Miłecki
2011-12-09 21:45 ` Greg KH
2011-12-09 21:54 ` [PATCH] MAINTAINERS: stable: Update address Joe Perches
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.