]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
13 years agoMerge remote-tracking branch 'bjdooks-i2c/next-i2c'
Stephen Rothwell [Wed, 14 Sep 2011 02:03:22 +0000 (12:03 +1000)]
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'

13 years agoMerge branch 'quilt/i2c'
Stephen Rothwell [Wed, 14 Sep 2011 02:02:11 +0000 (12:02 +1000)]
Merge branch 'quilt/i2c'

13 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Wed, 14 Sep 2011 02:00:53 +0000 (12:00 +1000)]
Merge remote-tracking branch 'hid/for-next'

Conflicts:
drivers/hid/hid-core.c
drivers/hid/hid-ids.h

13 years agoMerge remote-tracking branch 'xfs/master'
Stephen Rothwell [Wed, 14 Sep 2011 01:59:26 +0000 (11:59 +1000)]
Merge remote-tracking branch 'xfs/master'

Conflicts:
fs/xfs/xfs_super.c

13 years agoMerge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Wed, 14 Sep 2011 01:58:12 +0000 (11:58 +1000)]
Merge remote-tracking branch 'v9fs/for-next'

Conflicts:
net/9p/trans_virtio.c

13 years agoMerge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Wed, 14 Sep 2011 01:56:44 +0000 (11:56 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'

13 years agoMerge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Wed, 14 Sep 2011 01:50:49 +0000 (11:50 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'

13 years agoMerge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Wed, 14 Sep 2011 01:49:36 +0000 (11:49 +1000)]
Merge remote-tracking branch 'nfs/linux-next'

13 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Wed, 14 Sep 2011 01:48:24 +0000 (11:48 +1000)]
Merge remote-tracking branch 'logfs/master'

13 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Wed, 14 Sep 2011 01:47:11 +0000 (11:47 +1000)]
Merge remote-tracking branch 'gfs2/master'

13 years agoMerge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Wed, 14 Sep 2011 01:45:51 +0000 (11:45 +1000)]
Merge remote-tracking branch 'ext4/dev'

13 years agoMerge remote-tracking branch 'cifs/master'
Stephen Rothwell [Wed, 14 Sep 2011 01:44:35 +0000 (11:44 +1000)]
Merge remote-tracking branch 'cifs/master'

13 years agoMerge remote-tracking branch 'ceph/for-next'
Stephen Rothwell [Wed, 14 Sep 2011 01:43:21 +0000 (11:43 +1000)]
Merge remote-tracking branch 'ceph/for-next'

13 years agoMerge remote-tracking branch 'xtensa/master'
Stephen Rothwell [Wed, 14 Sep 2011 01:42:10 +0000 (11:42 +1000)]
Merge remote-tracking branch 'xtensa/master'

13 years agoMerge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Wed, 14 Sep 2011 01:41:00 +0000 (11:41 +1000)]
Merge remote-tracking branch 'unicore32/unicore32'

13 years agoMerge remote-tracking branch 'tile/master'
Stephen Rothwell [Wed, 14 Sep 2011 01:39:47 +0000 (11:39 +1000)]
Merge remote-tracking branch 'tile/master'

13 years agoMerge remote-tracking branch 'rmobile/rmobile-latest'
Stephen Rothwell [Wed, 14 Sep 2011 01:38:34 +0000 (11:38 +1000)]
Merge remote-tracking branch 'rmobile/rmobile-latest'

13 years agoMerge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Wed, 14 Sep 2011 01:37:24 +0000 (11:37 +1000)]
Merge remote-tracking branch 'sh/sh-latest'

13 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Wed, 14 Sep 2011 01:36:07 +0000 (11:36 +1000)]
Merge remote-tracking branch 's390/features'

13 years agoMerge remote-tracking branch '52xx-and-virtex/powerpc/next'
Stephen Rothwell [Wed, 14 Sep 2011 01:34:50 +0000 (11:34 +1000)]
Merge remote-tracking branch '52xx-and-virtex/powerpc/next'

13 years agoMerge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Wed, 14 Sep 2011 01:33:38 +0000 (11:33 +1000)]
Merge remote-tracking branch 'powerpc/next'

13 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Wed, 14 Sep 2011 01:32:22 +0000 (11:32 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

13 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Wed, 14 Sep 2011 01:31:03 +0000 (11:31 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'

13 years agoMerge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Wed, 14 Sep 2011 01:29:52 +0000 (11:29 +1000)]
Merge remote-tracking branch 'm68k/for-next'

13 years agoMerge remote-tracking branch 'ia64/test'
Stephen Rothwell [Wed, 14 Sep 2011 01:28:40 +0000 (11:28 +1000)]
Merge remote-tracking branch 'ia64/test'

13 years agoMerge branch 'quilt/hexagon'
Stephen Rothwell [Wed, 14 Sep 2011 01:27:23 +0000 (11:27 +1000)]
Merge branch 'quilt/hexagon'

13 years agoMerge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Wed, 14 Sep 2011 01:26:06 +0000 (11:26 +1000)]
Merge remote-tracking branch 'cris/for-next'

13 years agoMerge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Wed, 14 Sep 2011 01:24:55 +0000 (11:24 +1000)]
Merge remote-tracking branch 'blackfin/for-linus'

13 years agoMerge remote-tracking branch 'ux500-core/ux500-core'
Stephen Rothwell [Wed, 14 Sep 2011 01:23:44 +0000 (11:23 +1000)]
Merge remote-tracking branch 'ux500-core/ux500-core'

13 years agoMerge remote-tracking branch 's5p/for-next'
Stephen Rothwell [Wed, 14 Sep 2011 01:22:30 +0000 (11:22 +1000)]
Merge remote-tracking branch 's5p/for-next'

Conflicts:
arch/arm/mach-exynos4/mach-smdkc210.c

13 years agoMerge remote-tracking branch 'i.MX/for-next'
Stephen Rothwell [Wed, 14 Sep 2011 01:12:40 +0000 (11:12 +1000)]
Merge remote-tracking branch 'i.MX/for-next'

13 years agoMerge remote-tracking branch 'at91/at91-next'
Stephen Rothwell [Wed, 14 Sep 2011 01:12:39 +0000 (11:12 +1000)]
Merge remote-tracking branch 'at91/at91-next'

13 years agoMerge remote-tracking branch 'arm-soc/for-next'
Stephen Rothwell [Wed, 14 Sep 2011 01:11:26 +0000 (11:11 +1000)]
Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
arch/arm/include/asm/hardware/cache-l2x0.h
arch/arm/mach-at91/board-usb-a9260.c
arch/arm/mach-msm/board-msm8x60.c
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/mach-u300/Makefile.boot
arch/arm/plat-mxc/include/mach/gpio.h

13 years agoMerge remote-tracking branch 'arm-lpae/for-next'
Stephen Rothwell [Wed, 14 Sep 2011 01:01:20 +0000 (11:01 +1000)]
Merge remote-tracking branch 'arm-lpae/for-next'

Conflicts:
arch/arm/include/asm/page.h
arch/arm/include/asm/pgalloc.h
arch/arm/include/asm/pgtable-hwdef.h
arch/arm/include/asm/pgtable.h
arch/arm/include/asm/tlb.h
arch/arm/kernel/head.S
arch/arm/kernel/sleep.S
arch/arm/mm/dma-mapping.c
arch/arm/mm/mmu.c

13 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Wed, 14 Sep 2011 01:00:01 +0000 (11:00 +1000)]
Merge remote-tracking branch 'arm/for-next'

13 years agoMerge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Wed, 14 Sep 2011 00:58:34 +0000 (10:58 +1000)]
Merge remote-tracking branch 'input-current/for-linus'

13 years agoMerge remote-tracking branch 'wireless-current/master'
Stephen Rothwell [Wed, 14 Sep 2011 00:58:31 +0000 (10:58 +1000)]
Merge remote-tracking branch 'wireless-current/master'

13 years agoMerge remote-tracking branch 'pci-current/for-linus'
Stephen Rothwell [Wed, 14 Sep 2011 00:58:30 +0000 (10:58 +1000)]
Merge remote-tracking branch 'pci-current/for-linus'

13 years agoMerge remote-tracking branch 'net-current/master'
Stephen Rothwell [Wed, 14 Sep 2011 00:58:29 +0000 (10:58 +1000)]
Merge remote-tracking branch 'net-current/master'

13 years agoMerge remote-tracking branch 'scsi-rc-fixes/master'
Stephen Rothwell [Wed, 14 Sep 2011 00:58:28 +0000 (10:58 +1000)]
Merge remote-tracking branch 'scsi-rc-fixes/master'

13 years agoAdd extra arch overrides to asm-generic/checksum.h
Richard Kuo [Wed, 14 Sep 2011 00:50:37 +0000 (10:50 +1000)]
Add extra arch overrides to asm-generic/checksum.h

There are plausible reasons for architectures to provide their own
versions of csum_partial_copy_nocheck and csum_tcpudp_magic.
By protecting these, the architecture can still re-use the
asm-generic checksum.h, instead of copying it.

Signed-off-by: Linas Vepstas <linas@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
13 years agoHexagon: Add self to MAINTAINERS
Richard Kuo [Wed, 14 Sep 2011 00:50:37 +0000 (10:50 +1000)]
Hexagon: Add self to MAINTAINERS

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
13 years agoHexagon: Add basic stacktrace functionality for Hexagon architecture.
Richard Kuo [Wed, 14 Sep 2011 00:50:37 +0000 (10:50 +1000)]
Hexagon: Add basic stacktrace functionality for Hexagon architecture.

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
13 years agoHexagon: Add configuration and makefiles for the Hexagon architecture.
Richard Kuo [Wed, 14 Sep 2011 00:50:36 +0000 (10:50 +1000)]
Hexagon: Add configuration and makefiles for the Hexagon architecture.

Removed CONFIG_ARCH_HAS_KMAP

Signed-off-by: Linas Vepstas <linas@codeaurora.org>
Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
13 years agoHexagon: Comet platform support
Richard Kuo [Wed, 14 Sep 2011 00:50:36 +0000 (10:50 +1000)]
Hexagon: Comet platform support

Used the shortened version of the config; other platform stuff moved out until
it's ready.

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
13 years agoHexagon: kgdb support files
Richard Kuo [Wed, 14 Sep 2011 00:50:36 +0000 (10:50 +1000)]
Hexagon: kgdb support files

Signed-off-by: Linas Vepstas <linas@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
13 years agoHexagon: Add page-fault support.
Richard Kuo [Wed, 14 Sep 2011 00:50:36 +0000 (10:50 +1000)]
Hexagon: Add page-fault support.

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Signed-off-by: Linas Vepstas <linas@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
13 years agoHexagon: Add page table header files & etc.
Richard Kuo [Wed, 14 Sep 2011 00:50:35 +0000 (10:50 +1000)]
Hexagon: Add page table header files & etc.

Removed highmem more highmem stuff.

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Signed-off-by: Linas Vepstas <linas@codeaurora.org>
13 years agoHexagon: Add ioremap support
Richard Kuo [Wed, 14 Sep 2011 00:50:35 +0000 (10:50 +1000)]
Hexagon: Add ioremap support

Removed redundant flush_cache_vmap.

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
13 years agoHexagon: Provide DMA implementation
Richard Kuo [Wed, 14 Sep 2011 00:50:35 +0000 (10:50 +1000)]
Hexagon: Provide DMA implementation

Basic DMA implementation for our architecture.

Added sync_single_for_* routines; hexagon_map_page() still seems to be a
convenient place to flush/invalidate.

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Signed-off-by: Linas Vepstas <linas@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
13 years agoHexagon: Implement basic TLB management routines for Hexagon.
Richard Kuo [Wed, 14 Sep 2011 00:50:34 +0000 (10:50 +1000)]
Hexagon: Implement basic TLB management routines for Hexagon.

Mostly all stubs, as the TLB is managed by the hypervisor.

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
13 years agoHexagon: Implement basic cache-flush support
Richard Kuo [Wed, 14 Sep 2011 00:50:34 +0000 (10:50 +1000)]
Hexagon: Implement basic cache-flush support

We have separate I/D caches.  Data caches are physically indexed.

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
13 years agoHexagon: Provide basic implementation and/or stubs for I/O routines.
Richard Kuo [Wed, 14 Sep 2011 00:50:34 +0000 (10:50 +1000)]
Hexagon: Provide basic implementation and/or stubs for I/O routines.

Filled in the ins/outs; leaving them in for now.

Change _IO_BASE and IO_SPACE_LIMIT for safety.

I have compiled this with sparse and it builds; I've also picked over
various files related to the HAS_IOPORT_MAP from arm-soc.git and
tried them out, and they work, so I guess we'll just wait until
they're merged.

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Signed-off-by: Linas Vepstas <linas@codeaurora.org>
13 years agoHexagon: Add user access functions
Richard Kuo [Wed, 14 Sep 2011 00:50:34 +0000 (10:50 +1000)]
Hexagon: Add user access functions

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
13 years agoHexagon: Add locking types and functions
Richard Kuo [Wed, 14 Sep 2011 00:50:33 +0000 (10:50 +1000)]
Hexagon: Add locking types and functions

Moved rwsem to asm-generic.  Will submit a subsequent patch for PPC
use it from the new location.

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
13 years agoHexagon: Add SMP support
Richard Kuo [Wed, 14 Sep 2011 00:50:33 +0000 (10:50 +1000)]
Hexagon: Add SMP support

Changed smp.c to use generic IPI handler functions.

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Signed-off-by: Linas Vepstas <linas@codeaurora.org>
13 years agoHexagon: Provide basic debugging and system trap support.
Richard Kuo [Wed, 14 Sep 2011 00:50:33 +0000 (10:50 +1000)]
Hexagon: Provide basic debugging and system trap support.

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Signed-off-by: Linas Vepstas <linas@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
13 years agoHexagon: Add ptrace support
Richard Kuo [Wed, 14 Sep 2011 00:50:32 +0000 (10:50 +1000)]
Hexagon: Add ptrace support

Will look at the more generic ptrace support in the future.

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Signed-off-by: Linas Vepstas <linas@codeaurora.org>
13 years agoHexagon: Add time and timer functions
Richard Kuo [Wed, 14 Sep 2011 00:50:31 +0000 (10:50 +1000)]
Hexagon: Add time and timer functions

Cleaned up iomem and register declarations, unnecessary
SMP ifdefs, cpu_relax() in udelay.

Platform stuff is in development; platform defines will be cleaned up.

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
13 years agoHexagon: Add interrupts
Richard Kuo [Wed, 14 Sep 2011 00:50:30 +0000 (10:50 +1000)]
Hexagon: Add interrupts

Removed init_IRQ wrapper and fixed up some comments.

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
13 years agoHexagon: Add startup code
Richard Kuo [Wed, 14 Sep 2011 00:50:29 +0000 (10:50 +1000)]
Hexagon: Add startup code

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
13 years agoHexagon: Add init_task and process functions
Richard Kuo [Wed, 14 Sep 2011 00:50:29 +0000 (10:50 +1000)]
Hexagon: Add init_task and process functions

Fixed potential race-to-sleep condition in cpu_idle() and calling schedule
with irq's disabled.  I still have to have that extra enable/disbale in the
while() loop else the interrupt never gets serviced, and thus need_resched()
will always be false.

If called with interrupts disabled, our __vmwait() actually just returns
without servicing it.

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
13 years agoHexagon: Add signal functions
Richard Kuo [Wed, 14 Sep 2011 00:50:29 +0000 (10:50 +1000)]
Hexagon: Add signal functions

Added vDSO support; signal trampoline is no longer on the stack
so it no longer needs to be executable.

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Signed-off-by: Linas Vepstas <linas@codeaurora.org>
13 years agoHexagon: Support dynamic module loading.
Richard Kuo [Wed, 14 Sep 2011 00:50:29 +0000 (10:50 +1000)]
Hexagon: Support dynamic module loading.

Modules should be compiled as ordinary .o's; shared objects are not
supported.

Deleted module functions that already have generic equivalents.

Signed-off-by: Linas Vepstas <linas@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
13 years agoHexagon: Export ksyms defined in assembly files.
Richard Kuo [Wed, 14 Sep 2011 00:50:28 +0000 (10:50 +1000)]
Hexagon: Export ksyms defined in assembly files.

Signed-off-by: Linas Vepstas <linas@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
13 years agoHexagon: Add hypervisor interface
Richard Kuo [Wed, 14 Sep 2011 00:50:28 +0000 (10:50 +1000)]
Hexagon: Add hypervisor interface

The port of Linux for Hexagon runs on top of a hypervisor layer,
which presents an interface for memory management, events, hardware
control, etc.

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
13 years agoHexagon: Add memcpy and memset accelerated functions
Richard Kuo [Wed, 14 Sep 2011 00:50:28 +0000 (10:50 +1000)]
Hexagon: Add memcpy and memset accelerated functions

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
13 years agoHexagon: Add checksum functions
Richard Kuo [Wed, 14 Sep 2011 00:50:28 +0000 (10:50 +1000)]
Hexagon: Add checksum functions

Removed most non-assembly functions and use the generic ones instead.

Made a few more minor changes to use the generic header file.

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Signed-off-by: Linas Vepstas <linas@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
13 years agoHexagon: Add delay functions
Richard Kuo [Wed, 14 Sep 2011 00:50:27 +0000 (10:50 +1000)]
Hexagon: Add delay functions

Added read_current_timer elsewhere.

udelay is based off of __vmgettime() which returns processor ticks.

Removed __delay and CONFIG_GENERIC_CALIBRATE_DELAY.

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
13 years agoHexagon: Add threadinfo
Richard Kuo [Wed, 14 Sep 2011 00:50:27 +0000 (10:50 +1000)]
Hexagon: Add threadinfo

Removed some cruft and changed to allow kernel stack to be smaller than a page
size.

I left the thread_info alignment alone for the time being; may revisit that in
the future.

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
13 years agoHexagon: Add processor and system headers
Richard Kuo [Wed, 14 Sep 2011 00:50:27 +0000 (10:50 +1000)]
Hexagon: Add processor and system headers

Adds Hexagon information for processor/system type stuff
like context switching, register access, and irqflags.

Changed cpu_relax() to call __vmyield().

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Signed-off-by: Linas Vepstas <linas@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
13 years agoHexagon: Add syscalls
Richard Kuo [Wed, 14 Sep 2011 00:50:27 +0000 (10:50 +1000)]
Hexagon: Add syscalls

Removed sys_mmap* and replaced with sys_mmap_pgoff()

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
13 years agoHexagon: Add atomic ops support
Richard Kuo [Wed, 14 Sep 2011 00:50:26 +0000 (10:50 +1000)]
Hexagon: Add atomic ops support

Our architecture uses load locked/store conditional type semantics for atomic
ops.

Added inline assembly version of atomic_add_unless.

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
13 years agoHexagon: Add bitops support
Richard Kuo [Wed, 14 Sep 2011 00:50:26 +0000 (10:50 +1000)]
Hexagon: Add bitops support

Merged sub-files into bitops.h; fixed return types and volatiles.

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
13 years agoHexagon: Core arch-specific header files
Richard Kuo [Wed, 14 Sep 2011 00:50:26 +0000 (10:50 +1000)]
Hexagon: Core arch-specific header files

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Signed-off-by: Linas Vepstas <linas@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
13 years agoHexagon: Add generic headers
Richard Kuo [Wed, 14 Sep 2011 00:50:25 +0000 (10:50 +1000)]
Hexagon: Add generic headers

Reworked to use the Kbuild generic headers mechanism.

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
13 years agolib/sha1.c: quiet sparse noise about symbol not declared
H Hartley Sweeten [Fri, 9 Sep 2011 18:30:27 +0000 (11:30 -0700)]
lib/sha1.c: quiet sparse noise about symbol not declared

Include <linux/cryptohash.h> to pickup the declarations for sha_transform
and sha_init to quite the sparse noise:

  warning: symbol 'sha_transform' was not declared. Should it be static?
  warning: symbol 'sha_init' was not declared. Should it be static?

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: Mandeep Singh Baines <msb@chromium.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
13 years agopci: Don't crash when reading mpss from root complex
Benjamin Herrenschmidt [Tue, 13 Sep 2011 18:16:33 +0000 (15:16 -0300)]
pci: Don't crash when reading mpss from root complex

In pcie_find_smpss(), we have the following statement:

  if (dev->is_hotplug_bridge && (!list_is_singular(&dev->bus->devices) ||
    dev->bus->self->pcie_type != PCI_EXP_TYPE_ROOT_PORT))

The problem is that at least on my machine, this gets called for the
root complex (virtual P2P bridge), and dev->bus->self is NULL since
the parent bus for this is not itself anchor to a PCI device.

This adds the necessary NULL check.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Jon Mason <mason@myri.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
13 years agonfs: Do not allow multiple mounts on same mountpoint when using -o noac
Sachin Prabhu [Mon, 1 Aug 2011 11:10:12 +0000 (12:10 +0100)]
nfs: Do not allow multiple mounts on same mountpoint when using -o noac

Do not allow multiple mounts on same mountpoint when using -o noac

When you normally attempt to mount a share twice on the same mountpoint,
a check in do_add_mount causes it to return an error

# mount localhost:/nfsv3 /mnt
# mount localhost:/nfsv3 /mnt
mount.nfs: /mnt is already mounted or busy

However when using the option 'noac', the user is able to mount the same
share on the same mountpoint multiple times. This happens because a
share mounted with the noac option is automatically assigned the 'sync'
flag MS_SYNCHRONOUS in nfs_initialise_sb(). This flag is set after the
check for already existing superblocks is done in sget(). The check for
the mount flags in nfs_compare_mount_options() does not take into
account the 'sync' flag applied later on in the code path. This means
that when using 'noac', a new superblock structure is assigned for every
new mount of the same share and multiple shares on the same mountpoint
are allowed.

ie.
# mount -onoac localhost:/nfsv3 /mnt
can be run multiple times.

The patch checks for noac and assigns the sync flag before sget() is
called to obtain an already existing superblock structure.

Signed-off-by: Sachin Prabhu <sprabhu@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
13 years agoNFS: Fix a typo in nfs_flush_multi
Trond Myklebust [Mon, 12 Sep 2011 15:47:53 +0000 (11:47 -0400)]
NFS: Fix a typo in nfs_flush_multi

Fix a typo which causes an Oops in the RPC layer, when using wsize < 4k.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Tested-by: Sricharan R <r.sricharan@ti.com>
13 years agoiwlagn: fix command queue timeout
Johannes Berg [Mon, 12 Sep 2011 19:09:10 +0000 (12:09 -0700)]
iwlagn: fix command queue timeout

If the command queue is constantly busy,
which can happen in P2P, the hangcheck
timer will frequently find a command in
it and will eventually reset the device
because nothing sets the timestamp for
this queue when commands are processed.

Fix this by setting the timestamp when
a command completes.

Cc: stable@kernel.org #2.6.39, #3.0.0 #3.1.0
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
SIgned-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agoiwlagn: fix stack corruption
Johannes Berg [Mon, 12 Sep 2011 19:08:25 +0000 (21:08 +0200)]
iwlagn: fix stack corruption

Alexander reported a strange crash in iwlagn that
Meenakshi and Wey couldn't reproduce. I just ran
into the same issue and tracked it down to stack
corruption. This fixes it.

The problem was introduced in
commit 4b8b99b6e650d0527f3a123744b7459976581d14
Author: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Date:   Fri Jul 8 14:29:48 2011 -0700

    iwlagn: radio sensor offset in le16 format

Cc: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Cc: Meenakshi Venkataraman <meenakshi.venkataraman@intel.com>
Reported-by: Alexander Diewald <alex@diewald.cc>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agoath9k: Fix kernel panic on unplugging the device
Mohammed Shafi Shajakhan [Fri, 9 Sep 2011 05:11:08 +0000 (10:41 +0530)]
ath9k: Fix kernel panic on unplugging the device

when the device is yanked out ath_pci_remove starts doing the cleanups,
unregistering the hardware etc. so we should bail out immediately when
we get drv_flush callback from mac80211 when the card is being unplugged.
the panic occurs after we had associated to an AP.

EIP: 0060:[<fb315b00>] EFLAGS: 00010246 CPU: 0
EIP is at ath_reset+0xa0/0x1c0 [ath9k]
EAX: 00000000 EBX: 000697c0 ECX: 00000002 EDX: f3c3ccf0
ESI: 00000000 EDI: 00000000 EBP: f43e7b78 ESP: f43e7b50
  DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068
  Process kworker/u:2 (pid: 182, ti=f43e6000 task=f3c3c7c0
task.ti=f43e6000)
  Stack:
  0000002a 00000000 00000000 003e7b78 0000000f eaaa8500
ffffffea eaaa97c0
  eaaaa000 00000001 f43e7ba8 fb315d23 f99e7721 ecece680
eaaac738 eaaa8500
  eaaaa020 000000c8 000000c8 00000000 eaaa8d58 eaaa8500
f43e7bd0 fb080b29
  Call Trace:
[<fb315d23>] ath9k_flush+0x103/0x170 [ath9k]
[<fb080b29>] __ieee80211_recalc_idle+0x2c9/0x400
[mac80211]
[<fb080c8e>] ieee80211_recalc_idle+0x2e/0x60 [mac80211]
[<fb07aa73>] ieee80211_mgd_deauth+0x173/0x210 [mac80211]
[<fb084559>] ieee80211_deauth+0x19/0x20 [mac80211]
[<f99dda53>] __cfg80211_mlme_deauth+0xf3/0x140
[cfg80211]
[<c0633d00>] ? __mutex_lock_common+0x1f0/0x380
[<f99e1b5d>] __cfg80211_disconnect+0x18d/0x1f0
[cfg80211]
[<f99c8199>] cfg80211_netdev_notifier_call+0x159/0x5c0
[cfg80211]
[<c0608a64>] ? packet_notifier+0x174/0x1f0
[<c0639202>] notifier_call_chain+0x82/0xb0
[<c0170d8f>] raw_notifier_call_chain+0x1f/0x30
[<c053b86c>] call_netdevice_notifiers+0x2c/0x60
[<c0182184>] ? trace_hardirqs_on_caller+0xf4/0x180
[<c053b8ec>] __dev_close_many+0x4c/0xd0
[<c053ba2d>] dev_close_many+0x6d/0xc0
[<c053bb53>] rollback_registered_many+0x93/0x1c0
[<c018221b>] ? trace_hardirqs_on+0xb/0x10
[<c053bc95>] unregister_netdevice_many+0x15/0x50
[<fb07f83b>] ieee80211_remove_interfaces+0x7b/0xb0
[mac80211]
[<fb06a14b>] ieee80211_unregister_hw+0x4b/0x110
[mac80211]
[<fb311a4a>] ath9k_deinit_device+0x3a/0x60 [ath9k]
[<fb31eed6>] ath_pci_remove+0x46/0x90 [ath9k]
[<c03b4ac4>] pci_device_remove+0x44/0x100
[<c043eb54>] __device_release_driver+0x64/0xb0
[<c043ec67>] device_release_driver+0x27/0x40
[<c043deeb>] bus_remove_device+0x7b/0xa0
[<c043c491>] device_del+0xf1/0x180
[<c043c530>] device_unregister+0x10/0x20
[<c03afafe>] pci_stop_bus_device+0x6e/0x80
[<c03afb72>] pci_remove_bus_device+0x12/0xa0
[<c03c2f29>] pciehp_unconfigure_device+0x89/0x180
[<c0181e54>] ? mark_held_locks+0x64/0x100
[<c063390f>] ? __mutex_unlock_slowpath+0xaf/0x140
[<c03c1f84>] pciehp_disable_slot+0x64/0x1b0
[<c03c2850>] pciehp_power_thread+0xd0/0x100
[<c0164ad0>] ? process_one_work+0x100/0x4d0
[<c0164b4c>] process_one_work+0x17c/0x4d0
[<c0164ad0>] ? process_one_work+0x100/0x4d0
[<c03c2780>] ? queue_interrupt_event+0xa0/0xa0
[<c01662bb>] worker_thread+0x13b/0x320
[<c018221b>] ? trace_hardirqs_on+0xb/0x10
[<c0166180>] ? manage_workers+0x1e0/0x1e0
[<c016a654>] kthread+0x84/0x90
[<c016a5d0>] ? __init_kthread_worker+0x60/0x60
[<c063d106>] kernel_thread_helper+0x6/0x10

Cc: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
Signed-off-by: Mohammed Shafi Shajakhan <mohammed@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agomac80211: fix missing sta_lock in __sta_info_destroy
Johannes Berg [Tue, 6 Sep 2011 10:47:39 +0000 (12:47 +0200)]
mac80211: fix missing sta_lock in __sta_info_destroy

Since my commit 34e895075e21be3e21e71d6317440d1ee7969ad0
("mac80211: allow station add/remove to sleep") there is
a race in mac80211 when it clears the TIM bit because a
sleeping station disconnected, the spinlock isn't held
around the relevant code any more. Use the right API to
acquire the spinlock correctly.

Cc: stable@kernel.org [2.6.34+]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agortlwifi: Fix problem when switching connections
George [Sat, 3 Sep 2011 15:58:48 +0000 (10:58 -0500)]
rtlwifi: Fix problem when switching connections

The driver fails to clear encryption keys making it impossible
to switch connections.

Signed-off-by: George <george0505@realtek.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Stable <stable@kernel.org> [2.6.39+]
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agortlwifi: rtl8192su: Fix problem connecting to HT-enabled AP
George [Sat, 3 Sep 2011 15:58:47 +0000 (10:58 -0500)]
rtlwifi: rtl8192su: Fix problem connecting to HT-enabled AP

The driver fails to connect to 802.11n-enabled APs. The patch fixes
Bug #42262.

Signed-off-by: George <george0505@realtek.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Stable <stable@kernel.org> [2.6.39+]
Signed-off-by: John W. Linville <linville@tuxdriver.com>
13 years agoMerge branches 'imx-cleanup', 'imx-fixes' and 'imx-features' into master
Uwe Kleine-König [Tue, 13 Sep 2011 09:36:42 +0000 (11:36 +0200)]
Merge branches 'imx-cleanup', 'imx-fixes' and 'imx-features' into master

Conflicts:
arch/arm/mach-imx/Makefile
arch/arm/mach-mx5/Kconfig

13 years agoMerge branch 'cleanups/mm-tzic' into imx-cleanup
Uwe Kleine-König [Tue, 13 Sep 2011 09:22:15 +0000 (11:22 +0200)]
Merge branch 'cleanups/mm-tzic' into imx-cleanup

Conflicts:
arch/arm/mach-mx5/Makefile

13 years agoarm: mx28: check for gated clocks when setting saif divider
Wolfram Sang [Sat, 10 Sep 2011 10:29:43 +0000 (12:29 +0200)]
arm: mx28: check for gated clocks when setting saif divider

Like with all other clocks, the divider for the SAIF devices should not
be altered when the clock is gated. Bail out when this is the case like
the other clocks do.

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
13 years agoarm: mx28: fix bit operation in clock setting
Wolfram Sang [Sat, 10 Sep 2011 10:26:07 +0000 (12:26 +0200)]
arm: mx28: fix bit operation in clock setting

reg | (1 << clk->enable_shift) always evaluates to true. Switch it
to & which makes much more sense. Same fix as 13be9f00 (ARM i.MX28: fix
bit operation) at a different location.

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
13 years agoARM: mx5/mm: consolidate TZIC map code
Jason Liu [Fri, 9 Sep 2011 09:17:49 +0000 (17:17 +0800)]
ARM: mx5/mm: consolidate TZIC map code

Use a static mapping for TZIC to get rid of the duplicated code for
ioremap and the corresponding error handling. This is already done on
i.MX50.

This patch also removes TZIC mapping for i.mx51 TO1 since
there is no support for TO1 now since the following commit:
9ab4650 (ARM: imx: Get the silicon version from the IIM module)

Signed-off-by: Jason Liu <jason.hui@linaro.org>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
13 years agoARM: mx5/mm: Remove MX51_DEBUG related mapping
Jason Liu [Fri, 9 Sep 2011 09:17:48 +0000 (17:17 +0800)]
ARM: mx5/mm: Remove MX51_DEBUG related mapping

MX51_DEBUG related mapping is dead code, no-one uses it

Signed-off-by: Jason Liu <jason.hui@linaro.org>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
13 years agoARM: mx5/mm: move i.MX50 mm stuff into mm.c
Jason Liu [Fri, 9 Sep 2011 09:17:47 +0000 (17:17 +0800)]
ARM: mx5/mm: move i.MX50 mm stuff into mm.c

i.MX50 is similar enough to i.MX51/53 to handle it in a single file.
No functional change.

Signed-off-by: Jason Liu <jason.hui@linaro.org>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
13 years ago[S390] defconfig: switch on CONFIG_DEVTMPFS
Hendrik Brueckner [Tue, 13 Sep 2011 07:49:40 +0000 (09:49 +0200)]
[S390] defconfig: switch on CONFIG_DEVTMPFS

Switching on the DEVTMPFS kernel option helpes to maintain a /dev
file system early in the boot process, especially, in limited
environments.

Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
13 years ago[S390] lowcore cleanup
Martin Schwidefsky [Tue, 13 Sep 2011 07:49:39 +0000 (09:49 +0200)]
[S390] lowcore cleanup

Remove the save_area_64 field from the 0xe00 - 0xf00 area in the lowcore.
Use a free slot in the save_area array instead.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
13 years ago[S390] s390: kdump backend code
Michael Holzheu [Tue, 13 Sep 2011 07:49:38 +0000 (09:49 +0200)]
[S390] s390: kdump backend code

This patch provides the architecture specific part of the s390 kdump
support.

Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
13 years ago[S390] s390: Add real memory access functions
Michael Holzheu [Tue, 13 Sep 2011 07:49:37 +0000 (09:49 +0200)]
[S390] s390: Add real memory access functions

Add access function for real memory needed by s390 kdump backend.

Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
13 years ago[S390] Force PSW restart on online CPU
Martin Schwidefsky [Tue, 13 Sep 2011 07:49:36 +0000 (09:49 +0200)]
[S390] Force PSW restart on online CPU

Reference ID: RAS1101
From: Michael Holzheu <holzheu@linux.vnet.ibm.com>

PSW restart can be triggered on offline CPUs. If this happens, currently
the PSW restart code fails, because functions like smp_processor_id()
do not work on offline CPUs. This patch fixes this as follows:

If PSW restart is triggered on an offline CPU, the PSW restart (sigp restart)
is done a second time on another CPU that is online and the old CPU is
stopped afterwards.

Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
13 years ago[S390] kdump: Add size to elfcorehdr kernel parameter
Michael Holzheu [Tue, 13 Sep 2011 07:49:35 +0000 (09:49 +0200)]
[S390] kdump: Add size to elfcorehdr kernel parameter

Currently only the address of the pre-allocated ELF header is passed with
the elfcorehdr= kernel parameter. In order to reserve memory for the header
in the 2nd kernel also the size is required. Current kdump architecture
backends use different methods to do that, e.g. x86 uses the memmap= kernel
parameter. On s390 there is no easy way to transfer this information.
Therefore the elfcorehdr kernel parameter is extended to also pass the size.
This now can also be used as standard mechanism by all future kdump
architecture backends.

The syntax of the kernel parameter is extended as follows:

elfcorehdr=[size[KMG]@]offset[KMG]

This change is backward compatible because elfcorehdr=size is still allowed.

Acked-by: Vivek Goyal <vgoyal@redhat.com>
Acked-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
13 years ago[S390] kdump: Add KEXEC_CRASH_CONTROL_MEMORY_LIMIT
Michael Holzheu [Tue, 13 Sep 2011 07:49:34 +0000 (09:49 +0200)]
[S390] kdump: Add KEXEC_CRASH_CONTROL_MEMORY_LIMIT

On s390 there is a different KEXEC_CONTROL_MEMORY_LIMIT for the normal and
the kdump kexec case. Therefore this patch introduces a new macro
KEXEC_CRASH_CONTROL_MEMORY_LIMIT. This is set to
KEXEC_CONTROL_MEMORY_LIMIT for all architectures that do not define
KEXEC_CRASH_CONTROL_MEMORY_LIMIT.

Acked-by: Vivek Goyal <vgoyal@redhat.com>
Acked-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>