Linus Torvalds
a135c717d5
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus ...
Pull MIPS updates from Ralf Baechle:
"This is the main pull request for MIPS:
- a number of fixes that didn't make the 3.19 release.
- a number of cleanups.
- preliminary support for Cavium's Octeon 3 SOCs which feature up to
48 MIPS64 R3 cores with FPU and hardware virtualization.
- support for MIPS R6 processors.
Revision 6 of the MIPS architecture is a major revision of the MIPS
architecture which does away with many of original sins of the
architecture such as branch delay slots. This and other changes in
R6 require major changes throughout the entire MIPS core
architecture code and make up for the lion share of this pull
request.
- finally some preparatory work for eXtendend Physical Address
support, which allows support of up to 40 bit of physical address
space on 32 bit processors"
[ Ahh, MIPS can't leave the PAE brain damage alone. It's like
every CPU architect has to make that mistake, but pee in the snow
by changing the TLA. But whether it's called PAE, LPAE or XPA,
it's horrid crud - Linus ]
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (114 commits)
MIPS: sead3: Corrected get_c0_perfcount_int
MIPS: mm: Remove dead macro definitions
MIPS: OCTEON: irq: add CIB and other fixes
MIPS: OCTEON: Don't do acknowledge operations for level triggered irqs.
MIPS: OCTEON: More OCTEONIII support
MIPS: OCTEON: Remove setting of processor specific CVMCTL icache bits.
MIPS: OCTEON: Core-15169 Workaround and general CVMSEG cleanup.
MIPS: OCTEON: Update octeon-model.h code for new SoCs.
MIPS: OCTEON: Implement DCache errata workaround for all CN6XXX
MIPS: OCTEON: Add little-endian support to asm/octeon/octeon.h
MIPS: OCTEON: Implement the core-16057 workaround
MIPS: OCTEON: Delete unused COP2 saving code
MIPS: OCTEON: Use correct instruction to read 64-bit COP0 register
MIPS: OCTEON: Save and restore CP2 SHA3 state
MIPS: OCTEON: Fix FP context save.
MIPS: OCTEON: Save/Restore wider multiply registers in OCTEON III CPUs
MIPS: boot: Provide more uImage options
MIPS: Remove unneeded #ifdef __KERNEL__ from asm/processor.h
MIPS: ip22-gio: Remove legacy suspend/resume support
mips: pci: Add ifdef around pci_proc_domain
...
2015-02-21 19:41:38 -08:00
DEC: Document the R4k MB ASIC mini interrupt controller
2014-06-04 22:50:41 +02:00
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
MIPS: ARC: Fix build error.
2015-01-19 13:09:52 +01:00
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
Revert "MIPS: make CAC_ADDR and UNCAC_ADDR account for PHYS_OFFSET"
2013-07-01 15:10:58 +02:00
MIPS: ath25: add AR2315 PCI host controller driver
2014-11-24 07:45:28 +01:00
mips: delete non-required instances of include <linux/init.h>
2014-01-24 22:39:56 +01:00
MIPS: Replace use of phys_t with phys_addr_t.
2014-11-24 22:47:31 +01:00
MIPS: BCM47XX: Clean up nvram header
2014-11-24 07:45:08 +01:00
MIPS: Replace use of phys_t with phys_addr_t.
2014-11-24 22:47:31 +01:00
MIPS: bcm3384: Initial commit of bcm3384 platform support
2014-11-24 07:45:13 +01:00
MIPS: OCTEON: More OCTEONIII support
2015-02-20 15:32:46 +01:00
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
MIPS: Alchemy: fold mach-db1xxx/db1x00 headers into board code
2014-03-26 23:09:21 +01:00
MIPS: DECstation CPU feature overrides
2013-10-29 21:24:46 +01:00
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
MIPS: Replace use of phys_t with phys_addr_t.
2014-11-24 22:47:31 +01:00
MIPS: IP22: This platform may come with either MIPS III or MIPS IV CPUs.
2014-05-23 15:10:59 +02:00
MIPS: Remove unnecessary platform dma helper functions
2013-10-29 21:24:40 +01:00
MIPS: IP28: Fix/clean spaces.h
2014-08-26 02:18:58 +02:00
MIPS: Remove unnecessary platform dma helper functions
2013-10-29 21:24:40 +01:00
mips: delete non-required instances of include <linux/init.h>
2014-01-24 22:39:56 +01:00
mtd: nand: jz4740: Convert to GPIO descriptor API
2015-02-02 01:04:36 -08:00
MIPS: lantiq: export soc type
2014-11-24 07:45:18 +01:00
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
MIPS: Loongson: Improve LEFI firmware interface
2014-11-24 07:45:01 +01:00
MIPS: Loongson1B: Some fixes/updates for LS1B
2014-11-24 07:45:09 +01:00
irqchip: mips-gic: Probe for number of external interrupts
2014-11-24 07:44:56 +01:00
MIPS: NL: Fix nlm_xlp_defconfig build error
2014-08-26 02:18:55 +02:00
MIPS: Add code for new system 'paravirt'
2014-06-02 12:34:20 +02:00
MIPS: asm: Rename GCC_OFF12_ASM to GCC_OFF_SMALL_ASM
2015-02-17 15:37:21 +00:00
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
MIPS: ralink: add mt7628an support
2014-11-24 07:45:24 +01:00
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
MIPS: PMC-Sierra Yosemite: Remove support.
2012-12-13 18:15:30 +01:00
irqchip: mips-gic: Probe for number of external interrupts
2014-11-24 07:44:56 +01:00
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
MIPS: Replace use of phys_t with phys_addr_t.
2014-11-24 22:47:31 +01:00
MIPS: Replace use of phys_t with phys_addr_t.
2014-11-24 22:47:31 +01:00
MIPS: PMC-Sierra Yosemite: Remove support.
2012-12-13 18:15:30 +01:00
MIPS: Move gic.h to include/linux/irqchip/mips-gic.h
2014-11-24 07:44:59 +01:00
MIPS: Add MSI support for XLP9XX
2014-05-30 16:51:02 +02:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2015-02-21 19:41:38 -08:00
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
MIPS: IP22/IP28: Improve GIO support
2014-06-04 22:50:42 +02:00
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
MIPS: IP27: Remove pfn_t.
2013-05-08 03:51:58 +02:00
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
MIPS: IP27: Fix build errors with CONFIG_PCI disabled.
2013-06-21 18:07:00 +02:00
mips: Use get_signal() signal_setup_done()
2014-08-06 13:03:08 +02:00
MIPS: Add NUMA support for Loongson-3
2014-07-30 21:46:19 +02:00
MIPS: APRP: Code formatting clean-ups.
2014-01-22 20:19:02 +01:00
MIPS: asm: Add wrappers for EVA/non-EVA instructions
2014-03-26 23:09:12 +01:00
MIPS: Fix gigaton of warning building with microMIPS.
2014-03-31 18:17:12 +02:00
MIPS: Fix build with binutils 2.24.51+
2014-11-07 15:07:36 +01:00
MIPS: Support for 64-bit FP with O32 binaries
2014-01-13 23:40:56 +01:00
MIPS: kernel: r4k_switch: Add support for MIPS R6
2015-02-17 15:37:27 +00:00
MIPS: asm: atomic: Update ISA constraints for MIPS R6 support
2015-02-17 15:37:22 +00:00
arch: Add lightweight memory barriers dma_rmb() and dma_wmb()
2014-12-11 21:15:06 -05:00
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
MIPS: asm: bitops: Update ISA constraints for MIPS R6 support
2015-02-17 15:37:22 +00:00
MIPS: BMIPS: Let each platform customize the CPU1 IRQ mask
2014-11-24 07:45:11 +01:00
MIPS: Replace use of phys_t with phys_addr_t.
2014-11-24 22:47:31 +01:00
MIPS: kernel: mips-r2-to-r6-emul: Add R2 emulator for MIPS R6
2015-02-17 15:37:37 +00:00
MIPS: Quit exporting kernel internel break codes to uapi/asm/break.h
2013-02-20 18:24:24 +01:00
MIPS: Rename .data..mostly and properly handle it in linker script
2011-05-10 18:15:24 +01:00
MIPS: add kmap_noncoherent to wire a cached non-coherent TLB entry
2014-05-28 16:20:14 +01:00
MIPS: fix case mismatch in local_r4k_flush_icache_range()
2014-01-15 14:19:42 +07:00
MIPS: MSP: Fix build error
2011-05-10 18:15:24 +01:00
MIPS: Use generic checksum functions for MIPS R6
2015-02-17 15:37:19 +00:00
clk: Add common __clk_get(), __clk_put() implementations
2013-12-04 17:19:44 +01:00
MIPS: Remove declaration of obsolete arch_init_clk_ops()
2014-11-24 07:45:37 +01:00
MIPS: SMP: Remove plat_smp_ops cpus_done method.
2014-05-27 11:06:42 +02:00
MIPS: asm: cmpxchg: Update ISA constraints for MIPS R6 support
2015-02-17 15:37:22 +00:00
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2013-03-02 07:44:16 -08:00
MIPS: Use the new "ZC" constraint for MIPS R6
2015-02-17 15:37:21 +00:00
MIPS: Prevent compiler warning from cop2_{save,restore}
2014-10-23 19:58:13 +02:00
MIPS: Handle MIPS IV, V and R2 FPU instructions on MIPS R6 as well
2015-02-17 15:37:37 +00:00
MIPS: HTW: Prevent accidental HTW start due to nested htw_{start, stop}
2015-02-16 10:55:26 +01:00
MIPS: Add cases for CPU_QEMU_GENERIC
2015-02-16 10:01:24 +00:00
MIPS: Add LLB bit and related feature for the Config 5 CP0 register
2015-02-17 15:37:36 +00:00
MIPS: Make __{,n,u}delay declarations match definitions and generic delay.h
2012-10-16 22:20:03 +02:00
MIPS: Convert DMA to use dma-mapping-common.h
2010-10-29 19:08:31 +01:00
MIPS: improve checks for noncoherent DMA
2014-01-22 20:43:10 +01:00
MIPS: Loongson: Add swiotlb to support All-Memory DMA
2014-03-31 18:17:12 +02:00
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
MIPS: DSP: Fix DSP mask for registers.
2013-01-24 13:20:09 +01:00
MIPS: asm: Rename GCC_OFF12_ASM to GCC_OFF_SMALL_ASM
2015-02-17 15:37:21 +00:00
MIPS: kernel: elf: Improve the overall ABI and FPU mode checks
2015-02-17 15:37:39 +00:00
UAPI: (Scripted) Disintegrate arch/mips/include/asm
2012-10-09 09:47:14 +01:00
MIPS: EVA: Add new EVA header
2014-08-26 02:18:56 +02:00
Disintegrate asm/system.h for MIPS
2012-03-28 18:30:02 +01:00
MIPS: MT: Remove SMTC support
2014-05-24 00:07:01 +02:00
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
MIPS: Fix build with binutils 2.24.51+
2014-11-07 15:07:36 +01:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2015-02-21 19:41:38 -08:00
MIPS: Replace __get_cpu_var uses in FPU emulator.
2014-08-26 13:45:51 -04:00
MIPS: ftrace: Fix a microMIPS build problem
2014-10-24 02:38:33 +02:00
MIPS: asm: futex: Set the appropriate ISA level for MIPS R6
2015-02-17 15:37:23 +00:00
MIPS: ip22-gio: Remove legacy suspend/resume support
2015-02-20 13:30:55 +01:00
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
MIPS: asm: hazards: Add MIPSR6 definitions
2015-02-17 15:37:19 +00:00
mips: delete non-required instances of include <linux/init.h>
2014-01-24 22:39:56 +01:00
MIPS: Loongson-3: Add RS780/SBX00 HPET support
2014-11-24 07:45:02 +01:00
mm/hugetlb: add more arch-defined huge_pte functions
2013-04-29 15:54:33 -07:00
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
cpuidle: Invert CPUIDLE_FLAG_TIME_VALID logic
2014-11-12 21:17:27 +01:00
MIPS: MIPS16e: Support handling of delay slots.
2013-05-09 17:55:20 +02:00
MIPS: Replace use of phys_t with phys_addr_t.
2014-11-24 22:47:31 +01:00
MIPS: Add arch_trigger_all_cpu_backtrace() function
2014-11-24 07:44:49 +01:00
MIPS: Rename mips_cpu_intc_init() -> mips_cpu_irq_of_init()
2014-11-24 07:44:52 +01:00
MIPS: asm: irqflags: Add MIPS R6 related definitions
2015-02-17 15:37:20 +00:00
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
MIPS: jump_label.c: Handle the microMIPS J instruction encoding
2014-11-19 18:22:09 +01:00
MIPS: Use generic checksum functions for MIPS R6
2015-02-17 15:37:19 +00:00
MIPS: kdump: Add support
2012-12-13 16:46:47 +01:00
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
kvm: add halt_poll_ns module parameter
2015-02-06 13:08:37 +01:00
MIPS: Add functions for hypervisor call
2014-05-30 21:01:11 +02:00
consolidate cond_syscall and SYSCALL_ALIAS declarations
2013-03-03 22:55:19 -05:00
MIPS: asm: local: Set the appropriate ISA level for MIPS R6
2015-02-17 15:37:24 +00:00
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
MIPS: Initialise MAARs
2014-08-02 00:06:46 +02:00
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
MIPS: mips-cm: Fix sparse warnings
2015-01-13 15:53:09 +01:00
MIPS: Replace use of phys_t with phys_addr_t.
2014-11-24 22:47:31 +01:00
MIPS: kernel: mips-r2-to-r6-emul: Add R2 emulator for MIPS R6
2015-02-17 15:37:37 +00:00
MIPS: move mips_{set,get}_machine_name() to a more generic place
2013-05-08 01:19:07 +02:00
MIPS: MT: Remove SMTC support
2014-05-24 00:07:01 +02:00
MIPS: MT: define write_c0_tchalt macro
2014-05-28 16:20:22 +01:00
MIPS: SNI: Fix conflicting wrapper symbols for headers.
2011-10-20 15:00:18 +01:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2015-02-21 19:41:38 -08:00
MIPS,prctl: add PR_[GS]ET_FP_MODE prctl options for MIPS
2015-02-12 12:30:29 +01:00
MIPS: HTW: Prevent accidental HTW start due to nested htw_{start, stop}
2015-02-16 10:55:26 +01:00
MIPS: asm: module: define MODULE_PROC_FAMILY for MIPS R6
2015-02-17 15:37:17 +00:00
MIPS: fix read_msa_* & write_msa_* functions on non-MSA toolchains
2014-08-02 00:06:44 +02:00
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
mips: Update the email address of Geert Uytterhoeven
2014-06-02 16:34:41 +02:00
MIPS: Apply `.insn' to fixup labels throughout
2014-11-24 07:45:36 +01:00
MIPS: Replace MIPS-specific 64BIT_PHYS_ADDR with generic PHYS_ADDR_T_64BIT
2014-11-24 22:46:44 +01:00
mips: pci: Add ifdef around pci_proc_domain
2015-02-20 13:16:14 +01:00
MIPS, Perf-events: Work with irq_work
2011-03-14 21:07:26 +01:00
mips: handle pgtable_page_ctor() fail
2013-11-15 09:32:18 +09:00
mm: make FIRST_USER_ADDRESS unsigned long on all archs
2015-02-11 17:06:03 -08:00
mips: drop _PAGE_FILE and pte_file()-related helpers
2015-02-10 14:30:32 -08:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2015-02-21 19:41:38 -08:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2015-02-21 19:41:38 -08:00
MIPS: pm-cps: add PM state entry code for CPS systems
2014-05-28 16:20:31 +01:00
Merge branch 'wip-mips-pm' of https://github.com/paulburton/linux into mips-for-linux-next
2014-05-29 15:08:23 +02:00
MIPS: OCTEON: Save and restore CP2 SHA3 state
2015-02-20 15:29:08 +01:00
MIPS: Remove unused dt_setup_arch()
2015-01-16 13:10:42 +01:00
MIPS: OCTEON: Save/Restore wider multiply registers in OCTEON III CPUs
2015-02-20 15:28:29 +01:00
MIPS: Synchronize MIPS count one CPU at a time
2012-08-17 10:57:28 +02:00
MIPS: asm: r4kcache: Add MIPS R6 cache unroll functions
2015-02-17 15:37:20 +00:00
MIPS: asm/reg.h: Move to uapi
2014-08-02 00:06:38 +02:00
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
MIPS: APRP: Code formatting clean-ups.
2014-01-22 20:19:02 +01:00
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
MIPS: Add 8250/16550 serial early printk driver
2013-10-29 21:24:36 +01:00
MIPS: ARC: Add declarations for a few missing ARC firmware functions.
2015-01-13 16:04:28 +01:00
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
Revert "MIPS: Save/restore MSA context around signals"
2014-06-26 10:48:18 +01:00
Fix breakage in MIPS siginfo handling
2013-03-19 19:15:52 +01:00
mips: switch to generic sys_fork() and sys_clone()
2013-02-03 18:33:02 -05:00
MIPS: pm-cps: Prevent use of mips_cps_* without CPS SMP
2014-07-30 20:47:39 +02:00
MIPS: SMP: Remove plat_smp_ops cpus_done method.
2014-05-27 11:06:42 +02:00
MIPS: Move CPU topology macros to topology.h
2014-08-27 13:44:44 +02:00
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
UAPI: (Scripted) Disintegrate arch/mips/include/asm
2012-10-09 09:47:14 +01:00
MIPS: Add NUMA support for Loongson-3
2014-07-30 21:46:19 +02:00
MIPS: asm: spinlock: Replace "sub" instruction with "addiu"
2015-02-17 15:37:23 +00:00
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
MIPS: asm: spram: Add new symbol for MIPS scratch pad storage
2015-02-17 15:37:20 +00:00
MIPS: asm: stackframe: Do not preserve the HI/LO registers on MIPS R6
2015-02-17 15:37:17 +00:00
MIPS: initial stack protector support
2013-07-01 15:10:48 +02:00
MIPS: Add new unwind_stack variant
2011-06-15 14:35:33 +02:00
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
MIPS: Make use of the ERETNC instruction on MIPS R6
2015-02-17 15:37:37 +00:00
MIPS: Fix syscall_get_nr for the syscall exit tracing.
2015-02-04 16:40:09 +01:00
UAPI: (Scripted) Disintegrate arch/mips/include/asm
2012-10-09 09:47:14 +01:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2015-02-21 19:41:38 -08:00
clocksource: mips-gic: Use CPU notifiers to setup the timer
2014-11-24 07:45:16 +01:00
MIPS: Implement random_get_entropy with CP0 Random
2014-05-30 18:21:30 +02:00
MIPS: tlb: Set the EHINV bit for TLBINVF cores when invalidating the TLB
2014-01-22 20:18:59 +01:00
MIPS: Fix Jazz 64-bit build error.
2011-12-07 22:01:45 +00:00
MIPS: Move CPU topology macros to topology.h
2014-08-27 13:44:44 +02:00
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
MIPS: Remove now unused definition of phys_t.
2014-11-24 22:47:31 +01:00
MIPS: uaccess.h: Fix strnlen_user comment.
2014-11-24 07:45:33 +01:00
MIPS: Add MFHC0 and MTHC0 instructions to uasm.
2014-11-24 22:47:31 +01:00
sys_sgetmask/sys_ssetmask: add CONFIG_SGETMASK_SYSCALL
2014-06-04 16:54:14 -07:00
MIPS: Fix VGA_MAP_MEM macro.
2013-09-18 17:13:58 +02:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2014-01-30 17:20:32 -08:00
MIPS: Whitespace cleanup.
2013-02-01 10:00:22 +01:00
a135c717d5