linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
* [RFC PATCH 2/3] Add initial iomega StorCenter board port.
@ 2008-01-07 17:55 Jon Loeliger
  2008-01-07 19:31 ` Grant Likely
  2008-01-07 20:42 ` Scott Wood
  0 siblings, 2 replies; 6+ messages in thread
From: Jon Loeliger @ 2008-01-07 17:55 UTC (permalink / raw)
  To: linuxppc-dev


Use cuImage bootwrapper until U-Boot port is completed.
Derived heavily from Linkstation port.

Signed-off-by: Andy Wilcox <andy@protium.com>
Signed-off-by: Jon Loeliger <jdl@jdl.com>
---

Nope, I have NOT verified that the bd_t file that
is used here byte-identical to U-Boot's layout yet.
[ There is _always_ something more to do... ]

 arch/powerpc/boot/Makefile                      |    3 +-
 arch/powerpc/boot/cuboot-824x.c                 |   52 ++++++++
 arch/powerpc/platforms/embedded6xx/Kconfig      |   15 ++-
 arch/powerpc/platforms/embedded6xx/Makefile     |    2 +
 arch/powerpc/platforms/embedded6xx/storcenter.c |  158 +++++++++++++++++++++++
 5 files changed, 227 insertions(+), 3 deletions(-)
 create mode 100644 arch/powerpc/boot/cuboot-824x.c
 create mode 100644 arch/powerpc/platforms/embedded6xx/storcenter.c

diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index d1e625c..a59b176 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -57,7 +57,7 @@ src-wlib := string.S crt0.S stdio.c main.c \
 		4xx.c ebony.c mv64x60.c mpsc.c mv64x60_i2c.c cuboot.c bamboo.c \
 		cpm-serial.c stdlib.c mpc52xx-psc.c planetcore.c uartlite.c \
 		fsl-soc.c mpc8xx.c pq2.c
-src-plat := of.c cuboot-52xx.c cuboot-83xx.c cuboot-85xx.c holly.c \
+src-plat := of.c cuboot-52xx.c cuboot-824x.c cuboot-83xx.c cuboot-85xx.c holly.c \
 		cuboot-ebony.c treeboot-ebony.c prpmc2800.c \
 		ps3-head.S ps3-hvcall.S ps3.c treeboot-bamboo.c cuboot-8xx.c \
 		cuboot-pq2.c cuboot-sequoia.c treeboot-walnut.c cuboot-bamboo.c \
@@ -196,6 +196,7 @@ image-$(CONFIG_PPC_EP88XC)		+= zImage.ep88xc
 image-$(CONFIG_EP405)			+= zImage.ep405
 image-$(CONFIG_8260)			+= cuImage.pq2
 image-$(CONFIG_PPC_MPC52xx)		+= cuImage.52xx
+image-$(CONFIG_STORCENTER)		+= cuImage.824x
 image-$(CONFIG_PPC_83xx)		+= cuImage.83xx
 image-$(CONFIG_PPC_85xx)		+= cuImage.85xx
 image-$(CONFIG_MPC7448HPC2)		+= cuImage.hpc2
diff --git a/arch/powerpc/boot/cuboot-824x.c b/arch/powerpc/boot/cuboot-824x.c
new file mode 100644
index 0000000..4aa3eee
--- /dev/null
+++ b/arch/powerpc/boot/cuboot-824x.c
@@ -0,0 +1,52 @@
+/*
+ * Old U-boot compatibility for 824x
+ *
+ * Copyright (c) 2007 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 version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include "ops.h"
+#include "stdio.h"
+#include "cuboot.h"
+
+#define TARGET_824x
+#include "ppcboot.h"
+
+static bd_t bd;
+
+static void platform_fixups(void)
+{
+	void *soc;
+
+	dt_fixup_memory(bd.bi_memstart, bd.bi_memsize);
+	dt_fixup_mac_addresses(bd.bi_enetaddr);
+	dt_fixup_cpu_clocks(bd.bi_intfreq, bd.bi_busfreq / 4, bd.bi_busfreq);
+
+	soc = find_node_by_devtype(NULL, "soc");
+	if (soc) {
+		void *serial = NULL;
+
+		setprop(soc, "bus-frequency", &bd.bi_busfreq,
+		        sizeof(bd.bi_busfreq));
+
+		while ((serial = find_node_by_devtype(serial, "serial"))) {
+			if (get_parent(serial) != soc)
+				continue;
+
+			setprop(serial, "clock-frequency", &bd.bi_busfreq,
+			        sizeof(bd.bi_busfreq));
+		}
+	}
+}
+
+void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
+                   unsigned long r6, unsigned long r7)
+{
+	CUBOOT_INIT();
+	fdt_init(_dtb_start);
+	serial_console_init();
+	platform_ops.fixups = platform_fixups;
+}
diff --git a/arch/powerpc/platforms/embedded6xx/Kconfig b/arch/powerpc/platforms/embedded6xx/Kconfig
index 8924095..be5cdd2 100644
--- a/arch/powerpc/platforms/embedded6xx/Kconfig
+++ b/arch/powerpc/platforms/embedded6xx/Kconfig
@@ -16,6 +16,17 @@ config LINKSTATION
 	  Linkstation-I HD-HLAN and HD-HGLAN versions, and PPC-based
 	  Terastation systems should be supported too.
 
+config STORCENTER
+	bool "IOMEGA StorCenter"
+	depends on EMBEDDED6xx
+	select MPIC
+	select FSL_SOC
+	select PPC_UDBG_16550 if SERIAL_8250
+	select WANT_DEVICE_TREE
+	help
+	  Select STORCENTER if configuring for the iomega StorCenter
+	  with an 8241 CPU in it.
+
 config MPC7448HPC2
 	bool "Freescale MPC7448HPC2(Taiga)"
 	depends on EMBEDDED6xx
@@ -56,7 +67,7 @@ config TSI108_BRIDGE
 
 config MPC10X_BRIDGE
 	bool
-	depends on LINKSTATION
+	depends on LINKSTATION || STORCENTER
 	select PPC_INDIRECT_PCI
 	default y
 
@@ -67,7 +78,7 @@ config MV64X60
 
 config MPC10X_OPENPIC
 	bool
-	depends on LINKSTATION
+	depends on LINKSTATION || STORCENTER
 	default y
 
 config MPC10X_STORE_GATHERING
diff --git a/arch/powerpc/platforms/embedded6xx/Makefile b/arch/powerpc/platforms/embedded6xx/Makefile
index 844947c..f4fb280 100644
--- a/arch/powerpc/platforms/embedded6xx/Makefile
+++ b/arch/powerpc/platforms/embedded6xx/Makefile
@@ -3,5 +3,7 @@
 #
 obj-$(CONFIG_MPC7448HPC2)	+= mpc7448_hpc2.o
 obj-$(CONFIG_LINKSTATION)	+= linkstation.o ls_uart.o
+obj-$(CONFIG_STORCENTER)	+= storcenter.o
 obj-$(CONFIG_PPC_HOLLY)		+= holly.o
 obj-$(CONFIG_PPC_PRPMC2800)	+= prpmc2800.o
+obj-$(CONFIG_STORCENTER)	+= storcenter.o
diff --git a/arch/powerpc/platforms/embedded6xx/storcenter.c b/arch/powerpc/platforms/embedded6xx/storcenter.c
new file mode 100644
index 0000000..90ba119
--- /dev/null
+++ b/arch/powerpc/platforms/embedded6xx/storcenter.c
@@ -0,0 +1,158 @@
+/*
+ * Board setup routines for the storcenter
+ *
+ * Copyright 2007 (C) Oyvind Repvik (nail@nslu2-linux.org)
+ * Copyright 2007 Andy Wilcox, Jon Loeliger
+ *
+ * Based on linkstation.c by G. Liakhovetski
+ *
+ * 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.
+ */
+
+#include <linux/kernel.h>
+#include <linux/pci.h>
+#include <linux/initrd.h>
+#include <linux/mtd/physmap.h>
+#include <linux/of_platform.h>
+
+#include <asm/time.h>
+#include <asm/prom.h>
+#include <asm/mpic.h>
+#include <asm/pci-bridge.h>
+
+#include "mpc10x.h"
+
+static int __init storcenter_add_bridge(struct device_node *dev)
+{
+#ifdef CONFIG_PCI
+	int len;
+	struct pci_controller *hose;
+	const int *bus_range;
+
+	printk("Adding PCI host bridge %s\n", dev->full_name);
+
+	bus_range = of_get_property(dev, "bus-range", &len);
+	if (bus_range == NULL || len < 2 * sizeof(int))
+		printk(KERN_WARNING "Can't get bus-range for %s, assume"
+				" bus 0\n", dev->full_name);
+
+	hose = pcibios_alloc_controller(dev);
+	if (hose == NULL)
+		return -ENOMEM;
+	hose->first_busno = bus_range ? bus_range[0] : 0;
+	hose->last_busno = bus_range ? bus_range[1] : 0xff;
+
+	setup_indirect_pci(hose, MPC10X_MAPB_CNFG_ADDR, MPC10X_MAPB_CNFG_DATA, 0);
+
+	/* Interpret the "ranges" property */
+	/* This also maps the I/O region and sets isa_io/mem_base */
+	pci_process_bridge_OF_ranges(hose, dev, 1);
+#endif
+
+	return 0;
+}
+
+static void __init storcenter_setup_arch(void)
+{
+	struct device_node *np;
+
+	/* Lookup PCI host bridges */
+	for_each_compatible_node(np, "pci", "mpc10x-pci")
+		storcenter_add_bridge(np);
+
+	printk(KERN_INFO "IOMEGA StorCenter\n");
+}
+
+/*
+ * Interrupt setup and service.  Interrrupts on the turbostation come
+ * from the four PCI slots plus onboard 8241 devices: I2C, DUART.
+ */
+static void __init storcenter_init_IRQ(void)
+{
+	struct mpic *mpic;
+	struct device_node *dnp;
+	const void *prop;
+	int size;
+	phys_addr_t paddr;
+
+	dnp = of_find_node_by_type(NULL, "open-pic");
+	if (dnp == NULL)
+		return;
+
+	prop = of_get_property(dnp, "reg", &size);
+	paddr = (phys_addr_t)of_translate_address(dnp, prop);
+	mpic = mpic_alloc(dnp, paddr, MPIC_PRIMARY | MPIC_WANTS_RESET,
+			4, 32, " EPIC     ");
+	BUG_ON(mpic == NULL);
+
+	/* PCI IRQs */
+	/*
+	 * 2.6.12 patch:
+	 *         openpic_set_sources(0, 5, OpenPIC_Addr + 0x10200);
+	 *         openpic_set_sources(5, 2, OpenPIC_Addr + 0x11120);
+	 *         first_irq, num_irqs, __iomem first_ISR
+	 *         o_ss: i, src: 0, fdf50200 
+	 *         o_ss: i, src: 1, fdf50220
+	 *         o_ss: i, src: 2, fdf50240
+	 *         o_ss: i, src: 3, fdf50260
+	 *         o_ss: i, src: 4, fdf50280
+	 *         o_ss: i, src: 5, fdf51120
+	 *         o_ss: i, src: 6, fdf51140
+	 */
+	mpic_assign_isu(mpic, 0, paddr + 0x10200);
+	mpic_assign_isu(mpic, 1, paddr + 0x10220);
+	mpic_assign_isu(mpic, 2, paddr + 0x10240);
+	mpic_assign_isu(mpic, 3, paddr + 0x10260);
+	mpic_assign_isu(mpic, 4, paddr + 0x10280);
+	mpic_assign_isu(mpic, 5, paddr + 0x11120);
+	mpic_assign_isu(mpic, 6, paddr + 0x11140);
+
+	mpic_init(mpic);
+}
+
+static void storcenter_restart(char *cmd)
+{
+	/* Insert restart-stuff */
+}
+
+static void storcenter_power_off(void)
+{
+	/* Insert powerdown-stuff */
+}
+
+static void storcenter_halt(void)
+{
+	storcenter_power_off();
+}
+
+static void storcenter_show_cpuinfo(struct seq_file *m)
+{
+	seq_printf(m, "vendor\t\t: IOMEGA\n");
+	seq_printf(m, "machine\t\t: StorCenter\n");
+}
+
+static int __init storcenter_probe(void)
+{
+	unsigned long root;
+
+	root = of_get_flat_dt_root();
+
+	if (!of_flat_dt_is_compatible(root, "storcenter"))
+		return 0;
+	return 1;
+}
+
+define_machine(storcenter){
+	.name 			= "IOMEGA StorCenter",
+	.probe 			= storcenter_probe,
+	.setup_arch 		= storcenter_setup_arch,
+	.init_IRQ 		= storcenter_init_IRQ,
+	.show_cpuinfo 		= storcenter_show_cpuinfo,
+	.get_irq 		= mpic_get_irq,
+	.restart 		= storcenter_restart,
+	.power_off 		= storcenter_power_off,
+	.halt	 		= storcenter_halt,
+	.calibrate_decr 	= generic_calibrate_decr,
+};
-- 
1.5.4.rc0

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [RFC PATCH 2/3] Add initial iomega StorCenter board port.
  2008-01-07 17:55 [RFC PATCH 2/3] Add initial iomega StorCenter board port Jon Loeliger
@ 2008-01-07 19:31 ` Grant Likely
  2008-01-07 20:13   ` Jon Loeliger
  2008-01-07 20:42 ` Scott Wood
  1 sibling, 1 reply; 6+ messages in thread
From: Grant Likely @ 2008-01-07 19:31 UTC (permalink / raw)
  To: Jon Loeliger; +Cc: linuxppc-dev

On 1/7/08, Jon Loeliger <jdl@jdl.com> wrote:
>
> Use cuImage bootwrapper until U-Boot port is completed.
> Derived heavily from Linkstation port.
>
> Signed-off-by: Andy Wilcox <andy@protium.com>
> Signed-off-by: Jon Loeliger <jdl@jdl.com>
> ---
>
> diff --git a/arch/powerpc/platforms/embedded6xx/Kconfig b/arch/powerpc/platforms/embedded6xx/Kconfig
> index 8924095..be5cdd2 100644
> --- a/arch/powerpc/platforms/embedded6xx/Kconfig
> +++ b/arch/powerpc/platforms/embedded6xx/Kconfig

Curious; why in platforms/embedded6xx vs platforms/82xx?

> diff --git a/arch/powerpc/platforms/embedded6xx/Makefile b/arch/powerpc/platforms/embedded6xx/Makefile
> index 844947c..f4fb280 100644
> --- a/arch/powerpc/platforms/embedded6xx/Makefile
> +++ b/arch/powerpc/platforms/embedded6xx/Makefile
> @@ -3,5 +3,7 @@
>  #
>  obj-$(CONFIG_MPC7448HPC2)      += mpc7448_hpc2.o
>  obj-$(CONFIG_LINKSTATION)      += linkstation.o ls_uart.o
> +obj-$(CONFIG_STORCENTER)       += storcenter.o
>  obj-$(CONFIG_PPC_HOLLY)                += holly.o
>  obj-$(CONFIG_PPC_PRPMC2800)    += prpmc2800.o
> +obj-$(CONFIG_STORCENTER)       += storcenter.o

Linked twice?

Cheers,
g.

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [RFC PATCH 2/3] Add initial iomega StorCenter board port.
  2008-01-07 19:31 ` Grant Likely
@ 2008-01-07 20:13   ` Jon Loeliger
  0 siblings, 0 replies; 6+ messages in thread
From: Jon Loeliger @ 2008-01-07 20:13 UTC (permalink / raw)
  To: Grant Likely; +Cc: linuxppc-dev, andy

So, like, the other day "Grant Likely" mumbled:
> 
> Curious; why in platforms/embedded6xx vs platforms/82xx?

82xx is nominally the _other_ 82xx family. :-)
This is just more historical precedent, and the fact
that it is similar to the linkstation there.

> >  obj-$(CONFIG_MPC7448HPC2)      += mpc7448_hpc2.o
> >  obj-$(CONFIG_LINKSTATION)      += linkstation.o ls_uart.o
> > +obj-$(CONFIG_STORCENTER)       += storcenter.o
> >  obj-$(CONFIG_PPC_HOLLY)                += holly.o
> >  obj-$(CONFIG_PPC_PRPMC2800)    += prpmc2800.o
> > +obj-$(CONFIG_STORCENTER)       += storcenter.o
> 
> Linked twice?

I wanted to make double-sure to screw it up.  You know. :-)

Thanks,
jdl

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [RFC PATCH 2/3] Add initial iomega StorCenter board port.
  2008-01-07 17:55 [RFC PATCH 2/3] Add initial iomega StorCenter board port Jon Loeliger
  2008-01-07 19:31 ` Grant Likely
@ 2008-01-07 20:42 ` Scott Wood
  2008-01-07 21:10   ` Jon Loeliger
  1 sibling, 1 reply; 6+ messages in thread
From: Scott Wood @ 2008-01-07 20:42 UTC (permalink / raw)
  To: Jon Loeliger; +Cc: linuxppc-dev

Jon Loeliger wrote:
> Use cuImage bootwrapper until U-Boot port is completed.
> Derived heavily from Linkstation port.
> 
> Signed-off-by: Andy Wilcox <andy@protium.com>
> Signed-off-by: Jon Loeliger <jdl@jdl.com>
> ---
> 
> Nope, I have NOT verified that the bd_t file that
> is used here byte-identical to U-Boot's layout yet.
> [ There is _always_ something more to do... ]
> 
>  arch/powerpc/boot/Makefile                      |    3 +-
>  arch/powerpc/boot/cuboot-824x.c                 |   52 ++++++++
>  arch/powerpc/platforms/embedded6xx/Kconfig      |   15 ++-
>  arch/powerpc/platforms/embedded6xx/Makefile     |    2 +
>  arch/powerpc/platforms/embedded6xx/storcenter.c |  158 +++++++++++++++++++++++
>  5 files changed, 227 insertions(+), 3 deletions(-)
>  create mode 100644 arch/powerpc/boot/cuboot-824x.c
>  create mode 100644 arch/powerpc/platforms/embedded6xx/storcenter.c
> 
> diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
> index d1e625c..a59b176 100644
> --- a/arch/powerpc/boot/Makefile
> +++ b/arch/powerpc/boot/Makefile
> @@ -57,7 +57,7 @@ src-wlib := string.S crt0.S stdio.c main.c \
>  		4xx.c ebony.c mv64x60.c mpsc.c mv64x60_i2c.c cuboot.c bamboo.c \
>  		cpm-serial.c stdlib.c mpc52xx-psc.c planetcore.c uartlite.c \
>  		fsl-soc.c mpc8xx.c pq2.c
> -src-plat := of.c cuboot-52xx.c cuboot-83xx.c cuboot-85xx.c holly.c \
> +src-plat := of.c cuboot-52xx.c cuboot-824x.c cuboot-83xx.c cuboot-85xx.c holly.c \
>  		cuboot-ebony.c treeboot-ebony.c prpmc2800.c \
>  		ps3-head.S ps3-hvcall.S ps3.c treeboot-bamboo.c cuboot-8xx.c \
>  		cuboot-pq2.c cuboot-sequoia.c treeboot-walnut.c cuboot-bamboo.c \
> @@ -196,6 +196,7 @@ image-$(CONFIG_PPC_EP88XC)		+= zImage.ep88xc
>  image-$(CONFIG_EP405)			+= zImage.ep405
>  image-$(CONFIG_8260)			+= cuImage.pq2
>  image-$(CONFIG_PPC_MPC52xx)		+= cuImage.52xx
> +image-$(CONFIG_STORCENTER)		+= cuImage.824x
>  image-$(CONFIG_PPC_83xx)		+= cuImage.83xx
>  image-$(CONFIG_PPC_85xx)		+= cuImage.85xx
>  image-$(CONFIG_MPC7448HPC2)		+= cuImage.hpc2
> diff --git a/arch/powerpc/boot/cuboot-824x.c b/arch/powerpc/boot/cuboot-824x.c
> new file mode 100644
> index 0000000..4aa3eee
> --- /dev/null
> +++ b/arch/powerpc/boot/cuboot-824x.c
> @@ -0,0 +1,52 @@
> +/*
> + * Old U-boot compatibility for 824x
> + *
> + * Copyright (c) 2007 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 version 2 as published
> + * by the Free Software Foundation.
> + */
> +
> +#include "ops.h"
> +#include "stdio.h"
> +#include "cuboot.h"
> +
> +#define TARGET_824x
> +#include "ppcboot.h"
> +
> +static bd_t bd;
> +
> +static void platform_fixups(void)
> +{
> +	void *soc;
> +
> +	dt_fixup_memory(bd.bi_memstart, bd.bi_memsize);
> +	dt_fixup_mac_addresses(bd.bi_enetaddr);
> +	dt_fixup_cpu_clocks(bd.bi_intfreq, bd.bi_busfreq / 4, bd.bi_busfreq);
> +
> +	soc = find_node_by_devtype(NULL, "soc");
> +	if (soc) {
> +		void *serial = NULL;
> +
> +		setprop(soc, "bus-frequency", &bd.bi_busfreq,
> +		        sizeof(bd.bi_busfreq));
> +
> +		while ((serial = find_node_by_devtype(serial, "serial"))) {
> +			if (get_parent(serial) != soc)
> +				continue;
> +
> +			setprop(serial, "clock-frequency", &bd.bi_busfreq,
> +			        sizeof(bd.bi_busfreq));
> +		}
> +	}
> +}
> +
> +void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
> +                   unsigned long r6, unsigned long r7)
> +{
> +	CUBOOT_INIT();
> +	fdt_init(_dtb_start);
> +	serial_console_init();
> +	platform_ops.fixups = platform_fixups;
> +}
> diff --git a/arch/powerpc/platforms/embedded6xx/Kconfig b/arch/powerpc/platforms/embedded6xx/Kconfig
> index 8924095..be5cdd2 100644
> --- a/arch/powerpc/platforms/embedded6xx/Kconfig
> +++ b/arch/powerpc/platforms/embedded6xx/Kconfig
> @@ -16,6 +16,17 @@ config LINKSTATION
>  	  Linkstation-I HD-HLAN and HD-HGLAN versions, and PPC-based
>  	  Terastation systems should be supported too.
>  
> +config STORCENTER
> +	bool "IOMEGA StorCenter"
> +	depends on EMBEDDED6xx
> +	select MPIC
> +	select FSL_SOC
> +	select PPC_UDBG_16550 if SERIAL_8250
> +	select WANT_DEVICE_TREE
> +	help
> +	  Select STORCENTER if configuring for the iomega StorCenter
> +	  with an 8241 CPU in it.
> +
>  config MPC7448HPC2
>  	bool "Freescale MPC7448HPC2(Taiga)"
>  	depends on EMBEDDED6xx
> @@ -56,7 +67,7 @@ config TSI108_BRIDGE
>  
>  config MPC10X_BRIDGE
>  	bool
> -	depends on LINKSTATION
> +	depends on LINKSTATION || STORCENTER
>  	select PPC_INDIRECT_PCI
>  	default y
>  
> @@ -67,7 +78,7 @@ config MV64X60
>  
>  config MPC10X_OPENPIC
>  	bool
> -	depends on LINKSTATION
> +	depends on LINKSTATION || STORCENTER
>  	default y

There are many boards out there with mpc10x chips; we really don't want 
to maintain a huge list of them in the dependency list of these options.

Can we take out the dependencies and the default y, and just select them 
in the individual board configs?

> +#ifdef CONFIG_PCI
> +	int len;
> +	struct pci_controller *hose;
> +	const int *bus_range;
> +
> +	printk("Adding PCI host bridge %s\n", dev->full_name);
> +
> +	bus_range = of_get_property(dev, "bus-range", &len);
> +	if (bus_range == NULL || len < 2 * sizeof(int))
> +		printk(KERN_WARNING "Can't get bus-range for %s, assume"
> +				" bus 0\n", dev->full_name);

This warning should probably go away.  Does this board even have 
multiple PCI host buses?  Why is this done from board-specific code, anyway?

> +static void storcenter_restart(char *cmd)
> +{
> +	/* Insert restart-stuff */
> +}
> +
> +static void storcenter_power_off(void)
> +{
> +	/* Insert powerdown-stuff */
> +}

Shouldn't these be omitted until they actually do something, so that the 
generic infinite loop implementations can be used?

> +static void storcenter_show_cpuinfo(struct seq_file *m)
> +{
> +	seq_printf(m, "vendor\t\t: IOMEGA\n");
> +	seq_printf(m, "machine\t\t: StorCenter\n");
> +}

ppc_md.name is printed by the generic cpuinfo handler; this is redundant.

-Scott

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [RFC PATCH 2/3] Add initial iomega StorCenter board port.
  2008-01-07 20:42 ` Scott Wood
@ 2008-01-07 21:10   ` Jon Loeliger
  2008-01-07 21:13     ` Scott Wood
  0 siblings, 1 reply; 6+ messages in thread
From: Jon Loeliger @ 2008-01-07 21:10 UTC (permalink / raw)
  To: Scott Wood; +Cc: linuxppc-dev, andy

So, like, the other day Scott Wood mumbled:

> > --- a/arch/powerpc/platforms/embedded6xx/Kconfig
> > +++ b/arch/powerpc/platforms/embedded6xx/Kconfig
> > @@ -16,6 +16,17 @@ config LINKSTATION
> >  	  Linkstation-I HD-HLAN and HD-HGLAN versions, and PPC-based
> >  	  Terastation systems should be supported too.
> >  
> > +config STORCENTER
> > +	bool "IOMEGA StorCenter"
> > +	depends on EMBEDDED6xx
> > +	select MPIC
> > +	select FSL_SOC
> > +	select PPC_UDBG_16550 if SERIAL_8250
> > +	select WANT_DEVICE_TREE
> > +	help
> > +	  Select STORCENTER if configuring for the iomega StorCenter
> > +	  with an 8241 CPU in it.
> > +
> >  config MPC7448HPC2
> >  	bool "Freescale MPC7448HPC2(Taiga)"
> >  	depends on EMBEDDED6xx
> > @@ -56,7 +67,7 @@ config TSI108_BRIDGE
> >  
> >  config MPC10X_BRIDGE
> >  	bool
> > -	depends on LINKSTATION
> > +	depends on LINKSTATION || STORCENTER
> >  	select PPC_INDIRECT_PCI
> >  	default y
> >  
> > @@ -67,7 +78,7 @@ config MV64X60
> >  
> >  config MPC10X_OPENPIC
> >  	bool
> > -	depends on LINKSTATION
> > +	depends on LINKSTATION || STORCENTER
> >  	default y
> 
> There are many boards out there with mpc10x chips; we really don't want 
> to maintain a huge list of them in the dependency list of these options.
> 
> Can we take out the dependencies and the default y, and just select them 
> in the individual board configs?

Yeah.  That and, shouldn't those choices be mutually
exclusive in a "choice" arrangement instead too?

> > +#ifdef CONFIG_PCI
> > +	int len;
> > +	struct pci_controller *hose;
> > +	const int *bus_range;
> > +
> > +	printk("Adding PCI host bridge %s\n", dev->full_name);
> > +
> > +	bus_range = of_get_property(dev, "bus-range", &len);
> > +	if (bus_range == NULL || len < 2 * sizeof(int))
> > +		printk(KERN_WARNING "Can't get bus-range for %s, assume"
> > +				" bus 0\n", dev->full_name);
> 
> This warning should probably go away.  Does this board even have 
> multiple PCI host buses?

Hmmm...  Yeah all likely true.

>  Why is this done from board-specific code, anyway?

History.

> > +static void storcenter_restart(char *cmd)
> > +{
> > +	/* Insert restart-stuff */
> > +}
> > +
> > +static void storcenter_power_off(void)
> > +{
> > +	/* Insert powerdown-stuff */
> > +}
> 
> Shouldn't these be omitted until they actually do something, so that the 
> generic infinite loop implementations can be used?

OK.

> > +static void storcenter_show_cpuinfo(struct seq_file *m)
> > +{
> > +	seq_printf(m, "vendor\t\t: IOMEGA\n");
> > +	seq_printf(m, "machine\t\t: StorCenter\n");
> > +}
> 
> ppc_md.name is printed by the generic cpuinfo handler; this is redundant.

Ah, right.

Thanks for your review time.

jdl

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [RFC PATCH 2/3] Add initial iomega StorCenter board port.
  2008-01-07 21:10   ` Jon Loeliger
@ 2008-01-07 21:13     ` Scott Wood
  0 siblings, 0 replies; 6+ messages in thread
From: Scott Wood @ 2008-01-07 21:13 UTC (permalink / raw)
  To: Jon Loeliger; +Cc: linuxppc-dev, andy

Jon Loeliger wrote:
>> Can we take out the dependencies and the default y, and just select them 
>> in the individual board configs?
> 
> Yeah.  That and, shouldn't those choices be mutually
> exclusive in a "choice" arrangement instead too?

No, "choice" sucks for multiplatform.

-Scott

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2008-01-07 21:13 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-01-07 17:55 [RFC PATCH 2/3] Add initial iomega StorCenter board port Jon Loeliger
2008-01-07 19:31 ` Grant Likely
2008-01-07 20:13   ` Jon Loeliger
2008-01-07 20:42 ` Scott Wood
2008-01-07 21:10   ` Jon Loeliger
2008-01-07 21:13     ` Scott Wood

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).