| Message ID | 1442826259-6270-1-git-send-email-zajec5@gmail.com (mailing list archive) |
|---|---|
| State | RFC |
| Headers | show |
On 09/21/2015 04:04 AM, Rafa? Mi?ecki wrote: > 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. > > Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com> > --- > drivers/net/wireless/b43/Kconfig | 20 ------ > drivers/net/wireless/b43/Makefile | 1 - > drivers/net/wireless/b43/main.c | 9 +-- > drivers/net/wireless/b43/pcmcia.c | 145 -------------------------------------- > drivers/net/wireless/b43/pcmcia.h | 20 ------ > drivers/ssb/main.c | 8 ++- > drivers/ssb/pcmcia.c | 110 +++++++++++++++++++++++++++++ > drivers/ssb/ssb_private.h | 9 +++ > 8 files changed, 127 insertions(+), 195 deletions(-) > delete mode 100644 drivers/net/wireless/b43/pcmcia.c > delete mode 100644 drivers/net/wireless/b43/pcmcia.h I like this change very much. I did not go into the history of splitting the PCMCIA support between ssb and b43, other than to note that this change makes the initialization of b43 look exactly like the init code of b43legacy. Thus the splitting of PCMCIA functions between ssb and b43 happened after b43legacy was split from early b43. This patch has been tested on PPC architecture with Linksys WPC54G PCMCIA cards. Both V1 (using b43legacy) and V3 (using b43) of these devices are available. As expected, the V1 device was not affected by this patch, and the V3 unit worked with no problems, other than an initial build error on the PPC. To fix this, an "#include <linux/module.h>" is needed in drivers/ssb/pcmcia.c, otherwise the build fails because the MODULE_DEVICE_TABLE macro is not defined. With that change, you may add Tested-by: Larry Finger <Larry.Finger@lwfinger.net> I have also in-lined one little comment below: > > diff --git a/drivers/net/wireless/b43/Kconfig b/drivers/net/wireless/b43/Kconfig > index 759fb8d..fba8560 100644 > --- a/drivers/net/wireless/b43/Kconfig > +++ b/drivers/net/wireless/b43/Kconfig > @@ -71,26 +71,6 @@ config B43_PCICORE_AUTOSELECT > select SSB_DRIVER_PCICORE > default y ..snip.. > diff --git a/drivers/ssb/pcmcia.c b/drivers/ssb/pcmcia.c > index f03422b..e279925 100644 > --- a/drivers/ssb/pcmcia.c > +++ b/drivers/ssb/pcmcia.c > @@ -839,3 +839,113 @@ error: > ssb_err("Failed to initialize PCMCIA host device\n"); > return err; > } > + > +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, It probably does not matter here, but I prefer that hexadecimal constants in device tables contain only the lower-case versions of a-f. That makes searching for such constants with grep a lot easier. Good work, Larry -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, 21 Sep 2015 11:04:19 +0200 Rafa? Mi?ecki <zajec5@gmail.com> wrote: > 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. The idea basically was that b43 is the only user of that code. So the code was put there. > 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. I agree that this makes the architecture a bit cleaner. So this basically looks good. I currently can't test it, because I don't have that device here right now. In two weeks or so I'll probably be able to test it, though. > @@ -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 */ Why not? What's the point of not failing here? > + err = 0; > + } > +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, > +}; This doesn't belong into ssb'c pcmcia.c, IMO. It should be in a new file called b43_pcmcia_bridge.c, just like we have b43_pci_bridge.c. The bridge code technically (also for pci) doesn't belong into ssb. But it makes kconfig simpler.
On Mon, 21 Sep 2015 11:14:32 -0500 Larry Finger <Larry.Finger@lwfinger.net> wrote: > This patch has been tested on PPC architecture with Linksys WPC54G PCMCIA cards. Are you sure that this really is a 16 bit PCMCIA card and not a PC-Card? If it shows up in lspci, it's not a PCMCIA card. > It probably does not matter here, but I prefer that hexadecimal constants in > device tables contain only the lower-case versions of a-f. That makes searching > for such constants with grep a lot easier. I prefer coffee over tea. That doesn't make coffee any better, though. Is it really so that the rest of the kernel only uses lower case here? Grep also supports case insensitive regexes, if done correctly. And if not everybody uses lower case here, you'll have to do that anyway.
On 09/21/2015 11:26 AM, Michael Büsch wrote: > On Mon, 21 Sep 2015 11:14:32 -0500 > Larry Finger <Larry.Finger@lwfinger.net> wrote: > >> This patch has been tested on PPC architecture with Linksys WPC54G PCMCIA cards. > > Are you sure that this really is a 16 bit PCMCIA card and not a PC-Card? > If it shows up in lspci, it's not a PCMCIA card. Point taken. These are indeed PC-Cards in a PCMCIA format. >> It probably does not matter here, but I prefer that hexadecimal constants in >> device tables contain only the lower-case versions of a-f. That makes searching >> for such constants with grep a lot easier. > > I prefer coffee over tea. That doesn't make coffee any better, though. > > Is it really so that the rest of the kernel only uses lower case here? > Grep also supports case insensitive regexes, if done correctly. And if > not everybody uses lower case here, you'll have to do that anyway. Yes, I know how to use grep to ignore case. Larry > -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 21 September 2015 at 18:20, Michael Büsch <m@bues.ch> wrote: > On Mon, 21 Sep 2015 11:04:19 +0200 > Rafa? Mi?ecki <zajec5@gmail.com> wrote: >> @@ -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 */ > > Why not? What's the point of not failing here? I just copied the logic from few lines above where we handle PCI init. I guess the point was to support other host devices even is PCI host registration fails. >> +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, >> +}; > > This doesn't belong into ssb'c pcmcia.c, IMO. > It should be in a new file called b43_pcmcia_bridge.c, just like we have > b43_pci_bridge.c. > The bridge code technically (also for pci) doesn't belong into ssb. But > it makes kconfig simpler. This is something I don't understand. This PCI bridge was also always confusing me. Why do we want a separated file for that? What's wrong with having 1 file for host (PCI/PCMCIA) driver (probe and remove functions) *and* ssb initialization?
On Wed, 23 Sep 2015 12:02:48 +0200 Rafa? Mi?ecki <zajec5@gmail.com> wrote: > On 21 September 2015 at 18:20, Michael Büsch <m@bues.ch> wrote: > > On Mon, 21 Sep 2015 11:04:19 +0200 > > Rafa? Mi?ecki <zajec5@gmail.com> wrote: > >> @@ -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 */ > > > > Why not? What's the point of not failing here? > > I just copied the logic from few lines above where we handle PCI init. > I guess the point was to support other host devices even is PCI host > registration fails. Ah I misread it. This is at modinit time. That might make sense then. > >> +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, > >> +}; > > > > This doesn't belong into ssb'c pcmcia.c, IMO. > > It should be in a new file called b43_pcmcia_bridge.c, just like we have > > b43_pci_bridge.c. > > The bridge code technically (also for pci) doesn't belong into ssb. But > > it makes kconfig simpler. > > This is something I don't understand. This PCI bridge was also always > confusing me. > Why do we want a separated file for that? What's wrong with having 1 > file for host (PCI/PCMCIA) driver (probe and remove functions) *and* > ssb initialization? Because that's not ssb code. These are device IDs for b43 devices. We just keep it in ssb to make module handling easier. Ssb also runs non-b43 devices. Think of it like PCI IDs that belong into the driver and not the PCI subsystem.
On 23 September 2015 at 17:58, Michael Büsch <m@bues.ch> wrote: > On Wed, 23 Sep 2015 12:02:48 +0200 > Rafa? Mi?ecki <zajec5@gmail.com> wrote: > >> On 21 September 2015 at 18:20, Michael Büsch <m@bues.ch> wrote: >> > On Mon, 21 Sep 2015 11:04:19 +0200 >> > Rafa? Mi?ecki <zajec5@gmail.com> wrote: >> >> @@ -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 */ >> > >> > Why not? What's the point of not failing here? >> >> I just copied the logic from few lines above where we handle PCI init. >> I guess the point was to support other host devices even is PCI host >> registration fails. > > > Ah I misread it. This is at modinit time. That might make sense then. > > >> >> +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, >> >> +}; >> > >> > This doesn't belong into ssb'c pcmcia.c, IMO. >> > It should be in a new file called b43_pcmcia_bridge.c, just like we have >> > b43_pci_bridge.c. >> > The bridge code technically (also for pci) doesn't belong into ssb. But >> > it makes kconfig simpler. >> >> This is something I don't understand. This PCI bridge was also always >> confusing me. >> Why do we want a separated file for that? What's wrong with having 1 >> file for host (PCI/PCMCIA) driver (probe and remove functions) *and* >> ssb initialization? > > > Because that's not ssb code. These are device IDs for b43 devices. > We just keep it in ssb to make module handling easier. > Ssb also runs non-b43 devices. > Think of it like PCI IDs that belong into the driver and not the PCI > subsystem. Sorry, it's still unclear for me. If all PCI-bus-host-specific code is always the same, what's the point of having separated files for devices with different functionality? Now I can see we have: 1) b43_pci_ssb_bridge_init 2) b44_pci_init which do the same thing. Why we can't simply put that code in ssb itself, e.g. pcihost_wrapper.c? It looks like adding extra unneeded logic into drivers like b44.
On Wed, 14 Oct 2015 13:17:16 +0200
Rafa? Mi?ecki <zajec5@gmail.com> wrote:
> If all PCI-bus-host-specific code is always the same,
And that's the point. It's always the same _except_ for the device IDs.
Which obviously are PCI-device specific.
diff --git a/drivers/net/wireless/b43/Kconfig b/drivers/net/wireless/b43/Kconfig index 759fb8d..fba8560 100644 --- a/drivers/net/wireless/b43/Kconfig +++ b/drivers/net/wireless/b43/Kconfig @@ -71,26 +71,6 @@ config B43_PCICORE_AUTOSELECT select SSB_DRIVER_PCICORE default y -config B43_PCMCIA - bool "Broadcom 43xx PCMCIA device support" - depends on B43 && B43_SSB && SSB_PCMCIAHOST_POSSIBLE - select SSB_PCMCIAHOST - ---help--- - Broadcom 43xx PCMCIA device support. - - Support for 16bit PCMCIA devices. - Please note that most PC-CARD devices are _NOT_ 16bit PCMCIA - devices, but 32bit CardBUS devices. CardBUS devices are supported - out of the box by b43. - - With this config option you can drive b43 cards in - CompactFlash formfactor in a PCMCIA adaptor. - CF b43 cards can sometimes be found in handheld PCs. - - It's safe to select Y here, even if you don't have a B43 PCMCIA device. - - If unsure, say N. - config B43_SDIO bool "Broadcom 43xx SDIO device support" depends on B43 && B43_SSB && SSB_SDIOHOST_POSSIBLE diff --git a/drivers/net/wireless/b43/Makefile b/drivers/net/wireless/b43/Makefile index c624d4d..ddc4df4 100644 --- a/drivers/net/wireless/b43/Makefile +++ b/drivers/net/wireless/b43/Makefile @@ -21,7 +21,6 @@ b43-y += pio.o b43-y += rfkill.o b43-y += ppr.o b43-$(CONFIG_B43_LEDS) += leds.o -b43-$(CONFIG_B43_PCMCIA) += pcmcia.o b43-$(CONFIG_B43_SDIO) += sdio.o b43-$(CONFIG_B43_DEBUG) += debugfs.o diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 2849070..ba792ae09 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c @@ -56,7 +56,6 @@ #include "sysfs.h" #include "xmit.h" #include "lo.h" -#include "pcmcia.h" #include "sdio.h" #include <linux/mmc/sdio_func.h> @@ -5849,12 +5848,9 @@ static int __init b43_init(void) int err; b43_debugfs_init(); - err = b43_pcmcia_init(); - if (err) - goto err_dfs_exit; err = b43_sdio_init(); if (err) - goto err_pcmcia_exit; + goto err_dfs_exit; #ifdef CONFIG_B43_BCMA err = bcma_driver_register(&b43_bcma_driver); if (err) @@ -5877,8 +5873,6 @@ err_bcma_driver_exit: err_sdio_exit: #endif b43_sdio_exit(); -err_pcmcia_exit: - b43_pcmcia_exit(); err_dfs_exit: b43_debugfs_exit(); return err; @@ -5893,7 +5887,6 @@ static void __exit b43_exit(void) bcma_driver_unregister(&b43_bcma_driver); #endif b43_sdio_exit(); - b43_pcmcia_exit(); b43_debugfs_exit(); } diff --git a/drivers/net/wireless/b43/pcmcia.c b/drivers/net/wireless/b43/pcmcia.c deleted file mode 100644 index 55f2bd7..0000000 --- a/drivers/net/wireless/b43/pcmcia.c +++ /dev/null @@ -1,145 +0,0 @@ -/* - - Broadcom B43 wireless driver - - Copyright (c) 2007 Michael Buesch <m@bues.ch> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor, - Boston, MA 02110-1301, USA. - -*/ - -#include "pcmcia.h" - -#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> - - -static const struct pcmcia_device_id b43_pcmcia_tbl[] = { - PCMCIA_DEVICE_MANF_CARD(0x2D0, 0x448), - PCMCIA_DEVICE_MANF_CARD(0x2D0, 0x476), - PCMCIA_DEVICE_NULL, -}; - -MODULE_DEVICE_TABLE(pcmcia, b43_pcmcia_tbl); - -#ifdef CONFIG_PM -static int b43_pcmcia_suspend(struct pcmcia_device *dev) -{ - struct ssb_bus *ssb = dev->priv; - - return ssb_bus_suspend(ssb); -} - -static int b43_pcmcia_resume(struct pcmcia_device *dev) -{ - struct ssb_bus *ssb = dev->priv; - - return ssb_bus_resume(ssb); -} -#else /* CONFIG_PM */ -# define b43_pcmcia_suspend NULL -# define b43_pcmcia_resume NULL -#endif /* CONFIG_PM */ - -static int b43_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: - printk(KERN_ERR "b43-pcmcia: Initialization failed (%d, %d)\n", - res, err); - return err; -} - -static void b43_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; -} - -static struct pcmcia_driver b43_pcmcia_driver = { - .owner = THIS_MODULE, - .name = "b43-pcmcia", - .id_table = b43_pcmcia_tbl, - .probe = b43_pcmcia_probe, - .remove = b43_pcmcia_remove, - .suspend = b43_pcmcia_suspend, - .resume = b43_pcmcia_resume, -}; - -/* - * These are not module init/exit functions! - * The module_pcmcia_driver() helper cannot be used here. - */ -int b43_pcmcia_init(void) -{ - return pcmcia_register_driver(&b43_pcmcia_driver); -} - -void b43_pcmcia_exit(void) -{ - pcmcia_unregister_driver(&b43_pcmcia_driver); -} diff --git a/drivers/net/wireless/b43/pcmcia.h b/drivers/net/wireless/b43/pcmcia.h deleted file mode 100644 index 85f120a..0000000 --- a/drivers/net/wireless/b43/pcmcia.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef B43_PCMCIA_H_ -#define B43_PCMCIA_H_ - -#ifdef CONFIG_B43_PCMCIA - -int b43_pcmcia_init(void); -void b43_pcmcia_exit(void); - -#else /* CONFIG_B43_PCMCIA */ - -static inline int b43_pcmcia_init(void) -{ - return 0; -} -static inline void b43_pcmcia_exit(void) -{ -} - -#endif /* CONFIG_B43_PCMCIA */ -#endif /* B43_PCMCIA_H_ */ diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c index 8cf23a2..90ec6a0 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/pcmcia.c b/drivers/ssb/pcmcia.c index f03422b..e279925 100644 --- a/drivers/ssb/pcmcia.c +++ b/drivers/ssb/pcmcia.c @@ -839,3 +839,113 @@ error: ssb_err("Failed to initialize PCMCIA host device\n"); return err; } + +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/ssb_private.h b/drivers/ssb/ssb_private.h index 8a2ebc8..93bb8f0 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 */
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. Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com> --- drivers/net/wireless/b43/Kconfig | 20 ------ drivers/net/wireless/b43/Makefile | 1 - drivers/net/wireless/b43/main.c | 9 +-- drivers/net/wireless/b43/pcmcia.c | 145 -------------------------------------- drivers/net/wireless/b43/pcmcia.h | 20 ------ drivers/ssb/main.c | 8 ++- drivers/ssb/pcmcia.c | 110 +++++++++++++++++++++++++++++ drivers/ssb/ssb_private.h | 9 +++ 8 files changed, 127 insertions(+), 195 deletions(-) delete mode 100644 drivers/net/wireless/b43/pcmcia.c delete mode 100644 drivers/net/wireless/b43/pcmcia.h