| Age | Commit message (Collapse) | Author |
|
debug_ll_addr is only used on machines with an MMU so it can be #ifdef'ed
out safely. This fixes:
arch/arm/kernel/debug.S: Assembler messages:
arch/arm/kernel/debug.S:104: Error: too many positional arguments
The problem was introduced in e5c5f2a ARM: implement debug_ll_io_init().
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
|
|
When using DEBUG_LL, the UART's (or other HW's) registers are mapped
into early page tables based on the results of assembly macro addruart.
Later, when the page tables are replaced, the same virtual address must
remain valid. Historically, this has been ensured by using defines from
<mach/iomap.h> in both the implementation of addruart, and the machine's
.map_io() function. However, with the move to single zImage, we wish to
remove <mach/iomap.h>. To enable this, the macro addruart may be used
when constructing the late page tables too; addruart is exposed as a
C function debug_ll_addr(), and used to set up the required mapping in
debug_ll_io_init(), which may called on an opt-in basis from a machine's
.map_io() function.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
[swarren: Mask map.virtual with PAGE_MASK. Checked for NULL results from
debug_ll_addr (e.g. when selected UART isn't valid). Fixed compile when
either !CONFIG_DEBUG_LL or CONFIG_DEBUG_SEMIHOSTING.]
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
|
|
Based on suggestion by Russell King, create a common location for debug
macros and select the included debug macro file using config option.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: Russell King <linux@arm.linux.org.uk>
|
|
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull "ARM: cleanups of io includes" from Olof Johansson:
"Rob Herring has done a sweeping change cleaning up all of the
mach/io.h includes, moving some of the oft-repeated macros to a common
location and removing a bunch of boiler plate. This is another step
closer to a common zImage for multiple platforms."
Fix up various fairly trivial conflicts (<mach/io.h> removal vs changes
around it, tegra localtimer.o is *still* gone, yadda-yadda).
* tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (29 commits)
ARM: tegra: Include assembler.h in sleep.S to fix build break
ARM: pxa: use common IOMEM definition
ARM: dma-mapping: convert ARCH_HAS_DMA_SET_COHERENT_MASK to kconfig symbol
ARM: __io abuse cleanup
ARM: create a common IOMEM definition
ARM: iop13xx: fix missing declaration of iop13xx_init_early
ARM: fix ioremap/iounmap for !CONFIG_MMU
ARM: kill off __mem_pci
ARM: remove bunch of now unused mach/io.h files
ARM: make mach/io.h include optional
ARM: clps711x: remove unneeded include of mach/io.h
ARM: dove: add explicit include of dove.h to addr-map.c
ARM: at91: add explicit include of hardware.h to uncompressor
ARM: ep93xx: clean-up mach/io.h
ARM: tegra: clean-up mach/io.h
ARM: orion5x: clean-up mach/io.h
ARM: davinci: remove unneeded mach/io.h include
[media] davinci: remove includes of mach/io.h
ARM: OMAP: Remove remaining includes for mach/io.h
ARM: msm: clean-up mach/io.h
...
|
|
This is a very simple method for code running in an emulator, or under
the supervision of a debugger, to use I/O facilities on the controlling
host.
Tested with OpenOCD, and ARM's Fast Models.
Details on semihosting can be found in chapter 8 of
DUI0203I_rvct_developer_guide.pdf from ARM Ltd.
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
|
|
Several platforms create IOMEM defines for casting to 'void __iomem *',
and other platforms are incorrectly using __io() macro for the same
purpose. This creates a common definition and removes all the platform
specific versions. Rather than try to make linux/io.h and asm/io.h
assembly safe, the assembly version of IOMEM is moved into
asm/assembler.h.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Sekhar Nori <nsekhar@ti.com>
Cc: Kevin Hilman <khilman@ti.com>
Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ryan Mallon <rmallon@gmail.com>
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Haojian Zhuang <haojian.zhuang@marvell.com>
Acked-by: David Brown <davidb@codeaurora.org>
Cc: Daniel Walker <dwalker@fifo99.com>
Cc: Bryan Huntsman <bryanh@codeaurora.org>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Paul Walmsley <paul@pwsan.com>
Acked-by: Viresh Kumar <viresh.kumar@st.com>
Cc: Rajeev Kumar <rajeev-dlh.kumar@st.com>
Cc: Colin Cross <ccross@android.com>
Cc: Olof Johansson <olof@lixom.net>
Cc: Stephen Warren <swarren@nvidia.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
|
|
http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
* 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (178 commits)
ARM: 7139/1: fix compilation with CONFIG_ARM_ATAG_DTB_COMPAT and large TEXT_OFFSET
ARM: gic, local timers: use the request_percpu_irq() interface
ARM: gic: consolidate PPI handling
ARM: switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H
ARM: mach-s5p64x0: remove mach/memory.h
ARM: mach-s3c64xx: remove mach/memory.h
ARM: plat-mxc: remove mach/memory.h
ARM: mach-prima2: remove mach/memory.h
ARM: mach-zynq: remove mach/memory.h
ARM: mach-bcmring: remove mach/memory.h
ARM: mach-davinci: remove mach/memory.h
ARM: mach-pxa: remove mach/memory.h
ARM: mach-ixp4xx: remove mach/memory.h
ARM: mach-h720x: remove mach/memory.h
ARM: mach-vt8500: remove mach/memory.h
ARM: mach-s5pc100: remove mach/memory.h
ARM: mach-tegra: remove mach/memory.h
ARM: plat-tcc: remove mach/memory.h
ARM: mach-mmp: remove mach/memory.h
ARM: mach-cns3xxx: remove mach/memory.h
...
Fix up mostly pretty trivial conflicts in:
- arch/arm/Kconfig
- arch/arm/include/asm/localtimer.h
- arch/arm/kernel/Makefile
- arch/arm/mach-shmobile/board-ap4evb.c
- arch/arm/mach-u300/core.c
- arch/arm/mm/dma-mapping.c
- arch/arm/mm/proc-v7.S
- arch/arm/plat-omap/Kconfig
largely due to some CONFIG option renaming (ie CONFIG_PM_SLEEP ->
CONFIG_ARM_CPU_SUSPEND for the arm-specific suspend code etc) and
addition of NEED_MACH_MEMORY_H next to HAVE_IDE.
|
|
Upon adding new board LL debug support, if the resultant code
addition would not cause PC relative offset of "hexbuf" from
"adr r2, hexbuf" (+2) instruction to be representable in a
shifted 8-bit value (hence indirectly putting higher aligment
requirement on larger offsets), following error occurs,
arch/arm/kernel/debug.S: Assembler messages:
arch/arm/kernel/debug.S:138: Error: invalid constant (428) after fixup
Fix it by bringing "hexbuf" closer so that "adr"
can have the offset.
Signed-off-by: Afzal Mohammed <afzal@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
|
|
Some platforms (like OMAP not to name it) are doing rather complicated
hacks just to determine the base UART address to use. Let's give their
addruart macro some slack by providing an extra work register which will
allow for much needed cleanups.
This is basically a no-op as this commit is only adding the extra argument
to the macro but no one is using it yet.
Signed-off-by: nicolas Pitre <nicolas.pitre@linaro.org>
Reviewed-by: Kevin Hilman <khilman@ti.com>
|
|
The inline assembly differences for v6 vs. v7 are purely
optimizations. On a v7 processor, an mrc with the pc sets the
condition codes to the 28-31 bits of the register being read. It
just so happens that the TX/RX full bits the DCC support code is
testing for are high enough in the register to be put into the
condition codes. On a v6 processor, this "feature" isn't
implemented and thus we have to do the usual read, mask, test
operations to check for TX/RX full. Thus, we can drop the v7
implementation and just use the v6 implementation for both.
Cc: Tony Lindgren <tony@atomide.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
|
|
Introduce a CPU_V6K configuration option for platforms to select if they
have a V6K CPU core. This allows us to identify whether we need to
support ARMv6 CPUs without the V6K SMP extensions at build time.
Currently CPU_V6K is just an alias for CPU_V6, and all places which
reference CPU_V6 are replaced by (CPU_V6 || CPU_V6K).
Select CPU_V6K from platforms which are known to be V6K-only.
Acked-by: Tony Lindgren <tony@atomide.com>
Tested-by: Sourav Poddar <sourav.poddar@ti.com>
Tested-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
|
|
Rather than checking the MMU status in every instance of addruart, do it
once in kernel/debug.S, and change the existing addruart macros to
return both physical and virtual addresses. The main debug code can then
select the appropriate address to use.
This will also allow us to retreive the address of a uart for the MMU
state that we're not current in.
Updated with fixes for OMAP from Jason Wang <jason77.wang@gmail.com>
and Tony Lindgren <tony@atomide.com>, and fix for versatile express from
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>.
Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Jason Wang <jason77.wang@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Tested-by: Kevin Hilman <khilman@deeprootsystems.com>
|
|
We have the same (empty) macro for all IDEDCC flavours, so consolidate
it to one.
Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>
|
|
Otherwise more complicated uart configuration won't be possible.
We can use r1 for tmp register for both head.S and debug.S.
NOTE: This patch depends on another patch to add the the tmp register
into all debug-macro.S files. That can be done with:
$ sed -i -e "s/addruart,rx|addruart, rx/addruart, rx, tmp/"
arch/arm/*/include/*/debug-macro.S
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
|
|
Without this patch arch/arm/compressed/head.S defaults to generic
DCC code that does not work for v7.
For more information on the v7 DCC, see Cortex-A8 TRM
"12.11.1 Debug communications channel".
To use it with post 2.6.33-rc1 or later, you need to have:
CONFIG_DEBUG_LL=y
ONFIG_DEBUG_ICEDCC=y
CONFIG_EARLY_PRINTK=y
Earlier kernels need commit 93fd03a8c6728b58879f8af20ffd55d9c32a778b
backported.
Tested on omap3430.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
|
|
SCALE: add ice dcc support
Tested on the ixp425 with the ice PEEDI
Ack-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
|
|
This declaration specifies the "function" type and size for various
assembly functions, mainly needed for generating the correct branch
instructions in Thumb-2.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
|
|
This just leaves include/asm-arm/plat-* to deal with.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
|
|
Adds support for CONFIG_DEBUG_ICEDCC for ARM11.
Tested on ARM1136 (OMAP2420).
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
|
|
Signed-off-by: Jörn Engel <joern@wohnheim.fh-wedel.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
|
|
asm/hardware.h is not required for the majority of processor support
files, ioremap support, mm initialisation, acorn IO support, nor
the debug code (which picks up its machine specific includes via
debug-macros.S)
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
|
|
Patch from Ben Dooks
Remove the currently #if'ed out FTVPCI debug code
from arch/arm/kernel/debug.S as FTVPCI has no current
build candidate.
Signed-off-by: Ben Dooks
Signed-off-by: Russell King
|
|
Patch from Lennert Buytenhek
arch/arm/kernel/debug.S has a comment at the top stating that the
file is called debug-armv.S, which is clearly not so.
Signed-off-by: Lennert Buytenhek
Signed-off-by: Russell King
|
|
Patch from Ben Dooks
This patch moves all the machine/arch specific bits out of
arch/arm/kernel/debug.S and places them into the include
directories for those given architectures. The debug macros
are placed into include/asm-arm/arch-*/debug-macro.S.
The aim is to clean-up the debug.S code and make it easier to
modify a single-architecture without affecting the entire
debug.S file.
The patch also removes CONFIG_ARCH_FTVPCI, which no longer
exists anywhere else in the kernel.
All new include files have the original copyright notice
from arch/arm/kernel/debug.S.
Note, not all architectures modified here have been built
and/or tested due to lack of available machines, or
problems building for them (no defconfig available, or
problems with kernel build).
Signed-off-by: Ben Dooks
Signed-off-by: Russell King
|
|
Patch from Catalin Marinas
Common changes for Versatile PB and AB
|
|
Patch from Ben Dooks
fixes the following:
- no debug output in the head code for either s3c2410 or s3c2440
- fifo size calculation in the low-level debugging code
- serial constants for s3c2440 serial fifo sizes
- added s3c2440 support for uncompress.h
Signed-off-by: Ben Dooks
|
|
Patch from Sascha Hauer
This patch supports the Hynix developer boards h7201 and h7202 for the
HMS30C7201 and HMS30C7202 CPUs.
Changes to previous patch:
- reorganized file structure. We now have common.c which shares stuff
common to all h720x processors and cpu-h720[12].c files for the cpu
specific stuff
- fixed timer handling for timers 1/2
- cleaned up h720x register definitions and splitted in files specific
to each cpu and one generic part
Signed-off-by: Thomas Gleixner
Signed-off-by: Robert Schwebel
Signed-off-by: Sascha Hauer
|
|
into flint.arm.linux.org.uk:/usr/src/bk/linux-2.6-rmk
|
|
Patch from Dave Jiang
arch/arm/kernel changes
|
|
into plexity.net:/home/dsaxena/src/linux-2.6-for-rmk
|
|
Patch from Dave Jiang
Code cleanup. Removed all IOP80310 support. Also some minor compile warning fixups for 80321. Preping for IOP321 and IOP331 code submissions.
|
|
Patch from Sascha Hauer
This patch adds support for the Motorola i.MX SoC. It has board
support included for the MX1ADS Eval Board, but the patch has been
tested on two other custom boards as well.
Things changed since Patch 1955/2:
- fixed according to Russell's comments.
- removed unnecassary files from include/asm-arm/arch-imx.
- removed cpufreq support (it needs rework).
- made myself the Maintainer of mx1ads
Sascha Hauer
|
|
Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
|
|
into plexity.net:/home/dsaxena/src/linux-2.6-for-rmk
|
|
The code is completely out of date, I am no longer maintaining it,
and nobdy has volunteered to do so; therefore, I am killing it.
Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
|
|
SDRAM
Patch from Marc Singer
[if's replaced by ifdef's.]
While the BLOB boot loader doesn't support it, there are two others,
UBOOT and Logic's LOLO, that will initialize the SDRAM controller such
that the memory appears as a contiguous region. This layout to be
required for WinCE and, thus, is the default for these loaders. The
memory organization had been optimized for discontiguous blocks. Now,
it supports a default mode that is compatible with all of the
bootloaders as well as options to optimize for either contiguous or
discontiguous models.
Withing, there is also a slight change to the way that the DEBUG_LL
macros select the UART address. Now it uses immediate constants
exclusively.
|
|
Patch from Tony Lindgren
This patch makes the low level debug functions work when support is
compiled in for multiple OMAPs. The patch also removes now unnecessary
include, incorrect comment, and SERIAL_REG_SHIFT ifdefs.
|
|
Patch from Ben Dooks
Removed two 's from assembly code (binutils has problems
with these)
|
|
into flint.arm.linux.org.uk:/usr/src/bk/linux-2.6-ds
|
|
Patch from Tony Lindgren
Changes OMAP low level debug function to allow virtual IO != physical
IO. Also removes waituart checking, as it only worked for first
serial port.
|
|
IXP4xx support
|
|
into flint.arm.linux.org.uk:/usr/src/bk/linux-2.6-rmk
|
|
Patch from Marc Singer
Updated change set for the 2.6.5 kernel *and* for the April 8th arm
patch. Also included are changes suggested by Russell that merge
several of the files in the mach- directory. I have also endeavored
to remove all unnecessary whitespace additions.
Note that since I've found the cause of an annoying user-space crash,
I believe that this patch is OK. The crash appears to have nothing to
do with the system setup.
|
|
This cset adds minimal support for ARM Ltd's ARM926EJ-S "Versatile"
platform.
|
|
This adds support for the AMBA PL011 UART primecell, and moves the
existing AMBA UART support to indicate it covers the AMBA PL010
primecell.
|
|
Patch from Ben Dooks
arch/arm/kernel patch for S3C2410 support
- default configurations for S3C2410
- build changes for S3C2410
- IRQ support for kernel entry
- debug serial support
|
|
Patch from Tony Lindgren
This patch updates the ARM Linux core files to add support for
Texas Instruments OMAP-1510, 1610, and 730 processors.
OMAP is an embedded ARM processor with integrated DSP.
OMAP-1610 has hardware support for USB OTG, which might be of interest
to Linux developers. OMAP-1610 could be easily be used as development
platform to add USB OTG support to Linux.
This patch is an updated version of an earlier patch 1767/1
with the dummy Kconfig added for OMAP as suggested by Russell King
here:
http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=1767/1
This patch is brought to you by various linux-omap developers.
|
|
Anakin has not been maintained since it was (partially) merged, and
the maintainers appear to ignore mail about it. No one appears
willing to maintain it either. However, some unrelated kernel
maintainers have been updating various files while they've been
working in the area - which is wasted work for something which
isn't maintained.
Therefore, this cset removes Anakin completely from the kernel.
|
|
Patch from Eli Carter
# Tue Apr 15 16:07:34 CDT 2003 ejc@rnd-linux-c84
# add-iq80321
#
# Adds basic support for the iq80321 board.
#
# Diff'ed against 2.5.65-rmk1+1472-4+1502
# Applies to 2.5.67-rmk1+1502 with offsets
#
# arch/arm/boot/Makefile | 1
# arch/arm/boot/compressed/head-xscale.S | 6
# arch/arm/def-configs/iq80321 | 676 ++++++++++++++++++++++++++++++
# arch/arm/kernel/debug.S | 10
# arch/arm/kernel/entry-armv.S | 22
# arch/arm/mach-iop3xx/Kconfig | 12
# arch/arm/mach-iop3xx/Makefile | 16
# arch/arm/mach-iop3xx/arch.c | 26 +
# arch/arm/mach-iop3xx/iop321-irq.c | 95 ++++
# arch/arm/mach-iop3xx/iop321-pci.c | 257 +++++++++++
# arch/arm/mach-iop3xx/iop321-time.c | 92 ++++
# arch/arm/mach-iop3xx/iq80321-pci.c | 98 ++++
# arch/arm/mach-iop3xx/mm-321.c | 64 ++
# arch/arm/mm/proc-xscale.S | 19
# include/asm-arm/arch-iop3xx/hardware.h | 17
# include/asm-arm/arch-iop3xx/iop321-irqs.h | 83 +++
# include/asm-arm/arch-iop3xx/iop321.h | 143 ++++++
# include/asm-arm/arch-iop3xx/iq80321.h | 17
# include/asm-arm/arch-iop3xx/irqs.h | 67 --
# include/asm-arm/arch-iop3xx/memory.h | 11
# include/asm-arm/arch-iop3xx/serial.h | 11
# include/asm-arm/arch-iop3xx/timex.h | 6
# include/asm-arm/arch-iop3xx/uncompress.h | 7
# include/asm-arm/mach/pci.h | 4
# 24 files changed, 1691 insertions(+), 69 deletions(-)
|
|
Patch from Eli Carter
# Tue Apr 15 14:41:15 CDT 2003 ejc@rnd-linux-c84
# config-rename
#
# This patch renames the IOP310 config variables to IOP3XX in preparation for
# IOP321 support.
#
# Diff'ed against 2.5.65-rmk1+1472-4
# Applies to 2.5.67-rmk1 with an offset.
#
# arch/arm/Kconfig | 14 +++++-----
# arch/arm/Makefile | 2 -
# arch/arm/def-configs/iq80310 | 15 +++++-----
# arch/arm/kernel/debug.S | 2 -
# arch/arm/mach-iop3xx/Kconfig | 49 ++++++++++++++++++++++-------------
# arch/arm/mach-iop3xx/Makefile | 8 ++---
# include/asm-arm/arch-iop3xx/memory.h | 2 -
# include/asm-arm/arch-iop3xx/timex.h | 2 -
# 8 files changed, 54 insertions(+), 40 deletions(-)
#
|