Ralf Baechle
68d8848567
Merge branches 'next/generic', 'next/alchemy', 'next/bcm63xx', 'next/cavium', 'next/jz4740', 'next/lantiq', 'next/loongson1b' and 'next/netlogic' into mips-for-linux-next
2012-07-25 16:37:46 +02:00
Jayachandran C
7e6507ad76
MIPS: Netlogic: early console fix
...
In prom_putchar(), wait for just the TX empty bit to clear in the
UART LSR.
Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com >
Cc: linux-mips@linux-mips.org
Cc: Florian Fainelli <florian@openwrt.org >
Patchwork: https://patchwork.linux-mips.org/patch/4112/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-24 18:24:44 +02:00
Jayachandran C
93a0293259
MIPS: Netlogic: Fix indentation of smpboot.S
...
[ralf@linux-mips.org: I've folded most segments of this patch into those
patches in -next that originally were causing the whitespace damage.
This is just what's left over]
Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/4094/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-24 18:17:47 +02:00
Ganesan Ramalingam
fcf9b4de33
MIPS: Netlogic: Add XLP SoC devices in FDT
...
Probe and add devices on SoC "simple-bus" on startup. This will
in turn add devices like I2C controller that are specified in the
device tree under 'soc'.
Signed-off-by: Ganesan Ramalingam <ganesanr@broadcom.com >
Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3762/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-24 17:28:55 +02:00
Jayachandran C
57d7cdb630
MIPS: Netlogic: Add IRQ mappings for more devices
...
Add IRT to IRQ translation for the MMC and I2C IRQs.
Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3761/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-24 17:28:54 +02:00
Ganesan Ramalingam
1004165f34
MIPS: Netlogic: USB support for XLP
...
The XLP USB controller appears as a device on the internal SoC PCIe
bus, the block has 2 EHCI blocks and 4 OHCI blocks. Change are to:
* Add files netlogic/xlp/usb-init.c and asm/netlogic/xlp-hal/usb.h
to initialize the USB controller and define PCI fixups. The PCI
fixups are to setup interrupts and DMA mask.
* Update include/asm/xlp-hal/{iomap.h,pic.h,xlp.h} to add interrupt
mapping for EHCI/OHCI interrupts.
Signed-off-by: Ganesan Ramalingam <ganesanr@netlogicmicro.com >
Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3756/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-24 17:28:54 +02:00
Ganesan Ramalingam
9bac624b0f
MIPS: Netlogic: XLP PCIe controller support.
...
Adds support for the XLP on-chip PCIe controller. On XLP, the
on-chip devices(including the 4 PCIe links) appear in the PCIe
configuration space of the XLP as PCI devices.
The changes are to initialize and register the PCIe controller,
enable hardware byte swap in the PCIe IO and MEM space, and to
enable PCIe interrupts.
Signed-off-by: Ganesan Ramalingam <ganesanr@netlogicmicro.com >
Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3760/
Patchwork: https://patchwork.linux-mips.org/patch/4104/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-24 17:28:54 +02:00
Jayachandran C
77c8da014a
MIPS: Netlogic: Platform changes for XLR/XLS I2C
...
Add platform code for XLR/XLS I2C controller and devices. Add
devices on the I2C bus on the XLR/XLS developement boards.
Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3757/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-24 17:28:54 +02:00
Ganesan Ramalingam
3a2f9b9905
MIPS: Netlogic: Platform NAND/NOR flash support
...
Changes to add support for the boot NOR flash on XLR boards and the
boot NAND/NOR flash drivers on the XLS boards.
Signed-off-by: Ganesan Ramalingam <ganesanr@netlogicmicro.com >
Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3758/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-24 17:28:54 +02:00
Jayachandran C
f35574a3ab
MIPS: Netlogic: Platform changes for XLS USB
...
Add USB initialization code, setup resources and add USB platform
driver in mips/netlogic/xlr/platform.c.
Add USB support for XLR/XLS platform in Kconfig.
Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3759/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-24 17:28:53 +02:00
Jayachandran C
c5a48ff81e
MIPS: Netlogic: Remove NETLOGIC_ prefix
...
Remove NETLOGIC_ prefix from gpio register definitions, this will
bring it in-line with the other Netlogic headers.
Having NETLOGIC prefix here is misleading because these are XLR/XLS
specific register definitions.
Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3754/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-24 17:28:53 +02:00
Jayachandran C
51d1eac0cd
MIPS: Netlogic: SMP wakeup code update
...
Update for core intialization code. Initialize status register
after receiving NMI for CPU wakeup. Add the low level L1D flush
code before enabling threads in core.
Also convert the ehb to _ehb so that it works under more GCC
versions.
Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3755/
Patchwork: https://patchwork.linux-mips.org/patch/4095/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-24 17:28:47 +02:00
Jayachandran C
cedc8ef87c
MIPS: Netlogic: Update comments in smpboot.S
...
No change in logic, comments update and whitespace cleanup.
* A few comments in the file were in assembler style and the rest
int C style, convert all of them to C style.
* Mark workarounds for Ax silicon with a macro XLP_AX_WORKAROUND
* Whitespace fixes - use tabs consistently
* rename __config_lsu macro to xlp_config_lsu
Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3749/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-24 17:26:34 +02:00
David Daney
b01da9f130
MIPS: Prune some target specific code out of prom.c
...
This code is not common enough to be in a shared file. It is also not
used by any existing boards, so just remove it.
[ralf@linux-mips.org: Dropped removal of irq_create_of_mapping which was
already removed by abd2363f6a
[irq_domain/mips: Allow irq_domain on MIPS]. Moved device_tree_init() and
dependencies to its sole user, the XLP code.]
Signed-off-by: David Daney <david.daney@cavium.com >
Cc: linux-mips@linux-mips.org
Cc: devicetree-discuss@lists.ozlabs.org
Cc: grant.likely@secretlab.ca
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/2946/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-23 13:54:52 +01:00
Jayachandran C
b876c1a0bc
MIPS: Netlogic: Fix TLB size of boot CPU.
...
Starting other threads in the core will change the number of
TLB entries of a CPU. Re-calculate current_cpu_data.tlbsize
on the boot cpu after enabling and waking up other threads.
The secondary CPUs do not need this logic because the threads
are enabled on the secondary cores at wakeup and before cpu_probe.
Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3751/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2012-07-03 19:04:02 +02:00
Rusty Russell
0b5f9c005d
remove references to cpu_*_map in arch/
...
This has been obsolescent for a while; time for the final push.
In adjacent context, replaced old cpus_* with cpumask_*.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au >
Acked-by: David S. Miller <davem@davemloft.net > (arch/sparc)
Acked-by: Chris Metcalf <cmetcalf@tilera.com > (arch/tile)
Cc: user-mode-linux-devel@lists.sourceforge.net
Cc: Russell King <linux@arm.linux.org.uk >
Cc: linux-arm-kernel@lists.infradead.org
Cc: Richard Kuo <rkuo@codeaurora.org >
Cc: linux-hexagon@vger.kernel.org
Cc: Ralf Baechle <ralf@linux-mips.org >
Cc: linux-mips@linux-mips.org
Cc: Kyle McMartin <kyle@mcmartin.ca >
Cc: Helge Deller <deller@gmx.de >
Cc: sparclinux@vger.kernel.org
2012-03-29 15:38:30 +10:30
David Howells
b81947c646
Disintegrate asm/system.h for MIPS
...
Disintegrate asm/system.h for MIPS.
Signed-off-by: David Howells <dhowells@redhat.com >
Acked-by: Ralf Baechle <ralf@linux-mips.org >
cc: linux-mips@linux-mips.org
2012-03-28 18:30:02 +01:00
Hillf Danton
b3ea581834
MIPS: Netlogic: Mark Netlogic chips as SMT capable
...
Netlogic XLR chip has multiple cores. Each core includes four integrated
hardware threads, and they share L1 data and instruction caches.
If the chip is marked to be SMT capable, scheduler then could do more, say,
idle load balancing.
Changes are now confined only to the code of XLR, and hardware is probed
to get core ID for correct setup.
[jayachandranc: simplified and adapted for new merged XLR/XLP code]
Signed-off-by: Hillf Danton <dhillf@gmail.com >
Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2972/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-12-07 22:04:57 +00:00
Jayachandran C
2aa54b2009
MIPS: Netlogic: Add support for XLP 3XX cores
...
Add new processor ID to asm/cpu.h and kernel/cpu-probe.c.
Update to new CPU frequency detection code which works on XLP 3XX
and 8XX.
Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2971/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-12-07 22:04:56 +00:00
Jayachandran C
66d29985fa
MIPS: Netlogic: Merge some of XLR/XLP wakup code
...
Create a common NMI and reset handler in smpboot.S and use this for
both XLR and XLP. In the earlier code, the woken up CPUs would
busy wait until released, switch this to wakeup by NMI.
The initial wakeup code or XLR and XLP are differ since they are
started from different bootloaders (XLP from u-boot and XLR from
netlogic bootloader). But in both platforms the woken up CPUs wait
and are released by sending an NMI.
Add support for starting XLR and XLP in 1/2/4 threads per core.
Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2970/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-12-07 22:04:56 +00:00
Jayachandran C
1c773ea4dc
MIPS: Netlogic: Add XLP makefiles and config
...
- Add CPU_XLP and NLM_XLR_BOARD to arch/mips/Kconfig for Netlogic XLP boards
- Update mips Makefiles to add XLP
Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2968/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-12-07 22:04:56 +00:00
Jayachandran C
65040e224e
MIPS: Netlogic: Add XLP platform files for XLP SoC
...
- Update common files to support XLP.
- Add arch/mips/include/asm/netlogic/xlp-hal for register definitions
and access macros
- Add arch/mips/netlogic/xlp/ for XLP specific files.
Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2967/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-12-07 22:04:56 +00:00
Jayachandran C
0c9654072a
MIPS: Netlogic: Move code common with XLP to common/
...
- Move code that can be shared with XLP (irq.c, smp.c, time.c and
xlr_console.c) to arch/mips/netlogic/common
- Add asm/netlogic/haldefs.h and asm/netlogic/common.h for common and
io functions shared with XLP
- remove type 'nlm_reg_t *' and use uint64_t for mmio offsets
- Move XLR specific code in smp.c to xlr/wakeup.c
- Move XLR specific PCI code from irq.c to mips/pci/pci-xlr.c
- Provide API for pic functions called from common/irq.c
Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2964/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-12-07 22:04:55 +00:00
Jayachandran C
99fb2f7984
MIPS: Netlogic: No need to set -Werror in mips/xlr
...
The -Werror compilation flag is already set for arch/mips - it can be removed
from arch/mips/xlr/Makefile
Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2963/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-12-07 22:04:55 +00:00
Jayachandran C
c3c8cfb979
MIPS: Netlogic: Use CPU_XLR instead of NLM_XLR
...
The CPU_XLR config variable is sufficient for XLR compilation, the
variable NLM_XLR can be removed.
Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2962/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-12-07 22:04:55 +00:00
Jayachandran C
faabeb9e57
MIPS: Netlogic: Style fixes for Platform
...
- Use platform- variable for xlr
- Load address common for all netlogic chips
Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2961/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-12-07 22:04:55 +00:00
Ganesan Ramalingam
f32671a867
MIPS: Netlogic: Add basic MSI support for XLR/XLS
...
Add basic support for MSI.
Signed-off-by: Ganesan Ramalingam <ganesanr@netlogicmicro.com >
Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com >
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2730/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-12-07 22:04:54 +00:00
Jayachandran C
e6be33cf6b
MIPS: Netlogic: Change load address
...
Move load address from 0x84000000 to 0x80100000 to avoid wasting
memory.
Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com >
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2727/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-12-07 22:04:54 +00:00
Hillf Danton
b2788965ba
MIPS: XLR, XLS: Add comment for smp setup
...
It seems that BSP could be setup twice, but the nlm_cpu_ready array is only
set for ASPs in smpboot.S, not including BSP.
Signed-off-by: Hillf Danton <dhillf@gmail.com >
Cc: "Jayachandran C." <jayachandranc@netlogicmicro.com >
Cc: LKML <linux-kernel@vger.kernel.org >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2695/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >,
2011-10-24 23:34:25 +01:00
Jayachandran C
39ad56805a
MIPS: Netlogic: Specify architecture CFLAGS
...
Use -march=xlr if available, otherwise fallback to mips64. This allows
us to support compilation with MIPS toolchains which are not customized
for XLR.
[ralf@linux-mips.org: And more importantly it works around a gas bug in
binutils 2.21 which otherwise may result in an assertion failure building
arch/mips/kernel/genex.S. See
http://sourceware.org/bugzilla/show_bug.cgi?id=12915 for details.]
Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com >
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2534/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-10-20 15:00:19 +01:00
Jayachandran C
a74e33535f
MIPS:Netlogic:Fix section mismatch warnings.
...
Add __init and __cpuinit annotation to functions that need it.
Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com >
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2535/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-10-20 15:00:19 +01:00
Arnaud Lacombe
b8ecf341f1
MIPS: Do not use EXTRA_CFLAGS
...
Usage of these flags has been deprecated for nearly 4 years by:
commit f77bf01425
Author: Sam Ravnborg <sam@neptun.(none)>
Date: Mon Oct 15 22:25:06 2007 +0200
kbuild: introduce ccflags-y, asflags-y and ldflags-y
Moreover, these flags (at least EXTRA_CFLAGS) have been documented for command
line use. By default, gmake(1) do not override command line setting, so this is
likely to result in build failure or unexpected behavior.
Replace their usage by Kbuild's `{as,cc,ld}flags-y'.
To: linux-kernel@vger.kernel.org
Cc: Sam Ravnborg <sam@ravnborg.org >
Patchwork: https://patchwork.linux-mips.org/patch/2710/
Cc: linux-mips@linux-mips.org
Signed-off-by: Arnaud Lacombe <lacombar@gmail.com >
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-09-21 17:53:38 +02:00
Jayachandran C
39263eeb44
MIPS: Netlogic: SMP fixes for XLR/XLS platform code.
...
Fix few issues in the Netlogic code:
- Use handle_percpu_irq to handle per-cpu interrupts
- Remove unused function nlm_common_ipi_handler()
- Call scheduler_ipi() on SMP_RESCHEDULE_YOURSELF
- Enable interrupts in nlm_smp_finish()
Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2460/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-07-20 23:12:11 +01:00
Ralf Baechle
bf45e58371
MIPS: XLR, XLS: Move makefile bits to were they belong.
...
This patch combines linux-mips.org patches
637d69600fb1773da56487271ec2a79c33d237ed [MIPS: Netlogic: Yank out crap.]
and 5e3c263b9658a4b1c6c5577793e9347efb44854e [MIPS: XLR, XLS: Add Kbuild
files for platform.]
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2415/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-07-20 23:12:11 +01:00
Jayachandran C
9b130f8004
MIPS: XLR, XLS: Add PCI support.
...
Adds pci/pci-xlr.c to support for XLR PCI/PCI-X interface and XLS PCIe
interface.
Update irq.c to ack PCI interrupts, use irq handler data to do the
PCI/PCIe bus ack.
Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com >
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2337/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-05-19 09:55:41 +01:00
Jayachandran C
7f058e852b
MIPS: Kconfig and Makefile update for Netlogic XLR/XLS
...
Add NLM_XLR_BOARD, CPU_XLR and other config options
Makefile updates, mostly based on r4k
Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com >
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2334/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-05-19 09:55:40 +01:00
Jayachandran C
5c64250674
MIPS: Platform files for XLR/XLS processor support
...
* include/asm/netlogic added with files common for all Netlogic processors
(common with XLP which will be added later)
* include/asm/netlogic/xlr for XLR/XLS chip specific files
* netlogic/xlr for XLR/XLS platform files
Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com >
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2334/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
2011-05-19 09:55:40 +01:00