Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

807249d3 · Linus Torvalds <[email protected]> · 2015-09-03 16:55:55 -07:00

Pull MIPS updates from Ralf Baechle:
 "This is the main pull request for 4.3 for MIPS.  Here's the summary:

  Three fixes that didn't make 4.2-stable:

   - a -Os build might compile the kernel using the MIPS16 instruction
     set but the R2 optimized inline functions in <uapi/asm/swab.h> are
     implemented using 32-bit wide instructions which is invalid.

   - a build error in pgtable-bits.h for a particular kernel
     configuration.

   - accessing registers of the CM GCR might have been compiled to use
     64 bit accesses but these registers are onl 32 bit wide.

  And also a few new bits:

   - move the ATH79 GPIO driver to drivers/gpio

   - the definition of IRQCHIP_DECLARE has moved to linux/irqchip.h,
     change ATH79 accordingly.

   - fix definition of pgprot_writecombine

   - add an implementation of dma_map_ops.mmap

   - fix alignment of quiet build output for vmlinuz link

   - BCM47xx: Use kmemdup rather than duplicating its implementation

   - Netlogic: Fix 0x0x prefixes of constants.

   - merge Bjorn Helgaas' series to remove most of the weak keywords
     from function declarations.

   - CP0 and CP1 registers are best considered treated as unsigned
     values to avoid large values from becoming negative values.

   - improve support for the MIPS GIC timer.

   - enable common clock framework for Malta and SEAD3.

   - a number of improvments and fixes to dump_tlb().

   - document the MIPS TLB dump functionality in Magic SysRq.

   - Cavium Octeon CN68XX improvments.

   - NetLogic improvments.

   - irq: Use access helper irq_data_get_affinity_mask.

   - handle MSA unaligned accesses.

   - a number of R6-related math-emu fixes.

   - support for I6400.

   - improvments to MSA support.

   - add uprobes support.

   - move from deprecated __initcall to arch_initcall.

   - remove finish_arch_switch().

   - IRQ cleanups by Thomas Gleixner.

   - migrate to new 'set-state' interface.

   - random small cleanups"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (148 commits)
  MIPS: UAPI: Fix unrecognized opcode WSBH/DSBH/DSHD when using MIPS16.
  MIPS: Fix alignment of quiet build output for vmlinuz link
  MIPS: math-emu: Remove unused handle_dsemul function declaration
  MIPS: math-emu: Add support for the MIPS R6 MAX{, A} FPU instruction
  MIPS: math-emu: Add support for the MIPS R6 MIN{, A} FPU instruction
  MIPS: math-emu: Add support for the MIPS R6 CLASS FPU instruction
  MIPS: math-emu: Add support for the MIPS R6 RINT FPU instruction
  MIPS: math-emu: Add support for the MIPS R6 MSUBF FPU instruction
  MIPS: math-emu: Add support for the MIPS R6 MADDF FPU instruction
  MIPS: math-emu: Add support for the MIPS R6 SELNEZ FPU instruction
  MIPS: math-emu: Add support for the MIPS R6 SELEQZ FPU instruction
  MIPS: math-emu: Add support for the CMP.condn.fmt R6 instruction
  MIPS: inst.h: Add new MIPS R6 FPU opcodes
  MIPS: Octeon: Fix management port MII address on Kontron S1901
  MIPS: BCM47xx: Use kmemdup rather than duplicating its implementation
  STAGING: Octeon: Use common helpers for determining interface and port
  MIPS: Octeon: Support interfaces 4 and 5
  MIPS: Octeon: Set up 1:1 mapping between CN68XX PKO queues and ports
  MIPS: Octeon: Initialize CN68XX PKO
  STAGING: Octeon: Support CN68XX style WQE
  ...

Commit: 807249d3ada1ff28a47c4054ca4edd479421b671
Parents: ff474e8c · 2db97045

Merge commit. Changes below are compared with the first parent: ff474e8c.

Changes

195 files changed · +6347 −2101

File	Status	Add	Del	Content
Documentation/devicetree/bindings/timer/img,pistachio-gptimer.txt	added	+28	−0	View file
Documentation/features/debug/uprobes/arch-support.txt	modified	+1	−1	View file
Documentation/sysrq.txt	modified	+1	−0	View file
arch/mips/Kconfig	modified	+17	−8	View file
arch/mips/Kconfig.debug	modified	+0	−9	View file
arch/mips/alchemy/Kconfig	modified	+0	−7	View file
arch/mips/alchemy/board-gpr.c	modified	+1	−0	View file
arch/mips/alchemy/board-mtx1.c	modified	+1	−0	View file
arch/mips/alchemy/common/Makefile	modified	+1	−6	View file
arch/mips/alchemy/common/irq.c	modified	+2	−2	View file
arch/mips/alchemy/common/time.c	modified	+0	−6	View file
arch/mips/alchemy/devboards/bcsr.c	modified	+4	−2	View file
arch/mips/alchemy/devboards/db1000.c	modified	+1	−0	View file
arch/mips/alchemy/devboards/db1300.c	modified	+1	−0	View file
arch/mips/alchemy/devboards/db1550.c	modified	+1	−0	View file
arch/mips/alchemy/devboards/pm.c	modified	+1	−1	View file
arch/mips/ar7/gpio.c	modified	+4	−1	View file
arch/mips/ar7/platform.c	modified	+0	−1	View file
arch/mips/ar7/setup.c	modified	+0	−1	View file
arch/mips/ath79/Makefile	modified	+1	−1	View file
arch/mips/ath79/common.h	modified	+0	−3	View file
arch/mips/ath79/irq.c	modified	+2	−16	View file
arch/mips/bcm47xx/buttons.c	modified	+1	−2	View file
arch/mips/bcm63xx/irq.c	modified	+3	−3	View file
arch/mips/boot/compressed/Makefile	modified	+1	−1	View file
arch/mips/boot/dts/netlogic/xlp_evp.dts	modified	+12	−0	View file
arch/mips/boot/dts/netlogic/xlp_fvp.dts	modified	+12	−0	View file
arch/mips/boot/dts/netlogic/xlp_gvp.dts	modified	+11	−0	View file
arch/mips/boot/dts/netlogic/xlp_rvp.dts	modified	+11	−0	View file
arch/mips/boot/dts/netlogic/xlp_svp.dts	modified	+12	−0	View file
arch/mips/cavium-octeon/executive/cvmx-helper-board.c	modified	+6	−0	View file
arch/mips/cavium-octeon/executive/cvmx-helper-util.c	modified	+16	−4	View file
arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c	modified	+13	−1	View file
arch/mips/cavium-octeon/executive/cvmx-helper.c	modified	+17	−0	View file
arch/mips/cavium-octeon/executive/cvmx-pko.c	modified	+144	−5	View file
arch/mips/cavium-octeon/octeon-irq.c	modified	+19	−17	View file
arch/mips/include/asm/Kbuild	modified	+0	−1	View file
arch/mips/include/asm/abi.h	modified	+4	−0	View file
arch/mips/include/asm/asmmacro.h	modified	+114	−0	View file
arch/mips/include/asm/cdmm.h	modified	+2	−2	View file
arch/mips/include/asm/cevt-r4k.h	modified	+0	−1	View file
arch/mips/include/asm/cpu-features.h	modified	+4	−0	View file
arch/mips/include/asm/cpu-type.h	modified	+4	−0	View file
arch/mips/include/asm/cpu.h	modified	+3	−0	View file
arch/mips/include/asm/debug.h	deleted	+0	−48	View before deletion
arch/mips/include/asm/elf.h	modified	+3	−1	View file
arch/mips/include/asm/fpu.h	modified	+13	−8	View file
arch/mips/include/asm/gpio.h	deleted	+0	−6	View before deletion
arch/mips/include/asm/irq.h	modified	+1	−1	View file
arch/mips/include/asm/kdebug.h	modified	+3	−1	View file
arch/mips/include/asm/linkage.h	modified	+0	−1	View file
arch/mips/include/asm/maar.h	modified	+1	−1	View file
arch/mips/include/asm/mach-ar7/ar7.h	modified	+4	−0	View file
arch/mips/include/asm/mach-ar7/gpio.h	deleted	+0	−41	View before deletion
arch/mips/include/asm/mach-ath25/gpio.h	deleted	+0	−16	View before deletion
arch/mips/include/asm/mach-ath79/gpio.h	deleted	+0	−26	View before deletion
arch/mips/include/asm/mach-au1x00/gpio-au1000.h	modified	+11	−137	View file
arch/mips/include/asm/mach-au1x00/gpio.h	deleted	+0	−86	View before deletion
arch/mips/include/asm/mach-bcm47xx/gpio.h	deleted	+0	−17	View before deletion
arch/mips/include/asm/mach-bcm63xx/gpio.h	deleted	+0	−15	View before deletion
arch/mips/include/asm/mach-cavium-octeon/gpio.h	deleted	+0	−21	View before deletion
arch/mips/include/asm/mach-generic/gpio.h	deleted	+0	−21	View before deletion
arch/mips/include/asm/mach-jz4740/gpio.h	modified	+0	−2	View file
arch/mips/include/asm/mach-lantiq/gpio.h	deleted	+0	−13	View before deletion
arch/mips/include/asm/mach-loongson64/gpio.h	deleted	+0	−36	View before deletion
arch/mips/include/asm/mach-pistachio/gpio.h	deleted	+0	−21	View before deletion
arch/mips/include/asm/mach-rc32434/gpio.h	modified	+0	−12	View file
arch/mips/include/asm/mips-cm.h	modified	+85	−4	View file
arch/mips/include/asm/mips-cpc.h	modified	+0	−10	View file
arch/mips/include/asm/mipsregs.h	modified	+32	−28	View file
arch/mips/include/asm/msa.h	modified	+80	−0	View file
arch/mips/include/asm/octeon/cvmx-bootinfo.h	modified	+2	−0	View file
arch/mips/include/asm/octeon/cvmx-pip.h	modified	+1	−1	View file
arch/mips/include/asm/octeon/cvmx-pko.h	modified	+3	−0	View file
arch/mips/include/asm/octeon/cvmx-pow-defs.h	modified	+29	−0	View file
arch/mips/include/asm/octeon/cvmx-pow.h	modified	+5	−4	View file
arch/mips/include/asm/octeon/cvmx-wqe.h	modified	+249	−59	View file
arch/mips/include/asm/pgtable-bits.h	modified	+10	−15	View file
arch/mips/include/asm/pgtable.h	modified	+2	−0	View file
arch/mips/include/asm/processor.h	modified	+2	−0	View file
arch/mips/include/asm/ptrace.h	modified	+80	−0	View file
arch/mips/include/asm/signal.h	modified	+3	−0	View file
arch/mips/include/asm/spinlock.h	modified	+5	−0	View file
arch/mips/include/asm/switch_to.h	modified	+4	−17	View file
arch/mips/include/asm/thread_info.h	modified	+4	−1	View file
arch/mips/include/asm/time.h	modified	+1	−1	View file
arch/mips/include/asm/tlbdebug.h	modified	+1	−0	View file
arch/mips/include/asm/uprobes.h	added	+58	−0	View file
arch/mips/include/asm/vpe.h	modified	+1	−1	View file
arch/mips/include/uapi/asm/break.h	modified	+2	−0	View file
arch/mips/include/uapi/asm/hwcap.h	added	+8	−0	View file
arch/mips/include/uapi/asm/inst.h	modified	+37	−3	View file
arch/mips/include/uapi/asm/sigcontext.h	modified	+12	−0	View file
arch/mips/include/uapi/asm/swab.h	modified	+9	−3	View file
arch/mips/include/uapi/asm/ucontext.h	added	+65	−0	View file
arch/mips/jazz/irq.c	modified	+0	−7	View file
arch/mips/jz4740/gpio.c	modified	+10	−14	View file
arch/mips/jz4740/time.c	modified	+27	−19	View file
arch/mips/kernel/Makefile	modified	+1	−0	View file
arch/mips/kernel/asm-offsets.c	modified	+1	−11	View file
arch/mips/kernel/cevt-bcm1480.c	modified	+22	−22	View file
arch/mips/kernel/cevt-ds1287.c	modified	+22	−15	View file
arch/mips/kernel/cevt-gt641xx.c	modified	+39	−18	View file
arch/mips/kernel/cevt-r4k.c	modified	+7	−11	View file
arch/mips/kernel/cevt-sb1250.c	modified	+23	−22	View file
arch/mips/kernel/cevt-txx9.c	modified	+51	−30	View file
arch/mips/kernel/cps-vec.S	modified	+2	−2	View file
arch/mips/kernel/cpu-probe.c	modified	+46	−10	View file
arch/mips/kernel/idle.c	modified	+1	−0	View file
arch/mips/kernel/mips-cm.c	modified	+256	−1	View file
arch/mips/kernel/mips-cpc.c	modified	+9	−2	View file
arch/mips/kernel/perf_event_mipsxx.c	modified	+6	−0	View file
arch/mips/kernel/pm-cps.c	modified	+2	−0	View file
arch/mips/kernel/ptrace.c	modified	+88	−0	View file
arch/mips/kernel/r4k_fpu.S	modified	+259	−177	View file
arch/mips/kernel/r4k_switch.S	modified	+1	−40	View file
arch/mips/kernel/signal-common.h	modified	+9	−0	View file
arch/mips/kernel/signal.c	modified	+340	−93	View file
arch/mips/kernel/signal32.c	modified	+11	−196	View file
arch/mips/kernel/signal_n32.c	modified	+5	−1	View file
arch/mips/kernel/spram.c	modified	+1	−0	View file
arch/mips/kernel/sysrq.c	modified	+1	−13	View file
arch/mips/kernel/traps.c	modified	+29	−28	View file
arch/mips/kernel/unaligned.c	modified	+73	−1	View file
arch/mips/kernel/uprobes.c	added	+341	−0	View file
arch/mips/kernel/vpe.c	modified	+6	−1	View file
arch/mips/lasat/sysctl.c	modified	+1	−1	View file
arch/mips/lib/dump_tlb.c	modified	+36	−9	View file
arch/mips/lib/r3k_dump_tlb.c	modified	+11	−0	View file
arch/mips/loongson32/common/time.c	modified	+34	−23	View file
arch/mips/loongson64/common/cs5536/cs5536_mfgpt.c	modified	+21	−25	View file
arch/mips/loongson64/loongson-3/hpet.c	modified	+71	−46	View file
arch/mips/math-emu/Makefile	modified	+2	−2	View file
arch/mips/math-emu/cp1emu.c	modified	+387	−13	View file
arch/mips/math-emu/dp_2008class.c	added	+55	−0	View file
arch/mips/math-emu/dp_fmax.c	added	+213	−0	View file
arch/mips/math-emu/dp_fmin.c	added	+213	−0	View file
arch/mips/math-emu/dp_maddf.c	added	+265	−0	View file
arch/mips/math-emu/dp_msubf.c	added	+269	−0	View file
arch/mips/math-emu/dsemul.c	modified	+0	−1	View file
arch/mips/math-emu/ieee754.h	modified	+19	−0	View file
arch/mips/math-emu/ieee754int.h	modified	+4	−4	View file
arch/mips/math-emu/me-debugfs.c	modified	+1	−1	View file
arch/mips/math-emu/sp_2008class.c	added	+55	−0	View file
arch/mips/math-emu/sp_fmax.c	added	+213	−0	View file
arch/mips/math-emu/sp_fmin.c	added	+213	−0	View file
arch/mips/math-emu/sp_maddf.c	added	+255	−0	View file
arch/mips/math-emu/sp_msubf.c	added	+258	−0	View file
arch/mips/mm/c-r4k.c	modified	+1	−0	View file
arch/mips/mm/dma-default.c	modified	+35	−0	View file
arch/mips/mm/fault.c	modified	+4	−4	View file
arch/mips/mm/init.c	modified	+34	−2	View file
arch/mips/mm/sc-mips.c	modified	+42	−0	View file
arch/mips/mm/tlb-r3k.c	modified	+1	−1	View file
arch/mips/mti-malta/malta-init.c	modified	+7	−0	View file
arch/mips/mti-malta/malta-int.c	modified	+1	−111	View file
arch/mips/mti-malta/malta-memory.c	modified	+0	−25	View file
arch/mips/netlogic/common/irq.c	modified	+6	−6	View file
arch/mips/netlogic/common/smp.c	modified	+4	−2	View file
arch/mips/netlogic/xlp/ahci-init-xlp2.c	modified	+1	−1	View file
arch/mips/netlogic/xlp/nlm_hal.c	modified	+2	−0	View file
arch/mips/oprofile/common.c	modified	+1	−0	View file
arch/mips/oprofile/op_model_mipsxx.c	modified	+4	−0	View file
arch/mips/pci/msi-xlp.c	modified	+10	−10	View file
arch/mips/pci/ops-emma2rh.c	modified	+2	−4	View file
arch/mips/pci/pci-ar71xx.c	modified	+2	−2	View file
arch/mips/pci/pci-ar724x.c	modified	+2	−2	View file
arch/mips/pci/pci-lantiq.c	modified	+0	−1	View file
arch/mips/pci/pci-rt3883.c	modified	+3	−4	View file
arch/mips/pistachio/Kconfig	added	+13	−0	View file
arch/mips/pmcs-msp71xx/msp_irq_cic.c	modified	+2	−1	View file
arch/mips/ralink/cevt-rt3352.c	modified	+30	−29	View file
arch/mips/rb532/devices.c	modified	+1	−0	View file
arch/mips/rb532/gpio.c	modified	+6	−0	View file
arch/mips/sgi-ip27/ip27-timer.c	modified	+0	−7	View file
arch/mips/sibyte/common/bus_watcher.c	modified	+1	−1	View file
arch/mips/sni/time.c	modified	+19	−30	View file
arch/mips/txx9/generic/setup.c	modified	+0	−16	View file
drivers/ata/pata_rb532_cf.c	modified	+1	−2	View file
drivers/bus/mips_cdmm.c	modified	+13	−1	View file
drivers/clocksource/Kconfig	modified	+4	−0	View file
drivers/clocksource/Makefile	modified	+1	−0	View file
drivers/clocksource/mips-gic-timer.c	modified	+56	−9	View file
drivers/clocksource/time-pistachio.c	added	+217	−0	View file
drivers/gpio/Makefile	modified	+1	−0	View file
arch/mips/ath79/gpio.c → drivers/gpio/gpio-ath79.c	renamed	+0	−75	View file
drivers/input/misc/rb532_button.c	modified	+1	−0	View file
drivers/irqchip/irq-mips-gic.c	modified	+94	−48	View file
drivers/net/ethernet/ti/cpmac.c	modified	+2	−0	View file
drivers/staging/octeon/ethernet-rx.c	modified	+92	−41	View file
drivers/staging/octeon/ethernet-tx.c	modified	+10	−9	View file
drivers/staging/octeon/ethernet-util.h	modified	+11	−11	View file
drivers/staging/octeon/ethernet.c	modified	+5	−2	View file
drivers/tty/mips_ejtag_fdc.c	modified	+6	−3	View file
include/linux/irqchip/mips-gic.h	modified	+12	−2	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/devicetree/bindings/timer/img,pistachio-gptimer.txt

View file

diff --git a/Documentation/devicetree/bindings/timer/img,pistachio-gptimer.txt b/Documentation/devicetree/bindings/timer/img,pistachio-gptimer.txt
new file mode 100644
index 0000000..7afce80
--- /dev/null
+++ b/Documentation/devicetree/bindings/timer/img,pistachio-gptimer.txt
@@ -0,0 +1,28 @@
+* Pistachio general-purpose timer based clocksource
+
+Required properties:
+ - compatible: "img,pistachio-gptimer".
+ - reg: Address range of the timer registers.
+ - interrupts: An interrupt for each of the four timers
+ - clocks: Should contain a clock specifier for each entry in clock-names
+ - clock-names: Should contain the following entries:
+                "sys", interface clock
+                "slow", slow counter clock
+                "fast", fast counter clock
+ - img,cr-periph: Must contain a phandle to the peripheral control
+		  syscon node.
+
+Example:
+	timer: timer@18102000 {
+		compatible = "img,pistachio-gptimer";
+		reg = <0x18102000 0x100>;
+		interrupts = <GIC_SHARED 60 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SHARED 61 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SHARED 62 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SHARED 63 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&clk_periph PERIPH_CLK_COUNTER_FAST>,
+		         <&clk_periph PERIPH_CLK_COUNTER_SLOW>,
+			 <&cr_periph SYS_CLK_TIMER>;
+		clock-names = "fast", "slow", "sys";
+		img,cr-periph = <&cr_periph>;
+	};

Documentation/features/debug/uprobes/arch-support.txt

View file

diff --git a/Documentation/features/debug/uprobes/arch-support.txt b/Documentation/features/debug/uprobes/arch-support.txt
index 4efe36c..d605c3f 100644
--- a/Documentation/features/debug/uprobes/arch-support.txt
+++ b/Documentation/features/debug/uprobes/arch-support.txt
@@ -22,7 +22,7 @@
     |        m68k: | TODO |
     |       metag: | TODO |
     |  microblaze: | TODO |
-    |        mips: | TODO |
+    |        mips: |  ok  |
     |     mn10300: | TODO |
     |       nios2: | TODO |
     |    openrisc: | TODO |

Documentation/sysrq.txt

View file

diff --git a/Documentation/sysrq.txt b/Documentation/sysrq.txt
index 0e307c9..267f393 100644
--- a/Documentation/sysrq.txt
+++ b/Documentation/sysrq.txt
@@ -119,6 +119,7 @@ On all -  write a character to /proc/sysrq-trigger.  e.g.:
 
 'x'	- Used by xmon interface on ppc/powerpc platforms.
           Show global PMU Registers on sparc64.
+          Dump all TLB entries on MIPS.
 
 'y'	- Show global CPU Registers [SPARC-64 specific]
 

arch/mips/Kconfig

View file

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 4ab9a79..752acca 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1,8 +1,10 @@
 config MIPS
 	bool
 	default y
+	select ARCH_SUPPORTS_UPROBES
 	select ARCH_MIGHT_HAVE_PC_PARPORT
 	select ARCH_MIGHT_HAVE_PC_SERIO
+	select ARCH_USE_CMPXCHG_LOCKREF if 64BIT
 	select HAVE_CONTEXT_TRACKING
 	select HAVE_GENERIC_DMA_COHERENT
 	select HAVE_IDE
@@ -13,7 +15,6 @@ config MIPS
 	select HAVE_ARCH_SECCOMP_FILTER
 	select HAVE_ARCH_TRACEHOOK
 	select HAVE_BPF_JIT if !CPU_MICROMIPS
-	select ARCH_HAVE_CUSTOM_GPIO_H
 	select HAVE_FUNCTION_TRACER
 	select HAVE_DYNAMIC_FTRACE
 	select HAVE_FTRACE_MCOUNT_RECORD
@@ -409,6 +410,7 @@ config MIPS_MALTA
 	select CEVT_R4K
 	select CSRC_R4K
 	select CLKSRC_MIPS_GIC
+	select COMMON_CLK
 	select DMA_MAYBE_COHERENT
 	select GENERIC_ISA_DMA
 	select HAVE_PCSPKR_PLATFORM
@@ -459,6 +461,7 @@ config MIPS_SEAD3
 	select CEVT_R4K
 	select CSRC_R4K
 	select CLKSRC_MIPS_GIC
+	select COMMON_CLK
 	select CPU_MIPSR2_IRQ_VI
 	select CPU_MIPSR2_IRQ_EI
 	select DMA_NONCOHERENT
@@ -899,6 +902,7 @@ config NLM_XLP_BOARD
 	select SYS_SUPPORTS_32BIT_KERNEL
 	select SYS_SUPPORTS_64BIT_KERNEL
 	select ARCH_PHYS_ADDR_T_64BIT
+	select ARCH_REQUIRE_GPIOLIB
 	select SYS_SUPPORTS_BIG_ENDIAN
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 	select SYS_SUPPORTS_HIGHMEM
@@ -948,6 +952,7 @@ source "arch/mips/jazz/Kconfig"
 source "arch/mips/jz4740/Kconfig"
 source "arch/mips/lantiq/Kconfig"
 source "arch/mips/lasat/Kconfig"
+source "arch/mips/pistachio/Kconfig"
 source "arch/mips/pmcs-msp71xx/Kconfig"
 source "arch/mips/ralink/Kconfig"
 source "arch/mips/sgi-ip27/Kconfig"
@@ -1041,6 +1046,9 @@ config FW_CFE
 config ARCH_DMA_ADDR_T_64BIT
 	def_bool (HIGHMEM && ARCH_PHYS_ADDR_T_64BIT) || 64BIT
 
+config ARCH_SUPPORTS_UPROBES
+	bool
+
 config DMA_MAYBE_COHERENT
 	select DMA_NONCOHERENT
 	bool
@@ -1364,7 +1372,7 @@ config CPU_MIPS32_R2
 	  otherwise CPU_MIPS32_R1 is a safe bet for any MIPS32 system.
 
 config CPU_MIPS32_R6
-	bool "MIPS32 Release 6 (EXPERIMENTAL)"
+	bool "MIPS32 Release 6"
 	depends on SYS_HAS_CPU_MIPS32_R6
 	select CPU_HAS_PREFETCH
 	select CPU_SUPPORTS_32BIT_KERNEL
@@ -1415,7 +1423,7 @@ config CPU_MIPS64_R2
 	  otherwise CPU_MIPS64_R1 is a safe bet for any MIPS64 system.
 
 config CPU_MIPS64_R6
-	bool "MIPS64 Release 6 (EXPERIMENTAL)"
+	bool "MIPS64 Release 6"
 	depends on SYS_HAS_CPU_MIPS64_R6
 	select CPU_HAS_PREFETCH
 	select CPU_SUPPORTS_32BIT_KERNEL
@@ -1965,6 +1973,7 @@ config 32BIT
 	select TRAD_SIGNALS
 	help
 	  Select this option if you want to build a 32-bit kernel.
+
 config 64BIT
 	bool "64-bit kernel"
 	depends on CPU_SUPPORTS_64BIT_KERNEL && SYS_SUPPORTS_64BIT_KERNEL
@@ -2110,7 +2119,7 @@ config CPU_R4K_CACHE_TLB
 
 config MIPS_MT_SMP
 	bool "MIPS MT SMP support (1 TC on each available VPE)"
-	depends on SYS_SUPPORTS_MULTITHREADING
+	depends on SYS_SUPPORTS_MULTITHREADING && !CPU_MIPSR6
 	select CPU_MIPSR2_IRQ_VI
 	select CPU_MIPSR2_IRQ_EI
 	select SYNC_R4K
@@ -2211,7 +2220,7 @@ config MIPS_VPE_APSP_API_MT
 
 config MIPS_CMP
 	bool "MIPS CMP framework support (DEPRECATED)"
-	depends on SYS_SUPPORTS_MIPS_CMP
+	depends on SYS_SUPPORTS_MIPS_CMP && !CPU_MIPSR6
 	select MIPS_GIC_IPI
 	select SMP
 	select SYNC_R4K
@@ -2228,7 +2237,7 @@ config MIPS_CMP
 
 config MIPS_CPS
 	bool "MIPS Coherent Processing System support"
-	depends on SYS_SUPPORTS_MIPS_CPS
+	depends on SYS_SUPPORTS_MIPS_CPS && !CPU_MIPSR6
 	select MIPS_CM
 	select MIPS_CPC
 	select MIPS_CPS_PM if HOTPLUG_CPU
@@ -2303,7 +2312,7 @@ config CPU_MICROMIPS
 endchoice
 
 config CPU_HAS_MSA
-	bool "Support for the MIPS SIMD Architecture (EXPERIMENTAL)"
+	bool "Support for the MIPS SIMD Architecture"
 	depends on CPU_SUPPORTS_MSA
 	depends on 64BIT || MIPS_O32_FP64_SUPPORT
 	help
@@ -2643,7 +2652,7 @@ config SECCOMP
 	  If unsure, say Y. Only embedded should say N here.
 
 config MIPS_O32_FP64_SUPPORT
-	bool "Support for O32 binaries using 64-bit FP (EXPERIMENTAL)"
+	bool "Support for O32 binaries using 64-bit FP"
 	depends on 32BIT || MIPS32_O32
 	help
 	  When this is enabled, the kernel will support use of 64-bit floating

arch/mips/Kconfig.debug

View file

diff --git a/arch/mips/Kconfig.debug b/arch/mips/Kconfig.debug
index 3a2b775..e250524 100644
--- a/arch/mips/Kconfig.debug
+++ b/arch/mips/Kconfig.debug
@@ -87,15 +87,6 @@ config SB1XXX_CORELIS
 	  Select compile flags that produce code that can be processed by the
 	  Corelis mksym utility and UDB Emulator.
 
-config RUNTIME_DEBUG
-	bool "Enable run-time debugging"
-	depends on DEBUG_KERNEL
-	help
-	  If you say Y here, some debugging macros will do run-time checking.
-	  If you say N here, those macros will mostly turn to no-ops.  See
-	  arch/mips/include/asm/debug.h for debugging macros.
-	  If unsure, say N.
-
 config DEBUG_ZBOOT
 	bool "Enable compressed kernel support debugging"
 	depends on DEBUG_KERNEL && SYS_SUPPORTS_ZBOOT

arch/mips/alchemy/Kconfig

View file

diff --git a/arch/mips/alchemy/Kconfig b/arch/mips/alchemy/Kconfig
index b962898..7fa2488 100644
--- a/arch/mips/alchemy/Kconfig
+++ b/arch/mips/alchemy/Kconfig
@@ -6,13 +6,6 @@ config ALCHEMY_GPIOINT_AU1000
 config ALCHEMY_GPIOINT_AU1300
 	bool
 
-# select this in your board config if you don't want to use the gpio
-# namespace as documented in the manuals.  In this case however you need
-# to create the necessary gpio_* functions in your board code/headers!
-# see arch/mips/include/asm/mach-au1x00/gpio.h   for more information.
-config ALCHEMY_GPIO_INDIRECT
-	def_bool n
-
 choice
 	prompt "Machine type"
 	depends on MIPS_ALCHEMY

arch/mips/alchemy/board-gpr.c

View file

diff --git a/arch/mips/alchemy/board-gpr.c b/arch/mips/alchemy/board-gpr.c
index acf9a2a..79efe4c 100644
--- a/arch/mips/alchemy/board-gpr.c
+++ b/arch/mips/alchemy/board-gpr.c
@@ -34,6 +34,7 @@
 #include <asm/idle.h>
 #include <asm/reboot.h>
 #include <asm/mach-au1x00/au1000.h>
+#include <asm/mach-au1x00/gpio-au1000.h>
 #include <prom.h>
 
 const char *get_system_type(void)

arch/mips/alchemy/board-mtx1.c

View file

diff --git a/arch/mips/alchemy/board-mtx1.c b/arch/mips/alchemy/board-mtx1.c
index 1e3b102..85bb756 100644
--- a/arch/mips/alchemy/board-mtx1.c
+++ b/arch/mips/alchemy/board-mtx1.c
@@ -32,6 +32,7 @@
 #include <asm/bootinfo.h>
 #include <asm/reboot.h>
 #include <asm/mach-au1x00/au1000.h>
+#include <asm/mach-au1x00/gpio-au1000.h>
 #include <asm/mach-au1x00/au1xxx_eth.h>
 #include <prom.h>
 

arch/mips/alchemy/common/Makefile

View file

diff --git a/arch/mips/alchemy/common/Makefile b/arch/mips/alchemy/common/Makefile
index f64744f..23800b8 100644
--- a/arch/mips/alchemy/common/Makefile
+++ b/arch/mips/alchemy/common/Makefile
@@ -5,10 +5,5 @@
 # Makefile for the Alchemy Au1xx0 CPUs, generic files.
 #
 
-obj-y += prom.o time.o clock.o platform.o power.o \
+obj-y += prom.o time.o clock.o platform.o power.o gpiolib.o \
 	 setup.o sleeper.o dma.o dbdma.o vss.o irq.o usb.o
-
-# optional gpiolib support
-ifeq ($(CONFIG_ALCHEMY_GPIO_INDIRECT),)
- obj-$(CONFIG_GPIOLIB) += gpiolib.o
-endif

arch/mips/alchemy/common/irq.c

View file

diff --git a/arch/mips/alchemy/common/irq.c b/arch/mips/alchemy/common/irq.c
index 6cb60ab..4c496c5 100644
--- a/arch/mips/alchemy/common/irq.c
+++ b/arch/mips/alchemy/common/irq.c
@@ -491,7 +491,7 @@ static int au1x_ic_settype(struct irq_data *d, unsigned int flow_type)
 	default:
 		ret = -EINVAL;
 	}
-	__irq_set_chip_handler_name_locked(d->irq, chip, handler, name);
+	irq_set_chip_handler_name_locked(d, chip, handler, name);
 
 	wmb();
 
@@ -703,7 +703,7 @@ static int au1300_gpic_settype(struct irq_data *d, unsigned int type)
 		return -EINVAL;
 	}
 
-	__irq_set_chip_handler_name_locked(d->irq, &au1300_gpic, hdl, name);
+	irq_set_chip_handler_name_locked(d, &au1300_gpic, hdl, name);
 
 	au1300_gpic_chgcfg(d->irq - ALCHEMY_GPIC_INT_BASE, GPIC_CFG_IC_MASK, s);
 

arch/mips/alchemy/common/time.c

View file

diff --git a/arch/mips/alchemy/common/time.c b/arch/mips/alchemy/common/time.c
index 50e17e1..f99d3ec 100644
--- a/arch/mips/alchemy/common/time.c
+++ b/arch/mips/alchemy/common/time.c
@@ -69,11 +69,6 @@ static int au1x_rtcmatch2_set_next_event(unsigned long delta,
 	return 0;
 }
 
-static void au1x_rtcmatch2_set_mode(enum clock_event_mode mode,
-				    struct clock_event_device *cd)
-{
-}
-
 static irqreturn_t au1x_rtcmatch2_irq(int irq, void *dev_id)
 {
 	struct clock_event_device *cd = dev_id;
@@ -86,7 +81,6 @@ static struct clock_event_device au1x_rtcmatch2_clockdev = {
 	.features	= CLOCK_EVT_FEAT_ONESHOT,
 	.rating		= 1500,
 	.set_next_event = au1x_rtcmatch2_set_next_event,
-	.set_mode	= au1x_rtcmatch2_set_mode,
 	.cpumask	= cpu_all_mask,
 };
 

arch/mips/alchemy/devboards/bcsr.c

View file

diff --git a/arch/mips/alchemy/devboards/bcsr.c b/arch/mips/alchemy/devboards/bcsr.c
index c98c9ea..324ad72 100644
--- a/arch/mips/alchemy/devboards/bcsr.c
+++ b/arch/mips/alchemy/devboards/bcsr.c
@@ -8,6 +8,7 @@
  */
 
 #include <linux/interrupt.h>
+#include <linux/irqchip/chained_irq.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
 #include <linux/irq.h>
@@ -88,10 +89,11 @@ EXPORT_SYMBOL_GPL(bcsr_mod);
 static void bcsr_csc_handler(unsigned int irq, struct irq_desc *d)
 {
 	unsigned short bisr = __raw_readw(bcsr_virt + BCSR_REG_INTSTAT);
+	struct irq_chip *chip = irq_desc_get_chip(d);
 
-	disable_irq_nosync(irq);
+	chained_irq_enter(chip, d);
 	generic_handle_irq(bcsr_csc_base + __ffs(bisr));
-	enable_irq(irq);
+	chained_irq_exit(chip, d);
 }
 
 static void bcsr_irq_mask(struct irq_data *d)

arch/mips/alchemy/devboards/db1000.c

View file

diff --git a/arch/mips/alchemy/devboards/db1000.c b/arch/mips/alchemy/devboards/db1000.c
index 001102e..bdeed9d 100644
--- a/arch/mips/alchemy/devboards/db1000.c
+++ b/arch/mips/alchemy/devboards/db1000.c
@@ -33,6 +33,7 @@
 #include <linux/spi/spi_gpio.h>
 #include <linux/spi/ads7846.h>
 #include <asm/mach-au1x00/au1000.h>
+#include <asm/mach-au1x00/gpio-au1000.h>
 #include <asm/mach-au1x00/au1000_dma.h>
 #include <asm/mach-au1x00/au1100_mmc.h>
 #include <asm/mach-db1x00/bcsr.h>

arch/mips/alchemy/devboards/db1300.c

View file

diff --git a/arch/mips/alchemy/devboards/db1300.c b/arch/mips/alchemy/devboards/db1300.c
index 1c64fdb..b580770 100644
--- a/arch/mips/alchemy/devboards/db1300.c
+++ b/arch/mips/alchemy/devboards/db1300.c
@@ -24,6 +24,7 @@
 #include <linux/wm97xx.h>
 
 #include <asm/mach-au1x00/au1000.h>
+#include <asm/mach-au1x00/gpio-au1300.h>
 #include <asm/mach-au1x00/au1100_mmc.h>
 #include <asm/mach-au1x00/au1200fb.h>
 #include <asm/mach-au1x00/au1xxx_dbdma.h>

arch/mips/alchemy/devboards/db1550.c

View file

diff --git a/arch/mips/alchemy/devboards/db1550.c b/arch/mips/alchemy/devboards/db1550.c
index 0fd5177..5740bcf 100644
--- a/arch/mips/alchemy/devboards/db1550.c
+++ b/arch/mips/alchemy/devboards/db1550.c
@@ -20,6 +20,7 @@
 #include <linux/spi/flash.h>
 #include <asm/bootinfo.h>
 #include <asm/mach-au1x00/au1000.h>
+#include <asm/mach-au1x00/gpio-au1000.h>
 #include <asm/mach-au1x00/au1xxx_eth.h>
 #include <asm/mach-au1x00/au1xxx_dbdma.h>
 #include <asm/mach-au1x00/au1xxx_psc.h>

arch/mips/alchemy/devboards/pm.c

View file

diff --git a/arch/mips/alchemy/devboards/pm.c b/arch/mips/alchemy/devboards/pm.c
index bfeb8f3..93024dc 100644
--- a/arch/mips/alchemy/devboards/pm.c
+++ b/arch/mips/alchemy/devboards/pm.c
@@ -9,7 +9,7 @@
 #include <linux/suspend.h>
 #include <linux/sysfs.h>
 #include <asm/mach-au1x00/au1000.h>
-#include <asm/mach-au1x00/gpio.h>
+#include <asm/mach-au1x00/gpio-au1000.h>
 #include <asm/mach-db1x00/bcsr.h>
 
 /*

arch/mips/ar7/gpio.c

View file

diff --git a/arch/mips/ar7/gpio.c b/arch/mips/ar7/gpio.c
index d8dbd8f..f493045 100644
--- a/arch/mips/ar7/gpio.c
+++ b/arch/mips/ar7/gpio.c
@@ -21,7 +21,10 @@
 #include <linux/module.h>
 #include <linux/gpio.h>
 
-#include <asm/mach-ar7/gpio.h>
+#include <asm/mach-ar7/ar7.h>
+
+#define AR7_GPIO_MAX 32
+#define TITAN_GPIO_MAX 51
 
 struct ar7_gpio_chip {
 	void __iomem		*regs;

arch/mips/ar7/platform.c

View file

diff --git a/arch/mips/ar7/platform.c b/arch/mips/ar7/platform.c
index 298b977..58fca9a 100644
--- a/arch/mips/ar7/platform.c
+++ b/arch/mips/ar7/platform.c
@@ -39,7 +39,6 @@
 
 #include <asm/addrspace.h>
 #include <asm/mach-ar7/ar7.h>
-#include <asm/mach-ar7/gpio.h>
 #include <asm/mach-ar7/prom.h>
 
 /*****************************************************************************

arch/mips/ar7/setup.c

View file

diff --git a/arch/mips/ar7/setup.c b/arch/mips/ar7/setup.c
index 820b7a3..7bb9a67 100644
--- a/arch/mips/ar7/setup.c
+++ b/arch/mips/ar7/setup.c
@@ -23,7 +23,6 @@
 #include <asm/reboot.h>
 #include <asm/mach-ar7/ar7.h>
 #include <asm/mach-ar7/prom.h>
-#include <asm/mach-ar7/gpio.h>
 
 static void ar7_machine_restart(char *command)
 {

arch/mips/ath79/Makefile

View file

diff --git a/arch/mips/ath79/Makefile b/arch/mips/ath79/Makefile
index 5c9ff69..fcc382c 100644
--- a/arch/mips/ath79/Makefile
+++ b/arch/mips/ath79/Makefile
@@ -8,7 +8,7 @@
 # under the terms of the GNU General Public License version 2 as published
 # by the Free Software Foundation.
 
-obj-y	:= prom.o setup.o irq.o common.o clock.o gpio.o
+obj-y	:= prom.o setup.o irq.o common.o clock.o
 
 obj-$(CONFIG_EARLY_PRINTK)		+= early_printk.o
 obj-$(CONFIG_PCI)			+= pci.o

arch/mips/ath79/common.h

View file

diff --git a/arch/mips/ath79/common.h b/arch/mips/ath79/common.h
index e5ea712..ca7cc19 100644
--- a/arch/mips/ath79/common.h
+++ b/arch/mips/ath79/common.h
@@ -25,9 +25,6 @@ unsigned long ath79_get_sys_clk_rate(const char *id);
 void ath79_ddr_ctrl_init(void);
 void ath79_ddr_wb_flush(unsigned int reg);
 
-void ath79_gpio_function_enable(u32 mask);
-void ath79_gpio_function_disable(u32 mask);
-void ath79_gpio_function_setup(u32 set, u32 clear);
 void ath79_gpio_init(void);
 
 #endif /* __ATH79_COMMON_H */

arch/mips/ath79/irq.c

View file

diff --git a/arch/mips/ath79/irq.c b/arch/mips/ath79/irq.c
index 2021be2..807132b 100644
--- a/arch/mips/ath79/irq.c
+++ b/arch/mips/ath79/irq.c
@@ -123,8 +123,6 @@ static void ar934x_ip2_irq_dispatch(unsigned int irq, struct irq_desc *desc)
 {
 	u32 status;
 
-	disable_irq_nosync(irq);
-
 	status = ath79_reset_rr(AR934X_RESET_REG_PCIE_WMAC_INT_STATUS);
 
 	if (status & AR934X_PCIE_WMAC_INT_PCIE_ALL) {
@@ -136,8 +134,6 @@ static void ar934x_ip2_irq_dispatch(unsigned int irq, struct irq_desc *desc)
 	} else {
 		spurious_interrupt();
 	}
-
-	enable_irq(irq);
 }
 
 static void ar934x_ip2_irq_init(void)
@@ -156,14 +152,12 @@ static void qca955x_ip2_irq_dispatch(unsigned int irq, struct irq_desc *desc)
 {
 	u32 status;
 
-	disable_irq_nosync(irq);
-
 	status = ath79_reset_rr(QCA955X_RESET_REG_EXT_INT_STATUS);
 	status &= QCA955X_EXT_INT_PCIE_RC1_ALL | QCA955X_EXT_INT_WMAC_ALL;
 
 	if (status == 0) {
 		spurious_interrupt();
-		goto enable;
+		return;
 	}
 
 	if (status & QCA955X_EXT_INT_PCIE_RC1_ALL) {
@@ -175,17 +169,12 @@ static void qca955x_ip2_irq_dispatch(unsigned int irq, struct irq_desc *desc)
 		/* TODO: flush DDR? */
 		generic_handle_irq(ATH79_IP2_IRQ(1));
 	}
-
-enable:
-	enable_irq(irq);
 }
 
 static void qca955x_ip3_irq_dispatch(unsigned int irq, struct irq_desc *desc)
 {
 	u32 status;
 
-	disable_irq_nosync(irq);
-
 	status = ath79_reset_rr(QCA955X_RESET_REG_EXT_INT_STATUS);
 	status &= QCA955X_EXT_INT_PCIE_RC2_ALL |
 		  QCA955X_EXT_INT_USB1 |
@@ -193,7 +182,7 @@ static void qca955x_ip3_irq_dispatch(unsigned int irq, struct irq_desc *desc)
 
 	if (status == 0) {
 		spurious_interrupt();
-		goto enable;
+		return;
 	}
 
 	if (status & QCA955X_EXT_INT_USB1) {
@@ -210,9 +199,6 @@ static void qca955x_ip3_irq_dispatch(unsigned int irq, struct irq_desc *desc)
 		/* TODO: flush DDR? */
 		generic_handle_irq(ATH79_IP3_IRQ(2));
 	}
-
-enable:
-	enable_irq(irq);
 }
 
 static void qca955x_irq_init(void)

arch/mips/bcm47xx/buttons.c

View file

diff --git a/arch/mips/bcm47xx/buttons.c b/arch/mips/bcm47xx/buttons.c
index 08a4abf..52caa75 100644
--- a/arch/mips/bcm47xx/buttons.c
+++ b/arch/mips/bcm47xx/buttons.c
@@ -396,10 +396,9 @@ static int __init bcm47xx_buttons_copy(const struct gpio_keys_button *buttons,
 {
 	size_t size = nbuttons * sizeof(*buttons);
 
-	bcm47xx_button_pdata.buttons = kmalloc(size, GFP_KERNEL);
+	bcm47xx_button_pdata.buttons = kmemdup(buttons, size, GFP_KERNEL);
 	if (!bcm47xx_button_pdata.buttons)
 		return -ENOMEM;
-	memcpy(bcm47xx_button_pdata.buttons, buttons, size);
 	bcm47xx_button_pdata.nbuttons = nbuttons;
 
 	return 0;

arch/mips/bcm63xx/irq.c

View file

diff --git a/arch/mips/bcm63xx/irq.c b/arch/mips/bcm63xx/irq.c
index e3e808a..1a47ec2 100644
--- a/arch/mips/bcm63xx/irq.c
+++ b/arch/mips/bcm63xx/irq.c
@@ -60,7 +60,7 @@ static inline int enable_irq_for_cpu(int cpu, struct irq_data *d,
 	if (m)
 		enable &= cpumask_test_cpu(cpu, m);
 	else if (irqd_affinity_was_set(d))
-		enable &= cpumask_test_cpu(cpu, d->affinity);
+		enable &= cpumask_test_cpu(cpu, irq_data_get_affinity_mask(d));
 #endif
 	return enable;
 }
@@ -365,9 +365,9 @@ static int bcm63xx_external_irq_set_type(struct irq_data *d,
 
 	irqd_set_trigger_type(d, flow_type);
 	if (flow_type & (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH))
-		__irq_set_handler_locked(d->irq, handle_level_irq);
+		irq_set_handler_locked(d, handle_level_irq);
 	else
-		__irq_set_handler_locked(d->irq, handle_edge_irq);
+		irq_set_handler_locked(d, handle_edge_irq);
 
 	return IRQ_SET_MASK_OK_NOCOPY;
 }

arch/mips/boot/compressed/Makefile

View file

diff --git a/arch/mips/boot/compressed/Makefile b/arch/mips/boot/compressed/Makefile
index dc91bde..d5bdee1 100644
--- a/arch/mips/boot/compressed/Makefile
+++ b/arch/mips/boot/compressed/Makefile
@@ -78,7 +78,7 @@ endif
 
 vmlinuzobjs-y += $(obj)/piggy.o
 
-quiet_cmd_zld = LD	$@
+quiet_cmd_zld = LD      $@
       cmd_zld = $(LD) $(LDFLAGS) -Ttext $(VMLINUZ_LOAD_ADDRESS) -T $< $(vmlinuzobjs-y) -o $@
 quiet_cmd_strip = STRIP	  $@
       cmd_strip = $(STRIP) -s $@

arch/mips/boot/dts/netlogic/xlp_evp.dts

View file

diff --git a/arch/mips/boot/dts/netlogic/xlp_evp.dts b/arch/mips/boot/dts/netlogic/xlp_evp.dts
index 89ad048..ec16ec2 100644
--- a/arch/mips/boot/dts/netlogic/xlp_evp.dts
+++ b/arch/mips/boot/dts/netlogic/xlp_evp.dts
@@ -110,6 +110,18 @@
 				read-only;
 			};
 		};
+
+		gpio: xlp_gpio@34100 {

This diff is incomplete. Download the complete patch.