linux-toradex.git/include/linux, branch v2.6.34.3

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

2010-08-10T17:54:17+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

2010-08-10T17:54:17+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"

2010-08-10T17:54:16+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

NFS: Fix a typo in include/linux/nfs_fs.h

2010-08-10T17:54:06+00:00

commit 77a63f3d1e0a3e7ede8d10f569e8481b13ff47c5 upstream.

nfs_commit_inode() needs to be defined irrespectively of whether or not
we are supporting NFSv3 and NFSv4.

Allow the compiler to optimise away code in the NFSv2-only case by
converting it into an inlined stub function.

Reported-and-tested-by: Ingo Molnar 
Signed-off-by: Trond Myklebust 
Signed-off-by: Linus Torvalds 
Signed-off-by: Greg Kroah-Hartman

NFS: kswapd must not block in nfs_release_page

2010-08-10T17:54:05+00:00

commit b608b283a962caaa280756bc8563016a71712acf upstream.

See https://bugzilla.kernel.org/show_bug.cgi?id=16056

If other processes are blocked waiting for kswapd to free up some memory so
that they can make progress, then we cannot allow kswapd to block on those
processes.

Signed-off-by: Trond Myklebust 
Signed-off-by: Greg Kroah-Hartman

firmware_class: fix memory leak - free allocated pages

2010-08-02T17:30:14+00:00

commit dd336c554d8926c3348a2d5f2a5ef5597f6d1a06 upstream.

fix memory leak introduced by the patch 6e03a201bbe:
firmware: speed up request_firmware()

1. vfree won't release pages there were allocated explicitly and mapped
using vmap. The memory has to be vunmap-ed and the pages needs
to be freed explicitly

2. page array is moved into the 'struct
firmware' so that we can free it from release_firmware()
and not only in fw_dev_release()

The fix doesn't break the firmware load speed.

Cc: Johannes Berg 
Cc: Ming Lei 
Cc: Catalin Marinas 
Singed-off-by: Kay Sievers 
Signed-off-by: David Woodhouse 
Signed-off-by: Tomas Winkler 
Signed-off-by: Greg Kroah-Hartman

libertas/sdio: 8686: set ECSI bit for 1-bit transfers

2010-08-02T17:30:12+00:00

commit 8a64c0f6b7ec7f758c4ef445e49f479e27fa2236 upstream.

When operating in 1-bit mode, SDAT1 is used as dedicated interrupt line.
However, the 8686 will only drive this line when the ECSI bit is set in
the CCCR_IF register.

Thanks to Alagu Sankar for pointing me in the right direction.

Signed-off-by: Daniel Mack 
Cc: Alagu Sankar 
Cc: Volker Ernst 
Cc: Dan Williams 
Cc: John W. Linville 
Cc: Holger Schurig 
Cc: Bing Zhao 
Cc: libertas-dev@lists.infradead.org
Cc: linux-wireless@vger.kernel.org
Cc: linux-mmc@vger.kernel.org
Acked-by: Dan Williams 
Signed-off-by: John W. Linville 
Signed-off-by: Greg Kroah-Hartman

ACPI: Unconditionally set SCI_EN on resume

2010-08-02T17:30:12+00:00

commit b6dacf63e9fb2e7a1369843d6cef332f76fca6a3 upstream.

The ACPI spec tells us that the firmware will reenable SCI_EN on resume.
Reality disagrees in some cases. The ACPI spec tells us that the only way
to set SCI_EN is via an SMM call.
https://bugzilla.kernel.org/show_bug.cgi?id=13745 shows us that doing so
may break machines. Tracing the ACPI calls made by Windows shows that it
unconditionally sets SCI_EN on resume with a direct register write, and
therefore the overwhelming probability is that everything is fine with
this behaviour.

Signed-off-by: Matthew Garrett 
Tested-by: Rafael J. Wysocki 
Signed-off-by: Len Brown 
Cc: Kamal Mostafa 
Signed-off-by: Greg Kroah-Hartman

ethtool: Fix potential user buffer overflow for ETHTOOL_{G, S}RXFH

2010-08-02T17:30:05+00:00

commit bf988435bd5b53529f4408a8efb1f433f6ddfda9 upstream.

struct ethtool_rxnfc was originally defined in 2.6.27 for the
ETHTOOL_{G,S}RXFH command with only the cmd, flow_type and data
fields.  It was then extended in 2.6.30 to support various additional
commands.  These commands should have been defined to use a new
structure, but it is too late to change that now.

Since user-space may still be using the old structure definition
for the ETHTOOL_{G,S}RXFH commands, and since they do not need the
additional fields, only copy the originally defined fields to and
from user-space.

Signed-off-by: Ben Hutchings 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

ahci,ata_generic: let ata_generic handle new MBP w/ MCP89

2010-08-02T17:29:49+00:00

commit c6353b4520788e34098bbf61c73fb9618ca7fdd6 upstream.

For yet unknown reason, MCP89 on MBP 7,1 doesn't work w/ ahci under
linux but the controller doesn't require explicit mode setting and
works fine with ata_generic.  Make ahci ignore the controller on MBP
7,1 and let ata_generic take it for now.

Reported in bko#15923.

  https://bugzilla.kernel.org/show_bug.cgi?id=15923

NVIDIA is investigating why ahci mode doesn't work.

Signed-off-by: Tejun Heo 
Cc: Peer Chen 
Reported-by: Anders Østhus 
Reported-by: Andreas Graf 
Reported-by: Benoit Gschwind 
Reported-by: Damien Cassou 
Reported-by: tixetsal@juno.com
Signed-off-by: Jeff Garzik 
Signed-off-by: Greg Kroah-Hartman