Commit 1b050180 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 fixes from Ralf Baechle:
 "MIPS fixes for 3.11.  Half of then is for Netlogic the remainder
  touches things across arch/mips.

  Nothing really dramatic and by rc1 standards MIPS will be in fairly
  good shape with this applied.  Tested by building all MIPS defconfigs
  of which with this pull request four platforms won't build.  And yes,
  it boots also on my favorite test systems"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: kvm: Kconfig: Drop HAVE_KVM dependency from VIRTUALIZATION
  MIPS: Octeon: Fix DT pruning bug with pip ports
  MIPS: KVM: Mark KVM_GUEST (T&E KVM) as BROKEN_ON_SMP
  MIPS: tlbex: fix broken build in v3.11-rc1
  MIPS: Netlogic: Add XLP PIC irqdomain
  MIPS: Netlogic: Fix USB block's coherent DMA mask
  MIPS: tlbex: Fix typo in r3000 tlb store handler
  MIPS: BMIPS: Fix thinko to release slave TP from reset
  MIPS: Delete dead invocation of exception_exit().
parents 89d0abe3 f1b70019

arch/mips/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -1702,6 +1702,7 @@ endchoice 


config KVM_GUEST

	bool "KVM Guest Kernel"

	depends on BROKEN_ON_SMP

	help

	  Select this option if building a guest kernel for KVM (Trap & Emulate) mode

arch/mips/cavium-octeon/octeon-platform.c

+3 −2
Original line number Diff line number Diff line
@@ -334,9 +334,10 @@ static void __init octeon_fdt_pip_iface(int pip, int idx, u64 *pmac) 
	char name_buffer[20];

	int iface;

	int p;

	int count;

	int count = 0;



	count = cvmx_helper_interface_enumerate(idx);

	if (cvmx_helper_interface_enumerate(idx) == 0)

		count = cvmx_helper_ports_on_interface(idx);



	snprintf(name_buffer, sizeof(name_buffer), "interface@%d", idx);

	iface = fdt_subnode_offset(initial_boot_params, pip, name_buffer);

arch/mips/kernel/smp-bmips.c

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ static void bmips_boot_secondary(int cpu, struct task_struct *idle) 
	else {

#if defined(CONFIG_CPU_BMIPS4350) || defined(CONFIG_CPU_BMIPS4380)

		/* Reset slave TP1 if booting from TP0 */

		if (cpu_logical_map(cpu) == 0)

		if (cpu_logical_map(cpu) == 1)

			set_c0_brcm_cmt_ctrl(0x01);

#elif defined(CONFIG_CPU_BMIPS5000)

		if (cpu & 0x01)

arch/mips/kernel/traps.c

+0 −1
Original line number Diff line number Diff line
@@ -1242,7 +1242,6 @@ asmlinkage void do_mcheck(struct pt_regs *regs) 
	panic("Caught Machine Check exception - %scaused by multiple "

	      "matching entries in the TLB.",

	      (multi_match) ? "" : "not ");

	exception_exit(prev_state);

}



asmlinkage void do_mt(struct pt_regs *regs)

arch/mips/kvm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ source "virt/kvm/Kconfig" 


menuconfig VIRTUALIZATION

	bool "Virtualization"

	depends on HAVE_KVM

	---help---

	  Say Y here to get to see options for using your Linux host to run

	  other operating systems inside virtual machines (guests).

CRA Git | Maintained and supported by SUSTech CRA and CCSE