git.karo-electronics.de Git - karo-tx-linux.git/log

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

commit | commitdiff | tree

Stephen Rothwell [Tue, 13 Sep 2011 01:37:21 +0000 (11:37 +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

commit | commitdiff | tree

Stephen Rothwell [Tue, 13 Sep 2011 01:36:02 +0000 (11:36 +1000)]

Merge remote-tracking branch 'arm/for-next'

commit | commitdiff | tree

Stephen Rothwell [Tue, 13 Sep 2011 01:34:36 +0000 (11:34 +1000)]

Merge remote-tracking branch 'input-current/for-linus'

commit | commitdiff | tree

Stephen Rothwell [Tue, 13 Sep 2011 01:34:33 +0000 (11:34 +1000)]

Merge remote-tracking branch 'wireless-current/master'

commit | commitdiff | tree

Stephen Rothwell [Tue, 13 Sep 2011 01:34:32 +0000 (11:34 +1000)]

Merge remote-tracking branch 'pci-current/for-linus'

commit | commitdiff | tree

Stephen Rothwell [Tue, 13 Sep 2011 01:34:31 +0000 (11:34 +1000)]

Merge remote-tracking branch 'net-current/master'

commit | commitdiff | tree

Stephen Rothwell [Tue, 13 Sep 2011 01:34:30 +0000 (11:34 +1000)]

Merge remote-tracking branch 'scsi-rc-fixes/master'

commit | commitdiff | tree

Richard Kuo [Tue, 13 Sep 2011 00:38:05 +0000 (10:38 +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>

commit | commitdiff | tree

Richard Kuo [Tue, 13 Sep 2011 00:38:05 +0000 (10:38 +1000)]

Hexagon: Add self to MAINTAINERS

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>

commit | commitdiff | tree

Richard Kuo [Tue, 13 Sep 2011 00:38:04 +0000 (10:38 +1000)]

Hexagon: Add basic stacktrace functionality for Hexagon architecture.

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>

commit | commitdiff | tree

Richard Kuo [Tue, 13 Sep 2011 00:38:04 +0000 (10:38 +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>

commit | commitdiff | tree

Richard Kuo [Tue, 13 Sep 2011 00:38:04 +0000 (10:38 +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>

commit | commitdiff | tree

Richard Kuo [Tue, 13 Sep 2011 00:38:03 +0000 (10:38 +1000)]

Hexagon: kgdb support files

Signed-off-by: Linas Vepstas <linas@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>

commit | commitdiff | tree

Richard Kuo [Tue, 13 Sep 2011 00:38:03 +0000 (10:38 +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>

commit | commitdiff | tree

Richard Kuo [Tue, 13 Sep 2011 00:38:03 +0000 (10:38 +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>

commit | commitdiff | tree

Richard Kuo [Tue, 13 Sep 2011 00:38:03 +0000 (10:38 +1000)]

Hexagon: Add ioremap support

Removed redundant flush_cache_vmap.

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>

commit | commitdiff | tree

Richard Kuo [Tue, 13 Sep 2011 00:38:02 +0000 (10:38 +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>

commit | commitdiff | tree

Richard Kuo [Tue, 13 Sep 2011 00:38:02 +0000 (10:38 +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>

commit | commitdiff | tree

Richard Kuo [Tue, 13 Sep 2011 00:38:02 +0000 (10:38 +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>

commit | commitdiff | tree

Richard Kuo [Tue, 13 Sep 2011 00:38:01 +0000 (10:38 +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>

commit | commitdiff | tree

Richard Kuo [Tue, 13 Sep 2011 00:38:01 +0000 (10:38 +1000)]

Hexagon: Add user access functions

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>

commit | commitdiff | tree

Richard Kuo [Tue, 13 Sep 2011 00:38:01 +0000 (10:38 +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>

commit | commitdiff | tree

Richard Kuo [Tue, 13 Sep 2011 00:38:00 +0000 (10:38 +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>

commit | commitdiff | tree

Richard Kuo [Tue, 13 Sep 2011 00:38:00 +0000 (10:38 +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>

commit | commitdiff | tree

Richard Kuo [Tue, 13 Sep 2011 00:38:00 +0000 (10:38 +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>

commit | commitdiff | tree

Richard Kuo [Tue, 13 Sep 2011 00:37:59 +0000 (10:37 +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>

commit | commitdiff | tree

Richard Kuo [Tue, 13 Sep 2011 00:37:59 +0000 (10:37 +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>

commit | commitdiff | tree

Richard Kuo [Tue, 13 Sep 2011 00:37:59 +0000 (10:37 +1000)]

Hexagon: Add startup code

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>

commit | commitdiff | tree

Richard Kuo [Tue, 13 Sep 2011 00:37:59 +0000 (10:37 +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>

commit | commitdiff | tree

Richard Kuo [Tue, 13 Sep 2011 00:37:58 +0000 (10:37 +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>

commit | commitdiff | tree

Richard Kuo [Tue, 13 Sep 2011 00:37:58 +0000 (10:37 +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>

commit | commitdiff | tree

Richard Kuo [Tue, 13 Sep 2011 00:37:58 +0000 (10:37 +1000)]

Hexagon: Export ksyms defined in assembly files.

Signed-off-by: Linas Vepstas <linas@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>

commit | commitdiff | tree

Richard Kuo [Tue, 13 Sep 2011 00:37:57 +0000 (10:37 +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>

commit | commitdiff | tree

Richard Kuo [Tue, 13 Sep 2011 00:37:57 +0000 (10:37 +1000)]

Hexagon: Add memcpy and memset accelerated functions

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>

commit | commitdiff | tree

Richard Kuo [Tue, 13 Sep 2011 00:37:57 +0000 (10:37 +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>

commit | commitdiff | tree

Richard Kuo [Tue, 13 Sep 2011 00:37:56 +0000 (10:37 +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>

commit | commitdiff | tree

Richard Kuo [Tue, 13 Sep 2011 00:37:56 +0000 (10:37 +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>

commit | commitdiff | tree

Richard Kuo [Tue, 13 Sep 2011 00:37:56 +0000 (10:37 +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>

Linux kernel for KaRo TX COM modules

RSS Atom