summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ARM: 7254/1: restart: S3C24XX: move SWRST based S3C platforms toHeiko Stuebner2012-01-0514-42/+27
| | | | | | | | | | | | | | S3C2412/S3C2416/S3C2443 use a special register to signal the reset to the processor and used therefore the s3c24xx_reset_hook mechanism in the s3c24xx-specific arch reset. This patch introduces restart functions for these architectures, moves the board files to them and removes the s3c24xx_reset_hook infrastructure, as all users are gone. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: restart: riscpc: use new restart hookRussell King2012-01-052-10/+12
| | | | | | Hook the RiscPC restart code into the new restart hook. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: restart: realview: use new restart hookRussell King2012-01-057-24/+15
| | | | | | | Hook these platforms restart code into the new restart hook rather than using arch_reset(). Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: restart: pxa: use new restart hookRussell King2012-01-0552-28/+95
| | | | | | | | Hook these platforms restart code into the new restart hook rather than using arch_reset(). Acked-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: restart: prima2: use new restart hookRussell King2012-01-054-8/+9
| | | | | | | | Hook these platforms restart code into the new restart hook rather than using arch_reset(). Reviewed-by: Barry Song <Baohua.Song@csr.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: restart: pnx4008: use new restart hookRussell King2012-01-052-5/+6
| | | | | | | Hook these platforms restart code into the new restart hook rather than using arch_reset(). Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: restart: orion5x: use new restart hookRussell King2012-01-0524-15/+41
| | | | | | | | | | | Hook these platforms restart code into the new restart hook rather than using arch_reset(). In addition, convert calls to arm_machine_restart() to orion5x_restart() to ensure that they continue to work as intended. Acked-by: Nicolas Pitre <nico@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: restart: omap: use new restart hookRussell King2012-01-0547-13/+59
| | | | | | | | Hook these platforms restart code into the new restart hook rather than using arch_reset(). Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: restart: nomadik: use new restart hookRussell King2012-01-054-9/+13
| | | | | | Hook the Nomadik NHK platform restart code into the new restart hook. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: restart: netx: use new restart hookRussell King2012-01-056-6/+9
| | | | | | | Hook these platforms restart code into the new restart hook rather than using arch_reset(). Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: restart: mxs: use new restart hookRussell King2012-01-058-2/+10
| | | | | | | | Hook these platforms restart code into the new restart hook rather than using arch_reset(). Acked-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: restart: mxc: use new restart hookRussell King2012-01-0546-11/+50
| | | | | | | | Hook these platforms restart code into the new restart hook rather than using arch_reset(). Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: restart: mv78xx0: use new restart hookRussell King2012-01-056-14/+20
| | | | | | | | Hook these platforms restart code into the new restart hook rather than using arch_reset(). Acked-by: Nicolas pitre <nico@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: restart: mmp: use new restart hookRussell King2012-01-0514-6/+22
| | | | | | | Hook the Shark restart code into the new restart hook rather than using arch_reset(). Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: restart: lpc32xx: use new restart hookRussell King2012-01-054-19/+24
| | | | | | | Hook these platforms restart code into the arm_pm_restart hook rather than using arch_reset(). Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: restart: ks8695: use new restart hookRussell King2012-01-056-17/+22
| | | | | | | Hook these platforms restart code into the new restart hook rather than using arch_reset(). Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: restart: kirkwood: use new restart hookRussell King2012-01-0517-15/+37
| | | | | | | | Hook these platforms restart code into the new restart hook rather than using arch_reset(). Acked-by: Nicolas Pitre <nico@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: restart: ixp4xx: use new restart hookRussell King2012-01-0516-21/+38
| | | | | | | | Hook these platforms restart code into the new restart hook rather than using arch_reset(). Acked-by: Krzysztof Hałasa <khc@pm.waw.pl> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: restart: ixp23xx: use new restart hookRussell King2012-01-056-13/+21
| | | | | | | | | | | Hook these platforms restart code into the new restart hook rather than using arch_reset(). In doing so, we split out the ixdp2351 restart code into its own platform file. Acked-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: restart: ixp2000: use new restart hookRussell King2012-01-057-29/+40
| | | | | | | | | | | Hook these platforms restart code into the new restart hook rather than using arch_reset(). In doing so, we split out the IXDP2401, IXDP2801 and IXDP2805 platform specific restart code into their own platform files. Acked-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: restart: iop13xx: use new restart hookRussell King2012-01-055-10/+14
| | | | | | | | Hook these platforms restart code into the new restart hook rather than using arch_reset(). Acked-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: restart: iop3xx: use new restart hookRussell King2012-01-0512-21/+38
| | | | | | | | | | | Hook these platforms restart code into the arm_pm_restart hook rather than using arch_reset(). In doing so, we split out the n2100 platform specific restart handler into the n2100 platform file. Acked-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: restart: integrator: use new restart hookRussell King2012-01-055-7/+11
| | | | | | | | Hook these platforms restart code into the new restart hook rather than using arch_reset(). Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: restart: highbank: use new restart hookRussell King2012-01-054-2/+6
| | | | | | | | Hook these platforms restart code into the new restart hook rather than using arch_reset(). Acked-by: Rob Herring <rob.herring@calxeda.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: restart: h720x: use new restart hookRussell King2012-01-055-3/+9
| | | | | | | Hook these platforms restart code into the new restart hook rather than using arch_reset(). Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: restart: footbridge: use new restart hookRussell King2012-01-057-52/+58
| | | | | | | Hook these platforms restart code into the new restart hook rather than using arch_reset(). Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: 7262/1: restart: EXYNOS: use new restart hookRussell King2012-01-058-6/+11
| | | | | | | | | | Hook these platforms restart code into the new restart hook rather than using arch_reset(). [kgene.kim@samsung.com: according to local header, updated] Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: restart: ep93xx: use new restart hookRussell King2012-01-0511-11/+32
| | | | | | | | Hook these platforms restart code into the new restart hook rather than using arch_reset(). Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: restart: ebsa110: use new restart hookRussell King2012-01-052-1/+9
| | | | | | | Hook the EBSA110 platform restart code into the new restart hook rather than using arch_reset(). Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: restart: dove: use new restart hookRussell King2012-01-055-14/+19
| | | | | | | | Hook these platforms restart code into the new restart hook rather than using arch_reset(). Acked-by: Nicolas Pitre <nico@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: 7190/1: restart: davinci: use new restart hookSekhar Nori2012-01-0526-15/+31
| | | | | | | | | | | | | | | Rather than using DaVinci specific davinci_soc_info based restart hook, use the restart hook available in the machine descriptor instead. Tested on DM365 and AM18x EVMs. v2: Changed to use restart hook in machine descriptor per Russell's comment. Signed-off-by: Sekhar Nori <nsekhar@ti.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: restart: cns3xxx: use new restart hookRussell King2012-01-054-4/+7
| | | | | | | | Hook these platforms restart code into the new restart hook rather than using arch_reset(). Acked-by: Anton Vorontsov <cbouatmailru@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: restart: clps711x: use new restart hookRussell King2012-01-0510-1/+13
| | | | | | | Hook these platforms restart code into the new restart hook rather than using arch_reset(). Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: restart: bcmring: use new restart hookRussell King2012-01-052-23/+24
| | | | | | | Hook the Shark restart code into the new restart hook rather than using arch_reset(). Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: restart: at91: use new restart hookRussell King2012-01-0510-24/+13
| | | | | | | | | | | | Rather than using a private function pointer, use the existing arm_pm_restart function pointer instead. We no longer need to enable the I-cache in at91sam9_alt_reset() as the caches will now be on when this function is called. Update the function names to use the 'restart' terminology rather than the 'reboot' terminology. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* ARM: restart: remove s3c24xx restart handlerRussell King2012-01-051-23/+0
| | | | | | | | | | Remove the s3c24xx restart handler, which is trying to work around a chip bug by keeping caches on but flushed. As we now only disable caches when performing a soft reboot, there doesn't need to be a work-around to do that. Acked-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* Merge branch 'restart-cleanup' into restartRussell King2012-01-051597-17448/+20867
|\ | | | | | | | | Conflicts: arch/arm/kernel/setup.c
| * Merge branch 'for-russell' of git://hansjkoch.de/git/linux-tcc into HEADRussell King2012-01-051522-15462/+18966
| |\ | | | | | | | | | | | | Conflicts: arch/arm/plat-omap/include/plat/common.h
| | * arm: Remove plat-tcc directoryHans J. Koch2012-01-0515-1411/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | The Telechips ARM architecture is being removed. This patch deletes the arch/arm/plat-tcc/ folder. Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Harry Sievers <hsievers@csselectronic.com> Signed-off-by: Hans J. Koch <hjk@hansjkoch.de>
| | * arm: Remove mach-tcc8k directoryHans J. Koch2012-01-0510-1245/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | The Telechips ARM architecture is being removed. This patch deletes the arch/arm/mach-tcc8k/ folder. Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Harry Sievers <hsievers@csselectronic.com> Signed-off-by: Hans J. Koch <hjk@hansjkoch.de>
| | * arm: Remove TCC subarch from Kconfig/MakefileHans J. Koch2012-01-052-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | The Telechips subarchitecture is being completely removed. Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Harry Sievers <hsievers@csselectronic.com> Signed-off-by: Hans J. Koch <hjk@hansjkoch.de>
| | * Remove Telechips ARM subarch from MAINTAINERSHans J. Koch2012-01-041-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | The ARM subarchitecture for Telechips SoCs isi being completely removed, so there's no need for a MAINTAINERS entry. Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Harry Sievers <hsievers@csselectronic.com> Signed-off-by: Hans J. Koch <hjk@hansjkoch.de>
| | * Linux 3.2-rc7v3.2-rc7Linus Torvalds2011-12-241-1/+1
| | |
| | * Merge branch 'for-linus' of ↵Linus Torvalds2011-12-241-4/+32
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: VFS: Fix race between CPU hotplug and lglocks
| | | * VFS: Fix race between CPU hotplug and lglocksSrivatsa S. Bhat2011-12-221-4/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the *_global_[un]lock_online() routines are not at all synchronized with CPU hotplug. Soft-lockups detected as a consequence of this race was reported earlier at https://lkml.org/lkml/2011/8/24/185. (Thanks to Cong Meng for finding out that the root-cause of this issue is the race condition between br_write_[un]lock() and CPU hotplug, which results in the lock states getting messed up). Fixing this race by just adding {get,put}_online_cpus() at appropriate places in *_global_[un]lock_online() is not a good option, because, then suddenly br_write_[un]lock() would become blocking, whereas they have been kept as non-blocking all this time, and we would want to keep them that way. So, overall, we want to ensure 3 things: 1. br_write_lock() and br_write_unlock() must remain as non-blocking. 2. The corresponding lock and unlock of the per-cpu spinlocks must not happen for different sets of CPUs. 3. Either prevent any new CPU online operation in between this lock-unlock, or ensure that the newly onlined CPU does not proceed with its corresponding per-cpu spinlock unlocked. To achieve all this: (a) We introduce a new spinlock that is taken by the *_global_lock_online() routine and released by the *_global_unlock_online() routine. (b) We register a callback for CPU hotplug notifications, and this callback takes the same spinlock as above. (c) We maintain a bitmap which is close to the cpu_online_mask, and once it is initialized in the lock_init() code, all future updates to it are done in the callback, under the above spinlock. (d) The above bitmap is used (instead of cpu_online_mask) while locking and unlocking the per-cpu locks. The callback takes the spinlock upon the CPU_UP_PREPARE event. So, if the br_write_lock-unlock sequence is in progress, the callback keeps spinning, thus preventing the CPU online operation till the lock-unlock sequence is complete. This takes care of requirement (3). The bitmap that we maintain remains unmodified throughout the lock-unlock sequence, since all updates to it are managed by the callback, which takes the same spinlock as the one taken by the lock code and released only by the unlock routine. Combining this with (d) above, satisfies requirement (2). Overall, since we use a spinlock (mentioned in (a)) to prevent CPU hotplug operations from racing with br_write_lock-unlock, requirement (1) is also taken care of. By the way, it is to be noted that a CPU offline operation can actually run in parallel with our lock-unlock sequence, because our callback doesn't react to notifications earlier than CPU_DEAD (in order to maintain our bitmap properly). And this means, since we use our own bitmap (which is stale, on purpose) during the lock-unlock sequence, we could end up unlocking the per-cpu lock of an offline CPU (because we had locked it earlier, when the CPU was online), in order to satisfy requirement (2). But this is harmless, though it looks a bit awkward. Debugged-by: Cong Meng <mc@linux.vnet.ibm.com> Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Cc: stable@vger.kernel.org
| | * | Merge tag 'writeback' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linuxLinus Torvalds2011-12-242-13/+13
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for linus: writeback reason binary tracing format fix * tag 'writeback' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux: writeback: show writeback reason with __print_symbolic
| | | * | writeback: show writeback reason with __print_symbolicWu Fengguang2011-12-182-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the binary trace understandable by trace-cmd. CC: Dave Chinner <david@fromorbit.com> CC: Curt Wohlgemuth <curtw@google.com> CC: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
| | * | | Merge branch 'rc-fixes' of ↵Linus Torvalds2011-12-241-3/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild * 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: kconfig: adapt update-po-config to new UML layout
| | | * | | kconfig: adapt update-po-config to new UML layoutPaul Bolle2011-12-181-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 5c48b108 ("um: take arch/um/sys-x86 to arch/x86/um") broke the make target update-po-config, as its symlink trick (again) fails. (Previous breakage was fixed with commit bdc69ca4 ("kconfig: change update-po-config to reflect new layout of arch/um").) The new UML layout allows to drop the symlick trick entirely. And if, one day, another architecture supports UML too, that should now work without again breaking this make target. Signed-off-by: Paul Bolle <pebolle@tiscali.nl> Signed-off-by: Michal Marek <mmarek@suse.cz>
| | * | | | Merge branch 'v4l_for_linus' of ↵Linus Torvalds2011-12-232-2/+2
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: [media] omap3isp: Fix crash caused by subdevs now having a pointer to devnodes