linux-stable.git/drivers/ssb, branch linux-2.6.33.y

ssb-pcmcia: Fix parsing of invariants tuples

2011-03-21T19:44:57+00:00

commit dd3cb633078fb12e06ce6cebbdfbf55a7562e929 upstream.

This fixes parsing of the device invariants (MAC address)
for PCMCIA SSB devices.

ssb_pcmcia_do_get_invariants expects an iv pointer as data
argument.

Tested-by: dylan cristiani 
Signed-off-by: Michael Buesch 
Signed-off-by: John W. Linville 
Signed-off-by: Greg Kroah-Hartman

ssb: b43-pci-bridge: Add new vendor for BCM4318

2011-03-21T19:43:47+00:00

commit 1d8638d4038eb8709edc80e37a0bbb77253d86e9 upstream.

Add new vendor for Broadcom 4318.

Signed-off-by: Daniel Klaffenbach 
Signed-off-by: Larry Finger 
Signed-off-by: John W. Linville 
Signed-off-by: Greg Kroah-Hartman

ssb: Handle alternate SSPROM location

2011-03-21T19:43:28+00:00

commit 9d1ac34ec3a67713308ae0883c3359c557f14d17 upstream.

In kernel Bugzilla #15825 (2 users), in a wireless mailing list thread
(http://lists.infradead.org/pipermail/b43-dev/2010-May/000124.html), and on a
netbook owned by John Linville
(http://marc.info/?l=linux-wireless&m=127230751408818&w=4), there are reports
of ssb failing to detect an SPROM at the normal location. After studying the
MMIO trace dump for the Broadcom wl driver, it was determined that the affected
boxes had a relocated SPROM.

This patch fixes all systems that have reported this problem.

Signed-off-by: Larry Finger 
Signed-off-by: John W. Linville 
Cc: Ben Hutchings 
Signed-off-by: Greg Kroah-Hartman

ssb: fix NULL ptr deref when pcihost_wrapper is used

2011-03-21T19:43:28+00:00

commit da1fdb02d9200ff28b6f3a380d21930335fe5429 upstream.

Ethernet driver b44 does register ssb by it's pcihost_wrapper
and doesn't set ssb_chipcommon. A check on this value
introduced with commit d53cdbb94a52a920d5420ed64d986c3523a56743
and ea2db495f92ad2cf3301623e60cb95b4062bc484 triggers:

BUG: unable to handle kernel NULL pointer dereference at 00000010
IP: [] ssb_is_sprom_available+0x16/0x30

Signed-off-by: Christoph Fritz 
Signed-off-by: John W. Linville 
Cc: Larry Finger 
Cc: Ben Hutchings 
Signed-off-by: Greg Kroah-Hartman

ssb: Look for SPROM at different offset on higher rev CC

2011-03-21T19:43:28+00:00

commit ea2db495f92ad2cf3301623e60cb95b4062bc484 upstream.

Our offset handling becomes even a little more hackish now. For some reason I
do not understand all offsets as inrelative. It assumes base offset is 0x1000
but it will work for now as we make offsets relative anyway by removing base
0x1000. Should be cleaner however.

Signed-off-by: Rafał Miłecki 
Signed-off-by: John W. Linville 
Cc: Larry Finger 
Cc: Ben Hutchings 
Signed-off-by: Greg Kroah-Hartman

ssb: do not read SPROM if it does not exist

2011-03-21T19:43:28+00:00

commit d53cdbb94a52a920d5420ed64d986c3523a56743 upstream.

Attempting to read registers that don't exist on the SSB bus can cause
hangs on some boxes.  At least some b43 devices are 'in the wild' that
don't have SPROMs at all.  When the SSB bus support loads, it attempts
to read these (non-existant) SPROMs and causes hard hangs on the box --
no console output, etc.

This patch adds some intelligence to determine whether or not the SPROM
is present before attempting to read it.  This avoids those hard hangs
on those devices with no SPROM attached to their SSB bus.  The
SSB-attached devices (e.g. b43, et al.) won't work, but at least the box
will survive to test further patches. :-)

Signed-off-by: John W. Linville 
Signed-off-by: Rafał Miłecki 
Cc: Larry Finger 
Cc: Michael Buesch 
Cc: Ben Hutchings 
Signed-off-by: Greg Kroah-Hartman

Revert "ssb: Handle Netbook devices where the SPROM address is changed"

2011-03-21T19:43:27+00:00

Turns out this isn't the best way to resolve this issue.  The
individual patches will be applied instead.

Cc: Larry Finger 
Cc: Ben Hutchings 
Signed-off-by: Greg Kroah-Hartman

ssb: Handle Netbook devices where the SPROM address is changed

2010-08-02T17:26:25+00:00

For some Netbook computers with Broadcom BCM4312 wireless interfaces,
the SPROM has been moved to a new location. When the ssb driver tries to
read the old location, the systems hangs when trying to read a
non-existent location. Such freezes are particularly bad as they do not
log the failure.

This patch is modified from commit
da1fdb02d9200ff28b6f3a380d21930335fe5429 with some pieces from other
mainline changes so that it can be applied to stable 2.6.34.Y.

Signed-off-by: Larry Finger 
Signed-off-by: Greg Kroah-Hartman

ssb: Fix CONFIG_SSB_SDIOHOST typo

2010-02-03T21:55:20+00:00

This fixes a CONFIG_SSB_SDIOHOST typo.

Signed-off-by: Michael Buesch 
Reported-by: Christoph Egger 
Tested-By: Albert Herranz 
Signed-off-by: John W. Linville

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

2009-12-05T23:22:26+00:00

Conflicts:
	drivers/net/pcmcia/fmvj18x_cs.c
	drivers/net/pcmcia/nmclan_cs.c
	drivers/net/pcmcia/xirc2ps_cs.c
	drivers/net/wireless/ray_cs.c