Skip to contentSkip to conversation

Please pull 'ssb-drivers' branch of wireless-2.6

PATCH Applied John W. Linville 4 participants 5 messages Sep 19, 2007 – Sep 20, 2007 2 messages not in the archive

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

Jeff, Greg, Gary, and Dave,

These patches build upon the SSB bus support added to net-2.6.24 to support the b43 wireless driver. Since Dave has that support in his tree, I'm asking him to merge these patches as well.

The first patch changes b44 from being a PCI (i.e. SSB-in-drag) device to being a native SSB device. This has little effect one way or the other for laptop/desktop/server machines. But, some embedded devices have b44 hardware but no PCI bus (i.e. just SSB). This patch enables the use of the b44 driver on that hardware.

The second patch adds a driver for a USB OHCI device which lives on the SSB bus. Again, this is found on a number of SoC devices used especially in wireless routers and APs.

Thanks for reviewing/ACKing/merging!

John

---

The patches are available here:

	http://www.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/ssb-drivers/0001-b44-port-to-native-ssb-support.patch
	http://www.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/ssb-drivers/0002-usb-ssb-hosted-OHCI-driver.patch

---

The following changes since commit 0d4cbb5e7f60b2f1a4d8b7f6ea4cc264262c7a01:
Linus Torvalds (1):

        Linux 2.6.23-rc6

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git ssb-drivers

Michael Buesch (2):
b44: port to native ssb support
usb: ssb-hosted OHCI driver

 drivers/net/Kconfig         |   28 ++-
 drivers/net/b44.c           |  743 ++++++++++++++++++++----------------------
 drivers/net/b44.h           |   81 +-----
 drivers/usb/host/Kconfig    |   13 +
 drivers/usb/host/ohci-hcd.c |   21 ++-
 drivers/usb/host/ohci-ssb.c |  254 +++++++++++++++
 6 files changed, 672 insertions(+), 468 deletions(-)
 create mode 100644 drivers/usb/host/ohci-ssb.c
drivers/net/Kconfig +24 -4
index 5b9e17b..6051fe6 100644
@@ -1453,18 +1453,38 @@ config APRICOT
 	  called apricot.
 
 config B44
-	tristate "Broadcom 4400 ethernet support"
-	depends on NET_PCI && PCI
+	tristate "Broadcom 440x/47xx ethernet support"
+	depends on SSB_POSSIBLE
+	select SSB
 	select MII
 	help
-	  If you have a network (Ethernet) controller of this type, say Y and
-	  read the Ethernet-HOWTO, available from
+	  If you have a network (Ethernet) controller of this type, say Y
+	  or M and read the Ethernet-HOWTO, available from
 	  <http://www.tldp.org/docs.html#howto>.
 
 	  To compile this driver as a module, choose M here and read
 	  <file:Documentation/networking/net-modules.txt>.  The module will be
 	  called b44.
 
+# Auto-select SSB PCI-HOST support, if possible
+config B44_PCI_AUTOSELECT
+	bool
+	depends on B44 && SSB_PCIHOST_POSSIBLE
+	select SSB_PCIHOST
+	default y
+
+# Auto-select SSB PCICORE driver, if possible
+config B44_PCICORE_AUTOSELECT
+	bool
+	depends on B44 && SSB_DRIVER_PCICORE_POSSIBLE
+	select SSB_DRIVER_PCICORE
+	default y
+
+config B44_PCI
+	bool
+	depends on B44_PCI_AUTOSELECT && B44_PCICORE_AUTOSELECT
+	default y
+
 config FORCEDETH
 	tristate "nForce Ethernet support"
 	depends on NET_PCI && PCI
drivers/net/b44.c +354 -389

1,281 lines not on this page · raw message

drivers/net/b44.h +7 -74

120 lines not on this page · raw message

drivers/usb/host/Kconfig +13 -0
index 565d6ef..dc3b7fe 100644
@@ -154,6 +154,19 @@ config USB_OHCI_HCD_PCI
 	  Enables support for PCI-bus plug-in USB controller cards.
 	  If unsure, say Y.
 
+config USB_OHCI_HCD_SSB
+	bool "OHCI support for the Broadcom SSB OHCI core (embedded systems only)"
+	depends on USB_OHCI_HCD && ((USB_OHCI_HCD=m && SSB) || (USB_OHCI_HCD=y && SSB=y)) && EXPERIMENTAL
+	default n
+	---help---
+	  Support for the Sonics Silicon Backplane (SSB) attached
+	  Broadcom USB OHCI core.
+
+	  This device is only present in some embedded devices with
+	  Broadcom based SSB bus.
+
+	  If unsure, say N.
+
 config USB_OHCI_BIG_ENDIAN_DESC
 	bool
 	depends on USB_OHCI_HCD
drivers/usb/host/ohci-hcd.c +20 -1
index 6edf409..cc39e22 100644
@@ -926,11 +926,17 @@ MODULE_LICENSE ("GPL");
 #define PS3_SYSTEM_BUS_DRIVER	ps3_ohci_driver
 #endif
 
+#ifdef CONFIG_USB_OHCI_HCD_SSB
+#include "ohci-ssb.c"
+#define SSB_OHCI_DRIVER		ssb_ohci_driver
+#endif
+
 #if	!defined(PCI_DRIVER) &&		\
 	!defined(PLATFORM_DRIVER) &&	\
 	!defined(OF_PLATFORM_DRIVER) &&	\
 	!defined(SA1111_DRIVER) &&	\
-	!defined(PS3_SYSTEM_BUS_DRIVER)
+	!defined(PS3_SYSTEM_BUS_DRIVER) && \
+	!defined(SSB_OHCI_DRIVER)
 #error "missing bus glue for ohci-hcd"
 #endif
 
@@ -975,10 +981,20 @@ static int __init ohci_hcd_mod_init(void)
 		goto error_pci;
 #endif
 
+#ifdef SSB_OHCI_DRIVER
+	retval = ssb_driver_register(&SSB_OHCI_DRIVER);
+	if (retval)
+		goto error_ssb;
+#endif
+
 	return retval;
 
 	/* Error path */
+#ifdef SSB_OHCI_DRIVER
+ error_ssb:
+#endif
 #ifdef PCI_DRIVER
+	pci_unregister_driver(&PCI_DRIVER);
  error_pci:
 #endif
 #ifdef SA1111_DRIVER
@@ -1003,6 +1019,9 @@ module_init(ohci_hcd_mod_init);
 
 static void __exit ohci_hcd_mod_exit(void)
 {
+#ifdef SSB_OHCI_DRIVER
+	ssb_driver_unregister(&SSB_OHCI_DRIVER);
+#endif
 #ifdef PCI_DRIVER
 	pci_unregister_driver(&PCI_DRIVER);
 #endif
drivers/usb/host/ohci-ssb.c new file +254 -0

254 lines not on this page · raw message

Signature · 2 lines
John W. Linville
[email protected]
maintainer Applied
#1 lore raw

From: "John W. Linville" <[email protected]>
Date: Wed, 19 Sep 2007 16:44:28 -0400

Quoted 12 lines

Jeff, Greg, Gary, and Dave,

These patches build upon the SSB bus support added to net-2.6.24 to support the b43 wireless driver. Since Dave has that support in his tree, I'm asking him to merge these patches as well.

The first patch changes b44 from being a PCI (i.e. SSB-in-drag) device to being a native SSB device. This has little effect one way or the other for laptop/desktop/server machines. But, some embedded devices have b44 hardware but no PCI bus (i.e. just SSB). This patch enables the use of the b44 driver on that hardware.

Quoted 5 lines

The second patch adds a driver for a USB OHCI device which lives on the SSB bus. Again, this is found on a number of SoC devices used especially in wireless routers and APs.

Thanks for reviewing/ACKing/merging!

I've merged the B44 driver conversion into my tree.

I'll let Greg take in the OHCI thing. I would suggest that he queue it up, and then once I get the net-2.6.24 tree into the merge window (which contains the SSB stack) he can push the OHCI change in afterwards.

#2 lore raw
Quoted 11 lines · David Miller

From: "John W. Linville" <[email protected]>
Date: Wed, 19 Sep 2007 16:44:28 -0400

Quoted 3 lines

The second patch adds a driver for a USB OHCI device which lives on the SSB bus. Again, this is found on a number of SoC devices used especially in wireless routers and APs.

I'll let Greg take in the OHCI thing. I would suggest that he queue it up, and then once I get the net-2.6.24 tree into the merge window (which contains the SSB stack) he can push the OHCI change in afterwards.

ACK

Signature · 11 lines
John W. Linville
[email protected]

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
[email protected]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-users
#4 lore raw
In reply to a message not in the archive
Quoted 18 lines · John W. Linville

Jeff, Greg, Gary, and Dave,

These patches build upon the SSB bus support added to net-2.6.24 to support the b43 wireless driver. Since Dave has that support in his tree, I'm asking him to merge these patches as well.

The first patch changes b44 from being a PCI (i.e. SSB-in-drag) device to being a native SSB device. This has little effect one way or the other for laptop/desktop/server machines. But, some embedded devices have b44 hardware but no PCI bus (i.e. just SSB). This patch enables the use of the b44 driver on that hardware.

The second patch adds a driver for a USB OHCI device which lives on the SSB bus. Again, this is found on a number of SoC devices used especially in wireless routers and APs.

Thanks for reviewing/ACKing/merging!

Quoted 8 lines

John

---

The patches are available here:

	http://www.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/ssb-drivers/0001-b44-port-to-native-ssb-support.patch
	http://www.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/ssb-drivers/0002-usb-ssb-hosted-OHCI-driver.patch

This one needs to go through the linux-usb-devel list (not the -users list) and get acked by David Brownell, the current OHCI maintainer.

thanks,

greg k-h

#6 lore raw
In reply to a message not in the archive
Quoted 10 lines · Greg KH
Quoted 7 lines · John W. Linville

These patches build upon the SSB bus support added to net-2.6.24 to support the b43 wireless driver. Since Dave has that support in his tree, I'm asking him to merge these patches as well.

The second patch adds a driver for a USB OHCI device which lives on the SSB bus. Again, this is found on a number of SoC devices used especially in wireless routers and APs.

Quoted 7 lines
Quoted 4 lines

The patches are available here:

	http://www.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/ssb-drivers/0001-b44-port-to-native-ssb-support.patch
	http://www.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/ssb-drivers/0002-usb-ssb-hosted-OHCI-driver.patch

This one needs to go through the linux-usb-devel list (not the -users list) and get acked by David Brownell, the current OHCI maintainer.

Ooops, sorry -- clicked on the wrong line in MAINTAINERS...

David, please review the patch in the second link above and consider it for inclusion in 2.6.24 (once the SSB stuff in net-2.6.24 is merged).

Thanks!

John

Signature · 2 lines
John W. Linville
[email protected]