ssb: pick PCMCIA host code support from b43 driver

ssb bus can be found on various "host" devices like PCI/PCMCIA/SDIO.
Every ssb bus contains cores AKA devices.
The main idea is to have ssb driver scan/initialize bus and register
ready-to-use cores. This way ssb drivers can operate on a single core
mostly ignoring underlaying details.

For some reason PCMCIA support was split between ssb and b43. We got
PCMCIA host device probing in b43, then bus scanning in ssb and then
wireless core probing back in b43. The truth is it's very unlikely we
will ever see PCMCIA ssb device with no 802.11 core but I still don't
see any advantage of the current architecture.

With proposed change we get the same functionality with a simpler
architecture, less Kconfig symbols, one killed EXPORT and hopefully
cleaner b43. Since b43 supports both: ssb & bcma I prefer to keep ssb
specific code in ssb driver.

This mostly moves code from b43's pcmcia.c to bridge_pcmcia_80211.c. We
already use similar solution with b43_pci_bridge.c. I didn't use "b43"
in name of this new file as in theory any driver can operate on wireless
core.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

4 files changed, 145 insertions, 2 deletions

diff --git a/drivers/ssb/Makefile b/drivers/ssb/Makefile
index b1ddc116d387..7daa03e34b37 100644
--- a/drivers/ssb/Makefile
+++ b/drivers/ssb/Makefile
@@ -5,7 +5,7 @@ ssb-$(CONFIG_SSB_SPROM)			+= sprom.o
 
 # host support
 ssb-$(CONFIG_SSB_PCIHOST)               += pci.o pcihost_wrapper.o
-ssb-$(CONFIG_SSB_PCMCIAHOST)            += pcmcia.o
+ssb-$(CONFIG_SSB_PCMCIAHOST)            += pcmcia.o bridge_pcmcia_80211.o
 ssb-$(CONFIG_SSB_SDIOHOST)              += sdio.o
 
 # built-in drivers
diff --git a/drivers/ssb/bridge_pcmcia_80211.c b/drivers/ssb/bridge_pcmcia_80211.c
new file mode 100644
index 000000000000..d70568ea02d5
--- /dev/null
+++ b/drivers/ssb/bridge_pcmcia_80211.c
@@ -0,0 +1,128 @@
+/*
+ * Broadcom 43xx PCMCIA-SSB bridge module
+ *
+ * Copyright (c) 2007 Michael Buesch <m@bues.ch>
+ *
+ * Licensed under the GNU/GPL. See COPYING for details.
+ */
+
+#include <linux/ssb/ssb.h>
+#include <linux/slab.h>
+#include <linux/module.h>
+
+#include <pcmcia/cistpl.h>
+#include <pcmcia/ciscode.h>
+#include <pcmcia/ds.h>
+#include <pcmcia/cisreg.h>
+
+#include "ssb_private.h"
+
+static const struct pcmcia_device_id ssb_host_pcmcia_tbl[] = {
+        PCMCIA_DEVICE_MANF_CARD(0x2D0, 0x448),
+        PCMCIA_DEVICE_MANF_CARD(0x2D0, 0x476),
+        PCMCIA_DEVICE_NULL,
+};
+
+MODULE_DEVICE_TABLE(pcmcia, ssb_host_pcmcia_tbl);
+
+static int ssb_host_pcmcia_probe(struct pcmcia_device *dev)
+{
+        struct ssb_bus *ssb;
+        int err = -ENOMEM;
+        int res = 0;
+
+        ssb = kzalloc(sizeof(*ssb), GFP_KERNEL);
+        if (!ssb)
+                goto out_error;
+
+        err = -ENODEV;
+
+        dev->config_flags |= CONF_ENABLE_IRQ;
+
+        dev->resource[2]->flags |=  WIN_ENABLE | WIN_DATA_WIDTH_16 |
+                         WIN_USE_WAIT;
+        dev->resource[2]->start = 0;
+        dev->resource[2]->end = SSB_CORE_SIZE;
+        res = pcmcia_request_window(dev, dev->resource[2], 250);
+        if (res != 0)
+                goto err_kfree_ssb;
+
+        res = pcmcia_map_mem_page(dev, dev->resource[2], 0);
+        if (res != 0)
+                goto err_disable;
+
+        if (!dev->irq)
+                goto err_disable;
+
+        res = pcmcia_enable_device(dev);
+        if (res != 0)
+                goto err_disable;
+
+        err = ssb_bus_pcmciabus_register(ssb, dev, dev->resource[2]->start);
+        if (err)
+                goto err_disable;
+        dev->priv = ssb;
+
+        return 0;
+
+err_disable:
+        pcmcia_disable_device(dev);
+err_kfree_ssb:
+        kfree(ssb);
+out_error:
+        ssb_err("Initialization failed (%d, %d)\n", res, err);
+        return err;
+}
+
+static void ssb_host_pcmcia_remove(struct pcmcia_device *dev)
+{
+        struct ssb_bus *ssb = dev->priv;
+
+        ssb_bus_unregister(ssb);
+        pcmcia_disable_device(dev);
+        kfree(ssb);
+        dev->priv = NULL;
+}
+
+#ifdef CONFIG_PM
+static int ssb_host_pcmcia_suspend(struct pcmcia_device *dev)
+{
+        struct ssb_bus *ssb = dev->priv;
+
+        return ssb_bus_suspend(ssb);
+}
+
+static int ssb_host_pcmcia_resume(struct pcmcia_device *dev)
+{
+        struct ssb_bus *ssb = dev->priv;
+
+        return ssb_bus_resume(ssb);
+}
+#else /* CONFIG_PM */
+# define ssb_host_pcmcia_suspend                NULL
+# define ssb_host_pcmcia_resume         NULL
+#endif /* CONFIG_PM */
+
+static struct pcmcia_driver ssb_host_pcmcia_driver = {
+        .owner          = THIS_MODULE,
+        .name           = "ssb-pcmcia",
+        .id_table       = ssb_host_pcmcia_tbl,
+        .probe          = ssb_host_pcmcia_probe,
+        .remove         = ssb_host_pcmcia_remove,
+        .suspend        = ssb_host_pcmcia_suspend,
+        .resume         = ssb_host_pcmcia_resume,
+};
+
+/*
+ * These are not module init/exit functions!
+ * The module_pcmcia_driver() helper cannot be used here.
+ */
+int ssb_host_pcmcia_init(void)
+{
+        return pcmcia_register_driver(&ssb_host_pcmcia_driver);
+}
+
+void ssb_host_pcmcia_exit(void)
+{
+        pcmcia_unregister_driver(&ssb_host_pcmcia_driver);
+}
diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
index 8cf23a2468ba..90ec6a048b4c 100644
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -897,7 +897,6 @@ int ssb_bus_pcmciabus_register(struct ssb_bus *bus,
 
         return err;
 }
-EXPORT_SYMBOL(ssb_bus_pcmciabus_register);
 #endif /* CONFIG_SSB_PCMCIAHOST */
 
 #ifdef CONFIG_SSB_SDIOHOST
@@ -1464,6 +1463,12 @@ static int __init ssb_modinit(void)
                 /* don't fail SSB init because of this */
                 err = 0;
         }
+        err = ssb_host_pcmcia_init();
+        if (err) {
+                ssb_err("PCMCIA host initialization failed\n");
+                /* don't fail SSB init because of this */
+                err = 0;
+        }
         err = ssb_gige_init();
         if (err) {
                 ssb_err("SSB Broadcom Gigabit Ethernet driver initialization failed\n");
@@ -1481,6 +1486,7 @@ fs_initcall(ssb_modinit);
 static void __exit ssb_modexit(void)
 {
         ssb_gige_exit();
+        ssb_host_pcmcia_exit();
         b43_pci_ssb_bridge_exit();
         bus_unregister(&ssb_bustype);
 }
diff --git a/drivers/ssb/ssb_private.h b/drivers/ssb/ssb_private.h
index 8a2ebc88c66f..93bb8f0195a9 100644
--- a/drivers/ssb/ssb_private.h
+++ b/drivers/ssb/ssb_private.h
@@ -94,6 +94,8 @@ extern int ssb_pcmcia_get_invariants(struct ssb_bus *bus,
 extern int ssb_pcmcia_hardware_setup(struct ssb_bus *bus);
 extern void ssb_pcmcia_exit(struct ssb_bus *bus);
 extern int ssb_pcmcia_init(struct ssb_bus *bus);
+extern int ssb_host_pcmcia_init(void);
+extern void ssb_host_pcmcia_exit(void);
 extern const struct ssb_bus_ops ssb_pcmcia_ops;
 #else /* CONFIG_SSB_PCMCIAHOST */
 static inline int ssb_pcmcia_switch_coreidx(struct ssb_bus *bus,
@@ -117,6 +119,13 @@ static inline int ssb_pcmcia_init(struct ssb_bus *bus)
 {
         return 0;
 }
+static inline int ssb_host_pcmcia_init(void)
+{
+        return 0;
+}
+static inline void ssb_host_pcmcia_exit(void)
+{
+}
 #endif /* CONFIG_SSB_PCMCIAHOST */
 
 /* sdio.c */