Commit d1447464 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull MIPS updates from Ralf Baechle:
 "MIPS updates:

   - All the things that didn't make 3.10.
   - Removes the Windriver PPMC platform.  Nobody will miss it.
   - Remove a workaround from kernel/irq/irqdomain.c which was there
     exclusivly for MIPS.  Patch by Grant Likely.
   - More small improvments for the SEAD 3 platform
   - Improvments on the BMIPS / SMP support for the BCM63xx series.
   - Various cleanups of dead leftovers.
   - Platform support for the Cavium Octeon-based EdgeRouter Lite.

  Two large KVM patchsets didn't make it for this pull request because
  their respective authors are vacationing"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (124 commits)
  MIPS: Kconfig: Add missing MODULES dependency to VPE_LOADER
  MIPS: BCM63xx: CLK: Add dummy clk_{set,round}_rate() functions
  MIPS: SEAD3: Disable L2 cache on SEAD-3.
  MIPS: BCM63xx: Enable second core SMP on BCM6328 if available
  MIPS: BCM63xx: Add SMP support to prom.c
  MIPS: define write{b,w,l,q}_relaxed
  MIPS: Expose missing pci_io{map,unmap} declarations
  MIPS: Malta: Update GCMP detection.
  Revert "MIPS: make CAC_ADDR and UNCAC_ADDR account for PHYS_OFFSET"
  MIPS: APSP: Remove <asm/kspd.h>
  SSB: Kconfig: Amend SSB_EMBEDDED dependencies
  MIPS: microMIPS: Fix improper definition of ISA exception bit.
  MIPS: Don't try to decode microMIPS branch instructions where they cannot exist.
  MIPS: Declare emulate_load_store_microMIPS as a static function.
  MIPS: Fix typos and cleanup comment
  MIPS: Cleanup indentation and whitespace
  MIPS: BMIPS: support booting from physical CPU other than 0
  MIPS: Only set cpu_has_mmips if SYS_SUPPORTS_MICROMIPS
  MIPS: GIC: Fix gic_set_affinity infinite loop
  MIPS: Don't save/restore OCTEON wide multiplier state on syscalls.
  ...
parents 833e6834 6ac5310e

arch/mips/Kbuild.platforms

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ platforms += sibyte 
platforms += sni

platforms += txx9

platforms += vr41xx

platforms += wrppmc



# include the platform specific files

include $(patsubst %, $(srctree)/arch/mips/%/Platform, $(platforms))

arch/mips/Kconfig

+28 −48
Original line number Diff line number Diff line 
config MIPS

	bool

	default y

	select HAVE_CONTEXT_TRACKING

	select HAVE_GENERIC_DMA_COHERENT

	select HAVE_IDE

	select HAVE_OPROFILE
@@ -27,6 +28,7 @@ config MIPS 
	select HAVE_GENERIC_HARDIRQS

	select GENERIC_IRQ_PROBE

	select GENERIC_IRQ_SHOW

	select GENERIC_PCI_IOMAP

	select HAVE_ARCH_JUMP_LABEL

	select ARCH_WANT_IPC_PARSE_VERSION

	select IRQ_FORCED_THREADING
@@ -46,9 +48,6 @@ config MIPS 


menu "Machine selection"



config ZONE_DMA

	bool



choice

	prompt "System type"

	default SGI_IP22
@@ -124,11 +123,14 @@ config BCM47XX 


config BCM63XX

	bool "Broadcom BCM63XX based boards"

	select BOOT_RAW

	select CEVT_R4K

	select CSRC_R4K

	select DMA_NONCOHERENT

	select IRQ_CPU

	select SYS_HAS_CPU_MIPS32_R1

	select SYS_HAS_CPU_BMIPS4350 if !BCM63XX_CPU_6338 && !BCM63XX_CPU_6345 && !BCM63XX_CPU_6348

	select NR_CPUS_DEFAULT_2

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_HAS_EARLY_PRINTK
@@ -341,7 +343,6 @@ config MIPS_SEAD3 
	select DMA_NONCOHERENT

	select IRQ_CPU

	select IRQ_GIC

	select MIPS_CPU_SCACHE

	select MIPS_MSC

	select SYS_HAS_CPU_MIPS32_R1

	select SYS_HAS_CPU_MIPS32_R2
@@ -420,7 +421,6 @@ config POWERTV 
	select CSRC_POWERTV

	select DMA_NONCOHERENT

	select HW_HAS_PCI

	select SYS_HAS_EARLY_PRINTK

	select SYS_HAS_CPU_MIPS32_R2

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN
@@ -713,46 +713,8 @@ config MIKROTIK_RB532 
	  Support the Mikrotik(tm) RouterBoard 532 series,

	  based on the IDT RC32434 SoC.



config WR_PPMC

	bool "Wind River PPMC board"

	select CEVT_R4K

	select CSRC_R4K

	select IRQ_CPU

	select BOOT_ELF32

	select DMA_NONCOHERENT

	select HW_HAS_PCI

	select PCI_GT64XXX_PCI0

	select SWAP_IO_SPACE

	select SYS_HAS_CPU_MIPS32_R1

	select SYS_HAS_CPU_MIPS32_R2

	select SYS_HAS_CPU_MIPS64_R1

	select SYS_HAS_CPU_NEVADA

	select SYS_HAS_CPU_RM7000

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_LITTLE_ENDIAN

	help

	  This enables support for the Wind River MIPS32 4KC PPMC evaluation

	  board, which is based on GT64120 bridge chip.



config CAVIUM_OCTEON_SIMULATOR

	bool "Cavium Networks Octeon Simulator"

	select CEVT_R4K

	select 64BIT_PHYS_ADDR

	select DMA_COHERENT

	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_HOTPLUG_CPU

	select SYS_HAS_CPU_CAVIUM_OCTEON

	select HOLES_IN_ZONE

	help

	  The Octeon simulator is software performance model of the Cavium

	  Octeon Processor. It supports simulating Octeon processors on x86

	  hardware.



config CAVIUM_OCTEON_REFERENCE_BOARD

	bool "Cavium Networks Octeon reference board"

config CAVIUM_OCTEON_SOC

	bool "Cavium Networks Octeon SoC based boards"

	select CEVT_R4K

	select 64BIT_PHYS_ADDR

	select DMA_COHERENT
@@ -806,6 +768,8 @@ config NLM_XLR_BOARD 
	select SYS_HAS_EARLY_PRINTK

	select USB_ARCH_HAS_OHCI if USB_SUPPORT

	select USB_ARCH_HAS_EHCI if USB_SUPPORT

	select SYS_SUPPORTS_ZBOOT

	select SYS_SUPPORTS_ZBOOT_UART16550

	help

	  Support for systems based on Netlogic XLR and XLS processors.

	  Say Y here if you have a XLR or XLS based board.
@@ -832,6 +796,8 @@ config NLM_XLP_BOARD 
	select SYNC_R4K

	select SYS_HAS_EARLY_PRINTK

	select USE_OF

	select SYS_SUPPORTS_ZBOOT

	select SYS_SUPPORTS_ZBOOT_UART16550

	help

	  This board is based on Netlogic XLP Processor.

	  Say Y here if you have a XLP based board.
@@ -1031,7 +997,6 @@ config CPU_BIG_ENDIAN 
config CPU_LITTLE_ENDIAN

	bool "Little endian"

	depends on SYS_SUPPORTS_LITTLE_ENDIAN

	help



endchoice
@@ -1964,7 +1929,7 @@ config MIPS_MT_FPAFF 


config MIPS_VPE_LOADER

	bool "VPE loader support."

	depends on SYS_SUPPORTS_MULTITHREADING

	depends on SYS_SUPPORTS_MULTITHREADING && MODULES

	select CPU_MIPSR2_IRQ_VI

	select CPU_MIPSR2_IRQ_EI

	select MIPS_MT
@@ -2382,6 +2347,19 @@ config SECCOMP 


	  If unsure, say Y. Only embedded should say N here.



config CC_STACKPROTECTOR

	bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"

	help

	  This option turns on the -fstack-protector GCC feature. This

	  feature puts, at the beginning of functions, a canary value on

	  the stack just before the return address, and validates

	  the value just before actually returning.  Stack based buffer

	  overflows (that need to overwrite this return address) now also

	  overwrite the canary, which gets detected and the attack is then

	  neutralized via a kernel panic.



	  This feature requires gcc version 4.2 or above.



config USE_OF

	bool

	select OF
@@ -2413,7 +2391,6 @@ config PCI 
	bool "Support for PCI controller"

	depends on HW_HAS_PCI

	select PCI_DOMAINS

	select GENERIC_PCI_IOMAP

	select NO_GENERIC_PCI_IOPORT_MAP

	help

	  Find out whether you have a PCI motherboard. PCI is the name of a
@@ -2479,6 +2456,9 @@ config I8253 
	select CLKEVT_I8253

	select MIPS_EXTERNAL_TIMER



config ZONE_DMA

	bool



config ZONE_DMA32

	bool

arch/mips/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -227,6 +227,10 @@ KBUILD_CPPFLAGS += -DDATAOFFSET=$(if $(dataoffset-y),$(dataoffset-y),0) 


LDFLAGS			+= -m $(ld-emul)



ifdef CONFIG_CC_STACKPROTECTOR

  KBUILD_CFLAGS += -fstack-protector

endif



ifdef CONFIG_MIPS

CHECKFLAGS += $(shell $(CC) $(KBUILD_CFLAGS) -dM -E -x c /dev/null | \

	egrep -vw '__GNUC_(|MINOR_|PATCHLEVEL_)_' | \

arch/mips/ath79/mach-ap136.c

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ static void __init ap136_pci_init(u8 *eeprom) 
	ath79_register_pci();

}

#else

static inline void ap136_pci_init(void) {}

static inline void ap136_pci_init(u8 *eeprom) {}

#endif /* CONFIG_PCI */



static void __init ap136_setup(void)

arch/mips/bcm63xx/Kconfig

+4 −5
Original line number Diff line number Diff line 
menu "CPU support"

	depends on BCM63XX



config BCM63XX_CPU_3368

	bool "support 3368 CPU"

	select HW_HAS_PCI



config BCM63XX_CPU_6328

	bool "support 6328 CPU"

	select HW_HAS_PCI
@@ -8,14 +12,9 @@ config BCM63XX_CPU_6328 
config BCM63XX_CPU_6338

	bool "support 6338 CPU"

	select HW_HAS_PCI

	select USB_ARCH_HAS_OHCI

	select USB_OHCI_BIG_ENDIAN_DESC

	select USB_OHCI_BIG_ENDIAN_MMIO



config BCM63XX_CPU_6345

	bool "support 6345 CPU"

	select USB_OHCI_BIG_ENDIAN_DESC

	select USB_OHCI_BIG_ENDIAN_MMIO



config BCM63XX_CPU_6348

	bool "support 6348 CPU"

CRA Git | Maintained and supported by SUSTech CRA and CCSE