Commit 3ae423fe 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:
 - Some minor work bringing the Cobalt MIPS platforms in line with other
   MIPS platforms
 - Make vmlinux.32 and vmlinux.64 build messages less verbose
 - Always register the R4k clocksource when selected, the clock source's
   rating will decide if this or another clock source is actually going
   to be used
 - Drop support for the Cisco (formerly Scientific Atlanta) PowerTV
   platform.  There appears to be nobody left who cares and the USB
   driver went stale while waiting for years to be merged
 - Some cleanup of Loongson 2 related #ifdefery
 - Various minor cleanups
 - Major rework on all things related to tracing / ptrace on MIPS,
   including switching the MIPS ELF core dumper to regsets, enabling the
   entries for SIGSYS in struct siginfo for MIPS, enabling ftrace
   syscall trace points
 - Some more work to bring DECstation support code in line with other
   more modern code
 - Report the name of the detected CPU, not just its CP0 PrID value
 - Some more BCM 47xx and atheros ath79xx work
 - Support for compressed kernels using the XZ compression scheme

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (53 commits)
  MIPS: remove duplicate define
  MIPS: Random whitespace clean-ups
  MIPS: traps: Reformat notify_die invocations to 80 columns.
  MIPS: Print correct PC in trace dump after NMI exception
  MIPS: kernel: cpu-probe: Report CPU id during probe
  MIPS: Remove unused defines in piix4.h
  MIPS: Get rid of hard-coded values for Malta PIIX4 fixups
  MIPS: Always register R4K clock when selected
  MIPS: Loongson: Get rid of Loongson 2 #ifdefery all over arch/mips.
  MIPS: cacheops.h: Increase indentation by one tab.
  MIPS: Remove bogus BUG_ON()
  MIPS: PowerTV: Remove support code.
  MIPS: ftrace: Add support for syscall tracepoints.
  MIPS: ptrace: Switch syscall reporting to tracehook_report_syscall_entry().
  MIPS: Move audit_arch() helper function to __syscall_get_arch().
  MIPS: Enable HAVE_ARCH_TRACEHOOK.
  MIPS: Switch ELF core dumper to use regsets.
  MIPS: Implement task_user_regset_view.
  MIPS: ptrace: Use tracehook helpers.
  MIPS: O32 / 32-bit: Always copy 4 stack arguments.
  ...
parents 280c84d1 723ff794

arch/mips/Kbuild.platforms

+0 −1
Original line number Original line Diff line number Diff line
@@ -20,7 +20,6 @@ platforms += mti-sead3 
platforms += netlogic

platforms += netlogic

platforms += pmcs-msp71xx

platforms += pmcs-msp71xx

platforms += pnx833x

platforms += pnx833x

platforms += powertv

platforms += ralink

platforms += ralink

platforms += rb532

platforms += rb532

platforms += sgi-ip22

platforms += sgi-ip22

arch/mips/Kconfig

+6 −21
Original line number Original line Diff line number Diff line
@@ -8,6 +8,7 @@ config MIPS 
	select HAVE_PERF_EVENTS

	select HAVE_PERF_EVENTS

	select PERF_USE_VMALLOC

	select PERF_USE_VMALLOC

	select HAVE_ARCH_KGDB

	select HAVE_ARCH_KGDB

	select HAVE_ARCH_TRACEHOOK

	select ARCH_HAVE_CUSTOM_GPIO_H

	select ARCH_HAVE_CUSTOM_GPIO_H

	select HAVE_FUNCTION_TRACER

	select HAVE_FUNCTION_TRACER

	select HAVE_FUNCTION_TRACE_MCOUNT_TEST

	select HAVE_FUNCTION_TRACE_MCOUNT_TEST
@@ -18,6 +19,7 @@ config MIPS 
	select HAVE_KPROBES

	select HAVE_KPROBES

	select HAVE_KRETPROBES

	select HAVE_KRETPROBES

	select HAVE_DEBUG_KMEMLEAK

	select HAVE_DEBUG_KMEMLEAK

	select HAVE_SYSCALL_TRACEPOINTS

	select ARCH_BINFMT_ELF_RANDOMIZE_PIE

	select ARCH_BINFMT_ELF_RANDOMIZE_PIE

	select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES && 64BIT

	select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES && 64BIT

	select RTC_LIB if !MACH_LOONGSON

	select RTC_LIB if !MACH_LOONGSON
@@ -146,6 +148,7 @@ config MIPS_COBALT 
	select CSRC_R4K

	select CSRC_R4K

	select CEVT_GT641XX

	select CEVT_GT641XX

	select DMA_NONCOHERENT

	select DMA_NONCOHERENT

	select EARLY_PRINTK_8250 if EARLY_PRINTK

	select HW_HAS_PCI

	select HW_HAS_PCI

	select I8253

	select I8253

	select I8259

	select I8259
@@ -412,23 +415,6 @@ config PMC_MSP 
	  of integrated peripherals, interfaces and DSPs in addition to

	  of integrated peripherals, interfaces and DSPs in addition to

	  a variety of MIPS cores.

	  a variety of MIPS cores.





config POWERTV

	bool "Cisco PowerTV"

	select BOOT_ELF32

	select CEVT_R4K

	select CPU_MIPSR2_IRQ_VI

	select CPU_MIPSR2_IRQ_EI

	select CSRC_POWERTV

	select DMA_NONCOHERENT

	select HW_HAS_PCI

	select SYS_HAS_CPU_MIPS32_R2

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	select SYS_SUPPORTS_HIGHMEM

	select USB_OHCI_LITTLE_ENDIAN

	help

	  This enables support for the Cisco PowerTV Platform.



config RALINK

config RALINK

	bool "Ralink based machines"

	bool "Ralink based machines"

	select CEVT_R4K

	select CEVT_R4K
@@ -811,7 +797,6 @@ source "arch/mips/jz4740/Kconfig" 
source "arch/mips/lantiq/Kconfig"

source "arch/mips/lantiq/Kconfig"

source "arch/mips/lasat/Kconfig"

source "arch/mips/lasat/Kconfig"

source "arch/mips/pmcs-msp71xx/Kconfig"

source "arch/mips/pmcs-msp71xx/Kconfig"

source "arch/mips/powertv/Kconfig"

source "arch/mips/ralink/Kconfig"

source "arch/mips/ralink/Kconfig"

source "arch/mips/sgi-ip27/Kconfig"

source "arch/mips/sgi-ip27/Kconfig"

source "arch/mips/sibyte/Kconfig"

source "arch/mips/sibyte/Kconfig"
@@ -890,9 +875,6 @@ config CSRC_BCM1480 
config CSRC_IOASIC

config CSRC_IOASIC

	bool

	bool





config CSRC_POWERTV

	bool



config CSRC_R4K

config CSRC_R4K

	bool

	bool
@@ -1489,8 +1471,10 @@ config SYS_SUPPORTS_ZBOOT 
	bool

	bool

	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_BZIP2

	select HAVE_KERNEL_BZIP2

	select HAVE_KERNEL_LZ4

	select HAVE_KERNEL_LZMA

	select HAVE_KERNEL_LZMA

	select HAVE_KERNEL_LZO

	select HAVE_KERNEL_LZO

	select HAVE_KERNEL_XZ





config SYS_SUPPORTS_ZBOOT_UART16550

config SYS_SUPPORTS_ZBOOT_UART16550

	bool

	bool
@@ -1977,6 +1961,7 @@ config MIPS_VPE_APSP_API 
config MIPS_CMP

config MIPS_CMP

	bool "MIPS CMP framework support"

	bool "MIPS CMP framework support"

	depends on SYS_SUPPORTS_MIPS_CMP

	depends on SYS_SUPPORTS_MIPS_CMP

	select SMP

	select SYNC_R4K

	select SYNC_R4K

	select SYS_SUPPORTS_SMP

	select SYS_SUPPORTS_SMP

	select SYS_SUPPORTS_SCHED_SMT if SMP

	select SYS_SUPPORTS_SCHED_SMT if SMP

arch/mips/Kconfig.debug

+8 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,14 @@ config EARLY_PRINTK 
	  doesn't cooperate with an X server. You should normally say N here,

	  doesn't cooperate with an X server. You should normally say N here,

	  unless you want to debug such a crash.

	  unless you want to debug such a crash.





config EARLY_PRINTK_8250

	bool "8250/16550 and compatible serial early printk driver"

	depends on EARLY_PRINTK

	default n

	help

	  If you say Y here, it will be possible to use a 8250/16550 serial

	  port as the boot console.



config CMDLINE_BOOL

config CMDLINE_BOOL

	bool "Built-in kernel command line"

	bool "Built-in kernel command line"

	default n

	default n

arch/mips/Makefile

+12 −2
Original line number Original line Diff line number Diff line
@@ -285,15 +285,19 @@ endif 
# Other need ECOFF, so we build a 32-bit ELF binary for them which we then

# Other need ECOFF, so we build a 32-bit ELF binary for them which we then

# convert to ECOFF using elf2ecoff.

# convert to ECOFF using elf2ecoff.

#

#

quiet_cmd_32 = OBJCOPY $@

	cmd_32 = $(OBJCOPY) -O $(32bit-bfd) $(OBJCOPYFLAGS) $< $@

vmlinux.32: vmlinux

vmlinux.32: vmlinux

	$(OBJCOPY) -O $(32bit-bfd) $(OBJCOPYFLAGS) $< $@

	$(call cmd,32)





#

#

# The 64-bit ELF tools are pretty broken so at this time we generate 64-bit

# The 64-bit ELF tools are pretty broken so at this time we generate 64-bit

# ELF files from 32-bit files by conversion.

# ELF files from 32-bit files by conversion.

#

#

quiet_cmd_64 = OBJCOPY $@

	cmd_64 = $(OBJCOPY) -O $(64bit-bfd) $(OBJCOPYFLAGS) $< $@

vmlinux.64: vmlinux

vmlinux.64: vmlinux

	$(OBJCOPY) -O $(64bit-bfd) $(OBJCOPYFLAGS) $< $@

	$(call cmd,64)





all:	$(all-y)

all:	$(all-y)
@@ -302,10 +306,16 @@ $(boot-y): $(vmlinux-32) FORCE 
	$(Q)$(MAKE) $(build)=arch/mips/boot VMLINUX=$(vmlinux-32) \

	$(Q)$(MAKE) $(build)=arch/mips/boot VMLINUX=$(vmlinux-32) \

		$(bootvars-y) arch/mips/boot/$@

		$(bootvars-y) arch/mips/boot/$@





ifdef CONFIG_SYS_SUPPORTS_ZBOOT

# boot/compressed

# boot/compressed

$(bootz-y): $(vmlinux-32) FORCE

$(bootz-y): $(vmlinux-32) FORCE

	$(Q)$(MAKE) $(build)=arch/mips/boot/compressed \

	$(Q)$(MAKE) $(build)=arch/mips/boot/compressed \

		$(bootvars-y) 32bit-bfd=$(32bit-bfd) $@

		$(bootvars-y) 32bit-bfd=$(32bit-bfd) $@

else

vmlinuz: FORCE

	@echo '   CONFIG_SYS_SUPPORTS_ZBOOT is not enabled'

	/bin/false

endif









CLEAN_FILES += vmlinux.32 vmlinux.64

CLEAN_FILES += vmlinux.32 vmlinux.64

arch/mips/alchemy/devboards/db1235.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -59,7 +59,7 @@ void __init board_setup(void) 
		ret = -ENODEV;

		ret = -ENODEV;

	}

	}

	if (ret)

	if (ret)

		panic("cannot initialize board support\n");

		panic("cannot initialize board support");

}

}





int __init db1235_arch_init(void)

int __init db1235_arch_init(void)

CRA Git | Maintained and supported by SUSTech CRA and CCSE