linux-toradex.git/arch/xtensa, branch v3.10.2

Merge tag 'xtensa-next-20130508' of git://github.com/czankel/xtensa-linux

2013-05-09T21:38:16+00:00

Pull xtensa updates from Chris Zankel:
 "Support for the latest MMU architecture that allows for a larger
  accessible memory region, and various bug-fixes"

* tag 'xtensa-next-20130508' of git://github.com/czankel/xtensa-linux:
  xtensa: Switch to asm-generic/linkage.h
  xtensa: fix redboot load address
  xtensa: ISS: fix timer_lock usage in rs_open
  xtensa: disable IRQs while IRQ handler is running
  xtensa: enable lockdep support
  xtensa: fix arch_irqs_disabled_flags implementation
  xtensa: add irq flags trace support
  xtensa: provide custom CALLER_ADDR* implementations
  xtensa: add stacktrace support
  xtensa: clean up stpill_registers
  xtensa: don't use a7 in simcalls
  xtensa: don't attempt to use unconfigured timers
  xtensa: provide default platform_pcibios_init implementation
  xtensa: remove KCORE_ELF again
  xtensa: document MMUv3 setup sequence
  xtensa: add MMU v3 support
  xtensa: fix ibreakenable register update
  xtensa: fix oprofile building as module

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2013-05-09T20:44:35+00:00

Pull more vfs fixes from Al Viro:
 "Regression fix from Geert + yet another open-coded kernel_read()"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  ecryptfs: don't open-code kernel_read()
  xtensa simdisk: Fix proc_create_data() conversion fallout

xtensa simdisk: Fix proc_create_data() conversion fallout

2013-05-09T17:20:20+00:00

arch/xtensa/platforms/iss/simdisk.c: In function 'proc_read_simdisk':
arch/xtensa/platforms/iss/simdisk.c:220:12: warning: initialization discards 'const' qualifier from pointer target type [enabled by default]
arch/xtensa/platforms/iss/simdisk.c: In function 'proc_write_simdisk':
arch/xtensa/platforms/iss/simdisk.c:241:38: error: 'buffer' undeclared (first use in this function)
arch/xtensa/platforms/iss/simdisk.c:241:38: note: each undeclared identifier is reported only once for each function it appears in

Introduced by commit a69755b187749e7cc020e17127a54f395aea4eaa ("xtensa
simdisk: switch to proc_create_data()")

Signed-off-by: Geert Uytterhoeven 
Signed-off-by: Al Viro

Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux

2013-05-09T16:59:16+00:00

Pull removal of GENERIC_GPIO from Grant Likely:
 "GENERIC_GPIO now synonymous with GPIOLIB.  There are no longer any
  valid cases for enableing GENERIC_GPIO without GPIOLIB, even though it
  is possible to do so which has been causing confusion and breakage.
  This branch does the work to completely eliminate GENERIC_GPIO."

* tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux:
  gpio: update gpio Chinese documentation
  Remove GENERIC_GPIO config option
  Convert selectors of GENERIC_GPIO to GPIOLIB
  blackfin: force use of gpiolib
  m68k: coldfire: use gpiolib
  mips: pnx833x: remove requirement for GENERIC_GPIO
  openrisc: default GENERIC_GPIO to false
  avr32: default GENERIC_GPIO to false
  xtensa: remove explicit selection of GENERIC_GPIO
  sh: replace CONFIG_GENERIC_GPIO by CONFIG_GPIOLIB
  powerpc: remove redundant GENERIC_GPIO selection
  unicore32: default GENERIC_GPIO to false
  unicore32: remove unneeded select GENERIC_GPIO
  arm: plat-orion: use GPIO driver on CONFIG_GPIOLIB
  arm: remove redundant GENERIC_GPIO selection
  mips: alchemy: require gpiolib
  mips: txx9: change GENERIC_GPIO to GPIOLIB
  mips: loongson: use GPIO driver on CONFIG_GPIOLIB
  mips: remove redundant GENERIC_GPIO select

xtensa: Switch to asm-generic/linkage.h

2013-05-09T08:07:12+00:00

Signed-off-by: Geert Uytterhoeven

xtensa: fix redboot load address

2013-05-09T08:07:12+00:00

With the patch to support MMUv3, the base address for the loaded
binary image has changed, and a fix was applied to the U-Boot image.
This fixes the RedBoot image.

Signed-off-by: Chris Zankel

xtensa: ISS: fix timer_lock usage in rs_open

2013-05-09T08:07:11+00:00

This fixes the following lockdep splat:

[   66.460000] =================================
[   66.460000] [ INFO: inconsistent lock state ]
[   66.460000] 3.9.0-rc5-00161-ga48dd49 #4 Not tainted
[   66.460000] ---------------------------------
[   66.460000] inconsistent {SOFTIRQ-ON-W} -> {IN-SOFTIRQ-W} usage.
[   66.460000] swapper/1 [HC0[0]:SC1[1]:HE1:SE0] takes:
[   66.460000]  (timer_lock){+.?...}, at: [] rs_poll+0x12/0xdc
[   66.460000] {SOFTIRQ-ON-W} state was registered at:
[   66.460000]   [] lock_acquire+0xec/0x13c
[   66.460000]   [] _raw_spin_lock+0x3a/0x84
[   66.460000]   [] rs_open+0x18/0x58
[   66.460000]   [] tty_open+0x262/0x3cc
[   66.460000]   [] chrdev_open+0x8c/0xe0
[   66.460000]   [] do_dentry_open$isra$16+0x10e/0x190
[   66.460000]   [] finish_open+0x39/0x48
[   66.460000]   [] do_last$isra$34+0x6c4/0x824
[   66.460000]   [] path_openat+0x66/0x310
[   66.460000]   [] do_filp_open+0x16/0x44
[   66.460000]   [] do_sys_open+0xd5/0x13c
[   66.460000]   [] sys_open+0x12/0x18
[   66.460000]   [] kernel_init_freeable+0xe4/0x12c
[   66.460000]   [] kernel_init+0xc/0x9c
[   66.460000]   [] ret_from_kernel_thread+0x8/0xc
[   66.460000] irq event stamp: 132542
[   66.460000] hardirqs last  enabled at (132542): [] _raw_spin_unlock_irq+0x30/0x44
[   66.460000] hardirqs last disabled at (132541): [] _raw_spin_lock_irq+0xe/0x8c
[   66.460000] softirqs last  enabled at (132234): [] __do_softirq+0x216/0x2a4
[   66.460000] softirqs last disabled at (132539): [] irq_exit+0x38/0x40
[   66.460000]
[   66.460000] other info that might help us debug this:
[   66.460000]  Possible unsafe locking scenario:
[   66.460000]
[   66.460000]        CPU0
[   66.460000]        ----
[   66.460000]   lock(timer_lock);
[   66.460000]   
[   66.460000]     lock(timer_lock);
[   66.460000]
[   66.460000]  *** DEADLOCK ***
[   66.460000]
[   66.460000] 1 lock held by swapper/1:
[   66.460000]  #0:  (((&serial_timer))){+.-...}, at: [] call_timer_fn+0x0/0x1f0
[   66.460000]
Stack: d7c2fac0 00000018 00000004 00000001 d7c2faa0 00000004 00000006 d7c2fa90
       9003e87c d7c2fae0 d7c30000 d025a87c 00000001 0000000f 00000000 d7c2fac0
       9004005d d7c2fb10 d7c30000 d7c30338 00000001 00000001 00000000 d7c30338
[   66.460000] Call Trace:
[   66.460000]  [] print_usage_bug$part$26+0x1c3/0x1c8
[   66.460000]  [] mark_lock+0x2b4/0x440
[   66.460000]  [] __lock_acquire+0x54d/0x16c4
[   66.460000]  [] lock_acquire+0xec/0x13c
[   66.460000]  [] _raw_spin_lock+0x3a/0x84
[   66.460000]  [] rs_poll+0x12/0xdc
[   66.460000]  [] call_timer_fn+0xbe/0x1f0
[   66.460000]  [] run_timer_softirq+0x198/0x1f4
[   66.460000]  [] __do_softirq+0x114/0x2a4
[   66.460000]  [] irq_exit+0x38/0x40
[   66.460000]  [] do_IRQ+0x44/0x48
[   66.460000]  [] do_interrupt+0x4c/0x54
[   66.460000]  [] common_exception_return+0x0/0x5c
[   66.460000]  [] free_pcppages_bulk+0x254/0x308
[   66.460000]

Signed-off-by: Max Filippov 
Signed-off-by: Chris Zankel

xtensa: disable IRQs while IRQ handler is running

2013-05-09T08:07:11+00:00

IRQ handlers are expected to run with IRQs disabled.
See e.g. http://lwn.net/Articles/380931/ for a longer story.

This was overlooked in the commit
  2d1c645 xtensa: dispatch medium-priority interrupts
Revert to old behavior and simplify interrupt entry and exit code.
Interrupt handler still honours IRQ priority.

do_notify_resume/schedule must be called with interrupts enabled, enable
interrupts if we return from user exception.

Signed-off-by: Max Filippov 
Signed-off-by: Chris Zankel

xtensa: enable lockdep support

2013-05-09T08:07:11+00:00

Signed-off-by: Max Filippov 
Signed-off-by: Chris Zankel

xtensa: fix arch_irqs_disabled_flags implementation

2013-05-09T08:07:11+00:00

IRQs are disabled when PS.EXCM is set or PS.INTLEVEL is equal to or
higher than LOCKLEVEL.

Signed-off-by: Max Filippov 
Signed-off-by: Chris Zankel