[patch 00/16] powerpc cleanup patches

[patch 00/16] powerpc cleanup patches

[s.hauer]

Hi all,

The following patchset contains various powerpc cleanup patches. Most of
them aim at reducing the usage of CONFIG_PPC_MULTIPLATFORM. Some patches
are trivial, others might cause objections.
Some patches have to go to subsystem maintainers, but I post them here
for review first.

Please comment

Sascha

--
 Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
  Pengutronix - Linux Solutions for Science and Industry
    Handelsregister: Amtsgericht Hildesheim, HRA 2686
      Hannoversche Str. 2, 31134 Hildesheim, Germany
    Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 01/16] remove inclusion of asm/processor.h for powerpc

[s.hauer]

Remove inclusion of asm/processor.h for powerpc. It was used for
some ppc specific hook in this file, but the hook is gone

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Index: linux-2.6/drivers/ide/pci/via82cxxx.c
===================================================================
--- linux-2.6.orig/drivers/ide/pci/via82cxxx.c
+++ linux-2.6/drivers/ide/pci/via82cxxx.c
@@ -35,10 +35,6 @@
 #include <linux/ide.h>
 #include <asm/io.h>
 
-#ifdef CONFIG_PPC_MULTIPLATFORM
-#include <asm/processor.h>
-#endif
-
 #include "ide-timing.h"
 
 #define DISPLAY_VIA_TIMINGS

--
 Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
  Pengutronix - Linux Solutions for Science and Industry
    Handelsregister: Amtsgericht Hildesheim, HRA 2686
      Hannoversche Str. 2, 31134 Hildesheim, Germany
    Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 02/16] replace CONFIG_PPC_MULTIPLATFORM with CONFIG_PPC_PMAC in tulip driver

[s.hauer]

replace CONFIG_PPC_MULTIPLATFORM with CONFIG_PPC_PMAC in
drivers/net/tulip/de4x5.c. It is needed for a pmac specific hook but
has nothing with to do with PPC_MULTIPLATFORM

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Index: linux-2.6/drivers/net/tulip/de4x5.c
===================================================================
--- linux-2.6.orig/drivers/net/tulip/de4x5.c
+++ linux-2.6/drivers/net/tulip/de4x5.c
@@ -473,9 +473,9 @@
 #include <asm/byteorder.h>
 #include <asm/unaligned.h>
 #include <asm/uaccess.h>
-#ifdef CONFIG_PPC_MULTIPLATFORM
+#ifdef CONFIG_PPC_PMAC
 #include <asm/machdep.h>
-#endif /* CONFIG_PPC_MULTIPLATFORM */
+#endif /* CONFIG_PPC_PMAC */
 
 #include "de4x5.h"
 
@@ -4151,7 +4151,7 @@ get_hw_addr(struct net_device *dev)
     /* If possible, try to fix a broken card - SMC only so far */
     srom_repair(dev, broken);
 
-#ifdef CONFIG_PPC_MULTIPLATFORM
+#ifdef CONFIG_PPC_PMAC
     /*
     ** If the address starts with 00 a0, we have to bit-reverse
     ** each byte of the address.
@@ -4168,7 +4168,7 @@ get_hw_addr(struct net_device *dev)
 		    dev->dev_addr[i] = ((x & 0x55) << 1) + ((x & 0xaa) >> 1);
 	    }
     }
-#endif /* CONFIG_PPC_MULTIPLATFORM */
+#endif /* CONFIG_PPC_PMAC */
 
     /* Test for a bad enet address */
     status = test_bad_enet(dev, status);

--
 Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
  Pengutronix - Linux Solutions for Science and Industry
    Handelsregister: Amtsgericht Hildesheim, HRA 2686
      Hannoversche Str. 2, 31134 Hildesheim, Germany
    Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 03/16] powerpc: remove dead Kconfig entries

[s.hauer]

Remove dead Kconfig entries in
arch/powerpc/platforms/embedded6xx/Kconfig. These can be easily patched
back in once real support for these engine is there. No need to confuse
people with these entries.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Index: linux-2.6/arch/powerpc/platforms/embedded6xx/Kconfig
===================================================================
--- linux-2.6.orig/arch/powerpc/platforms/embedded6xx/Kconfig
+++ linux-2.6/arch/powerpc/platforms/embedded6xx/Kconfig
@@ -2,78 +2,6 @@ choice
 	prompt "Machine Type"
 	depends on EMBEDDED6xx
 
-config KATANA
-	bool "Artesyn-Katana"
-	help
-	  Select KATANA if configuring an Artesyn KATANA 750i or 3750
-	  cPCI board.
-
-config WILLOW
-	bool "Cogent-Willow"
-
-config CPCI690
-	bool "Force-CPCI690"
-	help
-	  Select CPCI690 if configuring a Force CPCI690 cPCI board.
-
-config POWERPMC250
-	bool "Force-PowerPMC250"
-
-config CHESTNUT
-	bool "IBM 750FX Eval board or 750GX Eval board"
-	help
-	  Select CHESTNUT if configuring an IBM 750FX Eval Board or a
-	  IBM 750GX Eval board.
-
-config SPRUCE
-	bool "IBM-Spruce"
-	select PPC_INDIRECT_PCI
-
-config HDPU
-	bool "Sky-HDPU"
-	help
-	  Select HDPU if configuring a Sky Computers Compute Blade.
-
-config HDPU_FEATURES
-	depends HDPU
-	tristate "HDPU-Features"
-	help
-	  Select to enable HDPU enhanced features.
-
-config EV64260
-	bool "Marvell-EV64260BP"
-	help
-	  Select EV64260 if configuring a Marvell (formerly Galileo)
-	  EV64260BP Evaluation platform.
-
-config LOPEC
-	bool "Motorola-LoPEC"
-	select PPC_I8259
-
-config MVME5100
-	bool "Motorola-MVME5100"
-	select PPC_INDIRECT_PCI
-
-config PPLUS
-	bool "Motorola-PowerPlus"
-	select PPC_I8259
-	select PPC_INDIRECT_PCI
-
-config PRPMC750
-	bool "Motorola-PrPMC750"
-	select PPC_INDIRECT_PCI
-
-config PRPMC800
-	bool "Motorola-PrPMC800"
-	select PPC_INDIRECT_PCI
-
-config SANDPOINT
-	bool "Motorola-Sandpoint"
-	select PPC_I8259
-	help
-	  Select SANDPOINT if configuring for a Motorola Sandpoint X3
-	  (any flavor).
-
 config MPC7448HPC2
 	bool "Freescale MPC7448HPC2(Taiga)"
 	select TSI108_BRIDGE
@@ -84,233 +12,4 @@ config MPC7448HPC2
 	help
 	  Select MPC7448HPC2 if configuring for Freescale MPC7448HPC2 (Taiga)
 	  platform
-
-config RADSTONE_PPC7D
-	bool "Radstone Technology PPC7D board"
-	select PPC_I8259
-
-config PAL4
-	bool "SBS-Palomar4"
-
-config GEMINI
-	bool "Synergy-Gemini"
-	select PPC_INDIRECT_PCI
-	depends on BROKEN
-	help
-	  Select Gemini if configuring for a Synergy Microsystems' Gemini
-	  series Single Board Computer.  More information is available at:
-	  <http://www.synergymicro.com/PressRel/97_10_15.html>.
-
-config EST8260
-	bool "EST8260"
-	---help---
-	  The EST8260 is a single-board computer manufactured by Wind River
-	  Systems, Inc. (formerly Embedded Support Tools Corp.) and based on
-	  the MPC8260.  Wind River Systems has a website at
-	  <http://www.windriver.com/>, but the EST8260 cannot be found on it
-	  and has probably been discontinued or rebadged.
-
-config SBC82xx
-	bool "SBC82xx"
-	---help---
-	  SBC PowerQUICC II, single-board computer with MPC82xx CPU
-	  Manufacturer: Wind River Systems, Inc.
-	  Date of Release: May 2003
-	  End of Life: -
-	  URL: <http://www.windriver.com/>
-
-config SBS8260
-	bool "SBS8260"
-
-config RPX8260
-	bool "RPXSUPER"
-
-config TQM8260
-	bool "TQM8260"
-	---help---
-	  MPC8260 based module, little larger than credit card,
-	  up to 128 MB global + 64 MB local RAM, 32 MB Flash,
-	  32 kB EEPROM, 256 kB L@ Cache, 10baseT + 100baseT Ethernet,
-	  2 x serial ports, ...
-	  Manufacturer: TQ Components, www.tq-group.de
-	  Date of Release: June 2001
-	  End of Life: not yet :-)
-	  URL: <http://www.denx.de/PDF/TQM82xx_SPEC_Rev005.pdf>
-
-config ADS8272
-	bool "ADS8272"
-
-config PQ2FADS
-	bool "Freescale-PQ2FADS"
-	help
-	  Select PQ2FADS if you wish to configure for a Freescale
-	  PQ2FADS board (-VR or -ZU).
-
-config LITE5200
-	bool "Freescale LITE5200 / (IceCube)"
-	select PPC_MPC52xx
-	help
-	  Support for the LITE5200 dev board for the MPC5200 from Freescale.
-	  This is for the LITE5200 version 2.0 board. Don't know if it changes
-	  much but it's only been tested on this board version. I think this
-	  board is also known as IceCube.
-
-config EV64360
-	bool "Marvell-EV64360BP"
-	help
-	  Select EV64360 if configuring a Marvell EV64360BP Evaluation
-	  platform.
 endchoice
-
-config PQ2ADS
-	bool
-	depends on ADS8272
-	default y
-
-config TQM8xxL
-	bool
-	depends on 8xx && (TQM823L || TQM850L || FPS850L || TQM855L || TQM860L)
-	default y
-
-config PPC_MPC52xx
-	bool
-
-config 8260
-	bool "CPM2 Support" if WILLOW
-	depends on 6xx
-	default y if TQM8260 || RPX8260 || EST8260 || SBS8260 || SBC82xx || PQ2FADS
-	help
-	  The MPC8260 is a typical embedded CPU made by Motorola.  Selecting
-	  this option means that you wish to build a kernel for a machine with
-	  an 8260 class CPU.
-
-config 8272
-	bool
-	depends on 6xx
-	default y if ADS8272
-	select 8260
-	help
-	  The MPC8272 CPM has a different internal dpram setup than other CPM2
-	  devices
-
-config CPM2
-	bool
-	depends on 8260 || MPC8560 || MPC8555
-	default y
-	help
-	  The CPM2 (Communications Processor Module) is a coprocessor on
-	  embedded CPUs made by Motorola.  Selecting this option means that
-	  you wish to build a kernel for a machine with a CPM2 coprocessor
-	  on it (826x, 827x, 8560).
-
-config PPC_GEN550
-	bool
-	depends on SANDPOINT || SPRUCE || PPLUS || \
-		PRPMC750 || PRPMC800 || LOPEC || \
-		(EV64260 && !SERIAL_MPSC) || CHESTNUT || RADSTONE_PPC7D || \
-		83xx
-	default y
-
-config FORCE
-	bool
-	depends on 6xx && POWERPMC250
-	default y
-
-config GT64260
-	bool
-	depends on EV64260 || CPCI690
-	default y
-
-config MV64360		# Really MV64360 & MV64460
-	bool
-	depends on CHESTNUT || KATANA || RADSTONE_PPC7D || HDPU || EV64360
-	default y
-
-config MV64X60
-	bool
-	depends on (GT64260 || MV64360)
-	select PPC_INDIRECT_PCI
-	default y
-
-config TSI108_BRIDGE
-	bool
-	depends on MPC7448HPC2
-	default y
-
-menu "Set bridge options"
-	depends on MV64X60
-
-config NOT_COHERENT_CACHE
-	bool "Turn off Cache Coherency"
-	default n
-	help
-	  Some 64x60 bridges lock up when trying to enforce cache coherency.
-	  When this option is selected, cache coherency will be turned off.
-	  Note that this can cause other problems (e.g., stale data being
-	  speculatively loaded via a cached mapping).  Use at your own risk.
-
-config MV64X60_BASE
-	hex "Set bridge base used by firmware"
-	default "0xf1000000"
-	help
-	  A firmware can leave the base address of the bridge's registers at
-	  a non-standard location.  If so, set this value to reflect the
-	  address of that non-standard location.
-
-config MV64X60_NEW_BASE
-	hex "Set bridge base used by kernel"
-	default "0xf1000000"
-	help
-	  If the current base address of the bridge's registers is not where
-	  you want it, set this value to the address that you want it moved to.
-
-endmenu
-
-config NONMONARCH_SUPPORT
-	bool "Enable Non-Monarch Support"
-	depends on PRPMC800
-
-config HARRIER
-	bool
-	depends on PRPMC800
-	default y
-
-config EPIC_SERIAL_MODE
-	bool
-	depends on 6xx && (LOPEC || SANDPOINT)
-	default y
-
-config MPC10X_BRIDGE
-	bool
-	depends on POWERPMC250 || LOPEC || SANDPOINT
-	select PPC_INDIRECT_PCI
-	default y
-
-config MPC10X_OPENPIC
-	bool
-	depends on POWERPMC250 || LOPEC || SANDPOINT
-	default y
-
-config MPC10X_STORE_GATHERING
-	bool "Enable MPC10x store gathering"
-	depends on MPC10X_BRIDGE
-
-config SANDPOINT_ENABLE_UART1
-	bool "Enable DUART mode on Sandpoint"
-	depends on SANDPOINT
-	help
-	  If this option is enabled then the MPC824x processor will run
-	  in DUART mode instead of UART mode.
-
-config HARRIER_STORE_GATHERING
-	bool "Enable Harrier store gathering"
-	depends on HARRIER
-
-config MVME5100_IPMC761_PRESENT
-	bool "MVME5100 configured with an IPMC761"
-	depends on MVME5100
-	select PPC_I8259
-
-config SPRUCE_BAUD_33M
-	bool "Spruce baud clock support"
-	depends on SPRUCE

--
 Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
  Pengutronix - Linux Solutions for Science and Industry
    Handelsregister: Amtsgericht Hildesheim, HRA 2686
      Hannoversche Str. 2, 31134 Hildesheim, Germany
    Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 04/16] powerpc: remove dead code in iommu.h

[s.hauer]

iommu_setup_pSeries() and iommu_setup_dart() are declared extern but are
not implemented, so remove them. iommu_free_table() is pSeries specific,
so #ifdef it with CONFIG_PPC_PSERIES and not CONFIG_PPC_MULTIPLATFORM

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Index: linux-2.6/include/asm-powerpc/iommu.h
===================================================================
--- linux-2.6.orig/include/asm-powerpc/iommu.h
+++ linux-2.6/include/asm-powerpc/iommu.h
@@ -70,16 +70,12 @@ struct iommu_table {
 struct scatterlist;
 struct device_node;
 
-#ifdef CONFIG_PPC_MULTIPLATFORM
-
-/* Walks all buses and creates iommu tables */
-extern void iommu_setup_pSeries(void);
-extern void iommu_setup_dart(void);
+#ifdef CONFIG_PPC_PSERIES
 
 /* Frees table for an individual device node */
 extern void iommu_free_table(struct device_node *dn);
 
-#endif /* CONFIG_PPC_MULTIPLATFORM */
+#endif /* CONFIG_PPC_PSERIES */
 
 /* Initializes an iommu_table based in values set in the passed-in
  * structure

--
 Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
  Pengutronix - Linux Solutions for Science and Industry
    Handelsregister: Amtsgericht Hildesheim, HRA 2686
      Hannoversche Str. 2, 31134 Hildesheim, Germany
    Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 05/16] powerpc: remove ifdef

[s.hauer]

current kernels always have one of CONFIG_PPC_MULTIPLATFORM
or CONFIG_PPC32 defined, so remove bogus ifdef

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Index: linux-2.6/include/asm-powerpc/pci.h
===================================================================
--- linux-2.6.orig/include/asm-powerpc/pci.h
+++ linux-2.6/include/asm-powerpc/pci.h
@@ -238,12 +238,10 @@ extern pgprot_t	pci_phys_mem_access_prot
 					 unsigned long size,
 					 pgprot_t prot);
 
-#if defined(CONFIG_PPC_MULTIPLATFORM) || defined(CONFIG_PPC32)
 #define HAVE_ARCH_PCI_RESOURCE_TO_USER
 extern void pci_resource_to_user(const struct pci_dev *dev, int bar,
 				 const struct resource *rsrc,
 				 resource_size_t *start, resource_size_t *end);
-#endif /* CONFIG_PPC_MULTIPLATFORM || CONFIG_PPC32 */
 
 #endif	/* __KERNEL__ */
 #endif /* __ASM_POWERPC_PCI_H */

--
 Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
  Pengutronix - Linux Solutions for Science and Industry
    Handelsregister: Amtsgericht Hildesheim, HRA 2686
      Hannoversche Str. 2, 31134 Hildesheim, Germany
    Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 06/16] powerpc: remove _machine

[s.hauer]

The _machine macro was once used for compatibility with ARCH=ppc
drivers. It is unused in current kernels

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Index: include/asm-powerpc/processor.h
===================================================================
--- a/include/asm-powerpc/processor.h.orig
+++ b/include/asm-powerpc/processor.h
@@ -53,10 +53,6 @@ extern unsigned char ucBoardRevMaj, ucBo
 
 #endif /* CONFIG_PPC_PREP */
 
-#ifndef CONFIG_PPC_MULTIPLATFORM
-#define _machine 0
-#endif /* CONFIG_PPC_MULTIPLATFORM */
-
 #endif /* defined(__KERNEL__) && defined(CONFIG_PPC32) */
 
 /*

--
 Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
  Pengutronix - Linux Solutions for Science and Industry
    Handelsregister: Amtsgericht Hildesheim, HRA 2686
      Hannoversche Str. 2, 31134 Hildesheim, Germany
    Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 07/16] powerpc: move MPC7448HPC2 platform support to platforms/74xx

[s.hauer]

This patch moves the only platform support in platforms/embedded6xx to
a directory of its own. There seems to be no need for a embedded6xx
directory since they have nothing in common.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Index: arch/powerpc/platforms/74xx/Makefile
===================================================================
--- /dev/null
+++ b/arch/powerpc/platforms/74xx/Makefile
@@ -0,0 +1,4 @@
+#
+# Makefile for the 6xx/7xx/7xxxx linux kernel.
+#
+obj-$(CONFIG_MPC7448HPC2)	+= mpc7448_hpc2.o
Index: arch/powerpc/platforms/74xx/mpc7448_hpc2.c
===================================================================
--- /dev/null
+++ b/arch/powerpc/platforms/74xx/mpc7448_hpc2.c
@@ -0,0 +1,308 @@
+/*
+ * mpc7448_hpc2.c
+ *
+ * Board setup routines for the Freescale mpc7448hpc2(taiga) platform
+ *
+ * Author: Jacob Pan
+ *	 jacob.pan@freescale.com
+ * Author: Xianghua Xiao
+ *       x.xiao@freescale.com
+ * Maintainer: Roy Zang <tie-fei.zang@freescale.com>
+ * 	Add Flat Device Tree support fot mpc7448hpc2 board
+ *
+ * Copyright 2004-2006 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#include <linux/stddef.h>
+#include <linux/kernel.h>
+#include <linux/pci.h>
+#include <linux/kdev_t.h>
+#include <linux/console.h>
+#include <linux/delay.h>
+#include <linux/irq.h>
+#include <linux/ide.h>
+#include <linux/seq_file.h>
+#include <linux/root_dev.h>
+#include <linux/serial.h>
+#include <linux/tty.h>
+#include <linux/serial_core.h>
+
+#include <asm/system.h>
+#include <asm/time.h>
+#include <asm/machdep.h>
+#include <asm/prom.h>
+#include <asm/udbg.h>
+#include <asm/tsi108.h>
+#include <asm/pci-bridge.h>
+#include <asm/reg.h>
+#include <mm/mmu_decl.h>
+#include "mpc7448_hpc2.h"
+#include <asm/tsi108_irq.h>
+#include <asm/mpic.h>
+
+#undef DEBUG
+#ifdef DEBUG
+#define DBG(fmt...) do { printk(fmt); } while(0)
+#else
+#define DBG(fmt...) do { } while(0)
+#endif
+
+#ifndef CONFIG_PCI
+isa_io_base = MPC7448_HPC2_ISA_IO_BASE;
+isa_mem_base = MPC7448_HPC2_ISA_MEM_BASE;
+pci_dram_offset = MPC7448_HPC2_PCI_MEM_OFFSET;
+#endif
+
+extern int tsi108_setup_pci(struct device_node *dev);
+extern void _nmask_and_or_msr(unsigned long nmask, unsigned long or_val);
+extern void tsi108_pci_int_init(void);
+extern void tsi108_irq_cascade(unsigned int irq, struct irq_desc *desc);
+
+int mpc7448_hpc2_exclude_device(u_char bus, u_char devfn)
+{
+	if (bus == 0 && PCI_SLOT(devfn) == 0)
+		return PCIBIOS_DEVICE_NOT_FOUND;
+	else
+		return PCIBIOS_SUCCESSFUL;
+}
+
+/*
+ * find pci slot by devfn in interrupt map of OF tree
+ */
+u8 find_slot_by_devfn(unsigned int *interrupt_map, unsigned int devfn)
+{
+	int i;
+	unsigned int tmp;
+	for (i = 0; i < 4; i++){
+		tmp = interrupt_map[i*4*7];
+		if ((tmp >> 11) == (devfn >> 3))
+			return i;
+	}
+	return i;
+}
+
+/*
+ * Scans the interrupt map for pci device
+ */
+void mpc7448_hpc2_fixup_irq(struct pci_dev *dev)
+{
+	struct pci_controller *hose;
+	struct device_node *node;
+	const unsigned int *interrupt;
+	int busnr;
+	int len;
+	u8 slot;
+	u8 pin;
+
+	/* Lookup the hose */
+	busnr = dev->bus->number;
+	hose = pci_bus_to_hose(busnr);
+	if (!hose)
+		printk(KERN_ERR "No pci hose found\n");
+
+	/* Check it has an OF node associated */
+	node = (struct device_node *) hose->arch_data;
+	if (!node)
+		printk(KERN_ERR "No pci node found\n");
+
+	interrupt = get_property(node, "interrupt-map", &len);
+	slot = find_slot_by_devfn(interrupt, dev->devfn);
+	pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);
+	if (pin == 0 || pin > 4)
+		pin = 1;
+	pin--;
+	dev->irq  = interrupt[slot*4*7 + pin*7 + 5];
+	DBG("TSI_PCI: dev->irq = 0x%x\n", dev->irq);
+}
+/* temporary pci irq map fixup*/
+
+void __init mpc7448_hpc2_pcibios_fixup(void)
+{
+	struct pci_dev *dev = NULL;
+	for_each_pci_dev(dev) {
+		mpc7448_hpc2_fixup_irq(dev);
+		pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq);
+	}
+}
+
+static void __init mpc7448_hpc2_setup_arch(void)
+{
+	struct device_node *cpu;
+	struct device_node *np;
+	if (ppc_md.progress)
+		ppc_md.progress("mpc7448_hpc2_setup_arch():set_bridge", 0);
+
+	cpu = of_find_node_by_type(NULL, "cpu");
+	if (cpu != 0) {
+		const unsigned int *fp;
+
+		fp = get_property(cpu, "clock-frequency", NULL);
+		if (fp != 0)
+			loops_per_jiffy = *fp / HZ;
+		else
+			loops_per_jiffy = 50000000 / HZ;
+		of_node_put(cpu);
+	}
+	tsi108_csr_vir_base = get_vir_csrbase();
+
+#ifdef	CONFIG_ROOT_NFS
+	ROOT_DEV = Root_NFS;
+#else
+	ROOT_DEV = Root_HDA1;
+#endif
+
+#ifdef CONFIG_BLK_DEV_INITRD
+	ROOT_DEV = Root_RAM0;
+#endif
+
+	/* setup PCI host bridge */
+#ifdef CONFIG_PCI
+	for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
+		tsi108_setup_pci(np);
+
+	ppc_md.pci_exclude_device = mpc7448_hpc2_exclude_device;
+	if (ppc_md.progress)
+		ppc_md.progress("tsi108: resources set", 0x100);
+#endif
+
+	printk(KERN_INFO "MPC7448HPC2 (TAIGA) Platform\n");
+	printk(KERN_INFO
+	       "Jointly ported by Freescale and Tundra Semiconductor\n");
+	printk(KERN_INFO
+	       "Enabling L2 cache then enabling the HID0 prefetch engine.\n");
+}
+
+/*
+ * Interrupt setup and service.  Interrrupts on the mpc7448_hpc2 come
+ * from the four external INT pins, PCI interrupts are routed via
+ * PCI interrupt control registers, it generates internal IRQ23
+ *
+ * Interrupt routing on the Taiga Board:
+ * TSI108:PB_INT[0] -> CPU0:INT#
+ * TSI108:PB_INT[1] -> CPU0:MCP#
+ * TSI108:PB_INT[2] -> N/C
+ * TSI108:PB_INT[3] -> N/C
+ */
+static void __init mpc7448_hpc2_init_IRQ(void)
+{
+	struct mpic *mpic;
+	phys_addr_t mpic_paddr = 0;
+	unsigned int cascade_pci_irq;
+	struct device_node *tsi_pci;
+	struct device_node *tsi_pic;
+
+	tsi_pic = of_find_node_by_type(NULL, "open-pic");
+	if (tsi_pic) {
+		unsigned int size;
+		const void *prop = get_property(tsi_pic, "reg", &size);
+		mpic_paddr = of_translate_address(tsi_pic, prop);
+	}
+
+	if (mpic_paddr == 0) {
+		printk("%s: No tsi108 PIC found !\n", __FUNCTION__);
+		return;
+	}
+
+	DBG("%s: tsi108pic phys_addr = 0x%x\n", __FUNCTION__,
+	    (u32) mpic_paddr);
+
+	mpic = mpic_alloc(tsi_pic, mpic_paddr,
+			MPIC_PRIMARY | MPIC_BIG_ENDIAN | MPIC_WANTS_RESET |
+			MPIC_SPV_EOI | MPIC_NO_PTHROU_DIS | MPIC_REGSET_TSI108,
+			0, /* num_sources used */
+			0, /* num_sources used */
+			"Tsi108_PIC");
+
+	BUG_ON(mpic == NULL); /* XXXX */
+	mpic_init(mpic);
+
+	tsi_pci = of_find_node_by_type(NULL, "pci");
+	if (tsi_pci == 0) {
+		printk("%s: No tsi108 pci node found !\n", __FUNCTION__);
+		return;
+	}
+
+	cascade_pci_irq = irq_of_parse_and_map(tsi_pci, 0);
+	set_irq_data(cascade_pci_irq, mpic);
+	set_irq_chained_handler(cascade_pci_irq, tsi108_irq_cascade);
+
+	tsi108_pci_int_init();
+
+	/* Configure MPIC outputs to CPU0 */
+	tsi108_write_reg(TSI108_MPIC_OFFSET + 0x30c, 0);
+	of_node_put(tsi_pic);
+}
+
+void mpc7448_hpc2_show_cpuinfo(struct seq_file *m)
+{
+	seq_printf(m, "vendor\t\t: Freescale Semiconductor\n");
+	seq_printf(m, "machine\t\t: MPC7448hpc2\n");
+}
+
+void mpc7448_hpc2_restart(char *cmd)
+{
+	local_irq_disable();
+
+	/* Set exception prefix high - to the firmware */
+	_nmask_and_or_msr(0, MSR_IP);
+
+	for (;;) ;		/* Spin until reset happens */
+}
+
+void mpc7448_hpc2_power_off(void)
+{
+	local_irq_disable();
+	for (;;) ;		/* No way to shut power off with software */
+}
+
+void mpc7448_hpc2_halt(void)
+{
+	mpc7448_hpc2_power_off();
+}
+
+/*
+ * Called very early, device-tree isn't unflattened
+ */
+static int __init mpc7448_hpc2_probe(void)
+{
+	unsigned long root = of_get_flat_dt_root();
+
+	if (!of_flat_dt_is_compatible(root, "mpc74xx"))
+		return 0;
+	return 1;
+}
+
+static int mpc7448_machine_check_exception(struct pt_regs *regs)
+{
+	extern void tsi108_clear_pci_cfg_error(void);
+	const struct exception_table_entry *entry;
+
+	/* Are we prepared to handle this fault */
+	if ((entry = search_exception_tables(regs->nip)) != NULL) {
+		tsi108_clear_pci_cfg_error();
+		regs->msr |= MSR_RI;
+		regs->nip = entry->fixup;
+		return 1;
+	}
+	return 0;
+
+}
+
+define_machine(mpc7448_hpc2){
+	.name 			= "MPC7448 HPC2",
+	.probe 			= mpc7448_hpc2_probe,
+	.setup_arch 		= mpc7448_hpc2_setup_arch,
+	.init_IRQ 		= mpc7448_hpc2_init_IRQ,
+	.show_cpuinfo 		= mpc7448_hpc2_show_cpuinfo,
+	.get_irq 		= mpic_get_irq,
+	.pcibios_fixup 		= mpc7448_hpc2_pcibios_fixup,
+	.restart 		= mpc7448_hpc2_restart,
+	.calibrate_decr 	= generic_calibrate_decr,
+	.machine_check_exception= mpc7448_machine_check_exception,
+	.progress 		= udbg_progress,
+};
Index: arch/powerpc/platforms/74xx/mpc7448_hpc2.h
===================================================================
--- /dev/null
+++ b/arch/powerpc/platforms/74xx/mpc7448_hpc2.h
@@ -0,0 +1,26 @@
+/*
+ * mpc7448_hpc2.h
+ *
+ * Definitions for Freescale MPC7448_HPC2 platform
+ *
+ * Author: Jacob Pan
+ *         jacob.pan@freescale.com
+ * Maintainer: Roy Zang <roy.zang@freescale.com>
+ *
+ * 2006 (c) Freescale Semiconductor, Inc.  This file is licensed under
+ * the terms of the GNU General Public License version 2.  This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ */
+
+#ifndef __PPC_PLATFORMS_MPC7448_HPC2_H
+#define __PPC_PLATFORMS_MPC7448_HPC2_H
+
+#include <asm/ppcboot.h>
+
+/* Base Addresses for the PCI bus
+ */
+#define MPC7448_HPC2_PCI_MEM_OFFSET	(0x00000000)
+#define MPC7448_HPC2_ISA_IO_BASE	(0x00000000)
+#define MPC7448_HPC2_ISA_MEM_BASE	(0x00000000)
+#endif				/* __PPC_PLATFORMS_MPC7448_HPC2_H */
Index: arch/powerpc/platforms/embedded6xx/Kconfig
===================================================================
--- a/arch/powerpc/platforms/embedded6xx/Kconfig
+++ b//dev/null
@@ -1,15 +0,0 @@
-choice
-	prompt "Machine Type"
-	depends on EMBEDDED6xx
-
-config MPC7448HPC2
-	bool "Freescale MPC7448HPC2(Taiga)"
-	select TSI108_BRIDGE
-	select DEFAULT_UIMAGE
-	select PPC_UDBG_16550
-	select MPIC
-	select MPIC_WEIRD
-	help
-	  Select MPC7448HPC2 if configuring for Freescale MPC7448HPC2 (Taiga)
-	  platform
-endchoice
Index: arch/powerpc/platforms/embedded6xx/Makefile
===================================================================
--- a/arch/powerpc/platforms/embedded6xx/Makefile
+++ b//dev/null
@@ -1,4 +0,0 @@
-#
-# Makefile for the 6xx/7xx/7xxxx linux kernel.
-#
-obj-$(CONFIG_MPC7448HPC2)	+= mpc7448_hpc2.o
Index: arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
===================================================================
--- a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
+++ b//dev/null
@@ -1,308 +0,0 @@
-/*
- * mpc7448_hpc2.c
- *
- * Board setup routines for the Freescale mpc7448hpc2(taiga) platform
- *
- * Author: Jacob Pan
- *	 jacob.pan@freescale.com
- * Author: Xianghua Xiao
- *       x.xiao@freescale.com
- * Maintainer: Roy Zang <tie-fei.zang@freescale.com>
- * 	Add Flat Device Tree support fot mpc7448hpc2 board
- *
- * Copyright 2004-2006 Freescale Semiconductor, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#include <linux/stddef.h>
-#include <linux/kernel.h>
-#include <linux/pci.h>
-#include <linux/kdev_t.h>
-#include <linux/console.h>
-#include <linux/delay.h>
-#include <linux/irq.h>
-#include <linux/ide.h>
-#include <linux/seq_file.h>
-#include <linux/root_dev.h>
-#include <linux/serial.h>
-#include <linux/tty.h>
-#include <linux/serial_core.h>
-
-#include <asm/system.h>
-#include <asm/time.h>
-#include <asm/machdep.h>
-#include <asm/prom.h>
-#include <asm/udbg.h>
-#include <asm/tsi108.h>
-#include <asm/pci-bridge.h>
-#include <asm/reg.h>
-#include <mm/mmu_decl.h>
-#include "mpc7448_hpc2.h"
-#include <asm/tsi108_irq.h>
-#include <asm/mpic.h>
-
-#undef DEBUG
-#ifdef DEBUG
-#define DBG(fmt...) do { printk(fmt); } while(0)
-#else
-#define DBG(fmt...) do { } while(0)
-#endif
-
-#ifndef CONFIG_PCI
-isa_io_base = MPC7448_HPC2_ISA_IO_BASE;
-isa_mem_base = MPC7448_HPC2_ISA_MEM_BASE;
-pci_dram_offset = MPC7448_HPC2_PCI_MEM_OFFSET;
-#endif
-
-extern int tsi108_setup_pci(struct device_node *dev);
-extern void _nmask_and_or_msr(unsigned long nmask, unsigned long or_val);
-extern void tsi108_pci_int_init(void);
-extern void tsi108_irq_cascade(unsigned int irq, struct irq_desc *desc);
-
-int mpc7448_hpc2_exclude_device(u_char bus, u_char devfn)
-{
-	if (bus == 0 && PCI_SLOT(devfn) == 0)
-		return PCIBIOS_DEVICE_NOT_FOUND;
-	else
-		return PCIBIOS_SUCCESSFUL;
-}
-
-/*
- * find pci slot by devfn in interrupt map of OF tree
- */
-u8 find_slot_by_devfn(unsigned int *interrupt_map, unsigned int devfn)
-{
-	int i;
-	unsigned int tmp;
-	for (i = 0; i < 4; i++){
-		tmp = interrupt_map[i*4*7];
-		if ((tmp >> 11) == (devfn >> 3))
-			return i;
-	}
-	return i;
-}
-
-/*
- * Scans the interrupt map for pci device
- */
-void mpc7448_hpc2_fixup_irq(struct pci_dev *dev)
-{
-	struct pci_controller *hose;
-	struct device_node *node;
-	const unsigned int *interrupt;
-	int busnr;
-	int len;
-	u8 slot;
-	u8 pin;
-
-	/* Lookup the hose */
-	busnr = dev->bus->number;
-	hose = pci_bus_to_hose(busnr);
-	if (!hose)
-		printk(KERN_ERR "No pci hose found\n");
-
-	/* Check it has an OF node associated */
-	node = (struct device_node *) hose->arch_data;
-	if (!node)
-		printk(KERN_ERR "No pci node found\n");
-
-	interrupt = get_property(node, "interrupt-map", &len);
-	slot = find_slot_by_devfn(interrupt, dev->devfn);
-	pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);
-	if (pin == 0 || pin > 4)
-		pin = 1;
-	pin--;
-	dev->irq  = interrupt[slot*4*7 + pin*7 + 5];
-	DBG("TSI_PCI: dev->irq = 0x%x\n", dev->irq);
-}
-/* temporary pci irq map fixup*/
-
-void __init mpc7448_hpc2_pcibios_fixup(void)
-{
-	struct pci_dev *dev = NULL;
-	for_each_pci_dev(dev) {
-		mpc7448_hpc2_fixup_irq(dev);
-		pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq);
-	}
-}
-
-static void __init mpc7448_hpc2_setup_arch(void)
-{
-	struct device_node *cpu;
-	struct device_node *np;
-	if (ppc_md.progress)
-		ppc_md.progress("mpc7448_hpc2_setup_arch():set_bridge", 0);
-
-	cpu = of_find_node_by_type(NULL, "cpu");
-	if (cpu != 0) {
-		const unsigned int *fp;
-
-		fp = get_property(cpu, "clock-frequency", NULL);
-		if (fp != 0)
-			loops_per_jiffy = *fp / HZ;
-		else
-			loops_per_jiffy = 50000000 / HZ;
-		of_node_put(cpu);
-	}
-	tsi108_csr_vir_base = get_vir_csrbase();
-
-#ifdef	CONFIG_ROOT_NFS
-	ROOT_DEV = Root_NFS;
-#else
-	ROOT_DEV = Root_HDA1;
-#endif
-
-#ifdef CONFIG_BLK_DEV_INITRD
-	ROOT_DEV = Root_RAM0;
-#endif
-
-	/* setup PCI host bridge */
-#ifdef CONFIG_PCI
-	for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
-		tsi108_setup_pci(np);
-
-	ppc_md.pci_exclude_device = mpc7448_hpc2_exclude_device;
-	if (ppc_md.progress)
-		ppc_md.progress("tsi108: resources set", 0x100);
-#endif
-
-	printk(KERN_INFO "MPC7448HPC2 (TAIGA) Platform\n");
-	printk(KERN_INFO
-	       "Jointly ported by Freescale and Tundra Semiconductor\n");
-	printk(KERN_INFO
-	       "Enabling L2 cache then enabling the HID0 prefetch engine.\n");
-}
-
-/*
- * Interrupt setup and service.  Interrrupts on the mpc7448_hpc2 come
- * from the four external INT pins, PCI interrupts are routed via
- * PCI interrupt control registers, it generates internal IRQ23
- *
- * Interrupt routing on the Taiga Board:
- * TSI108:PB_INT[0] -> CPU0:INT#
- * TSI108:PB_INT[1] -> CPU0:MCP#
- * TSI108:PB_INT[2] -> N/C
- * TSI108:PB_INT[3] -> N/C
- */
-static void __init mpc7448_hpc2_init_IRQ(void)
-{
-	struct mpic *mpic;
-	phys_addr_t mpic_paddr = 0;
-	unsigned int cascade_pci_irq;
-	struct device_node *tsi_pci;
-	struct device_node *tsi_pic;
-
-	tsi_pic = of_find_node_by_type(NULL, "open-pic");
-	if (tsi_pic) {
-		unsigned int size;
-		const void *prop = get_property(tsi_pic, "reg", &size);
-		mpic_paddr = of_translate_address(tsi_pic, prop);
-	}
-
-	if (mpic_paddr == 0) {
-		printk("%s: No tsi108 PIC found !\n", __FUNCTION__);
-		return;
-	}
-
-	DBG("%s: tsi108pic phys_addr = 0x%x\n", __FUNCTION__,
-	    (u32) mpic_paddr);
-
-	mpic = mpic_alloc(tsi_pic, mpic_paddr,
-			MPIC_PRIMARY | MPIC_BIG_ENDIAN | MPIC_WANTS_RESET |
-			MPIC_SPV_EOI | MPIC_NO_PTHROU_DIS | MPIC_REGSET_TSI108,
-			0, /* num_sources used */
-			0, /* num_sources used */
-			"Tsi108_PIC");
-
-	BUG_ON(mpic == NULL); /* XXXX */
-	mpic_init(mpic);
-
-	tsi_pci = of_find_node_by_type(NULL, "pci");
-	if (tsi_pci == 0) {
-		printk("%s: No tsi108 pci node found !\n", __FUNCTION__);
-		return;
-	}
-
-	cascade_pci_irq = irq_of_parse_and_map(tsi_pci, 0);
-	set_irq_data(cascade_pci_irq, mpic);
-	set_irq_chained_handler(cascade_pci_irq, tsi108_irq_cascade);
-
-	tsi108_pci_int_init();
-
-	/* Configure MPIC outputs to CPU0 */
-	tsi108_write_reg(TSI108_MPIC_OFFSET + 0x30c, 0);
-	of_node_put(tsi_pic);
-}
-
-void mpc7448_hpc2_show_cpuinfo(struct seq_file *m)
-{
-	seq_printf(m, "vendor\t\t: Freescale Semiconductor\n");
-	seq_printf(m, "machine\t\t: MPC7448hpc2\n");
-}
-
-void mpc7448_hpc2_restart(char *cmd)
-{
-	local_irq_disable();
-
-	/* Set exception prefix high - to the firmware */
-	_nmask_and_or_msr(0, MSR_IP);
-
-	for (;;) ;		/* Spin until reset happens */
-}
-
-void mpc7448_hpc2_power_off(void)
-{
-	local_irq_disable();
-	for (;;) ;		/* No way to shut power off with software */
-}
-
-void mpc7448_hpc2_halt(void)
-{
-	mpc7448_hpc2_power_off();
-}
-
-/*
- * Called very early, device-tree isn't unflattened
- */
-static int __init mpc7448_hpc2_probe(void)
-{
-	unsigned long root = of_get_flat_dt_root();
-
-	if (!of_flat_dt_is_compatible(root, "mpc74xx"))
-		return 0;
-	return 1;
-}
-
-static int mpc7448_machine_check_exception(struct pt_regs *regs)
-{
-	extern void tsi108_clear_pci_cfg_error(void);
-	const struct exception_table_entry *entry;
-
-	/* Are we prepared to handle this fault */
-	if ((entry = search_exception_tables(regs->nip)) != NULL) {
-		tsi108_clear_pci_cfg_error();
-		regs->msr |= MSR_RI;
-		regs->nip = entry->fixup;
-		return 1;
-	}
-	return 0;
-
-}
-
-define_machine(mpc7448_hpc2){
-	.name 			= "MPC7448 HPC2",
-	.probe 			= mpc7448_hpc2_probe,
-	.setup_arch 		= mpc7448_hpc2_setup_arch,
-	.init_IRQ 		= mpc7448_hpc2_init_IRQ,
-	.show_cpuinfo 		= mpc7448_hpc2_show_cpuinfo,
-	.get_irq 		= mpic_get_irq,
-	.pcibios_fixup 		= mpc7448_hpc2_pcibios_fixup,
-	.restart 		= mpc7448_hpc2_restart,
-	.calibrate_decr 	= generic_calibrate_decr,
-	.machine_check_exception= mpc7448_machine_check_exception,
-	.progress 		= udbg_progress,
-};
Index: arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.h
===================================================================
--- a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.h
+++ b//dev/null
@@ -1,26 +0,0 @@
-/*
- * mpc7448_hpc2.h
- *
- * Definitions for Freescale MPC7448_HPC2 platform
- *
- * Author: Jacob Pan
- *         jacob.pan@freescale.com
- * Maintainer: Roy Zang <roy.zang@freescale.com>
- *
- * 2006 (c) Freescale Semiconductor, Inc.  This file is licensed under
- * the terms of the GNU General Public License version 2.  This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
- */
-
-#ifndef __PPC_PLATFORMS_MPC7448_HPC2_H
-#define __PPC_PLATFORMS_MPC7448_HPC2_H
-
-#include <asm/ppcboot.h>
-
-/* Base Addresses for the PCI bus
- */
-#define MPC7448_HPC2_PCI_MEM_OFFSET	(0x00000000)
-#define MPC7448_HPC2_ISA_IO_BASE	(0x00000000)
-#define MPC7448_HPC2_ISA_MEM_BASE	(0x00000000)
-#endif				/* __PPC_PLATFORMS_MPC7448_HPC2_H */
Index: arch/powerpc/platforms/Makefile
===================================================================
--- a/arch/powerpc/platforms/Makefile.orig
+++ b/arch/powerpc/platforms/Makefile
@@ -15,4 +15,4 @@ obj-$(CONFIG_PPC_ISERIES)	+= iseries/
 obj-$(CONFIG_PPC_MAPLE)		+= maple/
 obj-$(CONFIG_PPC_PASEMI)		+= pasemi/
 obj-$(CONFIG_PPC_CELL)		+= cell/
-obj-$(CONFIG_EMBEDDED6xx)	+= embedded6xx/
+obj-$(CONFIG_74xx)		+= 74xx/
Index: arch/powerpc/Kconfig
===================================================================
--- a/arch/powerpc/Kconfig.orig
+++ b/arch/powerpc/Kconfig
@@ -602,7 +602,6 @@ config PPC_TODC
 
 endmenu
 
-source arch/powerpc/platforms/embedded6xx/Kconfig
 source arch/powerpc/platforms/4xx/Kconfig
 source arch/powerpc/platforms/82xx/Kconfig
 source arch/powerpc/platforms/83xx/Kconfig

--
 Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
  Pengutronix - Linux Solutions for Science and Industry
    Handelsregister: Amtsgericht Hildesheim, HRA 2686
      Hannoversche Str. 2, 31134 Hildesheim, Germany
    Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 08/16] powerpc: remove EMBEDDED6xx Kconfig entry

[s.hauer]

remove EMBEDDED6xx Kconfig entry

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Index: linux-2.6/arch/powerpc/Kconfig
===================================================================
--- linux-2.6.orig/arch/powerpc/Kconfig
+++ linux-2.6/arch/powerpc/Kconfig
@@ -338,10 +338,6 @@ config PPC_MULTIPLATFORM
 	  RS/6000 machine, an Apple machine, or a PReP, CHRP,
 	  Maple or Cell-based machine.
 
-config EMBEDDED6xx
-	bool "Embedded 6xx/7xx/7xxx-based board"
-	depends on PPC32 && (BROKEN||BROKEN_ON_SMP)
-
 config APUS
 	bool "Amiga-APUS"
 	depends on PPC32 && BROKEN

--
 Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
  Pengutronix - Linux Solutions for Science and Industry
    Handelsregister: Amtsgericht Hildesheim, HRA 2686
      Hannoversche Str. 2, 31134 Hildesheim, Germany
    Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 09/16] powerpc: remove occurences of PPC_MULTIPLATFORM in head_64.S

[s.hauer]

Since iSeries is merged to MULTIPLATFORM, there is no way to build a 64bit
kernel without MULTIPLATFORM, so PPC_MULTIPLATFORM can be removed in
64bit-only files 

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Index: arch/powerpc/kernel/head_64.S
===================================================================
--- a/arch/powerpc/kernel/head_64.S.orig
+++ b/arch/powerpc/kernel/head_64.S
@@ -74,13 +74,11 @@
 	.text
 	.globl  _stext
 _stext:
-#ifdef CONFIG_PPC_MULTIPLATFORM
 _GLOBAL(__start)
 	/* NOP this out unconditionally */
 BEGIN_FTR_SECTION
 	b	.__start_initialization_multiplatform
 END_FTR_SECTION(0, 1)
-#endif /* CONFIG_PPC_MULTIPLATFORM */
 
 	/* Catch branch to 0 in real mode */
 	trap
@@ -1595,7 +1593,6 @@ _STATIC(__start_initialization_iSeries)
 	b	.start_here_common
 #endif /* CONFIG_PPC_ISERIES */
 
-#ifdef CONFIG_PPC_MULTIPLATFORM
 
 _STATIC(__mmu_off)
 	mfmsr	r3
@@ -1621,13 +1618,11 @@ _STATIC(__mmu_off)
  *
  */
 _GLOBAL(__start_initialization_multiplatform)
-#ifdef CONFIG_PPC_MULTIPLATFORM
 	/*
 	 * Are we booted from a PROM Of-type client-interface ?
 	 */
 	cmpldi	cr0,r5,0
 	bne	.__boot_from_prom		/* yes -> prom */
-#endif
 
 	/* Save parameters */
 	mr	r31,r3
@@ -1656,7 +1651,6 @@ _GLOBAL(__start_initialization_multiplat
 	bl	.__mmu_off
 	b	.__after_prom_start
 
-#ifdef CONFIG_PPC_MULTIPLATFORM
 _STATIC(__boot_from_prom)
 	/* Save parameters */
 	mr	r31,r3
@@ -1696,7 +1690,6 @@ _STATIC(__boot_from_prom)
 	bl	.prom_init
 	/* We never return */
 	trap
-#endif
 
 /*
  * At this point, r3 contains the physical address we are running at,
@@ -1752,8 +1745,6 @@ _STATIC(__after_prom_start)
 	bl	.copy_and_flush		/* copy the rest */
 	b	.start_here_multiplatform
 
-#endif /* CONFIG_PPC_MULTIPLATFORM */
-
 /*
  * Copy routine used to copy the kernel to start at physical address 0
  * and flush and invalidate the caches as needed.
@@ -1913,7 +1904,6 @@ _GLOBAL(enable_64b_mode)
 	isync
 	blr
 
-#ifdef CONFIG_PPC_MULTIPLATFORM
 /*
  * This is where the main kernel code starts.
  */
@@ -1977,7 +1967,6 @@ _STATIC(start_here_multiplatform)
 	mtspr	SPRN_SRR1,r4
 	rfid
 	b	.	/* prevent speculative execution */
-#endif /* CONFIG_PPC_MULTIPLATFORM */
 	
 	/* This is where all platforms converge execution */
 _STATIC(start_here_common)
Index: arch/powerpc/kernel/entry_64.S
===================================================================
--- a/arch/powerpc/kernel/entry_64.S.orig
+++ b/arch/powerpc/kernel/entry_64.S
@@ -735,8 +735,6 @@ _STATIC(rtas_restore_regs)
 
 #endif /* CONFIG_PPC_RTAS */
 
-#ifdef CONFIG_PPC_MULTIPLATFORM
-
 _GLOBAL(enter_prom)
 	mflr	r0
 	std	r0,16(r1)
@@ -821,5 +819,3 @@ _GLOBAL(enter_prom)
 	ld	r0,16(r1)
 	mtlr    r0
         blr
-	
-#endif	/* CONFIG_PPC_MULTIPLATFORM */

--
 Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
  Pengutronix - Linux Solutions for Science and Industry
    Handelsregister: Amtsgericht Hildesheim, HRA 2686
      Hannoversche Str. 2, 31134 Hildesheim, Germany
    Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 10/16] powerpc: make hash_native_64.o a 64bit-only object

[s.hauer]

Make hash_native_64.o dependent on 64bit, not on MULTIPLATFORM

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Index: arch/powerpc/mm/Makefile
===================================================================
--- a/arch/powerpc/mm/Makefile.orig
+++ b/arch/powerpc/mm/Makefile
@@ -8,7 +8,7 @@ endif
 
 obj-y				:= fault.o mem.o lmb.o
 obj-$(CONFIG_PPC32)		+= init_32.o pgtable_32.o mmu_context_32.o
-hash-$(CONFIG_PPC_MULTIPLATFORM) := hash_native_64.o
+hash-$(CONFIG_PPC64)		:= hash_native_64.o
 obj-$(CONFIG_PPC64)		+= init_64.o pgtable_64.o mmu_context_64.o \
 				   hash_utils_64.o hash_low_64.o tlb_64.o \
 				   slb_low.o slb.o stab.o mmap.o imalloc.o \

--
 Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
  Pengutronix - Linux Solutions for Science and Industry
    Handelsregister: Amtsgericht Hildesheim, HRA 2686
      Hannoversche Str. 2, 31134 Hildesheim, Germany
    Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 11/16] powerpc: remove occurences of PPC_MULTIPLATFORM in pci_64.c

[s.hauer]

Since iSeries is merged to MULTIPLATFORM, there is no way to build a 64bit
kernel without MULTIPLATFORM, so PPC_MULTIPLATFORM can be removed in
64bit-only files 

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Index: arch/powerpc/kernel/pci_64.c
===================================================================
--- a/arch/powerpc/kernel/pci_64.c.orig
+++ b/arch/powerpc/kernel/pci_64.c
@@ -42,11 +42,9 @@
 unsigned long pci_probe_only = 1;
 int pci_assign_all_buses = 0;
 
-#ifdef CONFIG_PPC_MULTIPLATFORM
 static void fixup_resource(struct resource *res, struct pci_dev *dev);
 static void do_bus_setup(struct pci_bus *bus);
 static void phbs_remap_io(void);
-#endif
 
 /* pci_io_base -- the base address from which io bars are offsets.
  * This is the lowest I/O base address (so bar values are always positive),
@@ -251,7 +249,6 @@ static void __init pcibios_claim_of_setu
 		pcibios_claim_one_bus(b);
 }
 
-#ifdef CONFIG_PPC_MULTIPLATFORM
 static u32 get_int_prop(struct device_node *np, const char *name, u32 def)
 {
 	const u32 *prop;
@@ -506,7 +503,6 @@ void __devinit of_scan_pci_bridge(struct
 		pci_scan_child_bus(bus);
 }
 EXPORT_SYMBOL(of_scan_pci_bridge);
-#endif /* CONFIG_PPC_MULTIPLATFORM */
 
 void __devinit scan_phb(struct pci_controller *hose)
 {
@@ -540,7 +536,7 @@ void __devinit scan_phb(struct pci_contr
 	}
 
 	mode = PCI_PROBE_NORMAL;
-#ifdef CONFIG_PPC_MULTIPLATFORM
+
 	if (node && ppc_md.pci_probe_mode)
 		mode = ppc_md.pci_probe_mode(bus);
 	DBG("    probe mode: %d\n", mode);
@@ -548,7 +544,7 @@ void __devinit scan_phb(struct pci_contr
 		bus->subordinate = hose->last_busno;
 		of_scan_bus(node, bus);
 	}
-#endif /* CONFIG_PPC_MULTIPLATFORM */
+
 	if (mode == PCI_PROBE_NORMAL)
 		hose->last_busno = bus->subordinate = pci_scan_child_bus(bus);
 }
@@ -592,11 +588,9 @@ static int __init pcibios_init(void)
 	if (ppc64_isabridge_dev != NULL)
 		printk(KERN_DEBUG "ISA bridge at %s\n", pci_name(ppc64_isabridge_dev));
 
-#ifdef CONFIG_PPC_MULTIPLATFORM
 	if (!firmware_has_feature(FW_FEATURE_ISERIES))
 		/* map in PCI I/O space */
 		phbs_remap_io();
-#endif
 
 	printk(KERN_DEBUG "PCI: Probing PCI hardware done\n");
 
@@ -873,8 +867,6 @@ void pcibios_add_platform_entries(struct
 	device_create_file(&pdev->dev, &dev_attr_devspec);
 }
 
-#ifdef CONFIG_PPC_MULTIPLATFORM
-
 #define ISA_SPACE_MASK 0x1
 #define ISA_SPACE_IO 0x1
 
@@ -1343,8 +1335,6 @@ struct pci_controller* pci_find_hose_for
 	return NULL;
 }
 
-#endif /* CONFIG_PPC_MULTIPLATFORM */
-
 unsigned long pci_address_to_pio(phys_addr_t address)
 {
 	struct pci_controller *hose, *tmp;

--
 Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
  Pengutronix - Linux Solutions for Science and Industry
    Handelsregister: Amtsgericht Hildesheim, HRA 2686
      Hannoversche Str. 2, 31134 Hildesheim, Germany
    Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 12/16] remove PPC_MULTIPLATFORM in for config MV643XX_ETH

[s.hauer]

No need to depend on PPC_MULTIPLATFORM for MV643XX_ETH

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Index: drivers/net/Kconfig
===================================================================
--- a/drivers/net/Kconfig.orig
+++ b/drivers/net/Kconfig
@@ -2292,7 +2292,7 @@ config UGETH_HAS_GIGA
 
 config MV643XX_ETH
 	tristate "MV-643XX Ethernet support"
-	depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX || MV64360 || MOMENCO_OCELOT_3 || (PPC_MULTIPLATFORM && PPC32)
+	depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX || MV64360 || MOMENCO_OCELOT_3 || PPC32
 	select MII
 	help
 	  This driver supports the gigabit Ethernet on the Marvell MV643XX

--
 Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
  Pengutronix - Linux Solutions for Science and Industry
    Handelsregister: Amtsgericht Hildesheim, HRA 2686
      Hannoversche Str. 2, 31134 Hildesheim, Germany
    Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 13/16] powerpc: make prom_init.o dependent on PPC_OF

[s.hauer]

prom_init.o is used for OF machines, so make compilation dependent
on that and not on PPC_MULTIPLATFORM

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Index: arch/powerpc/kernel/Makefile
===================================================================
--- a/arch/powerpc/kernel/Makefile.orig
+++ b/arch/powerpc/kernel/Makefile
@@ -21,7 +21,7 @@ obj-$(CONFIG_PPC64)		+= setup_64.o binfm
 obj-$(CONFIG_PPC64)		+= vdso64/
 obj-$(CONFIG_ALTIVEC)		+= vecemu.o vector.o
 obj-$(CONFIG_PPC_970_NAP)	+= idle_power4.o
-obj-$(CONFIG_PPC_OF)		+= of_device.o prom_parse.o
+obj-$(CONFIG_PPC_OF)		+= of_device.o prom_parse.o prom_init.o
 procfs-$(CONFIG_PPC64)		:= proc_ppc64.o
 obj-$(CONFIG_PROC_FS)		+= $(procfs-y)
 rtaspci-$(CONFIG_PPC64)		:= rtas_pci.o
@@ -53,7 +53,6 @@ obj-y				+= time.o prom.o traps.o setup-
 				   udbg.o misc.o io.o
 obj-$(CONFIG_PPC32)		+= entry_32.o setup_32.o misc_32.o
 obj-$(CONFIG_PPC64)		+= misc_64.o dma_64.o iommu.o
-obj-$(CONFIG_PPC_MULTIPLATFORM)	+= prom_init.o
 obj-$(CONFIG_MODULES)		+= ppc_ksyms.o
 obj-$(CONFIG_BOOTX_TEXT)	+= btext.o
 obj-$(CONFIG_SMP)		+= smp.o

--
 Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
  Pengutronix - Linux Solutions for Science and Industry
    Handelsregister: Amtsgericht Hildesheim, HRA 2686
      Hannoversche Str. 2, 31134 Hildesheim, Germany
    Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 14/16] powerpc: make initialization of OF hooks dependent on PPC_OF

[s.hauer]

Make initialization of OF hooks dependent on PPC_OF, not on MULTIPLATFORM

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Index: arch/powerpc/kernel/head_32.S
===================================================================
--- a/arch/powerpc/kernel/head_32.S.orig
+++ b/arch/powerpc/kernel/head_32.S
@@ -119,7 +119,7 @@ __start:
  * because OF may have I/O devices mapped into that area
  * (particularly on CHRP).
  */
-#ifdef CONFIG_PPC_MULTIPLATFORM
+#ifdef CONFIG_PPC_OF
 	cmpwi	0,r5,0
 	beq	1f
 	bl	prom_init

--
 Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
  Pengutronix - Linux Solutions for Science and Industry
    Handelsregister: Amtsgericht Hildesheim, HRA 2686
      Hannoversche Str. 2, 31134 Hildesheim, Germany
    Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 15/16] powerpc: clean up usage of boot_dev

[s.hauer]

dev_t boot_dev is declared in arch/powerpc/kernel/setup_32.c
and in arch/powerpc/kernel/setup_64.c but not used in these files.
It is only used in arch/powerpc/platforms/powermac/setup.c, so make
it static in this file

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Index: arch/powerpc/kernel/setup_32.c
===================================================================
--- a/arch/powerpc/kernel/setup_32.c.orig
+++ b/arch/powerpc/kernel/setup_32.c
@@ -63,10 +63,6 @@ unsigned int DMA_MODE_WRITE;
 
 int have_of = 1;
 
-#ifdef CONFIG_PPC_MULTIPLATFORM
-dev_t boot_dev;
-#endif /* CONFIG_PPC_MULTIPLATFORM */
-
 #ifdef CONFIG_VGA_CONSOLE
 unsigned long vgacon_remap_base;
 #endif
Index: arch/powerpc/kernel/setup_64.c
===================================================================
--- a/arch/powerpc/kernel/setup_64.c.orig
+++ b/arch/powerpc/kernel/setup_64.c
@@ -71,7 +71,6 @@
 
 int have_of = 1;
 int boot_cpuid = 0;
-dev_t boot_dev;
 u64 ppc64_pft_size;
 
 /* Pick defaults since we might want to patch instructions
Index: arch/powerpc/platforms/powermac/setup.c
===================================================================
--- a/arch/powerpc/platforms/powermac/setup.c.orig
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -361,7 +361,7 @@ char *bootdevice;
 void *boot_host;
 int boot_target;
 int boot_part;
-extern dev_t boot_dev;
+static dev_t boot_dev;
 
 #ifdef CONFIG_SCSI
 void __init note_scsi_host(struct device_node *node, void *host)

--
 Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
  Pengutronix - Linux Solutions for Science and Industry
    Handelsregister: Amtsgericht Hildesheim, HRA 2686
      Hannoversche Str. 2, 31134 Hildesheim, Germany
    Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 16/16] powerpc: make nvram_64.o a 64bit-only object

[s.hauer]

Make nvram_64.o dependent on 64bit, not on MULTIPLATFORM

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Index: arch/powerpc/kernel/Makefile
===================================================================
--- a/arch/powerpc/kernel/Makefile.orig
+++ b/arch/powerpc/kernel/Makefile
@@ -17,7 +17,7 @@ obj-y				+= vdso32/
 obj-$(CONFIG_PPC64)		+= setup_64.o binfmt_elf32.o sys_ppc32.o \
 				   signal_64.o ptrace32.o \
 				   paca.o cpu_setup_ppc970.o \
-				   firmware.o sysfs.o
+				   firmware.o sysfs.o nvram_64.o
 obj-$(CONFIG_PPC64)		+= vdso64/
 obj-$(CONFIG_ALTIVEC)		+= vecemu.o vector.o
 obj-$(CONFIG_PPC_970_NAP)	+= idle_power4.o
@@ -32,7 +32,6 @@ obj-$(CONFIG_LPARCFG)		+= lparcfg.o
 obj-$(CONFIG_IBMVIO)		+= vio.o
 obj-$(CONFIG_IBMEBUS)           += ibmebus.o
 obj-$(CONFIG_GENERIC_TBSYNC)	+= smp-tbsync.o
-obj64-$(CONFIG_PPC_MULTIPLATFORM) += nvram_64.o
 obj-$(CONFIG_CRASH_DUMP)	+= crash_dump.o
 obj-$(CONFIG_6xx)		+= idle_6xx.o l2cr_6xx.o cpu_setup_6xx.o
 obj-$(CONFIG_TAU)		+= tau_6xx.o

--
 Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
  Pengutronix - Linux Solutions for Science and Industry
    Handelsregister: Amtsgericht Hildesheim, HRA 2686
      Hannoversche Str. 2, 31134 Hildesheim, Germany
    Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 08/16] powerpc: remove EMBEDDED6xx Kconfig entry

[Grant Likely]

On 11/2/06, s.hauer@pengutronix.de <s.hauer@pengutronix.de> wrote:
> remove EMBEDDED6xx Kconfig entry
>
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
>
> Index: linux-2.6/arch/powerpc/Kconfig
> ===================================================================
> --- linux-2.6.orig/arch/powerpc/Kconfig
> +++ linux-2.6/arch/powerpc/Kconfig
> @@ -338,10 +338,6 @@ config PPC_MULTIPLATFORM
>           RS/6000 machine, an Apple machine, or a PReP, CHRP,
>           Maple or Cell-based machine.
>
> -config EMBEDDED6xx
> -       bool "Embedded 6xx/7xx/7xxx-based board"
> -       depends on PPC32 && (BROKEN||BROKEN_ON_SMP)
> -
>  config APUS
>         bool "Amiga-APUS"
>         depends on PPC32 && BROKEN
>
> --

If you do this, then where should embedded 6xx board ports go?  For
example; mpc52xx for which there are currently patches on the mailing
list.

g.

-- 
Grant Likely, B.Sc. P.Eng.
Secret Lab Technologies Ltd.
grant.likely@secretlab.ca
(403) 399-0195

Re: [patch 08/16] powerpc: remove EMBEDDED6xx Kconfig entry

[Sascha Hauer]

On Thu, Nov 02, 2006 at 07:58:39AM -0700, Grant Likely wrote:
> On 11/2/06, s.hauer@pengutronix.de <s.hauer@pengutronix.de> wrote:
> >remove EMBEDDED6xx Kconfig entry
> >
> >Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> >
> >Index: linux-2.6/arch/powerpc/Kconfig
> >===================================================================
> >--- linux-2.6.orig/arch/powerpc/Kconfig
> >+++ linux-2.6/arch/powerpc/Kconfig
> >@@ -338,10 +338,6 @@ config PPC_MULTIPLATFORM
> >          RS/6000 machine, an Apple machine, or a PReP, CHRP,
> >          Maple or Cell-based machine.
> >
> >-config EMBEDDED6xx
> >-       bool "Embedded 6xx/7xx/7xxx-based board"
> >-       depends on PPC32 && (BROKEN||BROKEN_ON_SMP)
> >-
> > config APUS
> >        bool "Amiga-APUS"
> >        depends on PPC32 && BROKEN
> >
> >--
> 
> If you do this, then where should embedded 6xx board ports go?  For
> example; mpc52xx for which there are currently patches on the mailing
> list.

I'm too working on the mpc52xx (I have nothing to submit though at the
moment, because my port is mainly copy-paste from arch=ppc).
I put my stuff under platforms/mpc52xx. I did this mainly because Nikolas
states his board isn't 'embedded', but mine is. I think this shows there
more a historical difference than a technical difference between 'embedded'
and 'not embedded' boards.
I'm running my board as a normal MULTIPLATFORM board and it works just
fine.

Sascha


-- 
 Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
  Pengutronix - Linux Solutions for Science and Industry
    Handelsregister: Amtsgericht Hildesheim, HRA 2686
      Hannoversche Str. 2, 31134 Hildesheim, Germany
    Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 08/16] powerpc: remove EMBEDDED6xx Kconfig entry

[Stephen Winiecki]

[-- Attachment #1: Type: text/plain, Size: 1513 bytes --]





linuxppc-dev-bounces+stevewin=us.ibm.com@ozlabs.org wrote on 11/02/2006
09:58:39 AM:

> On 11/2/06, s.hauer@pengutronix.de <s.hauer@pengutronix.de> wrote:
> > remove EMBEDDED6xx Kconfig entry
> >
> > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> >
> > Index: linux-2.6/arch/powerpc/Kconfig
> > ===================================================================
> > --- linux-2.6.orig/arch/powerpc/Kconfig
> > +++ linux-2.6/arch/powerpc/Kconfig
> > @@ -338,10 +338,6 @@ config PPC_MULTIPLATFORM
> >           RS/6000 machine, an Apple machine, or a PReP, CHRP,
> >           Maple or Cell-based machine.
> >
> > -config EMBEDDED6xx
> > -       bool "Embedded 6xx/7xx/7xxx-based board"
> > -       depends on PPC32 && (BROKEN||BROKEN_ON_SMP)
> > -
> >  config APUS
> >         bool "Amiga-APUS"
> >         depends on PPC32 && BROKEN
> >
> > --
>
> If you do this, then where should embedded 6xx board ports go?  For
> example; mpc52xx for which there are currently patches on the mailing
> list.
>
> g.
>
> --
> Grant Likely, B.Sc. P.Eng.
> Secret Lab Technologies Ltd.
> grant.likely@secretlab.ca
> (403) 399-0195
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-dev

I also have a question about 750xx platforms.  I currently am looking at
adding platform code supporting IBM 750GX/CL eval boards.  Where would they
go - as well as others like Buckeye/Chestnut if/when they move over to
/powerpc?

[-- Attachment #2: Type: text/html, Size: 2158 bytes --]

Re: [patch 08/16] powerpc: remove EMBEDDED6xx Kconfig entry

[Grant Likely]

On 11/2/06, Sascha Hauer <s.hauer@pengutronix.de> wrote:
> On Thu, Nov 02, 2006 at 07:58:39AM -0700, Grant Likely wrote:
> > On 11/2/06, s.hauer@pengutronix.de <s.hauer@pengutronix.de> wrote:
> > >remove EMBEDDED6xx Kconfig entry
> > >
> > >Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> > >
> > >Index: linux-2.6/arch/powerpc/Kconfig
> > >===================================================================
> > >--- linux-2.6.orig/arch/powerpc/Kconfig
> > >+++ linux-2.6/arch/powerpc/Kconfig
> > >@@ -338,10 +338,6 @@ config PPC_MULTIPLATFORM
> > >          RS/6000 machine, an Apple machine, or a PReP, CHRP,
> > >          Maple or Cell-based machine.
> > >
> > >-config EMBEDDED6xx
> > >-       bool "Embedded 6xx/7xx/7xxx-based board"
> > >-       depends on PPC32 && (BROKEN||BROKEN_ON_SMP)
> > >-
> > > config APUS
> > >        bool "Amiga-APUS"
> > >        depends on PPC32 && BROKEN
> > >
> > >--
> >
> > If you do this, then where should embedded 6xx board ports go?  For
> > example; mpc52xx for which there are currently patches on the mailing
> > list.
>
> I'm too working on the mpc52xx (I have nothing to submit though at the
> moment, because my port is mainly copy-paste from arch=ppc).
> I put my stuff under platforms/mpc52xx. I did this mainly because Nikolas
> states his board isn't 'embedded', but mine is. I think this shows there
> more a historical difference than a technical difference between 'embedded'
> and 'not embedded' boards.
> I'm running my board as a normal MULTIPLATFORM board and it works just
> fine.

Then perhaps Efika should also be under platforms/mpc52xx?

g.

-- 
Grant Likely, B.Sc. P.Eng.
Secret Lab Technologies Ltd.
grant.likely@secretlab.ca
(403) 399-0195

Re: [patch 08/16] powerpc: remove EMBEDDED6xx Kconfig entry

[Sascha Hauer]

On Thu, Nov 02, 2006 at 10:32:53AM -0500, Stephen Winiecki wrote:
> 
>    I also have a question about 750xx platforms.  I currently am looking at
>    adding platform code supporting IBM 750GX/CL eval boards.  Where would
>    they go - as well as others like Buckeye/Chestnut if/when they move over
>    to /powerpc?

I don't know - Lets wait for ben and others what they say about this
approach.
My intention with this patch is to try and motivate people to
integrate their machines as a part of the multiplatform support, because
it doesn't cost a thing.
The presence of the embedded6xx entry and the entries in the directory
itself makes people think (me too) that the multiplatform thing is only
for the big irons. I think it's better to unify the two ways of platform
support where it's possible.

Sascha

-- 
 Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
  Pengutronix - Linux Solutions for Science and Industry
    Handelsregister: Amtsgericht Hildesheim, HRA 2686
      Hannoversche Str. 2, 31134 Hildesheim, Germany
    Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 08/16] powerpc: remove EMBEDDED6xx Kconfig entry

[Stephen Winiecki]

[-- Attachment #1: Type: text/plain, Size: 2049 bytes --]






Sascha Hauer <s.hauer@pengutronix.de> wrote on 11/02/2006 11:00:09 AM:

> On Thu, Nov 02, 2006 at 10:32:53AM -0500, Stephen Winiecki wrote:
> >
> >    I also have a question about 750xx platforms.  I currently am
looking at
> >    adding platform code supporting IBM 750GX/CL eval boards.  Where
would
> >    they go - as well as others like Buckeye/Chestnut if/when they move
over
> >    to /powerpc?
>
> I don't know - Lets wait for ben and others what they say about this
> approach.
> My intention with this patch is to try and motivate people to
> integrate their machines as a part of the multiplatform support, because
> it doesn't cost a thing.
> The presence of the embedded6xx entry and the entries in the directory
> itself makes people think (me too) that the multiplatform thing is only
> for the big irons. I think it's better to unify the two ways of platform
> support where it's possible.
>
What exactly is the intent of PPC_MULTIPLATFORM - the current desc states
"Generic desktop/server/laptop" - which doesn't exactly scream 'embedded'
to me either.  I guess I saw embedded6xx as a 'catch-all' for everything
else.

I might be missing something - but when you removed EMBEDDED6xx from
powerpc/Kconfig in patch 8, and removed MPC7448HPC2 from
embedded6xx/Kconfig in patch 6 - where did you move the MPC7448HPC2 config
section to?  Is your thought that it will depend on PPC_MULTIPLATFORM now
as well?

This may be slightly off topic - but one other thing I have noticed that
the new boot wrapper script supports specific 'types' of zImage files
associated w/ 'MUTIPLATFORMS' (PSERIES, CHRP, PREP etc.) and uImage - which
is what I think the majority of 'embedded' platforms will use by defining
CONFIG_DEFAULT_UIMAGE.  For IBM boards with PIBS just 'normal' zImage ELF
files get loaded - I'm not sure if there should be another type
defined/supported for boards which don't fit necessarily into a
PSERIES/CHRP/PREP definition and also don't use uboot -
CONFIG_DEFAULT_ZIMAGE?


[-- Attachment #2: Type: text/html, Size: 2354 bytes --]

Re: [patch 08/16] powerpc: remove EMBEDDED6xx Kconfig entry

[Benjamin Herrenschmidt]

> Then perhaps Efika should also be under platforms/mpc52xx?

Classifying platforms by their processor might not be the best idea... I
makes some sense when those platforms are basically reference designs
for the said processor but I yet have to be convinced it's really a good
thing in the long run :)

There will be a lot of platforms that will consist of basically once
signle source file. I think we need a directory for those. Maybe
platform/misc :) Or we could have them at the root of platforms/ in
fact... 

Paulus, what is your preference in that area ?

In the long run, it doesn't really matter in the sense that it's purely
the file location in the source tree, it has no effect on the content of
those files (+/- include path) or at runtime. You can still build kernel
with multiple images if the CPU cores are of the same category etc...
Thus, in this regard, it's almost cosmetic.
 
Cheers,
Ben.

Re: [patch 01/16] remove inclusion of asm/processor.h for powerpc

[Benjamin Herrenschmidt]

On Thu, 2006-11-02 at 13:55 +0100, s.hauer@pengutronix.de wrote:
> plain text document attachment
> (drivers-ide-pci-via82xxx-remove-ppc-ifdef.diff)
> Remove inclusion of asm/processor.h for powerpc. It was used for
> some ppc specific hook in this file, but the hook is gone

It's not:

init_hwif_via82cxxx() contains:

#if defined(CONFIG_PPC_CHRP) && defined(CONFIG_PPC32)
        if(machine_is(chrp) && _chrp_type == _CHRP_Pegasos) {
                hwif->irq = hwif->channel ? 15 : 14;
        }
#endif

Now you can replace CONFIG_PPC_MULTIPLATFORM with CONFIG_PPC_CHRP

> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> 
> Index: linux-2.6/drivers/ide/pci/via82cxxx.c
> ===================================================================
> --- linux-2.6.orig/drivers/ide/pci/via82cxxx.c
> +++ linux-2.6/drivers/ide/pci/via82cxxx.c
> @@ -35,10 +35,6 @@
>  #include <linux/ide.h>
>  #include <asm/io.h>
>  
> -#ifdef CONFIG_PPC_MULTIPLATFORM
> -#include <asm/processor.h>
> -#endif
> -
>  #include "ide-timing.h"
>  
>  #define DISPLAY_VIA_TIMINGS
> 
> --
>  Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
>   Pengutronix - Linux Solutions for Science and Industry
>     Handelsregister: Amtsgericht Hildesheim, HRA 2686
>       Hannoversche Str. 2, 31134 Hildesheim, Germany
>     Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-dev

Re: [patch 02/16] replace CONFIG_PPC_MULTIPLATFORM with CONFIG_PPC_PMAC in tulip driver

[Benjamin Herrenschmidt]

On Thu, 2006-11-02 at 13:55 +0100, s.hauer@pengutronix.de wrote:
> plain text document attachment
> (drivers-net-tulip-de4x5-remove-MULTIPLATFORM.diff)
> replace CONFIG_PPC_MULTIPLATFORM with CONFIG_PPC_PMAC in
> drivers/net/tulip/de4x5.c. It is needed for a pmac specific hook but
> has nothing with to do with PPC_MULTIPLATFORM
> 
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

> Index: linux-2.6/drivers/net/tulip/de4x5.c
> ===================================================================
> --- linux-2.6.orig/drivers/net/tulip/de4x5.c
> +++ linux-2.6/drivers/net/tulip/de4x5.c
> @@ -473,9 +473,9 @@
>  #include <asm/byteorder.h>
>  #include <asm/unaligned.h>
>  #include <asm/uaccess.h>
> -#ifdef CONFIG_PPC_MULTIPLATFORM
> +#ifdef CONFIG_PPC_PMAC
>  #include <asm/machdep.h>
> -#endif /* CONFIG_PPC_MULTIPLATFORM */
> +#endif /* CONFIG_PPC_PMAC */
>  
>  #include "de4x5.h"
>  
> @@ -4151,7 +4151,7 @@ get_hw_addr(struct net_device *dev)
>      /* If possible, try to fix a broken card - SMC only so far */
>      srom_repair(dev, broken);
>  
> -#ifdef CONFIG_PPC_MULTIPLATFORM
> +#ifdef CONFIG_PPC_PMAC
>      /*
>      ** If the address starts with 00 a0, we have to bit-reverse
>      ** each byte of the address.
> @@ -4168,7 +4168,7 @@ get_hw_addr(struct net_device *dev)
>  		    dev->dev_addr[i] = ((x & 0x55) << 1) + ((x & 0xaa) >> 1);
>  	    }
>      }
> -#endif /* CONFIG_PPC_MULTIPLATFORM */
> +#endif /* CONFIG_PPC_PMAC */
>  
>      /* Test for a bad enet address */
>      status = test_bad_enet(dev, status);
> 
> --
>  Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
>   Pengutronix - Linux Solutions for Science and Industry
>     Handelsregister: Amtsgericht Hildesheim, HRA 2686
>       Hannoversche Str. 2, 31134 Hildesheim, Germany
>     Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-dev

Re: [patch 04/16] powerpc: remove dead code in iommu.h

[Benjamin Herrenschmidt]

On Thu, 2006-11-02 at 13:55 +0100, s.hauer@pengutronix.de wrote:
> plain text document attachment
> (powerpc-include-asm-powerpc-iommu_h-remove-dead-code.diff)
> iommu_setup_pSeries() and iommu_setup_dart() are declared extern but are
> not implemented, so remove them. iommu_free_table() is pSeries specific,
> so #ifdef it with CONFIG_PPC_PSERIES and not CONFIG_PPC_MULTIPLATFORM
> 
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

There is no need to #ifdef an extern declaration. Just remove the
ifdef's and the two obsolete prototypes alltogether

Cheers,
Ben.

> Index: linux-2.6/include/asm-powerpc/iommu.h
> ===================================================================
> --- linux-2.6.orig/include/asm-powerpc/iommu.h
> +++ linux-2.6/include/asm-powerpc/iommu.h
> @@ -70,16 +70,12 @@ struct iommu_table {
>  struct scatterlist;
>  struct device_node;
>  
> -#ifdef CONFIG_PPC_MULTIPLATFORM
> -
> -/* Walks all buses and creates iommu tables */
> -extern void iommu_setup_pSeries(void);
> -extern void iommu_setup_dart(void);
> +#ifdef CONFIG_PPC_PSERIES
>  
>  /* Frees table for an individual device node */
>  extern void iommu_free_table(struct device_node *dn);
>  
> -#endif /* CONFIG_PPC_MULTIPLATFORM */
> +#endif /* CONFIG_PPC_PSERIES */
>  
>  /* Initializes an iommu_table based in values set in the passed-in
>   * structure
> 
> --
>  Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
>   Pengutronix - Linux Solutions for Science and Industry
>     Handelsregister: Amtsgericht Hildesheim, HRA 2686
>       Hannoversche Str. 2, 31134 Hildesheim, Germany
>     Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-dev

Re: [patch 05/16] powerpc: remove ifdef

[Benjamin Herrenschmidt]

On Thu, 2006-11-02 at 13:56 +0100, s.hauer@pengutronix.de wrote:
> plain text document attachment
> (powerpc-include-asm-powerpc-pci_h-remove-ifdef.diff)
> current kernels always have one of CONFIG_PPC_MULTIPLATFORM
> or CONFIG_PPC32 defined, so remove bogus ifdef
> 
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

> Index: linux-2.6/include/asm-powerpc/pci.h
> ===================================================================
> --- linux-2.6.orig/include/asm-powerpc/pci.h
> +++ linux-2.6/include/asm-powerpc/pci.h
> @@ -238,12 +238,10 @@ extern pgprot_t	pci_phys_mem_access_prot
>  					 unsigned long size,
>  					 pgprot_t prot);
>  
> -#if defined(CONFIG_PPC_MULTIPLATFORM) || defined(CONFIG_PPC32)
>  #define HAVE_ARCH_PCI_RESOURCE_TO_USER
>  extern void pci_resource_to_user(const struct pci_dev *dev, int bar,
>  				 const struct resource *rsrc,
>  				 resource_size_t *start, resource_size_t *end);
> -#endif /* CONFIG_PPC_MULTIPLATFORM || CONFIG_PPC32 */
>  
>  #endif	/* __KERNEL__ */
>  #endif /* __ASM_POWERPC_PCI_H */
> 
> --
>  Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
>   Pengutronix - Linux Solutions for Science and Industry
>     Handelsregister: Amtsgericht Hildesheim, HRA 2686
>       Hannoversche Str. 2, 31134 Hildesheim, Germany
>     Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-dev

Re: [patch 06/16] powerpc: remove _machine

[Benjamin Herrenschmidt]

On Thu, 2006-11-02 at 13:56 +0100, s.hauer@pengutronix.de wrote:
> plain text document attachment
> (powerpc-include-asm-powerpc-processor_h-remove-_machine.diff)
> The _machine macro was once used for compatibility with ARCH=ppc
> drivers. It is unused in current kernels
> 
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

> Index: include/asm-powerpc/processor.h
> ===================================================================
> --- a/include/asm-powerpc/processor.h.orig
> +++ b/include/asm-powerpc/processor.h
> @@ -53,10 +53,6 @@ extern unsigned char ucBoardRevMaj, ucBo
>  
>  #endif /* CONFIG_PPC_PREP */
>  
> -#ifndef CONFIG_PPC_MULTIPLATFORM
> -#define _machine 0
> -#endif /* CONFIG_PPC_MULTIPLATFORM */
> -
>  #endif /* defined(__KERNEL__) && defined(CONFIG_PPC32) */
>  
>  /*
> 
> --
>  Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
>   Pengutronix - Linux Solutions for Science and Industry
>     Handelsregister: Amtsgericht Hildesheim, HRA 2686
>       Hannoversche Str. 2, 31134 Hildesheim, Germany
>     Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-dev

Re: [patch 08/16] powerpc: remove EMBEDDED6xx Kconfig entry

[Benjamin Herrenschmidt]

On Thu, 2006-11-02 at 17:00 +0100, Sascha Hauer wrote:
> On Thu, Nov 02, 2006 at 10:32:53AM -0500, Stephen Winiecki wrote:
> > 
> >    I also have a question about 750xx platforms.  I currently am looking at
> >    adding platform code supporting IBM 750GX/CL eval boards.  Where would
> >    they go - as well as others like Buckeye/Chestnut if/when they move over
> >    to /powerpc?
> 
> I don't know - Lets wait for ben and others what they say about this
> approach.
> My intention with this patch is to try and motivate people to
> integrate their machines as a part of the multiplatform support, because
> it doesn't cost a thing.

And that's a great move :) Thanks for doing that work !

> The presence of the embedded6xx entry and the entries in the directory
> itself makes people think (me too) that the multiplatform thing is only
> for the big irons. I think it's better to unify the two ways of platform
> support where it's possible.

Yes. I've been wanting to get rid of it for some time.

As for new platforms, I tend to have no problem if they just create a
directory of their own (platforms/chesnut, etc...) though in some we
might want a grab bag for boards that really only need one file...

This could be a plaforms/misc, or platforms/simple, or just have them at
the root of platforms...

Ben. 

Re: [patch 08/16] powerpc: remove EMBEDDED6xx Kconfig entry

[Benjamin Herrenschmidt]

> What exactly is the intent of PPC_MULTIPLATFORM - the current desc
> states "Generic desktop/server/laptop" - which doesn't exactly scream
> 'embedded' to me either.  I guess I saw embedded6xx as a 'catch-all'
> for everything else.

It's historical. It was the good old prep/chrp/pmac option, meaning that
more than one board support can be built in the same kernel. I've made
the policy decision with ARCH=powerpc that we should now make that
mandatory for new boards (of course provided the CPUs are of the same
family) since, as Sascha rightfully pointed out, it costs nothing and
keeps things cleaner.

Thus I'm all about getting rid of the option :)

> I might be missing something - but when you removed EMBEDDED6xx from
> powerpc/Kconfig in patch 8, and removed MPC7448HPC2 from
> embedded6xx/Kconfig in patch 6 - where did you move the MPC7448HPC2
> config section to?  Is your thought that it will depend on
> PPC_MULTIPLATFORM now as well?

Board support are just boolean options depending on their CPU family
choice. That's the goal at least. I'm sure we are due for some Kconfig
cleanup to make that more visible :) We should probably split the
Kconfig into separate files for the various CPU families containing the
platforms for these families.

> This may be slightly off topic - but one other thing I have noticed
> that the new boot wrapper script supports specific 'types' of zImage
> files associated w/ 'MUTIPLATFORMS' (PSERIES, CHRP, PREP etc.) and
> uImage - which is what I think the majority of 'embedded' platforms
> will use by defining CONFIG_DEFAULT_UIMAGE.

That is not totally clear since they have non-compatible board info.

>   For IBM boards with PIBS just 'normal' zImage ELF files get loaded -
> I'm not sure if there should be another type defined/supported for
> boards which don't fit necessarily into a PSERIES/CHRP/PREP definition
> and also don't use uboot - CONFIG_DEFAULT_ZIMAGE? 
> 

Ask Paulus about the naming but pSeries is just "normal" in the sense
that it's "booted from a real OF" support.

The problem is despite the ability to do those nice multiplatform kernel
images, we still have bootloader incompatibilities. Thus we want to move
those to the zImage wrapper which can produce, from an already built
vmlinux binary, any zImage that can be supported for a given firmware
interface.

In the long run, we hope that firmwares will finally get their gears
together and use either a real OF entry point or a direct flat
device-tree entry point, which means that a single zImage (the "normal
one as you call it) will be able to boot everything.

There's also a glitch with real OF zImages due to the fact that IBM
pSeries OF requires a Notes section forcing OF into real mode while
Apple OF is allergic to that (it will crash badly) so we need to keep a
separate zImage for PowerMac. However, the vmlinux are the same so if
you use something like yaboot, the same vmlinux cna be booted on all
those machines.

Ben.

Re: [patch 10/16] powerpc: make hash_native_64.o a 64bit-only object

[Benjamin Herrenschmidt]

On Thu, 2006-11-02 at 13:56 +0100, s.hauer@pengutronix.de wrote:
> plain text document attachment
> (powerpc-mm-makefile-hash_native_64-make-obj64.diff)
> Make hash_native_64.o dependent on 64bit, not on MULTIPLATFORM
> 
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

If we ever want it, we might have specific Kconfig options for the
various low level MMU interfaces and have the platform select them, but
for now, that's fine.

> Index: arch/powerpc/mm/Makefile
> ===================================================================
> --- a/arch/powerpc/mm/Makefile.orig
> +++ b/arch/powerpc/mm/Makefile
> @@ -8,7 +8,7 @@ endif
>  
>  obj-y				:= fault.o mem.o lmb.o
>  obj-$(CONFIG_PPC32)		+= init_32.o pgtable_32.o mmu_context_32.o
> -hash-$(CONFIG_PPC_MULTIPLATFORM) := hash_native_64.o
> +hash-$(CONFIG_PPC64)		:= hash_native_64.o
>  obj-$(CONFIG_PPC64)		+= init_64.o pgtable_64.o mmu_context_64.o \
>  				   hash_utils_64.o hash_low_64.o tlb_64.o \
>  				   slb_low.o slb.o stab.o mmap.o imalloc.o \
> 
> --
>  Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
>   Pengutronix - Linux Solutions for Science and Industry
>     Handelsregister: Amtsgericht Hildesheim, HRA 2686
>       Hannoversche Str. 2, 31134 Hildesheim, Germany
>     Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-dev

Re: [patch 11/16] powerpc: remove occurences of PPC_MULTIPLATFORM in pci_64.c

[Benjamin Herrenschmidt]

On Thu, 2006-11-02 at 13:56 +0100, s.hauer@pengutronix.de wrote:
> plain text document attachment
> (powerpc-pci_64.S-remove-MULTIPLATFORM.diff)
> Since iSeries is merged to MULTIPLATFORM, there is no way to build a 64bit
> kernel without MULTIPLATFORM, so PPC_MULTIPLATFORM can be removed in
> 64bit-only files 
> 
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

> Index: arch/powerpc/kernel/pci_64.c
> ===================================================================
> --- a/arch/powerpc/kernel/pci_64.c.orig
> +++ b/arch/powerpc/kernel/pci_64.c
> @@ -42,11 +42,9 @@
>  unsigned long pci_probe_only = 1;
>  int pci_assign_all_buses = 0;
>  
> -#ifdef CONFIG_PPC_MULTIPLATFORM
>  static void fixup_resource(struct resource *res, struct pci_dev *dev);
>  static void do_bus_setup(struct pci_bus *bus);
>  static void phbs_remap_io(void);
> -#endif
>  
>  /* pci_io_base -- the base address from which io bars are offsets.
>   * This is the lowest I/O base address (so bar values are always positive),
> @@ -251,7 +249,6 @@ static void __init pcibios_claim_of_setu
>  		pcibios_claim_one_bus(b);
>  }
>  
> -#ifdef CONFIG_PPC_MULTIPLATFORM
>  static u32 get_int_prop(struct device_node *np, const char *name, u32 def)
>  {
>  	const u32 *prop;
> @@ -506,7 +503,6 @@ void __devinit of_scan_pci_bridge(struct
>  		pci_scan_child_bus(bus);
>  }
>  EXPORT_SYMBOL(of_scan_pci_bridge);
> -#endif /* CONFIG_PPC_MULTIPLATFORM */
>  
>  void __devinit scan_phb(struct pci_controller *hose)
>  {
> @@ -540,7 +536,7 @@ void __devinit scan_phb(struct pci_contr
>  	}
>  
>  	mode = PCI_PROBE_NORMAL;
> -#ifdef CONFIG_PPC_MULTIPLATFORM
> +
>  	if (node && ppc_md.pci_probe_mode)
>  		mode = ppc_md.pci_probe_mode(bus);
>  	DBG("    probe mode: %d\n", mode);
> @@ -548,7 +544,7 @@ void __devinit scan_phb(struct pci_contr
>  		bus->subordinate = hose->last_busno;
>  		of_scan_bus(node, bus);
>  	}
> -#endif /* CONFIG_PPC_MULTIPLATFORM */
> +
>  	if (mode == PCI_PROBE_NORMAL)
>  		hose->last_busno = bus->subordinate = pci_scan_child_bus(bus);
>  }
> @@ -592,11 +588,9 @@ static int __init pcibios_init(void)
>  	if (ppc64_isabridge_dev != NULL)
>  		printk(KERN_DEBUG "ISA bridge at %s\n", pci_name(ppc64_isabridge_dev));
>  
> -#ifdef CONFIG_PPC_MULTIPLATFORM
>  	if (!firmware_has_feature(FW_FEATURE_ISERIES))
>  		/* map in PCI I/O space */
>  		phbs_remap_io();
> -#endif
>  
>  	printk(KERN_DEBUG "PCI: Probing PCI hardware done\n");
>  
> @@ -873,8 +867,6 @@ void pcibios_add_platform_entries(struct
>  	device_create_file(&pdev->dev, &dev_attr_devspec);
>  }
>  
> -#ifdef CONFIG_PPC_MULTIPLATFORM
> -
>  #define ISA_SPACE_MASK 0x1
>  #define ISA_SPACE_IO 0x1
>  
> @@ -1343,8 +1335,6 @@ struct pci_controller* pci_find_hose_for
>  	return NULL;
>  }
>  
> -#endif /* CONFIG_PPC_MULTIPLATFORM */
> -
>  unsigned long pci_address_to_pio(phys_addr_t address)
>  {
>  	struct pci_controller *hose, *tmp;
> 
> --
>  Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
>   Pengutronix - Linux Solutions for Science and Industry
>     Handelsregister: Amtsgericht Hildesheim, HRA 2686
>       Hannoversche Str. 2, 31134 Hildesheim, Germany
>     Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-dev

Re: [patch 08/16] powerpc: remove EMBEDDED6xx Kconfig entry

[Grant Likely]

On 11/2/06, Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote:
> As for new platforms, I tend to have no problem if they just create a
> directory of their own (platforms/chesnut, etc...) though in some we
> might want a grab bag for boards that really only need one file...
>
> This could be a plaforms/misc, or platforms/simple, or just have them at
> the root of platforms...

Root of platforms makes sense to me.

g.

-- 
Grant Likely, B.Sc. P.Eng.
Secret Lab Technologies Ltd.
grant.likely@secretlab.ca
(403) 399-0195

Re: [patch 13/16] powerpc: make prom_init.o dependent on PPC_OF

[Benjamin Herrenschmidt]

On Thu, 2006-11-02 at 13:56 +0100, s.hauer@pengutronix.de wrote:
> plain text document attachment
> (powerpc-kernel-makefile-move-prom_init.c-to-PPC_OF.diff)
> prom_init.o is used for OF machines, so make compilation dependent
> on that and not on PPC_MULTIPLATFORM
> 
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

Note that CONFIG_PPC_OF is always set in arch/powerpc since that
includes support for the flat device-tree... We might want to keep a
separate option for prom_init.c, though I'm not too big about it right
now. Maybe CONFIG_PPC_BOOT_FROM_OF :) That would allow custom kernel to
be shrunk down if they don't need to support platforms that are known
not to have a real OF (iSeries for example).


> Index: arch/powerpc/kernel/Makefile
> ===================================================================
> --- a/arch/powerpc/kernel/Makefile.orig
> +++ b/arch/powerpc/kernel/Makefile
> @@ -21,7 +21,7 @@ obj-$(CONFIG_PPC64)		+= setup_64.o binfm
>  obj-$(CONFIG_PPC64)		+= vdso64/
>  obj-$(CONFIG_ALTIVEC)		+= vecemu.o vector.o
>  obj-$(CONFIG_PPC_970_NAP)	+= idle_power4.o
> -obj-$(CONFIG_PPC_OF)		+= of_device.o prom_parse.o
> +obj-$(CONFIG_PPC_OF)		+= of_device.o prom_parse.o prom_init.o
>  procfs-$(CONFIG_PPC64)		:= proc_ppc64.o
>  obj-$(CONFIG_PROC_FS)		+= $(procfs-y)
>  rtaspci-$(CONFIG_PPC64)		:= rtas_pci.o
> @@ -53,7 +53,6 @@ obj-y				+= time.o prom.o traps.o setup-
>  				   udbg.o misc.o io.o
>  obj-$(CONFIG_PPC32)		+= entry_32.o setup_32.o misc_32.o
>  obj-$(CONFIG_PPC64)		+= misc_64.o dma_64.o iommu.o
> -obj-$(CONFIG_PPC_MULTIPLATFORM)	+= prom_init.o
>  obj-$(CONFIG_MODULES)		+= ppc_ksyms.o
>  obj-$(CONFIG_BOOTX_TEXT)	+= btext.o
>  obj-$(CONFIG_SMP)		+= smp.o
> 
> --
>  Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
>   Pengutronix - Linux Solutions for Science and Industry
>     Handelsregister: Amtsgericht Hildesheim, HRA 2686
>       Hannoversche Str. 2, 31134 Hildesheim, Germany
>     Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-dev

Re: [patch 14/16] powerpc: make initialization of OF hooks dependent on PPC_OF

[Benjamin Herrenschmidt]

On Thu, 2006-11-02 at 13:56 +0100, s.hauer@pengutronix.de wrote:
> plain text document attachment
> (powerpc-head_32.S-remove-MULTIPLATFORM.diff)
> Make initialization of OF hooks dependent on PPC_OF, not on MULTIPLATFORM
> 
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

Though see my comment about your previous patch... In fact, they could
be one patch since things might not work/build if you only apply one of
them. So 13 and 14 should be folded into one.
 
> Index: arch/powerpc/kernel/head_32.S
> ===================================================================
> --- a/arch/powerpc/kernel/head_32.S.orig
> +++ b/arch/powerpc/kernel/head_32.S
> @@ -119,7 +119,7 @@ __start:
>   * because OF may have I/O devices mapped into that area
>   * (particularly on CHRP).
>   */
> -#ifdef CONFIG_PPC_MULTIPLATFORM
> +#ifdef CONFIG_PPC_OF
>  	cmpwi	0,r5,0
>  	beq	1f
>  	bl	prom_init
> 
> --
>  Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
>   Pengutronix - Linux Solutions for Science and Industry
>     Handelsregister: Amtsgericht Hildesheim, HRA 2686
>       Hannoversche Str. 2, 31134 Hildesheim, Germany
>     Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-dev

Re: [patch 15/16] powerpc: clean up usage of boot_dev

[Benjamin Herrenschmidt]

On Thu, 2006-11-02 at 13:56 +0100, s.hauer@pengutronix.de wrote:
> plain text document attachment
> (powerpc-pmac-move-boot_dev-to-pmac.diff)
> dev_t boot_dev is declared in arch/powerpc/kernel/setup_32.c
> and in arch/powerpc/kernel/setup_64.c but not used in these files.
> It is only used in arch/powerpc/platforms/powermac/setup.c, so make
> it static in this file
> 
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

> Index: arch/powerpc/kernel/setup_32.c
> ===================================================================
> --- a/arch/powerpc/kernel/setup_32.c.orig
> +++ b/arch/powerpc/kernel/setup_32.c
> @@ -63,10 +63,6 @@ unsigned int DMA_MODE_WRITE;
>  
>  int have_of = 1;
>  
> -#ifdef CONFIG_PPC_MULTIPLATFORM
> -dev_t boot_dev;
> -#endif /* CONFIG_PPC_MULTIPLATFORM */
> -
>  #ifdef CONFIG_VGA_CONSOLE
>  unsigned long vgacon_remap_base;
>  #endif
> Index: arch/powerpc/kernel/setup_64.c
> ===================================================================
> --- a/arch/powerpc/kernel/setup_64.c.orig
> +++ b/arch/powerpc/kernel/setup_64.c
> @@ -71,7 +71,6 @@
>  
>  int have_of = 1;
>  int boot_cpuid = 0;
> -dev_t boot_dev;
>  u64 ppc64_pft_size;
>  
>  /* Pick defaults since we might want to patch instructions
> Index: arch/powerpc/platforms/powermac/setup.c
> ===================================================================
> --- a/arch/powerpc/platforms/powermac/setup.c.orig
> +++ b/arch/powerpc/platforms/powermac/setup.c
> @@ -361,7 +361,7 @@ char *bootdevice;
>  void *boot_host;
>  int boot_target;
>  int boot_part;
> -extern dev_t boot_dev;
> +static dev_t boot_dev;
>  
>  #ifdef CONFIG_SCSI
>  void __init note_scsi_host(struct device_node *node, void *host)
> 
> --
>  Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
>   Pengutronix - Linux Solutions for Science and Industry
>     Handelsregister: Amtsgericht Hildesheim, HRA 2686
>       Hannoversche Str. 2, 31134 Hildesheim, Germany
>     Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-dev

Re: [patch 16/16] powerpc: make nvram_64.o a 64bit-only object

[Benjamin Herrenschmidt]

On Thu, 2006-11-02 at 13:56 +0100, s.hauer@pengutronix.de wrote:
> plain text document attachment
> (powerpc-make-nvram_64.c-a-64bit-object.diff)
> Make nvram_64.o dependent on 64bit, not on MULTIPLATFORM
> 
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

> Index: arch/powerpc/kernel/Makefile
> ===================================================================
> --- a/arch/powerpc/kernel/Makefile.orig
> +++ b/arch/powerpc/kernel/Makefile
> @@ -17,7 +17,7 @@ obj-y				+= vdso32/
>  obj-$(CONFIG_PPC64)		+= setup_64.o binfmt_elf32.o sys_ppc32.o \
>  				   signal_64.o ptrace32.o \
>  				   paca.o cpu_setup_ppc970.o \
> -				   firmware.o sysfs.o
> +				   firmware.o sysfs.o nvram_64.o
>  obj-$(CONFIG_PPC64)		+= vdso64/
>  obj-$(CONFIG_ALTIVEC)		+= vecemu.o vector.o
>  obj-$(CONFIG_PPC_970_NAP)	+= idle_power4.o
> @@ -32,7 +32,6 @@ obj-$(CONFIG_LPARCFG)		+= lparcfg.o
>  obj-$(CONFIG_IBMVIO)		+= vio.o
>  obj-$(CONFIG_IBMEBUS)           += ibmebus.o
>  obj-$(CONFIG_GENERIC_TBSYNC)	+= smp-tbsync.o
> -obj64-$(CONFIG_PPC_MULTIPLATFORM) += nvram_64.o
>  obj-$(CONFIG_CRASH_DUMP)	+= crash_dump.o
>  obj-$(CONFIG_6xx)		+= idle_6xx.o l2cr_6xx.o cpu_setup_6xx.o
>  obj-$(CONFIG_TAU)		+= tau_6xx.o
> 
> --
>  Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
>   Pengutronix - Linux Solutions for Science and Industry
>     Handelsregister: Amtsgericht Hildesheim, HRA 2686
>       Hannoversche Str. 2, 31134 Hildesheim, Germany
>     Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-dev

Re: [patch 01/16] remove inclusion of asm/processor.h for powerpc

[Sascha Hauer]

On Fri, Nov 03, 2006 at 09:20:20AM +1100, Benjamin Herrenschmidt wrote:
> On Thu, 2006-11-02 at 13:55 +0100, s.hauer@pengutronix.de wrote:
> > plain text document attachment
> > (drivers-ide-pci-via82xxx-remove-ppc-ifdef.diff)
> > Remove inclusion of asm/processor.h for powerpc. It was used for
> > some ppc specific hook in this file, but the hook is gone
> 
> It's not:
> 
> init_hwif_via82cxxx() contains:
> 
> #if defined(CONFIG_PPC_CHRP) && defined(CONFIG_PPC32)
>         if(machine_is(chrp) && _chrp_type == _CHRP_Pegasos) {
>                 hwif->irq = hwif->channel ? 15 : 14;
>         }
> #endif
> 
> Now you can replace CONFIG_PPC_MULTIPLATFORM with CONFIG_PPC_CHRP
> 

Oops, missed that one. Here is an updated version:

Remove inclusion of asm/processor.h for powerpc. It was used for
some ppc specific hook in this file, but the hook is gone

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Index: drivers/ide/pci/via82cxxx.c
===================================================================
--- drivers/ide/pci/via82cxxx.c.orig
+++ drivers/ide/pci/via82cxxx.c
@@ -35,7 +35,7 @@
 #include <linux/ide.h>
 #include <asm/io.h>
 
-#ifdef CONFIG_PPC_MULTIPLATFORM
+#ifdef CONFIG_PPC_CHRP
 #include <asm/processor.h>
 #endif
 
@@ -442,7 +442,7 @@ static void __devinit init_hwif_via82cxx
 	hwif->speedproc = &via_set_drive;
 
 
-#if defined(CONFIG_PPC_CHRP) && defined(CONFIG_PPC32)
+#ifdef CONFIG_PPC_CHRP
 	if(machine_is(chrp) && _chrp_type == _CHRP_Pegasos) {
 		hwif->irq = hwif->channel ? 15 : 14;
 	}

-- 
 Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
  Pengutronix - Linux Solutions for Science and Industry
    Handelsregister: Amtsgericht Hildesheim, HRA 2686
      Hannoversche Str. 2, 31134 Hildesheim, Germany
    Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 04/16] powerpc: remove dead code in iommu.h

[Sascha Hauer]

On Fri, Nov 03, 2006 at 09:21:53AM +1100, Benjamin Herrenschmidt wrote:
> On Thu, 2006-11-02 at 13:55 +0100, s.hauer@pengutronix.de wrote:
> > plain text document attachment
> > (powerpc-include-asm-powerpc-iommu_h-remove-dead-code.diff)
> > iommu_setup_pSeries() and iommu_setup_dart() are declared extern but are
> > not implemented, so remove them. iommu_free_table() is pSeries specific,
> > so #ifdef it with CONFIG_PPC_PSERIES and not CONFIG_PPC_MULTIPLATFORM
> > 
> > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> 
> There is no need to #ifdef an extern declaration. Just remove the
> ifdef's and the two obsolete prototypes alltogether
> 

Here we go:

iommu_setup_pSeries() and iommu_setup_dart() are declared extern but are
not implemented, so remove them. iommu_free_table() is pSeries specific,
so #ifdef it with CONFIG_PPC_PSERIES and not CONFIG_PPC_MULTIPLATFORM

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Index: include/asm-powerpc/iommu.h
===================================================================
--- a/include/asm-powerpc/iommu.h.orig
+++ b/include/asm-powerpc/iommu.h
@@ -70,17 +70,9 @@ struct iommu_table {
 struct scatterlist;
 struct device_node;
 
-#ifdef CONFIG_PPC_MULTIPLATFORM
-
-/* Walks all buses and creates iommu tables */
-extern void iommu_setup_pSeries(void);
-extern void iommu_setup_dart(void);
-
 /* Frees table for an individual device node */
 extern void iommu_free_table(struct device_node *dn);
 
-#endif /* CONFIG_PPC_MULTIPLATFORM */
-
 /* Initializes an iommu_table based in values set in the passed-in
  * structure
  */

-- 
 Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
  Pengutronix - Linux Solutions for Science and Industry
    Handelsregister: Amtsgericht Hildesheim, HRA 2686
      Hannoversche Str. 2, 31134 Hildesheim, Germany
    Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 01/16] remove inclusion of asm/processor.h for powerpc

[Sascha Hauer]

I Sent a -p0 patch by accident, forget the last one.

There is some PPC_CHRP specific code in drivers/ide/pci/via82cxxx.c,
so #ifdef on CONFIG_PPC_CHRP instead of CONFIG_PPC_MULTIPLATFORM.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Index: drivers/ide/pci/via82cxxx.c
===================================================================
--- a/drivers/ide/pci/via82cxxx.c.orig
+++ b/drivers/ide/pci/via82cxxx.c
@@ -35,7 +35,7 @@
 #include <linux/ide.h>
 #include <asm/io.h>
 
-#ifdef CONFIG_PPC_MULTIPLATFORM
+#ifdef CONFIG_PPC_CHRP
 #include <asm/processor.h>
 #endif
 
@@ -442,7 +442,7 @@ static void __devinit init_hwif_via82cxx
 	hwif->speedproc = &via_set_drive;
 
 
-#if defined(CONFIG_PPC_CHRP) && defined(CONFIG_PPC32)
+#ifdef CONFIG_PPC_CHRP
 	if(machine_is(chrp) && _chrp_type == _CHRP_Pegasos) {
 		hwif->irq = hwif->channel ? 15 : 14;
 	}



-- 
 Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
  Pengutronix - Linux Solutions for Science and Industry
    Handelsregister: Amtsgericht Hildesheim, HRA 2686
      Hannoversche Str. 2, 31134 Hildesheim, Germany
    Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 08/16] powerpc: remove EMBEDDED6xx Kconfig entry

[Sascha Hauer]

On Fri, Nov 03, 2006 at 09:13:08AM +1100, Benjamin Herrenschmidt wrote:
> 
> > Then perhaps Efika should also be under platforms/mpc52xx?
> 
> Classifying platforms by their processor might not be the best idea... I
> makes some sense when those platforms are basically reference designs
> for the said processor but I yet have to be convinced it's really a good
> thing in the long run :)
> 
> There will be a lot of platforms that will consist of basically once
> signle source file. I think we need a directory for those. Maybe
> platform/misc :) Or we could have them at the root of platforms/ in
> fact... 
> 

In the embedded world there are many vendors of custom boards, so
such a directory might become very big, even if there is only one
file per board. Also I like the idea that I see all affected boards at
first sight when I change something in lets say the mpc52xx interrupt
controller.
I don't know how this performs in the 'big computer world' where vendors
combine a cpu with different chipsets. In the SoC world where every SoC
has the very same interrupt controller and device layout this behaves
quite well. Things become very orthogonal with per SoC directories.
(I'm more familiar with arm, where directories are organized this way,
so you might want to look at arch/arch/mach-* to see what I mean)

Sascha

-- 
 Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
  Pengutronix - Linux Solutions for Science and Industry
    Handelsregister: Amtsgericht Hildesheim, HRA 2686
      Hannoversche Str. 2, 31134 Hildesheim, Germany
    Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 13/16] powerpc: make prom_init.o dependent on PPC_OF

[Sascha Hauer]

On Fri, Nov 03, 2006 at 09:34:13AM +1100, Benjamin Herrenschmidt wrote:
> 
> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> 
> Note that CONFIG_PPC_OF is always set in arch/powerpc since that
> includes support for the flat device-tree... We might want to keep a
> separate option for prom_init.c, though I'm not too big about it right
> now. Maybe CONFIG_PPC_BOOT_FROM_OF :) That would allow custom kernel to
> be shrunk down if they don't need to support platforms that are known
> not to have a real OF (iSeries for example).
> 

I don't know yet where the exact boarders are in the code between real
OF and flat device tree. Maybe I can look at it once I have a proper
device tree for my board.
Out of curiosity I just disabled CONFIG_PPC_OF. There were two undefined
references to functions I didn't need at the moment. After commenting
them out the kernel compiled and booted. It saved me ~10k kernelsize,
but ok, I thought I would still have flat tree support.

Sascha

-- 
 Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
  Pengutronix - Linux Solutions for Science and Industry
    Handelsregister: Amtsgericht Hildesheim, HRA 2686
      Hannoversche Str. 2, 31134 Hildesheim, Germany
    Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 13/16] powerpc: make prom_init.o dependent on PPC_OF

[Benjamin Herrenschmidt]

> I don't know yet where the exact boarders are in the code between real
> OF and flat device tree. Maybe I can look at it once I have a proper
> device tree for my board.
> Out of curiosity I just disabled CONFIG_PPC_OF. There were two undefined
> references to functions I didn't need at the moment. After commenting
> them out the kernel compiled and booted. It saved me ~10k kernelsize,
> but ok, I thought I would still have flat tree support.

Hrm... it's unclear, I think we changed it a couple of times. In fact,
since the flat DT support is mandatory, I suppose CONFIG_PPC_OF could be
used as "supports booting from a real OF". But in this case, prom_init
is really the only thing that should be covered by it.

Right now, it's used for bits in pci_32.c which should always be enabled
for arch/powerpc so ...

Also, I think we could safely get rid of the pci_OF_bus_map. I don't
think it's ever been used and we have the devspec files now.

Ben.

Re: [patch 01/16] remove inclusion of asm/processor.h for powerpc

[Benjamin Herrenschmidt]

On Fri, 2006-11-03 at 09:42 +0100, Sascha Hauer wrote:
> On Fri, Nov 03, 2006 at 09:20:20AM +1100, Benjamin Herrenschmidt wrote:
> > On Thu, 2006-11-02 at 13:55 +0100, s.hauer@pengutronix.de wrote:
> > > plain text document attachment
> > > (drivers-ide-pci-via82xxx-remove-ppc-ifdef.diff)
> > > Remove inclusion of asm/processor.h for powerpc. It was used for
> > > some ppc specific hook in this file, but the hook is gone
> > 
> > It's not:
> > 
> > init_hwif_via82cxxx() contains:
> > 
> > #if defined(CONFIG_PPC_CHRP) && defined(CONFIG_PPC32)
> >         if(machine_is(chrp) && _chrp_type == _CHRP_Pegasos) {
> >                 hwif->irq = hwif->channel ? 15 : 14;
> >         }
> > #endif
> > 
> > Now you can replace CONFIG_PPC_MULTIPLATFORM with CONFIG_PPC_CHRP
> > 
> 
> Oops, missed that one. Here is an updated version:
> 
> Remove inclusion of asm/processor.h for powerpc. It was used for
> some ppc specific hook in this file, but the hook is gone
> 
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

You should update the changelog comment :)

Ben.

Re: [patch 04/16] powerpc: remove dead code in iommu.h

[Benjamin Herrenschmidt]

On Fri, 2006-11-03 at 09:47 +0100, Sascha Hauer wrote:
> On Fri, Nov 03, 2006 at 09:21:53AM +1100, Benjamin Herrenschmidt wrote:
> > On Thu, 2006-11-02 at 13:55 +0100, s.hauer@pengutronix.de wrote:
> > > plain text document attachment
> > > (powerpc-include-asm-powerpc-iommu_h-remove-dead-code.diff)
> > > iommu_setup_pSeries() and iommu_setup_dart() are declared extern but are
> > > not implemented, so remove them. iommu_free_table() is pSeries specific,
> > > so #ifdef it with CONFIG_PPC_PSERIES and not CONFIG_PPC_MULTIPLATFORM
> > > 
> > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> > 
> > There is no need to #ifdef an extern declaration. Just remove the
> > ifdef's and the two obsolete prototypes alltogether
> > 
> 
> Here we go:
> 
> iommu_setup_pSeries() and iommu_setup_dart() are declared extern but are
> not implemented, so remove them. iommu_free_table() is pSeries specific,
> so #ifdef it with CONFIG_PPC_PSERIES and not CONFIG_PPC_MULTIPLATFORM

Same here :-)

Ben.

> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> 
> Index: include/asm-powerpc/iommu.h
> ===================================================================
> --- a/include/asm-powerpc/iommu.h.orig
> +++ b/include/asm-powerpc/iommu.h
> @@ -70,17 +70,9 @@ struct iommu_table {
>  struct scatterlist;
>  struct device_node;
>  
> -#ifdef CONFIG_PPC_MULTIPLATFORM
> -
> -/* Walks all buses and creates iommu tables */
> -extern void iommu_setup_pSeries(void);
> -extern void iommu_setup_dart(void);
> -
>  /* Frees table for an individual device node */
>  extern void iommu_free_table(struct device_node *dn);
>  
> -#endif /* CONFIG_PPC_MULTIPLATFORM */
> -
>  /* Initializes an iommu_table based in values set in the passed-in
>   * structure
>   */
> 

Re: [patch 01/16] remove inclusion of asm/processor.h for powerpc

[Benjamin Herrenschmidt]

On Fri, 2006-11-03 at 09:52 +0100, Sascha Hauer wrote:
> I Sent a -p0 patch by accident, forget the last one.
> 
> There is some PPC_CHRP specific code in drivers/ide/pci/via82cxxx.c,
> so #ifdef on CONFIG_PPC_CHRP instead of CONFIG_PPC_MULTIPLATFORM.
> 
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

> Index: drivers/ide/pci/via82cxxx.c
> ===================================================================
> --- a/drivers/ide/pci/via82cxxx.c.orig
> +++ b/drivers/ide/pci/via82cxxx.c
> @@ -35,7 +35,7 @@
>  #include <linux/ide.h>
>  #include <asm/io.h>
>  
> -#ifdef CONFIG_PPC_MULTIPLATFORM
> +#ifdef CONFIG_PPC_CHRP
>  #include <asm/processor.h>
>  #endif
>  
> @@ -442,7 +442,7 @@ static void __devinit init_hwif_via82cxx
>  	hwif->speedproc = &via_set_drive;
>  
> 
> -#if defined(CONFIG_PPC_CHRP) && defined(CONFIG_PPC32)
> +#ifdef CONFIG_PPC_CHRP
>  	if(machine_is(chrp) && _chrp_type == _CHRP_Pegasos) {
>  		hwif->irq = hwif->channel ? 15 : 14;
>  	}
> 
> 
> 

Re: [patch 04/16] powerpc: remove dead code in iommu.h

[Sascha Hauer]

Subject: powerpc: remove dead code in iommu.h
From: Sascha Hauer <s.hauer@pengutronix.de>

iommu_setup_pSeries() and iommu_setup_dart() are declared extern but are
not implemented, so remove them. Remove ifdef around extern function
declaration.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Index: include/asm-powerpc/iommu.h
===================================================================
--- a/include/asm-powerpc/iommu.h.orig
+++ b/include/asm-powerpc/iommu.h
@@ -70,17 +70,9 @@ struct iommu_table {
 struct scatterlist;
 struct device_node;
 
-#ifdef CONFIG_PPC_MULTIPLATFORM
-
-/* Walks all buses and creates iommu tables */
-extern void iommu_setup_pSeries(void);
-extern void iommu_setup_dart(void);
-
 /* Frees table for an individual device node */
 extern void iommu_free_table(struct device_node *dn);
 
-#endif /* CONFIG_PPC_MULTIPLATFORM */
-
 /* Initializes an iommu_table based in values set in the passed-in
  * structure
  */

-- 
 Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
  Pengutronix - Linux Solutions for Science and Industry
    Handelsregister: Amtsgericht Hildesheim, HRA 2686
      Hannoversche Str. 2, 31134 Hildesheim, Germany
    Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 00/16] powerpc cleanup patches

[Sascha Hauer]

Hi all and Ben,

What's the further way with these patches (at least the the ones Ben
acked)? Are they picked up from here or shall I post them to the patch
system?

Sascha

-- 
 Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
  Pengutronix - Linux Solutions for Science and Industry
    Handelsregister: Amtsgericht Hildesheim, HRA 2686
      Hannoversche Str. 2, 31134 Hildesheim, Germany
    Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 00/16] powerpc cleanup patches

[Benjamin Herrenschmidt]

On Thu, 2006-11-16 at 17:20 +0100, Sascha Hauer wrote:
> Hi all and Ben,
> 
> What's the further way with these patches (at least the the ones Ben
> acked)? Are they picked up from here or shall I post them to the patch
> system?

Paulus should pick them up if he didn't already.

Ben.

Re: [patch 00/16] powerpc cleanup patches

[Paul Mackerras]

Sascha Hauer writes:

> What's the further way with these patches (at least the the ones Ben
> acked)? Are they picked up from here or shall I post them to the patch
> system?

I picked up the ones that there was agreement on or that seemed
obvious, and they are now in the powerpc.git tree on the for-2.6.20
and master branches.  As for the rest, if you want them in you'll need
to repost them with the changes that were requested, or else convince
people that your original patch is actually correct.

Paul.

Re: [patch 00/16] powerpc cleanup patches

[Sascha Hauer]

On Tue, Nov 21, 2006 at 09:15:11AM +1100, Paul Mackerras wrote:
> Sascha Hauer writes:
> 
> > What's the further way with these patches (at least the the ones Ben
> > acked)? Are they picked up from here or shall I post them to the patch
> > system?
> 
> I picked up the ones that there was agreement on or that seemed
> obvious, and they are now in the powerpc.git tree on the for-2.6.20
> and master branches.  As for the rest, if you want them in you'll need
> to repost them with the changes that were requested, or else convince
> people that your original patch is actually correct.

Ah, thank you. I wasn't aware of your git tree. I'll look at the rest of
the patches soon.

Sascha

-- 
 Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
  Pengutronix - Linux Solutions for Science and Industry
    Handelsregister: Amtsgericht Hildesheim, HRA 2686
      Hannoversche Str. 2, 31134 Hildesheim, Germany
    Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9

Re: [patch 08/16] powerpc: remove EMBEDDED6xx Kconfig entry

[Grant Likely]

On 11/2/06, s.hauer@pengutronix.de <s.hauer@pengutronix.de> wrote:
> remove EMBEDDED6xx Kconfig entry
>
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

FWIW, I'm going to say ACK on this one.  Since this discussion, I've
moved my lite5200 support out of platforms/embedded6xx and changed it
to use CONFIG_PPC_MULTIPLATFORM

Cheers,
g.


>
> Index: linux-2.6/arch/powerpc/Kconfig
> ===================================================================
> --- linux-2.6.orig/arch/powerpc/Kconfig
> +++ linux-2.6/arch/powerpc/Kconfig
> @@ -338,10 +338,6 @@ config PPC_MULTIPLATFORM
>           RS/6000 machine, an Apple machine, or a PReP, CHRP,
>           Maple or Cell-based machine.
>
> -config EMBEDDED6xx
> -       bool "Embedded 6xx/7xx/7xxx-based board"
> -       depends on PPC32 && (BROKEN||BROKEN_ON_SMP)
> -
>  config APUS
>         bool "Amiga-APUS"
>         depends on PPC32 && BROKEN
>
> --
>  Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
>   Pengutronix - Linux Solutions for Science and Industry
>     Handelsregister: Amtsgericht Hildesheim, HRA 2686
>       Hannoversche Str. 2, 31134 Hildesheim, Germany
>     Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-dev
>


-- 
Grant Likely, B.Sc. P.Eng.
Secret Lab Technologies Ltd.
grant.likely@secretlab.ca
(403) 399-0195