---

yaml
---
r: 24651
b: refs/heads/master
c: 5cd2720
h: refs/heads/master
i:
  24649: a73c3ab
  24647: 7ff8b6a
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: facee873de8da5fe709c194f98eb0f2cc642a38c
+refs/heads/master: 5cd272085bbc905532869f3e1fd18a7100496b56

trunk/arch/powerpc/Makefile

@@ -129,12 +129,8 @@ core-y				+= arch/powerpc/kernel/ \
 				   arch/powerpc/lib/ \
 				   arch/powerpc/sysdev/ \
 				   arch/powerpc/platforms/
-core-$(CONFIG_MATH_EMULATION)	+= arch/ppc/math-emu/
+core-$(CONFIG_MATH_EMULATION)	+= arch/powerpc/math-emu/
 core-$(CONFIG_XMON)		+= arch/powerpc/xmon/
-core-$(CONFIG_APUS)		+= arch/ppc/amiga/
-drivers-$(CONFIG_8xx)		+= arch/ppc/8xx_io/
-drivers-$(CONFIG_4xx)		+= arch/ppc/4xx_io/
-drivers-$(CONFIG_CPM2)		+= arch/ppc/8260_io/
 
 drivers-$(CONFIG_OPROFILE)	+= arch/powerpc/oprofile/
 

trunk/arch/powerpc/kernel/entry_64.S

@@ -617,12 +617,6 @@ _GLOBAL(enter_rtas)
 	mfsrr1	r10
 	std	r10,_SRR1(r1)
 
-	/* Temporary workaround to clear CR until RTAS can be modified to
-	 * ignore all bits.
-	 */
-	li	r0,0
-	mtcr	r0
-
 	/* There is no way it is acceptable to get here with interrupts enabled,
 	 * check it with the asm equivalent of WARN_ON
 	 */

trunk/arch/powerpc/kernel/firmware.c

@@ -14,9 +14,7 @@
  */
 
 #include <linux/config.h>
-#include <linux/module.h>
 
 #include <asm/firmware.h>
 
-unsigned long powerpc_firmware_features;
-EXPORT_SYMBOL_GPL(powerpc_firmware_features);
+unsigned long ppc64_firmware_features;

trunk/arch/powerpc/kernel/pci_64.c

@@ -78,7 +78,6 @@ int global_phb_number;		/* Global phb counter */
 
 /* Cached ISA bridge dev. */
 struct pci_dev *ppc64_isabridge_dev = NULL;
-EXPORT_SYMBOL_GPL(ppc64_isabridge_dev);
 
 static void fixup_broken_pcnet32(struct pci_dev* dev)
 {

trunk/arch/powerpc/kernel/process.c

@@ -770,7 +770,7 @@ int sys_execve(unsigned long a0, unsigned long a1, unsigned long a2,
 	return error;
 }
 
-int validate_sp(unsigned long sp, struct task_struct *p,
+static int validate_sp(unsigned long sp, struct task_struct *p,
 		       unsigned long nbytes)
 {
 	unsigned long stack_page = (unsigned long)task_stack_page(p);
@@ -808,8 +808,6 @@ int validate_sp(unsigned long sp, struct task_struct *p,
 #define FRAME_MARKER	2
 #endif
 
-EXPORT_SYMBOL(validate_sp);
-
 unsigned long get_wchan(struct task_struct *p)
 {
 	unsigned long ip, sp;

trunk/arch/powerpc/kernel/prom.c

@@ -1030,13 +1030,25 @@ static int __init early_init_dt_scan_chosen(unsigned long node,
 
 	if (strstr(cmd_line, "mem=")) {
 		char *p, *q;
+		unsigned long maxmem = 0;
 
 		for (q = cmd_line; (p = strstr(q, "mem=")) != 0; ) {
 			q = p + 4;
 			if (p > cmd_line && p[-1] != ' ')
 				continue;
-			memory_limit = memparse(q, &q);
+			maxmem = simple_strtoul(q, &q, 0);
+			if (*q == 'k' || *q == 'K') {
+				maxmem <<= 10;
+				++q;
+			} else if (*q == 'm' || *q == 'M') {
+				maxmem <<= 20;
+				++q;
+			} else if (*q == 'g' || *q == 'G') {
+				maxmem <<= 30;
+				++q;
+			}
 		}
+		memory_limit = maxmem;
 	}
 
 	/* break now */

trunk/arch/powerpc/kernel/signal_64.c

@@ -212,7 +212,7 @@ static inline void __user * get_sigframe(struct k_sigaction *ka, struct pt_regs
         /* Default to using normal stack */
         newsp = regs->gpr[1];
 
-	if ((ka->sa.sa_flags & SA_ONSTACK) && current->sas_ss_size) {
+	if (ka->sa.sa_flags & SA_ONSTACK) {
 		if (! on_sig_stack(regs->gpr[1]))
 			newsp = (current->sas_ss_sp + current->sas_ss_size);
 	}

trunk/arch/powerpc/kernel/sysfs.c

@@ -65,11 +65,11 @@ static int __init smt_setup(void)
 	unsigned int cpu;
 
 	if (!cpu_has_feature(CPU_FTR_SMT))
-		return -ENODEV;
+		return 1;
 
 	options = find_path_device("/options");
 	if (!options)
-		return -ENODEV;
+		return 1;
 
 	val = (unsigned int *)get_property(options, "ibm,smt-snooze-delay",
 					   NULL);
@@ -78,7 +78,7 @@ static int __init smt_setup(void)
 			per_cpu(smt_snooze_delay, cpu) = *val;
 	}
 
-	return 0;
+	return 1;
 }
 __initcall(smt_setup);
 

trunk/arch/powerpc/platforms/cell/spufs/inode.c

@@ -442,7 +442,7 @@ static struct file_system_type spufs_type = {
 	.kill_sb = kill_litter_super,
 };
 
-static int __init spufs_init(void)
+static int spufs_init(void)
 {
 	int ret;
 	ret = -ENOMEM;
@@ -472,7 +472,7 @@ static int __init spufs_init(void)
 }
 module_init(spufs_init);
 
-static void __exit spufs_exit(void)
+static void spufs_exit(void)
 {
 	spu_sched_exit();
 	unregister_spu_syscalls(&spufs_calls);

trunk/arch/powerpc/platforms/iseries/setup.c

@@ -680,8 +680,8 @@ static int __init iseries_probe(int platform)
 	if (PLATFORM_ISERIES_LPAR != platform)
 		return 0;
 
-	powerpc_firmware_features |= FW_FEATURE_ISERIES;
-	powerpc_firmware_features |= FW_FEATURE_LPAR;
+	ppc64_firmware_features |= FW_FEATURE_ISERIES;
+	ppc64_firmware_features |= FW_FEATURE_LPAR;
 
 	return 1;
 }

trunk/arch/powerpc/platforms/pseries/firmware.c

@@ -91,7 +91,7 @@ void __init fw_feature_init(void)
 				continue;
 
 			/* we have a match */
-			powerpc_firmware_features |=
+			ppc64_firmware_features |=
 				firmware_features_table[i].val;
 			break;
 		}

trunk/arch/powerpc/platforms/pseries/hvconsole.c

@@ -62,11 +62,6 @@ int hvc_put_chars(uint32_t vtermno, const char *buf, int count)
 	unsigned long *lbuf = (unsigned long *) buf;
 	long ret;
 
-
-	/* hcall will ret H_PARAMETER if 'count' exceeds firmware max.*/
-	if (count > MAX_VIO_PUT_CHARS)
-		count = MAX_VIO_PUT_CHARS;
-
 	ret = plpar_hcall_norets(H_PUT_TERM_CHAR, vtermno, count, lbuf[0],
 				 lbuf[1]);
 	if (ret == H_Success)

trunk/arch/powerpc/platforms/pseries/ras.c

@@ -132,7 +132,7 @@ static int __init init_ras_IRQ(void)
 		of_node_put(np);
 	}
 
-	return 0;
+	return 1;
 }
 __initcall(init_ras_IRQ);
 

trunk/arch/powerpc/platforms/pseries/setup.c

@@ -385,7 +385,7 @@ static int __init pSeries_probe(int platform)
 	 */
 
 	if (platform == PLATFORM_PSERIES_LPAR)
-		powerpc_firmware_features |= FW_FEATURE_LPAR;
+		ppc64_firmware_features |= FW_FEATURE_LPAR;
 
 	return 1;
 }

trunk/arch/ppc/Kconfig

@@ -61,22 +61,26 @@ config 6xx
 	select PPC_FPU
 	help
 	  There are four types of PowerPC chips supported.  The more common
-	  types (601, 603, 604, 740, 750, 7400), the older Freescale
-	  (formerly Motorola) embedded versions (821, 823, 850, 855, 860,
-	  52xx, 82xx, 83xx), the IBM embedded versions (403 and 405) and
-	  the Book E embedded processors from IBM (44x) and Freescale (85xx).
-	  For support for 64-bit processors, set ARCH=powerpc.
+	  types (601, 603, 604, 740, 750, 7400), the Motorola embedded
+	  versions (821, 823, 850, 855, 860, 52xx, 82xx, 83xx), the IBM
+	  embedded versions (403 and 405) and the POWER3 processor.
+	  (For support for more recent 64-bit processors, set ARCH=powerpc.)
 	  Unless you are building a kernel for one of the embedded processor
-	  systems, choose 6xx.
-	  Also note that because the 52xx, 82xx, & 83xx family have a 603e
-	  core, specific support for that chipset is asked later on.
+	  systems or a POWER3-based IBM RS/6000, choose 6xx.
+	  Note that the kernel runs in 32-bit mode even on 64-bit chips.
+	  Also note that because the 52xx, 82xx, & 83xx family has a 603e core,
+	  specific support for that chipset is asked later on.
 
 config 40x
 	bool "40x"
 
 config 44x
 	bool "44x"
 
+config POWER3
+	select PPC_FPU
+	bool "POWER3"
+
 config 8xx
 	bool "8xx"
 
@@ -248,9 +252,14 @@ config PPC601_SYNC_FIX
 source arch/ppc/platforms/4xx/Kconfig
 source arch/ppc/platforms/85xx/Kconfig
 
+config PPC64BRIDGE
+	bool
+	depends on POWER3
+	default y
+
 config PPC_STD_MMU
 	bool
-	depends on 6xx
+	depends on 6xx || POWER3
 	default y
 
 config NOT_COHERENT_CACHE
@@ -525,8 +534,8 @@ endmenu
 
 choice
 	prompt "Machine Type"
-	depends on 6xx
-	default PPC_PREP
+	depends on 6xx || POWER3
+	default PPC_MULTIPLATFORM
 	---help---
 	  Linux currently supports several different kinds of PowerPC-based
 	  machines: Apple Power Macintoshes and clones (such as the Motorola
@@ -536,14 +545,15 @@ choice
 	  Platform) machines (including all of the recent IBM RS/6000 and
 	  pSeries machines), and several embedded PowerPC systems containing
 	  4xx, 6xx, 7xx, 8xx, 74xx, and 82xx processors.  Currently, the
-	  default option is to build a kernel which works on PReP.
+	  default option is to build a kernel which works on PReP and CHRP.
 
-	  Note that support for Apple and CHRP machines is now only available
-	  with ARCH=powerpc, and has been removed from this menu.  If you
-	  wish to build a kernel for an Apple or CHRP machine, exit this
-	  configuration process and re-run it with ARCH=powerpc.
+	  Note that support for Apple machines is now only available with
+	  ARCH=powerpc, and has been removed from this menu.  If you wish
+	  to build a kernel for an Apple machine, exit this configuration
+	  process and re-run it with ARCH=powerpc.
 
-	  Select PReP if configuring for a PReP machine.
+	  Select CHRP/PReP if configuring for an IBM RS/6000 or
+	  pSeries machine, or a PReP machine.
 
 	  Select Gemini if configuring for a Synergy Microsystems' Gemini
 	  series Single Board Computer.  More information is available at:
@@ -552,8 +562,8 @@ choice
 	  Select APUS if configuring for a PowerUP Amiga.  More information is
 	  available at: <http://linux-apus.sourceforge.net/>.
 
-config PPC_PREP
-	bool "PReP"
+config PPC_MULTIPLATFORM
+	bool "CHRP/PReP"
 
 config APUS
 	bool "Amiga-APUS"
@@ -797,6 +807,25 @@ config CPM2
 	  you wish to build a kernel for a machine with a CPM2 coprocessor
 	  on it (826x, 827x, 8560).
 
+config PPC_CHRP
+	bool "Support for CHRP (Common Hardware Reference Platform) machines"
+	depends on PPC_MULTIPLATFORM
+	select PPC_I8259
+	select PPC_INDIRECT_PCI
+	default y
+
+config PPC_PREP
+	bool "Support for PReP (PowerPC Reference Platform) machines"
+	depends on PPC_MULTIPLATFORM
+	select PPC_I8259
+	select PPC_INDIRECT_PCI
+	default y
+
+config PPC_OF
+	bool
+	depends on PPC_CHRP
+	default y
+
 config PPC_GEN550
 	bool
 	depends on SANDPOINT || SPRUCE || PPLUS || \
@@ -955,6 +984,14 @@ source "mm/Kconfig"
 
 source "fs/Kconfig.binfmt"
 
+config PROC_DEVICETREE
+	bool "Support for Open Firmware device tree in /proc"
+	depends on PPC_OF && PROC_FS
+	help
+	  This option adds a device-tree directory under /proc which contains
+	  an image of the device tree that the kernel copies from Open
+	  Firmware. If unsure, say Y here.
+
 config PREP_RESIDUAL
 	bool "Support for PReP Residual Data"
 	depends on PPC_PREP
@@ -1147,7 +1184,8 @@ menu "Bus options"
 
 config ISA
 	bool "Support for ISA-bus hardware"
-	depends on PPC_PREP
+	depends on PPC_PREP || PPC_CHRP
+	select PPC_I8259
 	help
 	  Find out whether you have ISA slots on your motherboard.  ISA is the
 	  name of a bus system, i.e. the way the CPU talks to the other stuff
@@ -1157,18 +1195,18 @@ config ISA
 
 config GENERIC_ISA_DMA
 	bool
-	depends on 6xx && !CPM2
+	depends on POWER3 || 6xx && !CPM2
 	default y
 
 config PPC_I8259
 	bool
-	default y if 85xx || PPC_PREP
+	default y if 85xx
 	default n
 
 config PPC_INDIRECT_PCI
 	bool
 	depends on PCI
-	default y if 40x || 44x || 85xx || 83xx || PPC_PREP
+	default y if 40x || 44x || 85xx || 83xx
 	default n
 
 config EISA
@@ -1359,7 +1397,7 @@ config CONSISTENT_SIZE
 
 config BOOT_LOAD_BOOL
 	bool "Set the boot link/load address"
-	depends on ADVANCED_OPTIONS && !PPC_PREP
+	depends on ADVANCED_OPTIONS && !PPC_MULTIPLATFORM
 	help
 	  This option allows you to set the initial load address of the zImage
 	  or zImage.initrd file.  This can be useful if you are on a board

trunk/arch/ppc/Kconfig.debug

@@ -53,6 +53,13 @@ config BDI_SWITCH
 	  Unless you are intending to debug the kernel with one of these
 	  machines, say N here.
 
+config BOOTX_TEXT
+	bool "Support for early boot text console (BootX or OpenFirmware only)"
+	depends PPC_OF
+	help
+	  Say Y here to see progress messages from the boot firmware in text
+	  mode. Requires either BootX or Open Firmware.
+
 config SERIAL_TEXT_DEBUG
 	bool "Support for early boot texts over serial port"
 	depends on 4xx || LOPEC || MV64X60 || PPLUS || PRPMC800 || \