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

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

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Treat R14000 like R10000.
  [MIPS] Remove EXPERIMENTAL from PAGE_SIZE_16KB
  [MIPS] Update/Fix instruction definitions
  [MIPS] DSP and MDMX share the same config flag bit.
  [MIPS] Fix deadlock on MP with cache aliases.
  [MIPS] Use generic STABS_DEBUG macro.
  [MIPS] Create consistency in "system type" selection.
  [MIPS] Use generic DWARF_DEBUG
  [MIPS] Fix kgdb exception handler from user mode.
  [MIPS] Update struct sigcontext member names
  [MIPS] Update/fix futex assembly
  [MIPS] Remove support for sysmips(2) SETNAME and MIPS_RDNVRAM operations.
  [MIPS] Fix detection and handling of the 74K processor.
  [MIPS] Add missing 34K processor IDs
  [MIPS] Fix marking buddy of pte global for MIPS32 w/36-bit physical address
  [MIPS] AU1xxx mips_timer_interrupt() fixes
  [MIPS] Fix typo
parents 5cedae9c 44d921b2

arch/mips/Kconfig

+47 −49
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ choice 
	default SGI_IP22



config MIPS_MTX1

	bool "Support for 4G Systems MTX-1 board"

	bool "4G Systems MTX-1 board"

	select DMA_NONCOHERENT

	select HW_HAS_PCI

	select SOC_AU1500
@@ -120,7 +120,7 @@ config MIPS_MIRAGE 
	select SYS_SUPPORTS_LITTLE_ENDIAN



config MIPS_COBALT

	bool "Support for Cobalt Server"

	bool "Cobalt Server"

	select DMA_NONCOHERENT

	select HW_HAS_PCI

	select I8259
@@ -132,7 +132,7 @@ config MIPS_COBALT 
	select SYS_SUPPORTS_LITTLE_ENDIAN



config MACH_DECSTATION

	bool "Support for DECstations"

	bool "DECstations"

	select BOOT_ELF32

	select DMA_NONCOHERENT

	select EARLY_PRINTK
@@ -158,7 +158,7 @@ config MACH_DECSTATION 
	  otherwise choose R3000.



config MIPS_EV64120

	bool "Support for Galileo EV64120 Evaluation board (EXPERIMENTAL)"

	bool "Galileo EV64120 Evaluation board (EXPERIMENTAL)"

	depends on EXPERIMENTAL

	select DMA_NONCOHERENT

	select HW_HAS_PCI
@@ -175,7 +175,7 @@ config MIPS_EV64120 
	  kernel for this platform.



config MIPS_EV96100

	bool "Support for Galileo EV96100 Evaluation board (EXPERIMENTAL)"

	bool "Galileo EV96100 Evaluation board (EXPERIMENTAL)"

	depends on EXPERIMENTAL

	select DMA_NONCOHERENT

	select HW_HAS_PCI
@@ -195,7 +195,7 @@ config MIPS_EV96100 
	  here if you wish to build a kernel for this platform.



config MIPS_IVR

	bool "Support for Globespan IVR board"

	bool "Globespan IVR board"

	select DMA_NONCOHERENT

	select HW_HAS_PCI

	select ITE_BOARD_GEN
@@ -211,7 +211,7 @@ config MIPS_IVR 
	  build a kernel for this platform.



config MIPS_ITE8172

	bool "Support for ITE 8172G board"

	bool "ITE 8172G board"

	select DMA_NONCOHERENT

	select HW_HAS_PCI

	select ITE_BOARD_GEN
@@ -228,7 +228,7 @@ config MIPS_ITE8172 
	  a kernel for this platform.



config MACH_JAZZ

	bool "Support for the Jazz family of machines"

	bool "Jazz family of machines"

	select ARC

	select ARC32

	select ARCH_MAY_HAVE_PC_FDC
@@ -246,7 +246,7 @@ config MACH_JAZZ 
	 Olivetti M700-10 workstations.



config LASAT

	bool "Support for LASAT Networks platforms"

	bool "LASAT Networks platforms"

	select DMA_NONCOHERENT

	select HW_HAS_PCI

	select MIPS_GT64120
@@ -258,7 +258,7 @@ config LASAT 
	select SYS_SUPPORTS_LITTLE_ENDIAN



config MIPS_ATLAS

	bool "Support for MIPS Atlas board"

	bool "MIPS Atlas board"

	select BOOT_ELF32

	select DMA_NONCOHERENT

	select IRQ_CPU
@@ -283,7 +283,7 @@ config MIPS_ATLAS 
	  board.



config MIPS_MALTA

	bool "Support for MIPS Malta board"

	bool "MIPS Malta board"

	select ARCH_MAY_HAVE_PC_FDC

	select BOOT_ELF32

	select HAVE_STD_PC_SERIAL_PORT
@@ -311,7 +311,7 @@ config MIPS_MALTA 
	  board.



config MIPS_SEAD

	bool "Support for MIPS SEAD board (EXPERIMENTAL)"

	bool "MIPS SEAD board (EXPERIMENTAL)"

	depends on EXPERIMENTAL

	select IRQ_CPU

	select DMA_NONCOHERENT
@@ -328,7 +328,7 @@ config MIPS_SEAD 
	  board.



config MIPS_SIM

	bool 'Support for MIPS simulator (MIPSsim)'

	bool 'MIPS simulator (MIPSsim)'

	select DMA_NONCOHERENT

	select IRQ_CPU

	select SYS_HAS_CPU_MIPS32_R1
@@ -341,7 +341,7 @@ config MIPS_SIM 
	  emulator.



config MOMENCO_JAGUAR_ATX

	bool "Support for Momentum Jaguar board"

	bool "Momentum Jaguar board"

	select BOOT_ELF32

	select DMA_NONCOHERENT

	select HW_HAS_PCI
@@ -361,7 +361,7 @@ config MOMENCO_JAGUAR_ATX 
	  Momentum Computer <http://www.momenco.com/>.



config MOMENCO_OCELOT

	bool "Support for Momentum Ocelot board"

	bool "Momentum Ocelot board"

	select DMA_NONCOHERENT

	select HW_HAS_PCI

	select IRQ_CPU
@@ -378,7 +378,7 @@ config MOMENCO_OCELOT 
	  Momentum Computer <http://www.momenco.com/>.



config MOMENCO_OCELOT_3

	bool "Support for Momentum Ocelot-3 board"

	bool "Momentum Ocelot-3 board"

	select BOOT_ELF32

	select DMA_NONCOHERENT

	select HW_HAS_PCI
@@ -397,7 +397,7 @@ config MOMENCO_OCELOT_3 
	  PMC-Sierra Rm79000 core.



config MOMENCO_OCELOT_C

	bool "Support for Momentum Ocelot-C board"

	bool "Momentum Ocelot-C board"

	select DMA_NONCOHERENT

	select HW_HAS_PCI

	select IRQ_CPU
@@ -414,7 +414,7 @@ config MOMENCO_OCELOT_C 
	  Momentum Computer <http://www.momenco.com/>.



config MOMENCO_OCELOT_G

	bool "Support for Momentum Ocelot-G board"

	bool "Momentum Ocelot-G board"

	select DMA_NONCOHERENT

	select HW_HAS_PCI

	select IRQ_CPU
@@ -431,23 +431,23 @@ config MOMENCO_OCELOT_G 
	  Momentum Computer <http://www.momenco.com/>.



config MIPS_XXS1500

	bool "Support for MyCable XXS1500 board"

	bool "MyCable XXS1500 board"

	select DMA_NONCOHERENT

	select SOC_AU1500

	select SYS_SUPPORTS_LITTLE_ENDIAN



config PNX8550_V2PCI

	bool "Support for Philips PNX8550 based Viper2-PCI board"

	bool "Philips PNX8550 based Viper2-PCI board"

	select PNX8550

	select SYS_SUPPORTS_LITTLE_ENDIAN



config PNX8550_JBS

	bool "Support for Philips PNX8550 based JBS board"

	bool "Philips PNX8550 based JBS board"

	select PNX8550

	select SYS_SUPPORTS_LITTLE_ENDIAN



config DDB5074

	bool "Support for NEC DDB Vrc-5074 (EXPERIMENTAL)"

	bool "NEC DDB Vrc-5074 (EXPERIMENTAL)"

	depends on EXPERIMENTAL

	select DDB5XXX_COMMON

	select DMA_NONCOHERENT
@@ -465,7 +465,7 @@ config DDB5074 
	  evaluation board.



config DDB5476

	bool "Support for NEC DDB Vrc-5476"

	bool "NEC DDB Vrc-5476"

	select DDB5XXX_COMMON

	select DMA_NONCOHERENT

	select HAVE_STD_PC_SERIAL_PORT
@@ -486,7 +486,7 @@ config DDB5476 
	  IDE controller, PS2 keyboard, PS2 mouse, etc.



config DDB5477

	bool "Support for NEC DDB Vrc-5477"

	bool "NEC DDB Vrc-5477"

	select DDB5XXX_COMMON

	select DMA_NONCOHERENT

	select HW_HAS_PCI
@@ -504,13 +504,13 @@ config DDB5477 
	  ether port USB, AC97, PCI, etc.



config MACH_VR41XX

	bool "Support for NEC VR4100 series based machines"

	bool "NEC VR41XX-based machines"

	select SYS_HAS_CPU_VR41XX

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL



config PMC_YOSEMITE

	bool "Support for PMC-Sierra Yosemite eval board"

	bool "PMC-Sierra Yosemite eval board"

	select DMA_COHERENT

	select HW_HAS_PCI

	select IRQ_CPU
@@ -527,7 +527,7 @@ config PMC_YOSEMITE 
	  manufactured by PMC-Sierra.



config QEMU

	bool "Support for Qemu"

	bool "Qemu"

	select DMA_COHERENT

	select GENERIC_ISA_DMA

	select HAVE_STD_PC_SERIAL_PORT
@@ -547,7 +547,7 @@ config QEMU 
	  can be found at http://www.linux-mips.org/wiki/Qemu.



config SGI_IP22

	bool "Support for SGI IP22 (Indy/Indigo2)"

	bool "SGI IP22 (Indy/Indigo2)"

	select ARC

	select ARC32

	select BOOT_ELF32
@@ -567,7 +567,7 @@ config SGI_IP22 
	  that runs on these, say Y here.



config SGI_IP27

	bool "Support for SGI IP27 (Origin200/2000)"

	bool "SGI IP27 (Origin200/2000)"

	select ARC

	select ARC64

	select BOOT_ELF64
@@ -583,7 +583,7 @@ config SGI_IP27 
	  here.



config SGI_IP32

	bool "Support for SGI IP32 (O2) (EXPERIMENTAL)"

	bool "SGI IP32 (O2) (EXPERIMENTAL)"

	depends on EXPERIMENTAL

	select ARC

	select ARC32
@@ -604,7 +604,7 @@ config SGI_IP32 
	  If you want this kernel to run on SGI O2 workstation, say Y here.



config SIBYTE_BIGSUR

	bool "Support for Sibyte BCM91480B-BigSur"

	bool "Sibyte BCM91480B-BigSur"

	select BOOT_ELF32

	select DMA_COHERENT

	select PCI_DOMAINS
@@ -615,7 +615,7 @@ config SIBYTE_BIGSUR 
	select SYS_SUPPORTS_LITTLE_ENDIAN



config SIBYTE_SWARM

	bool "Support for Sibyte BCM91250A-SWARM"

	bool "Sibyte BCM91250A-SWARM"

	select BOOT_ELF32

	select DMA_COHERENT

	select SIBYTE_SB1250
@@ -626,7 +626,7 @@ config SIBYTE_SWARM 
	select SYS_SUPPORTS_LITTLE_ENDIAN



config SIBYTE_SENTOSA

	bool "Support for Sibyte BCM91250E-Sentosa"

	bool "Sibyte BCM91250E-Sentosa"

	depends on EXPERIMENTAL

	select BOOT_ELF32

	select DMA_COHERENT
@@ -637,7 +637,7 @@ config SIBYTE_SENTOSA 
	select SYS_SUPPORTS_LITTLE_ENDIAN



config SIBYTE_RHONE

	bool "Support for Sibyte BCM91125E-Rhone"

	bool "Sibyte BCM91125E-Rhone"

	depends on EXPERIMENTAL

	select BOOT_ELF32

	select DMA_COHERENT
@@ -648,7 +648,7 @@ config SIBYTE_RHONE 
	select SYS_SUPPORTS_LITTLE_ENDIAN



config SIBYTE_CARMEL

	bool "Support for Sibyte BCM91120x-Carmel"

	bool "Sibyte BCM91120x-Carmel"

	depends on EXPERIMENTAL

	select BOOT_ELF32

	select DMA_COHERENT
@@ -659,7 +659,7 @@ config SIBYTE_CARMEL 
	select SYS_SUPPORTS_LITTLE_ENDIAN



config SIBYTE_PTSWARM

	bool "Support for Sibyte BCM91250PT-PTSWARM"

	bool "Sibyte BCM91250PT-PTSWARM"

	depends on EXPERIMENTAL

	select BOOT_ELF32

	select DMA_COHERENT
@@ -671,7 +671,7 @@ config SIBYTE_PTSWARM 
	select SYS_SUPPORTS_LITTLE_ENDIAN



config SIBYTE_LITTLESUR

	bool "Support for Sibyte BCM91250C2-LittleSur"

	bool "Sibyte BCM91250C2-LittleSur"

	depends on EXPERIMENTAL

	select BOOT_ELF32

	select DMA_COHERENT
@@ -683,7 +683,7 @@ config SIBYTE_LITTLESUR 
	select SYS_SUPPORTS_LITTLE_ENDIAN



config SIBYTE_CRHINE

	bool "Support for Sibyte BCM91120C-CRhine"

	bool "Sibyte BCM91120C-CRhine"

	depends on EXPERIMENTAL

	select BOOT_ELF32

	select DMA_COHERENT
@@ -694,7 +694,7 @@ config SIBYTE_CRHINE 
	select SYS_SUPPORTS_LITTLE_ENDIAN



config SIBYTE_CRHONE

	bool "Support for Sibyte BCM91125C-CRhone"

	bool "Sibyte BCM91125C-CRhone"

	depends on EXPERIMENTAL

	select BOOT_ELF32

	select DMA_COHERENT
@@ -706,7 +706,7 @@ config SIBYTE_CRHONE 
	select SYS_SUPPORTS_LITTLE_ENDIAN



config SNI_RM200_PCI

	bool "Support for SNI RM200 PCI"

	bool "SNI RM200 PCI"

	select ARC

	select ARC32

	select ARCH_MAY_HAVE_PC_FDC
@@ -732,7 +732,7 @@ config SNI_RM200_PCI 
	  support this machine type.



config TOSHIBA_JMR3927

	bool "Support for Toshiba JMR-TX3927 board"

	bool "Toshiba JMR-TX3927 board"

	select DMA_NONCOHERENT

	select HW_HAS_PCI

	select MIPS_TX3927
@@ -743,7 +743,7 @@ config TOSHIBA_JMR3927 
	select TOSHIBA_BOARDS



config TOSHIBA_RBTX4927

	bool "Support for Toshiba TBTX49[23]7 board"

	bool "Toshiba TBTX49[23]7 board"

	select DMA_NONCOHERENT

	select HAS_TXX9_SERIAL

	select HW_HAS_PCI
@@ -760,7 +760,7 @@ config TOSHIBA_RBTX4927 
	  support this machine type



config TOSHIBA_RBTX4938

	bool "Support for Toshiba RBTX4938 board"

	bool "Toshiba RBTX4938 board"

	select HAVE_STD_PC_SERIAL_PORT

	select DMA_NONCOHERENT

	select GENERIC_ISA_DMA
@@ -1411,13 +1411,12 @@ config PAGE_SIZE_8KB 


config PAGE_SIZE_16KB

	bool "16kB"

	depends on EXPERIMENTAL && !CPU_R3000 && !CPU_TX39XX

	depends on !CPU_R3000 && !CPU_TX39XX

	help

	  Using 16kB page size will result in higher performance kernel at

	  the price of higher memory consumption.  This option is available on

	  all non-R3000 family processor.  Not that at the time of this

	  writing this option is still high experimental; there are also

	  issues with compatibility of user applications.

	  all non-R3000 family processors.  Note that you will need a suitable

	  Linux distribution to support this.



config PAGE_SIZE_64KB

	bool "64kB"
@@ -1426,8 +1425,7 @@ config PAGE_SIZE_64KB 
	  Using 64kB page size will result in higher performance kernel at

	  the price of higher memory consumption.  This option is available on

	  all non-R3000 family processor.  Not that at the time of this

	  writing this option is still high experimental; there are also

	  issues with compatibility of user applications.

	  writing this option is still high experimental.



endchoice

arch/mips/au1000/common/irq.c

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


extern void set_debug_traps(void);

extern irq_cpustat_t irq_stat [NR_CPUS];

extern void mips_timer_interrupt(struct pt_regs *regs);



static void setup_local_irq(unsigned int irq, int type, int int_req);

static unsigned int startup_irq(unsigned int irq);

arch/mips/au1000/common/time.c

+1 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ void mips_timer_interrupt(struct pt_regs *regs) 


null:

	ack_r4ktimer(0);

	irq_exit();

}



#ifdef CONFIG_PM

arch/mips/kernel/asm-offsets.c

+2 −2
Original line number Diff line number Diff line
@@ -272,8 +272,8 @@ void output_sc_defines(void) 
	text("/* Linux sigcontext offsets. */");

	offset("#define SC_REGS       ", struct sigcontext, sc_regs);

	offset("#define SC_FPREGS     ", struct sigcontext, sc_fpregs);

	offset("#define SC_MDHI       ", struct sigcontext, sc_hi);

	offset("#define SC_MDLO       ", struct sigcontext, sc_lo);

	offset("#define SC_MDHI       ", struct sigcontext, sc_mdhi);

	offset("#define SC_MDLO       ", struct sigcontext, sc_mdlo);

	offset("#define SC_PC         ", struct sigcontext, sc_pc);

	offset("#define SC_FPC_CSR    ", struct sigcontext, sc_fpc_csr);

	linefeed;

arch/mips/kernel/cpu-probe.c

+13 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ static inline void check_wait(void) 
	case CPU_24K:

	case CPU_25KF:

	case CPU_34K:

	case CPU_74K:

 	case CPU_PR4450:

		cpu_wait = r4k_wait;

		printk(" available.\n");
@@ -432,6 +433,15 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c) 
		             MIPS_CPU_LLSC;

		c->tlbsize = 64;

		break;

	case PRID_IMP_R14000:

		c->cputype = CPU_R14000;

		c->isa_level = MIPS_CPU_ISA_IV;

		c->options = MIPS_CPU_TLB | MIPS_CPU_4K_CACHE | MIPS_CPU_4KEX |

		             MIPS_CPU_FPU | MIPS_CPU_32FPR |

			     MIPS_CPU_COUNTER | MIPS_CPU_WATCH |

		             MIPS_CPU_LLSC;

		c->tlbsize = 64;

		break;

	}

}
@@ -593,6 +603,9 @@ static inline void cpu_probe_mips(struct cpuinfo_mips *c) 
	case PRID_IMP_34K:

		c->cputype = CPU_34K;

		break;

	case PRID_IMP_74K:

		c->cputype = CPU_74K;

		break;

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE