Commit e503606c 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: (40 commits)
  [MIPS] Yosemite: Fix missing parens in SERIAL_READ_1 macro
  [MIPS] Fix warnings in run_uncached on 32bit kernel
  [MIPS] Comment fix
  [MIPS] MT: Nuke duplicate mips_mt_regdump() prototype.
  [MIPS] Alchemy:  Fix PCI-memory access
  [MIPS] Move .set reorder out of conditional code
  [MIPS] Check FCSR for pending interrupts before restoring from a context.
  [MIPS] Jaguar ATX: Fix large number of warnings.
  [MIPS] Jaguar: Fix MAC address detection after platform_device conversion.
  [MIPS] SMTC: Make a bunch of functions and variables static.
  [MIPS] Use compat_sys_pselect6
  [MIPS] SMTC: Cleanup idle hook invocation.
  [MIPS] SELinux: Add security hooks to mips-mt {get,set}affinity
  [MIPS] IRIX: Linux coding style cleanups.
  [MIPS] PB1100: Fix pile of warnings
  [MIPS] Alchemy: Fix bunch of warnings
  [MIPS] Whitespace cleanups.
  [MIPS] Alchemy: Fix bunch more warnings.
  [MIPS] Use ARRAY_SIZE macro when appropriate
  [MIPS] Fix some whitespace damage
  ...
parents 76c32956 d390008e

arch/mips/Kconfig

+66 −37
Original line number Diff line number Diff line
@@ -575,6 +575,7 @@ config SGI_IP27 
	select DMA_IP27

	select EARLY_PRINTK

	select HW_HAS_PCI

	select NR_CPUS_DEFAULT_64

	select PCI_DOMAINS

	select SYS_HAS_CPU_R10000

	select SYS_SUPPORTS_64BIT_KERNEL
@@ -612,6 +613,7 @@ config SIBYTE_BIGSUR 
	bool "Sibyte BCM91480B-BigSur"

	select BOOT_ELF32

	select DMA_COHERENT

	select NR_CPUS_DEFAULT_4

	select PCI_DOMAINS

	select SIBYTE_BCM1x80

	select SWAP_IO_SPACE
@@ -623,6 +625,7 @@ config SIBYTE_SWARM 
	bool "Sibyte BCM91250A-SWARM"

	select BOOT_ELF32

	select DMA_COHERENT

	select NR_CPUS_DEFAULT_2

	select SIBYTE_SB1250

	select SWAP_IO_SPACE

	select SYS_HAS_CPU_SB1
@@ -635,6 +638,7 @@ config SIBYTE_SENTOSA 
	depends on EXPERIMENTAL

	select BOOT_ELF32

	select DMA_COHERENT

	select NR_CPUS_DEFAULT_2

	select SIBYTE_SB1250

	select SWAP_IO_SPACE

	select SYS_HAS_CPU_SB1
@@ -668,6 +672,7 @@ config SIBYTE_PTSWARM 
	depends on EXPERIMENTAL

	select BOOT_ELF32

	select DMA_COHERENT

	select NR_CPUS_DEFAULT_2

	select SIBYTE_SB1250

	select SWAP_IO_SPACE

	select SYS_HAS_CPU_SB1
@@ -680,6 +685,7 @@ config SIBYTE_LITTLESUR 
	depends on EXPERIMENTAL

	select BOOT_ELF32

	select DMA_COHERENT

	select NR_CPUS_DEFAULT_2

	select SIBYTE_SB1250

	select SWAP_IO_SPACE

	select SYS_HAS_CPU_SB1
@@ -790,23 +796,6 @@ config TOSHIBA_RBTX4938 


endchoice



config KEXEC

 	bool "Kexec system call (EXPERIMENTAL)"

 	depends on EXPERIMENTAL

 	help

 	  kexec is a system call that implements the ability to shutdown your

 	  current kernel, and to start another kernel.  It is like a reboot

 	  but it is indepedent of the system firmware.   And like a reboot

 	  you can start any kernel with it, not just Linux.



 	  The name comes from the similiarity to the exec system call.



 	  It is an ongoing process to be certain the hardware in a machine

 	  is properly shutdown, so do not be surprised if this code does not

 	  initially work for you.  It may help to enable device hotplugging

 	  support.  As of this writing the exact hardware interface is

 	  strongly in flux, so no good recommendation can be made.



source "arch/mips/ddb5xxx/Kconfig"

source "arch/mips/gt64120/ev64120/Kconfig"

source "arch/mips/jazz/Kconfig"
@@ -1541,6 +1530,8 @@ config MIPS_MT_SMTC 
	select CPU_MIPSR2_IRQ_VI

	select CPU_MIPSR2_SRS

	select MIPS_MT

	select NR_CPUS_DEFAULT_2

	select NR_CPUS_DEFAULT_8

	select SMP

	select SYS_SUPPORTS_SMP

	help
@@ -1756,13 +1747,34 @@ config SMP 
config SYS_SUPPORTS_SMP

	bool



config NR_CPUS_DEFAULT_2

	bool



config NR_CPUS_DEFAULT_4

	bool



config NR_CPUS_DEFAULT_8

	bool



config NR_CPUS_DEFAULT_16

	bool



config NR_CPUS_DEFAULT_32

	bool



config NR_CPUS_DEFAULT_64

	bool



config NR_CPUS

	int "Maximum number of CPUs (2-64)"

	range 2 64

	depends on SMP

	default "64" if SGI_IP27

	default "2"

	default "8" if MIPS_MT_SMTC

	default "2" if NR_CPUS_DEFAULT_2

	default "4" if NR_CPUS_DEFAULT_4

	default "8" if NR_CPUS_DEFAULT_8

	default "16" if NR_CPUS_DEFAULT_16

	default "32" if NR_CPUS_DEFAULT_32

	default "64" if NR_CPUS_DEFAULT_64

	help

	  This allows you to specify the maximum number of CPUs which this

	  kernel will support.  The maximum supported value is 32 for 32-bit
@@ -1859,6 +1871,40 @@ config MIPS_INSANE_LARGE 
	  This will result in additional memory usage, so it is not

	  recommended for normal users.



config KEXEC

	bool "Kexec system call (EXPERIMENTAL)"

	depends on EXPERIMENTAL

	help

	  kexec is a system call that implements the ability to shutdown your

	  current kernel, and to start another kernel.  It is like a reboot

	  but it is indepedent of the system firmware.   And like a reboot

	  you can start any kernel with it, not just Linux.



	  The name comes from the similiarity to the exec system call.



	  It is an ongoing process to be certain the hardware in a machine

	  is properly shutdown, so do not be surprised if this code does not

	  initially work for you.  It may help to enable device hotplugging

	  support.  As of this writing the exact hardware interface is

	  strongly in flux, so no good recommendation can be made.



config SECCOMP

	bool "Enable seccomp to safely compute untrusted bytecode"

	depends on PROC_FS && BROKEN

	default y

	help

	  This kernel feature is useful for number crunching applications

	  that may need to compute untrusted bytecode during their

	  execution. By using pipes or other transports made available to

	  the process as file descriptors supporting the read/write

	  syscalls, it's possible to isolate those applications in

	  their own address space using seccomp. Once seccomp is

	  enabled via /proc/<pid>/seccomp, it cannot be disabled

	  and the task is only allowed to execute a few safe syscalls

	  defined by each seccomp mode.



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



endmenu



config RWSEM_GENERIC_SPINLOCK
@@ -2025,23 +2071,6 @@ config BINFMT_ELF32 
	bool

	default y if MIPS32_O32 || MIPS32_N32



config SECCOMP

	bool "Enable seccomp to safely compute untrusted bytecode"

	depends on PROC_FS && BROKEN

	default y

	help

	  This kernel feature is useful for number crunching applications

	  that may need to compute untrusted bytecode during their

	  execution. By using pipes or other transports made available to

	  the process as file descriptors supporting the read/write

	  syscalls, it's possible to isolate those applications in

	  their own address space using seccomp. Once seccomp is

	  enabled via /proc/<pid>/seccomp, it cannot be disabled

	  and the task is only allowed to execute a few safe syscalls

	  defined by each seccomp mode.



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



config PM

	bool "Power Management support (EXPERIMENTAL)"

	depends on EXPERIMENTAL && SOC_AU1X00

arch/mips/arc/identify.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static struct smatch * __init string_to_mach(const char *s) 
{

	int i;



	for (i = 0; i < (sizeof(mach_table) / sizeof (mach_table[0])); i++) {

	for (i = 0; i < ARRAY_SIZE(mach_table); i++) {

		if (!strcmp(s, mach_table[i].arcname))

			return &mach_table[i];

	}

arch/mips/arc/memory.c

+4 −14
Original line number Diff line number Diff line
@@ -141,30 +141,20 @@ void __init prom_meminit(void) 
	}

}



unsigned long __init prom_free_prom_memory(void)

void __init prom_free_prom_memory(void)

{

	unsigned long freed = 0;

	unsigned long addr;

	int i;



	if (prom_flags & PROM_FLAG_DONT_FREE_TEMP)

		return 0;

		return;



	for (i = 0; i < boot_mem_map.nr_map; i++) {

		if (boot_mem_map.map[i].type != BOOT_MEM_ROM_DATA)

			continue;



		addr = boot_mem_map.map[i].addr;

		while (addr < boot_mem_map.map[i].addr

			      + boot_mem_map.map[i].size) {

			ClearPageReserved(virt_to_page(__va(addr)));

			init_page_count(virt_to_page(__va(addr)));

			free_page((unsigned long)__va(addr));

			addr += PAGE_SIZE;

			freed += PAGE_SIZE;

		free_init_pages("prom memory",

				addr, addr + boot_mem_map.map[i].size);

	}

}
 
	printk(KERN_INFO "Freeing prom memory: %ldkb freed\n", freed >> 10);



	return freed;

}

arch/mips/au1000/common/irq.c

+4 −4
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ void restore_local_and_enable(int controller, unsigned long mask) 




static struct irq_chip rise_edge_irq_type = {

	.typename = "Au1000 Rise Edge",

	.name = "Au1000 Rise Edge",

	.ack = mask_and_ack_rise_edge_irq,

	.mask = local_disable_irq,

	.mask_ack = mask_and_ack_rise_edge_irq,
@@ -242,7 +242,7 @@ static struct irq_chip rise_edge_irq_type = { 
};



static struct irq_chip fall_edge_irq_type = {

	.typename = "Au1000 Fall Edge",

	.name = "Au1000 Fall Edge",

	.ack = mask_and_ack_fall_edge_irq,

	.mask = local_disable_irq,

	.mask_ack = mask_and_ack_fall_edge_irq,
@@ -251,7 +251,7 @@ static struct irq_chip fall_edge_irq_type = { 
};



static struct irq_chip either_edge_irq_type = {

	.typename = "Au1000 Rise or Fall Edge",

	.name = "Au1000 Rise or Fall Edge",

	.ack = mask_and_ack_either_edge_irq,

	.mask = local_disable_irq,

	.mask_ack = mask_and_ack_either_edge_irq,
@@ -260,7 +260,7 @@ static struct irq_chip either_edge_irq_type = { 
};



static struct irq_chip level_irq_type = {

	.typename = "Au1000 Level",

	.name = "Au1000 Level",

	.ack = mask_and_ack_level_irq,

	.mask = local_disable_irq,

	.mask_ack = mask_and_ack_level_irq,

arch/mips/au1000/common/pci.c

+11 −7
Original line number Diff line number Diff line
@@ -76,14 +76,18 @@ static int __init au1x_pci_setup(void) 
	}



#ifdef CONFIG_DMA_NONCOHERENT

	{

		/*

		 *  Set the NC bit in controller for Au1500 pre-AC silicon

		 */

		u32 prid = read_c0_prid();



		if ((prid & 0xFF000000) == 0x01000000 && prid < 0x01030202) {

	       au_writel( 1<<16 | au_readl(Au1500_PCI_CFG), Au1500_PCI_CFG);

		       au_writel((1 << 16) | au_readl(Au1500_PCI_CFG),

			         Au1500_PCI_CFG);

		       printk("Non-coherent PCI accesses enabled\n");

		}

	}

#endif



	set_io_port_base(virt_io_addr);

CRA Git | Maintained and supported by SUSTech CRA and CCSE