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

82abb273 · Linus Torvalds <[email protected]> · 2014-06-09 18:10:34 -07:00

Pull MIPS updates from Ralf Baechle:
 - three fixes for 3.15 that didn't make it in time
 - limited Octeon 3 support.
 - paravirtualization support
 - improvment to platform support for Netlogix SOCs.
 - add support for powering down the Malta eval board in software
 - add many instructions to the in-kernel microassembler.
 - add support for the BPF JIT.
 - minor cleanups of the BCM47xx code.
 - large cleanup of math emu code resulting in significant code size
   reduction, better readability of the code and more accurate
   emulation.
 - improvments to the MIPS CPS code.
 - support C3 power status for the R4k count/compare clock device.
 - improvments to the GIO support for older SGI workstations.
 - increase number of supported CPUs to 256; this can be reached on
   certain embedded multithreaded ccNUMA configurations.
 - various small cleanups, updates and fixes

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (173 commits)
  MIPS: IP22/IP28: Improve GIO support
  MIPS: Octeon: Add twsi interrupt initialization for OCTEON 3XXX, 5XXX, 63XX
  DEC: Document the R4k MB ASIC mini interrupt controller
  DEC: Add self as the maintainer
  MIPS: Add microMIPS MSA support.
  MIPS: Replace calls to obsolete strict_strto call with kstrto* equivalents.
  MIPS: Replace obsolete strict_strto call with kstrto
  MIPS: BFP: Simplify code slightly.
  MIPS: Call find_vma with the mmap_sem held
  MIPS: Fix 'write_msa_##' inline macro.
  MIPS: Fix MSA toolchain support detection.
  mips: Update the email address of Geert Uytterhoeven
  MIPS: Add minimal defconfig for mips_paravirt
  MIPS: Enable build for new system 'paravirt'
  MIPS: paravirt: Add pci controller for virtio
  MIPS: Add code for new system 'paravirt'
  MIPS: Add functions for hypervisor call
  MIPS: OCTEON: Add OCTEON3 to __get_cpu_type
  MIPS: Add function get_ebase_cpunum
  MIPS: Add minimal support for OCTEON3 to c-r4k.c
  ...

Commit: 82abb273d838318424644d8f02825db0fbbd400a
Parents: 9b651cc2 · f8647b50

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

Changes

256 files changed · +8562 −7905

File	Status	Add	Del	Content
MAINTAINERS	modified	+9	−0	View file
arch/mips/Kbuild	modified	+1	−1	View file
arch/mips/Kbuild.platforms	modified	+1	−0	View file
arch/mips/Kconfig	modified	+71	−71	View file
arch/mips/Kconfig.debug	modified	+0	−9	View file
arch/mips/Makefile	modified	+2	−1	View file
arch/mips/alchemy/board-xxs1500.c	modified	+1	−1	View file
arch/mips/alchemy/common/setup.c	modified	+6	−0	View file
arch/mips/alchemy/common/usb.c	modified	+2	−24	View file
arch/mips/alchemy/devboards/pm.c	modified	+2	−2	View file
arch/mips/bcm47xx/prom.c	modified	+11	−8	View file
arch/mips/cavium-octeon/Kconfig	modified	+11	−12	View file
arch/mips/cavium-octeon/executive/cvmx-helper.c	modified	+166	−0	View file
arch/mips/cavium-octeon/octeon-irq.c	modified	+2	−0	View file
arch/mips/cavium-octeon/setup.c	modified	+0	−17	View file
arch/mips/cavium-octeon/smp.c	modified	+0	−25	View file
arch/mips/configs/ath79_defconfig	modified	+1	−2	View file
arch/mips/configs/db1xxx_defconfig	modified	+1	−0	View file
arch/mips/configs/maltasmtc_defconfig	deleted	+0	−196	View before deletion
arch/mips/configs/maltasmvp_defconfig	modified	+1	−2	View file
arch/mips/configs/maltasmvp_eva_defconfig	modified	+1	−2	View file
arch/mips/configs/mips_paravirt_defconfig	added	+103	−0	View file
arch/mips/configs/rt305x_defconfig	modified	+1	−1	View file
arch/mips/dec/setup.c	modified	+5	−0	View file
arch/mips/include/asm/asmmacro.h	modified	+34	−28	View file
arch/mips/include/asm/branch.h	modified	+30	−0	View file
arch/mips/include/asm/cacheflush.h	modified	+6	−0	View file
arch/mips/include/asm/cmp.h	modified	+0	−1	View file
arch/mips/include/asm/cpu-features.h	modified	+19	−1	View file
arch/mips/include/asm/cpu-info.h	modified	+4	−9	View file
arch/mips/include/asm/cpu-type.h	modified	+1	−3	View file
arch/mips/include/asm/cpu.h	modified	+2	−1	View file
arch/mips/include/asm/dec/kn05.h	modified	+12	−3	View file
arch/mips/include/asm/fixmap.h	modified	+0	−4	View file
arch/mips/include/asm/fpu.h	modified	+4	−3	View file
arch/mips/include/asm/fpu_emulator.h	modified	+21	−0	View file
arch/mips/include/asm/gic.h	modified	+1	−0	View file
arch/mips/include/asm/gio_device.h	modified	+2	−2	View file
arch/mips/include/asm/idle.h	modified	+14	−0	View file
arch/mips/include/asm/irq.h	modified	+0	−96	View file
arch/mips/include/asm/irqflags.h	modified	+3	−29	View file
arch/mips/include/asm/kvm_para.h	added	+109	−0	View file
arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h	modified	+0	−1	View file
arch/mips/include/asm/mach-cavium-octeon/irq.h	modified	+2	−0	View file
arch/mips/include/asm/mach-ip22/cpu-feature-overrides.h	modified	+4	−0	View file
arch/mips/include/asm/mach-malta/kernel-entry-init.h	modified	+0	−30	View file
arch/mips/include/asm/mach-malta/malta-pm.h	added	+37	−0	View file
arch/mips/include/asm/mach-netlogic/topology.h	modified	+2	−0	View file
arch/mips/include/asm/mach-paravirt/cpu-feature-overrides.h	added	+36	−0	View file
arch/mips/include/asm/mach-paravirt/irq.h	added	+19	−0	View file
arch/mips/include/asm/mach-paravirt/kernel-entry-init.h	added	+50	−0	View file
arch/mips/include/asm/mach-paravirt/war.h	added	+25	−0	View file
arch/mips/include/asm/mach-pmcs-msp71xx/msp_usb.h	modified	+0	−4	View file
arch/mips/include/asm/mach-ralink/war.h	modified	+0	−1	View file
arch/mips/include/asm/mach-sead3/kernel-entry-init.h	modified	+0	−31	View file
arch/mips/include/asm/mips-boards/piix4.h	modified	+12	−0	View file
arch/mips/include/asm/mips-cpc.h	modified	+33	−1	View file
arch/mips/include/asm/mips_mt.h	modified	+2	−3	View file
arch/mips/include/asm/mipsmtregs.h	modified	+2	−0	View file
arch/mips/include/asm/mipsregs.h	modified	+18	−133	View file
arch/mips/include/asm/mmu_context.h	modified	+11	−111	View file
arch/mips/include/asm/module.h	modified	+1	−7	View file
arch/mips/include/asm/msa.h	modified	+12	−3	View file
arch/mips/include/asm/netlogic/mips-extns.h	modified	+3	−2	View file
arch/mips/include/asm/netlogic/xlp-hal/iomap.h	modified	+11	−7	View file
arch/mips/include/asm/netlogic/xlp-hal/pcibus.h	modified	+14	−0	View file
arch/mips/include/asm/netlogic/xlp-hal/pic.h	modified	+4	−0	View file
arch/mips/include/asm/netlogic/xlp-hal/sys.h	modified	+35	−0	View file
arch/mips/include/asm/netlogic/xlp-hal/xlp.h	modified	+13	−6	View file
arch/mips/include/asm/nile4.h	modified	+1	−1	View file
arch/mips/include/asm/octeon/octeon.h	modified	+0	−1	View file
arch/mips/include/asm/pgtable.h	modified	+2	−0	View file
arch/mips/include/asm/pm-cps.h	added	+51	−0	View file
arch/mips/include/asm/pm.h	added	+159	−0	View file
arch/mips/include/asm/ptrace.h	modified	+0	−3	View file
arch/mips/include/asm/r4kcache.h	modified	+4	−3	View file
arch/mips/include/asm/sgi/ip22.h	modified	+2	−0	View file
arch/mips/include/asm/smp-cps.h	modified	+15	−4	View file
arch/mips/include/asm/smp-ops.h	modified	+0	−1	View file
arch/mips/include/asm/smp.h	modified	+3	−0	View file
arch/mips/include/asm/smtc.h	deleted	+0	−78	View before deletion
arch/mips/include/asm/smtc_ipi.h	deleted	+0	−129	View before deletion
arch/mips/include/asm/smtc_proc.h	deleted	+0	−23	View before deletion
arch/mips/include/asm/stackframe.h	modified	+1	−195	View file
arch/mips/include/asm/thread_info.h	modified	+1	−10	View file
arch/mips/include/asm/time.h	modified	+1	−4	View file
arch/mips/include/asm/timex.h	modified	+47	−18	View file
arch/mips/include/asm/uasm.h	modified	+23	−0	View file
arch/mips/include/uapi/asm/Kbuild	modified	+1	−0	View file
arch/mips/include/uapi/asm/bitfield.h	added	+29	−0	View file
arch/mips/include/uapi/asm/inst.h	modified	+35	−29	View file
arch/mips/include/uapi/asm/kvm_para.h	modified	+5	−1	View file
arch/mips/include/uapi/asm/types.h	modified	+4	−1	View file
arch/mips/kernel/Makefile	modified	+4	−3	View file
arch/mips/kernel/asm-offsets.c	modified	+24	−8	View file
arch/mips/kernel/branch.c	modified	+201	−1	View file
arch/mips/kernel/cevt-gic.c	modified	+3	−2	View file
arch/mips/kernel/cevt-r4k.c	modified	+3	−21	View file
arch/mips/kernel/cevt-smtc.c	deleted	+0	−324	View before deletion
arch/mips/kernel/cps-vec.S	modified	+312	−16	View file
arch/mips/kernel/cpu-probe.c	modified	+4	−17	View file
arch/mips/kernel/entry.S	modified	+0	−38	View file
arch/mips/kernel/genex.S	modified	+0	−54	View file
arch/mips/kernel/head.S	modified	+0	−56	View file
arch/mips/kernel/i8259.c	modified	+0	−4	View file
arch/mips/kernel/idle.c	modified	+11	−14	View file
arch/mips/kernel/irq-gic.c	modified	+15	−0	View file
arch/mips/kernel/irq-msc01.c	modified	+0	−5	View file
arch/mips/kernel/irq.c	modified	+0	−17	View file
arch/mips/kernel/mips-cpc.c	modified	+28	−0	View file
arch/mips/kernel/mips-mt-fpaff.c	modified	+1	−1	View file
arch/mips/kernel/mips-mt.c	modified	+1	−17	View file
arch/mips/kernel/octeon_switch.S	modified	+61	−23	View file
arch/mips/kernel/pm-cps.c	added	+716	−0	View file
arch/mips/kernel/pm.c	added	+99	−0	View file
arch/mips/kernel/process.c	modified	+0	−7	View file
arch/mips/kernel/r4k_switch.S	modified	+3	−33	View file
arch/mips/kernel/rtlx-mt.c	modified	+0	−1	View file
arch/mips/kernel/smp-bmips.c	modified	+0	−9	View file
arch/mips/kernel/smp-cmp.c	modified	+1	−14	View file
arch/mips/kernel/smp-cps.c	modified	+281	−150	View file
arch/mips/kernel/smp-gic.c	modified	+11	−0	View file
arch/mips/kernel/smp-mt.c	modified	+0	−5	View file
arch/mips/kernel/smp-up.c	modified	+0	−6	View file
arch/mips/kernel/smp.c	modified	+47	−14	View file
arch/mips/kernel/smtc-asm.S	deleted	+0	−133	View before deletion
arch/mips/kernel/smtc-proc.c	deleted	+0	−102	View before deletion
arch/mips/kernel/smtc.c	deleted	+0	−1528	View before deletion
arch/mips/kernel/sync-r4k.c	modified	+0	−18	View file
arch/mips/kernel/time.c	modified	+0	−1	View file
arch/mips/kernel/traps.c	modified	+54	−68	View file
arch/mips/kernel/vpe-mt.c	modified	+7	−9	View file
arch/mips/lantiq/irq.c	modified	+2	−2	View file
arch/mips/lib/delay.c	modified	+3	−5	View file
arch/mips/lib/mips-atomic.c	modified	+6	−40	View file
arch/mips/loongson/Kconfig	modified	+3	−2	View file
arch/mips/loongson/loongson-3/smp.c	modified	+0	−8	View file
arch/mips/loongson1/Kconfig	modified	+1	−0	View file
arch/mips/math-emu/Makefile	modified	+9	−7	View file
arch/mips/math-emu/cp1emu.c	modified	+340	−594	View file
arch/mips/math-emu/dp_add.c	modified	+36	−35	View file
arch/mips/math-emu/dp_cmp.c	modified	+11	−13	View file
arch/mips/math-emu/dp_div.c	modified	+46	−48	View file
arch/mips/math-emu/dp_fint.c	modified	+5	−28	View file
arch/mips/math-emu/dp_flong.c	modified	+8	−20	View file
arch/mips/math-emu/dp_frexp.c	deleted	+0	−52	View before deletion
arch/mips/math-emu/dp_fsp.c	modified	+16	−16	View file
arch/mips/math-emu/dp_logb.c	deleted	+0	−53	View before deletion
arch/mips/math-emu/dp_modf.c	deleted	+0	−79	View before deletion
arch/mips/math-emu/dp_mul.c	modified	+70	−73	View file
arch/mips/math-emu/dp_scalb.c	deleted	+0	−57	View before deletion
arch/mips/math-emu/dp_simple.c	modified	+10	−29	View file
arch/mips/math-emu/dp_sqrt.c	modified	+23	−23	View file
arch/mips/math-emu/dp_sub.c	modified	+27	−28	View file
arch/mips/math-emu/dp_tint.c	modified	+26	−43	View file
arch/mips/math-emu/dp_tlong.c	modified	+26	−42	View file
arch/mips/math-emu/dsemul.c	modified	+7	−28	View file
arch/mips/math-emu/ieee754.c	modified	+54	−92	View file
arch/mips/math-emu/ieee754.h	modified	+92	−230	View file
arch/mips/math-emu/ieee754d.c	modified	+7	−32	View file
arch/mips/math-emu/ieee754dp.c	modified	+42	−80	View file
arch/mips/math-emu/ieee754dp.h	modified	+35	−35	View file
arch/mips/math-emu/ieee754int.h	modified	+89	−112	View file
arch/mips/math-emu/ieee754m.c	deleted	+0	−55	View before deletion
arch/mips/math-emu/ieee754sp.c	modified	+43	−83	View file
arch/mips/math-emu/ieee754sp.h	modified	+39	−40	View file
arch/mips/math-emu/ieee754xcpt.c	deleted	+0	−47	View before deletion
arch/mips/math-emu/kernel_linkage.c	deleted	+0	−45	View before deletion
arch/mips/math-emu/me-debugfs.c	added	+67	−0	View file
arch/mips/math-emu/sp_add.c	modified	+38	−34	View file
arch/mips/math-emu/sp_cmp.c	modified	+11	−13	View file
arch/mips/math-emu/sp_div.c	modified	+45	−48	View file
arch/mips/math-emu/sp_fdp.c	modified	+28	−28	View file
arch/mips/math-emu/sp_fint.c	modified	+8	−22	View file
arch/mips/math-emu/sp_flong.c	modified	+8	−22	View file
arch/mips/math-emu/sp_frexp.c	deleted	+0	−52	View before deletion
arch/mips/math-emu/sp_logb.c	deleted	+0	−53	View before deletion
arch/mips/math-emu/sp_modf.c	deleted	+0	−79	View before deletion
arch/mips/math-emu/sp_mul.c	modified	+67	−72	View file
arch/mips/math-emu/sp_scalb.c	deleted	+0	−57	View before deletion
arch/mips/math-emu/sp_simple.c	modified	+10	−29	View file
arch/mips/math-emu/sp_sqrt.c	modified	+17	−18	View file
arch/mips/math-emu/sp_sub.c	modified	+28	−29	View file
arch/mips/math-emu/sp_tint.c	modified	+25	−42	View file
arch/mips/math-emu/sp_tlong.c	modified	+27	−42	View file
arch/mips/mm/c-octeon.c	modified	+2	−0	View file
arch/mips/mm/c-r4k.c	modified	+70	−7	View file
arch/mips/mm/init.c	modified	+17	−65	View file
arch/mips/mm/tlb-r4k.c	modified	+49	−39	View file
arch/mips/mm/tlbex.c	modified	+1	−1	View file
arch/mips/mm/uasm-micromips.c	modified	+14	−0	View file
arch/mips/mm/uasm-mips.c	modified	+15	−0	View file
arch/mips/mm/uasm.c	modified	+45	−6	View file
arch/mips/mti-malta/Makefile	modified	+1	−2	View file
arch/mips/mti-malta/malta-init.c	modified	+0	−6	View file
arch/mips/mti-malta/malta-int.c	modified	+0	−19	View file
arch/mips/mti-malta/malta-memory.c	modified	+2	−2	View file
arch/mips/mti-malta/malta-pm.c	added	+96	−0	View file
arch/mips/mti-malta/malta-reset.c	modified	+10	−4	View file
arch/mips/mti-malta/malta-setup.c	modified	+0	−4	View file
arch/mips/mti-malta/malta-smtc.c	deleted	+0	−162	View before deletion
arch/mips/mti-sead3/sead3-pic32-i2c-drv.c	modified	+13	−23	View file
arch/mips/net/Makefile	added	+3	−0	View file
arch/mips/net/bpf_jit.c	added	+1399	−0	View file
arch/mips/net/bpf_jit.h	added	+44	−0	View file
arch/mips/netlogic/common/irq.c	modified	+2	−0	View file
arch/mips/netlogic/common/reset.S	modified	+30	−9	View file
arch/mips/netlogic/common/smp.c	modified	+4	−8	View file
arch/mips/netlogic/common/smpboot.S	modified	+8	−4	View file
arch/mips/netlogic/common/time.c	modified	+4	−1	View file
arch/mips/netlogic/dts/xlp_gvp.dts	modified	+3	−2	View file
arch/mips/netlogic/xlp/Makefile	modified	+2	−0	View file
arch/mips/netlogic/xlp/ahci-init-xlp2.c	added	+377	−0	View file
arch/mips/netlogic/xlp/ahci-init.c	added	+209	−0	View file
arch/mips/netlogic/xlp/dt.c	modified	+2	−1	View file
arch/mips/netlogic/xlp/nlm_hal.c	modified	+204	−79	View file
arch/mips/netlogic/xlp/setup.c	modified	+2	−1	View file
arch/mips/netlogic/xlp/wakeup.c	modified	+10	−6	View file
arch/mips/paravirt/Kconfig	added	+6	−0	View file
arch/mips/paravirt/Makefile	added	+14	−0	View file
arch/mips/paravirt/Platform	added	+8	−0	View file
arch/mips/paravirt/paravirt-irq.c	added	+368	−0	View file
arch/mips/paravirt/paravirt-smp.c	added	+143	−0	View file
arch/mips/paravirt/serial.c	added	+40	−0	View file
arch/mips/paravirt/setup.c	added	+67	−0	View file
arch/mips/pci/Makefile	modified	+1	−1	View file
arch/mips/pci/fixup-malta.c	modified	+6	−0	View file
arch/mips/pci/msi-octeon.c	modified	+6	−0	View file
arch/mips/pci/msi-xlp.c	modified	+135	−49	View file
arch/mips/pci/ops-pmcmsp.c	modified	+1	−1	View file
arch/mips/pci/ops-tx3927.c	modified	+1	−1	View file
arch/mips/pci/ops-tx4927.c	modified	+6	−3	View file
arch/mips/pci/pci-virtio-guest.c	added	+131	−0	View file
arch/mips/pmcs-msp71xx/Makefile	modified	+0	−1	View file
arch/mips/pmcs-msp71xx/msp_eth.c	modified	+0	−76	View file
arch/mips/pmcs-msp71xx/msp_irq.c	modified	+5	−11	View file
arch/mips/pmcs-msp71xx/msp_irq_cic.c	modified	+1	−6	View file
arch/mips/pmcs-msp71xx/msp_irq_per.c	modified	+0	−3	View file
arch/mips/pmcs-msp71xx/msp_setup.c	modified	+1	−16	View file
arch/mips/pmcs-msp71xx/msp_smtc.c	deleted	+0	−104	View before deletion
arch/mips/pmcs-msp71xx/msp_usb.c	modified	+0	−90	View file
arch/mips/pnx833x/common/platform.c	modified	+0	−73	View file
arch/mips/sgi-ip22/ip22-gio.c	modified	+28	−14	View file
arch/mips/sgi-ip22/ip22-int.c	modified	+6	−1	View file
arch/mips/sgi-ip27/ip27-smp.c	modified	+0	−5	View file
arch/mips/sibyte/bcm1480/irq.c	modified	+0	−11	View file
arch/mips/sibyte/bcm1480/smp.c	modified	+0	−8	View file
arch/mips/sibyte/sb1250/smp.c	modified	+0	−8	View file
arch/mips/txx9/generic/setup.c	modified	+2	−2	View file
drivers/cpuidle/Kconfig	modified	+5	−0	View file
drivers/cpuidle/Kconfig.mips	added	+17	−0	View file
drivers/cpuidle/Makefile	modified	+4	−0	View file
drivers/cpuidle/cpuidle-cps.c	added	+186	−0	View file
drivers/usb/host/ehci-pmcmsp.c	modified	+0	−40	View file
include/linux/cpuidle.h	modified	+1	−0	View file
include/uapi/linux/kvm_para.h	modified	+3	−0	View file

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

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index 454c054..77556fc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2700,6 +2700,15 @@ S:	Orphan
 F:	Documentation/networking/decnet.txt
 F:	net/decnet/
 
+DECSTATION PLATFORM SUPPORT
+M:	"Maciej W. Rozycki" <[email protected]>
+L:	[email protected]
+W:	http://www.linux-mips.org/wiki/DECstation
+S:	Maintained
+F:	arch/mips/dec/
+F:	arch/mips/include/asm/dec/
+F:	arch/mips/include/asm/mach-dec/
+
 DEFXX FDDI NETWORK DRIVER
 M:	"Maciej W. Rozycki" <[email protected]>
 S:	Maintained

arch/mips/Kbuild

View file

diff --git a/arch/mips/Kbuild b/arch/mips/Kbuild
index d2cfe45..dd29533 100644
--- a/arch/mips/Kbuild
+++ b/arch/mips/Kbuild
@@ -16,7 +16,7 @@ obj- := $(platform-)
 
 obj-y += kernel/
 obj-y += mm/
-obj-y += math-emu/
+obj-y += net/
 
 ifdef CONFIG_KVM
 obj-y += kvm/

arch/mips/Kbuild.platforms

View file

diff --git a/arch/mips/Kbuild.platforms b/arch/mips/Kbuild.platforms
index 6e23912..f5e18bf 100644
--- a/arch/mips/Kbuild.platforms
+++ b/arch/mips/Kbuild.platforms
@@ -18,6 +18,7 @@ platforms += loongson1
 platforms += mti-malta
 platforms += mti-sead3
 platforms += netlogic
+platforms += paravirt
 platforms += pmcs-msp71xx
 platforms += pnx833x
 platforms += ralink

arch/mips/Kconfig

View file

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 5e0014e..7a469ac 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -12,6 +12,7 @@ config MIPS
 	select HAVE_ARCH_KGDB
 	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_FUNCTION_TRACE_MCOUNT_TEST
@@ -50,6 +51,8 @@ config MIPS
 	select CLONE_BACKWARDS
 	select HAVE_DEBUG_STACKOVERFLOW
 	select HAVE_CC_STACKPROTECTOR
+	select CPU_PM if CPU_IDLE
+	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
 
 menu "Machine selection"
 
@@ -83,6 +86,7 @@ config AR7
 	select SYS_HAS_EARLY_PRINTK
 	select SYS_SUPPORTS_32BIT_KERNEL
 	select SYS_SUPPORTS_LITTLE_ENDIAN
+	select SYS_SUPPORTS_MIPS16
 	select SYS_SUPPORTS_ZBOOT_UART16550
 	select ARCH_REQUIRE_GPIOLIB
 	select VLYNQ
@@ -106,6 +110,7 @@ config ATH79
 	select SYS_HAS_EARLY_PRINTK
 	select SYS_SUPPORTS_32BIT_KERNEL
 	select SYS_SUPPORTS_BIG_ENDIAN
+	select SYS_SUPPORTS_MIPS16
 	help
 	  Support for the Atheros AR71XX/AR724X/AR913X SoCs.
 
@@ -122,6 +127,7 @@ config BCM47XX
 	select NO_EXCEPT_FILL
 	select SYS_SUPPORTS_32BIT_KERNEL
 	select SYS_SUPPORTS_LITTLE_ENDIAN
+	select SYS_SUPPORTS_MIPS16
 	select SYS_HAS_EARLY_PRINTK
 	select USE_GENERIC_EARLY_PRINTK_8250
 	help
@@ -168,9 +174,9 @@ config MACH_DECSTATION
 	bool "DECstations"
 	select BOOT_ELF32
 	select CEVT_DS1287
-	select CEVT_R4K
+	select CEVT_R4K if CPU_R4X00
 	select CSRC_IOASIC
-	select CSRC_R4K
+	select CSRC_R4K if CPU_R4X00
 	select CPU_DADDI_WORKAROUNDS if 64BIT
 	select CPU_R4000_WORKAROUNDS if 64BIT
 	select CPU_R4400_WORKAROUNDS if 64BIT
@@ -248,6 +254,7 @@ config LANTIQ
 	select SYS_HAS_CPU_MIPS32_R2
 	select SYS_SUPPORTS_BIG_ENDIAN
 	select SYS_SUPPORTS_32BIT_KERNEL
+	select SYS_SUPPORTS_MIPS16
 	select SYS_SUPPORTS_MULTITHREADING
 	select SYS_HAS_EARLY_PRINTK
 	select ARCH_REQUIRE_GPIOLIB
@@ -330,6 +337,7 @@ config MIPS_MALTA
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 	select SYS_SUPPORTS_MIPS_CMP
 	select SYS_SUPPORTS_MIPS_CPS
+	select SYS_SUPPORTS_MIPS16
 	select SYS_SUPPORTS_MULTITHREADING
 	select SYS_SUPPORTS_SMARTMIPS
 	select SYS_SUPPORTS_ZBOOT
@@ -361,6 +369,7 @@ config MIPS_SEAD3
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 	select SYS_SUPPORTS_SMARTMIPS
 	select SYS_SUPPORTS_MICROMIPS
+	select SYS_SUPPORTS_MIPS16
 	select USB_EHCI_BIG_ENDIAN_DESC
 	select USB_EHCI_BIG_ENDIAN_MMIO
 	select USE_OF
@@ -380,6 +389,7 @@ config MACH_VR41XX
 	select CEVT_R4K
 	select CSRC_R4K
 	select SYS_HAS_CPU_VR41XX
+	select SYS_SUPPORTS_MIPS16
 	select ARCH_REQUIRE_GPIOLIB
 
 config NXP_STB220
@@ -407,6 +417,7 @@ config PMC_MSP
 	select SYS_HAS_CPU_MIPS32_R2
 	select SYS_SUPPORTS_32BIT_KERNEL
 	select SYS_SUPPORTS_BIG_ENDIAN
+	select SYS_SUPPORTS_MIPS16
 	select IRQ_CPU
 	select SERIAL_8250
 	select SERIAL_8250_CONSOLE
@@ -430,6 +441,7 @@ config RALINK
 	select SYS_HAS_CPU_MIPS32_R2
 	select SYS_SUPPORTS_32BIT_KERNEL
 	select SYS_SUPPORTS_LITTLE_ENDIAN
+	select SYS_SUPPORTS_MIPS16
 	select SYS_HAS_EARLY_PRINTK
 	select HAVE_MACH_CLKDEV
 	select CLKDEV_LOOKUP
@@ -674,7 +686,6 @@ config SNI_RM
 	select SYS_SUPPORTS_BIG_ENDIAN
 	select SYS_SUPPORTS_HIGHMEM
 	select SYS_SUPPORTS_LITTLE_ENDIAN
-	select USE_GENERIC_EARLY_PRINTK_8250
 	help
 	  The SNI RM200/300/400 are MIPS-based machines manufactured by
 	  Siemens Nixdorf Informationssysteme (SNI), parent company of Pyramid
@@ -721,6 +732,11 @@ config CAVIUM_OCTEON_SOC
 	select ZONE_DMA32
 	select HOLES_IN_ZONE
 	select ARCH_REQUIRE_GPIOLIB
+	select LIBFDT
+	select USE_OF
+	select ARCH_SPARSEMEM_ENABLE
+	select SYS_SUPPORTS_SMP
+	select NR_CPUS_DEFAULT_16
 	help
 	  This option supports all of the Octeon reference boards from Cavium
 	  Networks. It builds a kernel that dynamically determines the Octeon
@@ -789,6 +805,25 @@ config NLM_XLP_BOARD
 	  This board is based on Netlogic XLP Processor.
 	  Say Y here if you have a XLP based board.
 
+config MIPS_PARAVIRT
+	bool "Para-Virtualized guest system"
+	select CEVT_R4K
+	select CSRC_R4K
+	select DMA_COHERENT
+	select SYS_SUPPORTS_64BIT_KERNEL
+	select SYS_SUPPORTS_32BIT_KERNEL
+	select SYS_SUPPORTS_BIG_ENDIAN
+	select SYS_SUPPORTS_SMP
+	select NR_CPUS_DEFAULT_4
+	select SYS_HAS_EARLY_PRINTK
+	select SYS_HAS_CPU_MIPS32_R2
+	select SYS_HAS_CPU_MIPS64_R2
+	select SYS_HAS_CPU_CAVIUM_OCTEON
+	select HW_HAS_PCI
+	select SWAP_IO_SPACE
+	help
+	  This option supports guest running under ????
+
 endchoice
 
 source "arch/mips/alchemy/Kconfig"
@@ -809,6 +844,7 @@ source "arch/mips/cavium-octeon/Kconfig"
 source "arch/mips/loongson/Kconfig"
 source "arch/mips/loongson1/Kconfig"
 source "arch/mips/netlogic/Kconfig"
+source "arch/mips/paravirt/Kconfig"
 
 endmenu
 
@@ -1059,6 +1095,7 @@ config SOC_PNX833X
 	select SYS_SUPPORTS_32BIT_KERNEL
 	select SYS_SUPPORTS_LITTLE_ENDIAN
 	select SYS_SUPPORTS_BIG_ENDIAN
+	select SYS_SUPPORTS_MIPS16
 	select CPU_MIPSR2_IRQ_VI
 
 config SOC_PNX8335
@@ -1398,16 +1435,11 @@ config CPU_SB1
 config CPU_CAVIUM_OCTEON
 	bool "Cavium Octeon processor"
 	depends on SYS_HAS_CPU_CAVIUM_OCTEON
-	select ARCH_SPARSEMEM_ENABLE
 	select CPU_HAS_PREFETCH
 	select CPU_SUPPORTS_64BIT_KERNEL
-	select SYS_SUPPORTS_SMP
-	select NR_CPUS_DEFAULT_16
 	select WEAK_ORDERING
 	select CPU_SUPPORTS_HIGHMEM
 	select CPU_SUPPORTS_HUGEPAGES
-	select LIBFDT
-	select USE_OF
 	select USB_EHCI_BIG_ENDIAN_MMIO
 	select MIPS_L1_CACHE_SHIFT_7
 	help
@@ -1659,6 +1691,12 @@ config SYS_HAS_CPU_XLR
 config SYS_HAS_CPU_XLP
 	bool
 
+config MIPS_MALTA_PM
+	depends on MIPS_MALTA
+	depends on PCI
+	bool
+	default y
+
 #
 # CPU may reorder R->R, R->W, W->R, W->W
 # Reordering beyond LL and SC is handled in WEAK_REORDERING_BEYOND_LLSC
@@ -1842,7 +1880,7 @@ config FORCE_MAX_ZONEORDER
 
 config CEVT_GIC
 	bool "Use GIC global counter for clock events"
-	depends on IRQ_GIC && !(MIPS_SEAD3 || MIPS_MT_SMTC)
+	depends on IRQ_GIC && !MIPS_SEAD3
 	help
 	  Use the GIC global counter for the clock events. The R4K clock
 	  event driver is always present, so if the platform ends up not
@@ -1895,19 +1933,8 @@ config CPU_R4K_CACHE_TLB
 	bool
 	default y if !(CPU_R3000 || CPU_R8000 || CPU_SB1 || CPU_TX39XX || CPU_CAVIUM_OCTEON)
 
-choice
-	prompt "MIPS MT options"
-
-config MIPS_MT_DISABLED
-	bool "Disable multithreading support"
-	help
-	  Use this option if your platform does not support the MT ASE
-	  which is hardware multithreading support. On systems without
-	  an MT-enabled processor, this will be the only option that is
-	  available in this menu.
-
 config MIPS_MT_SMP
-	bool "Use 1 TC on each available VPE for SMP"
+	bool "MIPS MT SMP support (1 TC on each available VPE)"
 	depends on SYS_SUPPORTS_MULTITHREADING
 	select CPU_MIPSR2_IRQ_VI
 	select CPU_MIPSR2_IRQ_EI
@@ -1926,26 +1953,6 @@ config MIPS_MT_SMP
 	  Intel Hyperthreading feature. For further information go to
 	  <http://www.imgtec.com/mips/mips-multithreading.asp>.
 
-config MIPS_MT_SMTC
-	bool "Use all TCs on all VPEs for SMP (DEPRECATED)"
-	depends on CPU_MIPS32_R2
-	depends on SYS_SUPPORTS_MULTITHREADING
-	depends on !MIPS_CPS
-	select CPU_MIPSR2_IRQ_VI
-	select CPU_MIPSR2_IRQ_EI
-	select MIPS_MT
-	select SMP
-	select SMP_UP
-	select SYS_SUPPORTS_SMP
-	select NR_CPUS_DEFAULT_8
-	help
-	  This is a kernel model which is known as SMTC. This is
-	  supported on cores with the MT ASE and presents all TCs
-	  available on all VPEs to support SMP. For further
-	  information see <http://www.linux-mips.org/wiki/34K#SMTC>.
-
-endchoice
-
 config MIPS_MT
 	bool
 
@@ -1967,7 +1974,7 @@ config SYS_SUPPORTS_MULTITHREADING
 config MIPS_MT_FPAFF
 	bool "Dynamic FPU affinity for FP-intensive threads"
 	default y
-	depends on MIPS_MT_SMP || MIPS_MT_SMTC
+	depends on MIPS_MT_SMP
 
 config MIPS_VPE_LOADER
 	bool "VPE loader support."
@@ -1989,29 +1996,6 @@ config MIPS_VPE_LOADER_MT
 	default "y"
 	depends on MIPS_VPE_LOADER && !MIPS_CMP
 
-config MIPS_MT_SMTC_IM_BACKSTOP
-	bool "Use per-TC register bits as backstop for inhibited IM bits"
-	depends on MIPS_MT_SMTC
-	default n
-	help
-	  To support multiple TC microthreads acting as "CPUs" within
-	  a VPE, VPE-wide interrupt mask bits must be specially manipulated
-	  during interrupt handling. To support legacy drivers and interrupt
-	  controller management code, SMTC has a "backstop" to track and
-	  if necessary restore the interrupt mask. This has some performance
-	  impact on interrupt service overhead.
-
-config MIPS_MT_SMTC_IRQAFF
-	bool "Support IRQ affinity API"
-	depends on MIPS_MT_SMTC
-	default n
-	help
-	  Enables SMP IRQ affinity API (/proc/irq/*/smp_affinity, etc.)
-	  for SMTC Linux kernel. Requires platform support, of which
-	  an example can be found in the MIPS kernel i8259 and Malta
-	  platform code.  Adds some overhead to interrupt dispatch, and
-	  should be used only if you know what you are doing.
-
 config MIPS_VPE_LOADER_TOM
 	bool "Load VPE program into memory hidden from linux"
 	depends on MIPS_VPE_LOADER
@@ -2039,7 +2023,7 @@ config MIPS_VPE_APSP_API_MT
 
 config MIPS_CMP
 	bool "MIPS CMP framework support (DEPRECATED)"
-	depends on SYS_SUPPORTS_MIPS_CMP && !MIPS_MT_SMTC
+	depends on SYS_SUPPORTS_MIPS_CMP
 	select MIPS_GIC_IPI
 	select SYNC_R4K
 	select WEAK_ORDERING
@@ -2057,9 +2041,11 @@ config MIPS_CPS
 	depends on SYS_SUPPORTS_MIPS_CPS
 	select MIPS_CM
 	select MIPS_CPC
+	select MIPS_CPS_PM if HOTPLUG_CPU
 	select MIPS_GIC_IPI
 	select SMP
 	select SYNC_R4K if (CEVT_R4K || CSRC_R4K)
+	select SYS_SUPPORTS_HOTPLUG_CPU
 	select SYS_SUPPORTS_SMP
 	select WEAK_ORDERING
 	help
@@ -2069,6 +2055,9 @@ config MIPS_CPS
 	  no external assistance. It is safe to enable this when hardware
 	  support is unavailable.
 
+config MIPS_CPS_PM
+	bool
+
 config MIPS_GIC_IPI
 	bool
 
@@ -2199,6 +2188,13 @@ config SYS_SUPPORTS_SMARTMIPS
 config SYS_SUPPORTS_MICROMIPS
 	bool
 
+config SYS_SUPPORTS_MIPS16
+	bool
+	help
+	  This option must be set if a kernel might be executed on a MIPS16-
+	  enabled CPU even if MIPS16 is not actually being used.  In other
+	  words, it makes the kernel MIPS16-tolerant.
+
 config CPU_SUPPORTS_MSA
 	bool
 
@@ -2239,7 +2235,7 @@ config NODES_SHIFT
 
 config HW_PERF_EVENTS
 	bool "Enable hardware performance counter support for perf events"
-	depends on PERF_EVENTS && !MIPS_MT_SMTC && OPROFILE=n && (CPU_MIPS32 || CPU_MIPS64 || CPU_R10000 || CPU_SB1 || CPU_CAVIUM_OCTEON || CPU_XLP)
+	depends on PERF_EVENTS && OPROFILE=n && (CPU_MIPS32 || CPU_MIPS64 || CPU_R10000 || CPU_SB1 || CPU_CAVIUM_OCTEON || CPU_XLP)
 	default y
 	help
 	  Enable hardware performance counter support for perf events. If
@@ -2297,8 +2293,8 @@ config NR_CPUS_DEFAULT_64
 	bool
 
 config NR_CPUS
-	int "Maximum number of CPUs (2-64)"
-	range 2 64
+	int "Maximum number of CPUs (2-256)"
+	range 2 256
 	depends on SMP
 	default "4" if NR_CPUS_DEFAULT_4
 	default "8" if NR_CPUS_DEFAULT_8
@@ -2671,12 +2667,16 @@ endmenu
 config MIPS_EXTERNAL_TIMER
 	bool
 
-if CPU_SUPPORTS_CPUFREQ && MIPS_EXTERNAL_TIMER
 menu "CPU Power Management"
+
+if CPU_SUPPORTS_CPUFREQ && MIPS_EXTERNAL_TIMER
 source "drivers/cpufreq/Kconfig"
-endmenu
 endif
 
+source "drivers/cpuidle/Kconfig"
+
+endmenu
+
 source "net/Kconfig"
 
 source "drivers/Kconfig"

arch/mips/Kconfig.debug

View file

diff --git a/arch/mips/Kconfig.debug b/arch/mips/Kconfig.debug
index 25de292..3a2b775 100644
--- a/arch/mips/Kconfig.debug
+++ b/arch/mips/Kconfig.debug
@@ -79,15 +79,6 @@ config CMDLINE_OVERRIDE
 
 	  Normally, you will choose 'N' here.
 
-config SMTC_IDLE_HOOK_DEBUG
-	bool "Enable additional debug checks before going into CPU idle loop"
-	depends on DEBUG_KERNEL && MIPS_MT_SMTC
-	help
-	  This option enables Enable additional debug checks before going into
-	  CPU idle loop.  For details on these checks, see
-	  arch/mips/kernel/smtc.c.  This debugging option result in significant
-	  overhead so should be disabled in production kernels.
-
 config SB1XXX_CORELIS
 	bool "Corelis Debugger"
 	depends on SIBYTE_SB1xxx_SOC

arch/mips/Makefile

View file

diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index 60a359c..a8521de 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -120,7 +120,7 @@ cflags-$(CONFIG_SB1XXX_CORELIS)	+= $(call cc-option,-mno-sched-prolog) \
 				   -fno-omit-frame-pointer
 
 ifeq ($(CONFIG_CPU_HAS_MSA),y)
-toolchain-msa			:= $(call cc-option-yn,-mhard-float -mfp64 -mmsa)
+toolchain-msa	:= $(call cc-option-yn,-mhard-float -mfp64 -Wa$(comma)-mmsa)
 cflags-$(toolchain-msa)		+= -DTOOLCHAIN_SUPPORTS_MSA
 endif
 
@@ -251,6 +251,7 @@ OBJCOPYFLAGS		+= --remove-section=.reginfo
 head-y := arch/mips/kernel/head.o
 
 libs-y			+= arch/mips/lib/
+libs-y			+= arch/mips/math-emu/
 
 # See arch/mips/Kbuild for content of core part of the kernel
 core-y += arch/mips/

arch/mips/alchemy/board-xxs1500.c

View file

diff --git a/arch/mips/alchemy/board-xxs1500.c b/arch/mips/alchemy/board-xxs1500.c
index bd55136..3fb814b 100644
--- a/arch/mips/alchemy/board-xxs1500.c
+++ b/arch/mips/alchemy/board-xxs1500.c
@@ -49,7 +49,7 @@ void __init prom_init(void)
 	prom_init_cmdline();
 
 	memsize_str = prom_getenv("memsize");
-	if (!memsize_str || strict_strtoul(memsize_str, 0, &memsize))
+	if (!memsize_str || kstrtoul(memsize_str, 0, &memsize))
 		memsize = 0x04000000;
 
 	add_memory_region(0, memsize, BOOT_MEM_RAM);

arch/mips/alchemy/common/setup.c

View file

diff --git a/arch/mips/alchemy/common/setup.c b/arch/mips/alchemy/common/setup.c
index 566a174..8267e3c 100644
--- a/arch/mips/alchemy/common/setup.c
+++ b/arch/mips/alchemy/common/setup.c
@@ -67,6 +67,12 @@ void __init plat_mem_setup(void)
 	case ALCHEMY_CPU_AU1500:
 	case ALCHEMY_CPU_AU1100:
 		coherentio = 0;
+		break;
+	case ALCHEMY_CPU_AU1200:
+		/* Au1200 AB USB does not support coherent memory */
+		if (0 == (read_c0_prid() & PRID_REV_MASK))
+			coherentio = 0;
+		break;
 	}
 
 	board_setup();	/* board specific setup */

arch/mips/alchemy/common/usb.c

View file

diff --git a/arch/mips/alchemy/common/usb.c b/arch/mips/alchemy/common/usb.c
index 2adc7ed..d193dbe 100644
--- a/arch/mips/alchemy/common/usb.c
+++ b/arch/mips/alchemy/common/usb.c
@@ -355,47 +355,25 @@ static inline void __au1200_udc_control(void __iomem *base, int enable)
 	}
 }
 
-static inline int au1200_coherency_bug(void)
-{
-#if defined(CONFIG_DMA_COHERENT)
-	/* Au1200 AB USB does not support coherent memory */
-	if (!(read_c0_prid() & PRID_REV_MASK)) {
-		printk(KERN_INFO "Au1200 USB: this is chip revision AB !!\n");
-		printk(KERN_INFO "Au1200 USB: update your board or re-configure"
-				 " the kernel\n");
-		return -ENODEV;
-	}
-#endif
-	return 0;
-}
-
 static inline int au1200_usb_control(int block, int enable)
 {
 	void __iomem *base =
 			(void __iomem *)KSEG1ADDR(AU1200_USB_CTL_PHYS_ADDR);
-	int ret = 0;
 
 	switch (block) {
 	case ALCHEMY_USB_OHCI0:
-		ret = au1200_coherency_bug();
-		if (ret && enable)
-			goto out;
 		__au1200_ohci_control(base, enable);
 		break;
 	case ALCHEMY_USB_UDC0:
 		__au1200_udc_control(base, enable);
 		break;
 	case ALCHEMY_USB_EHCI0:
-		ret = au1200_coherency_bug();
-		if (ret && enable)
-			goto out;
 		__au1200_ehci_control(base, enable);
 		break;
 	default:
-		ret = -ENODEV;
+		return -ENODEV;
 	}
-out:
-	return ret;
+	return 0;
 }
 
 

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 b86bff3..61e90fe 100644
--- a/arch/mips/alchemy/devboards/pm.c
+++ b/arch/mips/alchemy/devboards/pm.c
@@ -158,7 +158,7 @@ static ssize_t db1x_pmattr_store(struct kobject *kobj,
 	int tmp;
 
 	if (ATTRCMP(timer_timeout)) {
-		tmp = strict_strtoul(instr, 0, &l);
+		tmp = kstrtoul(instr, 0, &l);
 		if (tmp)
 			return tmp;
 
@@ -181,7 +181,7 @@ static ssize_t db1x_pmattr_store(struct kobject *kobj,
 		}
 
 	} else if (ATTRCMP(wakemsk)) {
-		tmp = strict_strtoul(instr, 0, &l);
+		tmp = kstrtoul(instr, 0, &l);
 		if (tmp)
 			return tmp;
 

arch/mips/bcm47xx/prom.c

View file

diff --git a/arch/mips/bcm47xx/prom.c b/arch/mips/bcm47xx/prom.c
index 0af808d..1a03a2f 100644
--- a/arch/mips/bcm47xx/prom.c
+++ b/arch/mips/bcm47xx/prom.c
@@ -69,15 +69,18 @@ static __init void prom_init_mem(void)
 	 * BCM47XX uses 128MB for addressing the ram, if the system contains
 	 * less that that amount of ram it remaps the ram more often into the
 	 * available space.
-	 * Accessing memory after 128MB will cause an exception.
-	 * max contains the biggest possible address supported by the platform.
-	 * If the method wants to try something above we assume 128MB ram.
 	 */
-	off = (unsigned long)prom_init;
-	max = off | ((128 << 20) - 1);
-	for (mem = (1 << 20); mem < (128 << 20); mem += (1 << 20)) {
-		if ((off + mem) > max) {
-			mem = (128 << 20);
+
+	/* Physical address, without mapping to any kernel segment */
+	off = CPHYSADDR((unsigned long)prom_init);
+
+	/* Accessing memory after 128 MiB will cause an exception */
+	max = 128 << 20;
+
+	for (mem = 1 << 20; mem < max; mem += 1 << 20) {
+		/* Loop condition may be not enough, off may be over 1 MiB */
+		if (off + mem >= max) {
+			mem = max;
 			printk(KERN_DEBUG "assume 128MB RAM\n");
 			break;
 		}