Skip to contentSkip to conversation

powerpc: consolidate mpc83xx platform files

PATCH In review Kim Phillips 6 participants 8 messages Dec 14, 2006 – Dec 18, 2006

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 powerpc: consolidate mpc83xx platform files

Eliminate platforms/83xx code redundancy. Common mpc83xx code cleaned up and merged into setup.c. Each board maintains its own machine definition and corresponding probe fn in its own file. Kconfig modified to allow for multiple board selection in a single kernel image.

This patch also utilizes of_platform_bus_probe() in lieu of manually calling of_platform_device_create for each ucc_geth device (consequently, the QE is added to of_default_bus_ids).

The loops_per_jiffy assignment is removed since udelay now uses the timebase.

---
 arch/powerpc/kernel/of_platform.c         |    1 +
 arch/powerpc/platforms/83xx/Kconfig       |    6 -
 arch/powerpc/platforms/83xx/Makefile      |    2 +-
 arch/powerpc/platforms/83xx/mpc832x_mds.c |  176 +----------------------------
 arch/powerpc/platforms/83xx/mpc832x_mds.h |   19 ---
 arch/powerpc/platforms/83xx/mpc834x_itx.c |   92 +++------------
 arch/powerpc/platforms/83xx/mpc834x_itx.h |   23 ----
 arch/powerpc/platforms/83xx/mpc834x_sys.c |  111 +++---------------
 arch/powerpc/platforms/83xx/mpc834x_sys.h |   23 ----
 arch/powerpc/platforms/83xx/mpc8360e_pb.c |  175 +----------------------------
 arch/powerpc/platforms/83xx/mpc83xx.h     |    2 +
 arch/powerpc/platforms/83xx/setup.c       |  176 +++++++++++++++++++++++++++++
 12 files changed, 220 insertions(+), 586 deletions(-)
arch/powerpc/kernel/of_platform.c +1 -0
index 3002ea3..72da78b 100644
@@ -50,6 +50,7 @@ static struct of_device_id of_default_bu
 	{ .type = "plb5", },
 	{ .type = "plb4", },
 	{ .type = "opb", },
+	{ .type = "qe", },
 	{},
 };
 
arch/powerpc/platforms/83xx/Kconfig +0 -6
index edcd5b8..c236dff 100644
@@ -1,10 +1,6 @@
 menu "Platform support"
 	depends on PPC_83xx
 
-choice
-	prompt "Machine Type"
-	default MPC834x_SYS
-
 config MPC832x_MDS
 	bool "Freescale MPC832x MDS"
 	select DEFAULT_UIMAGE
@@ -39,8 +35,6 @@ config MPC8360E_PB
 	help
 	  This option enables support for the MPC836x EMDS Processor Board.
 
-endchoice
-
 config PPC_MPC832x
 	bool
 	select PPC_UDBG_16550
arch/powerpc/platforms/83xx/Makefile +1 -1
index f1aa7e2..07db146 100644
@@ -1,7 +1,7 @@
 #
 # Makefile for the PowerPC 83xx linux kernel.
 #
-obj-y				:= misc.o
+obj-y				:= setup.o misc.o
 obj-$(CONFIG_PCI)		+= pci.o
 obj-$(CONFIG_MPC834x_SYS)	+= mpc834x_sys.o
 obj-$(CONFIG_MPC834x_ITX)	+= mpc834x_itx.o
arch/powerpc/platforms/83xx/mpc832x_mds.c +3 -173

202 lines not on this page · raw message

arch/powerpc/platforms/83xx/mpc832x_mds.h deleted +0 -19
deleted file mode 100644
index a495889..0000000
@@ -1,19 +0,0 @@
-/*
- * Copyright (C) Freescale Semicondutor, Inc. 2006. All rights reserved.
- *
- * Description:
- * MPC832x MDS board specific header.
- *
- * 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.
- *
- */
-
-#ifndef __MACH_MPC832x_MDS_H__
-#define __MACH_MPC832x_MDS_H__
-
-extern u8 *get_bcsr(void);
-
-#endif				/* __MACH_MPC832x_MDS_H__ */
arch/powerpc/platforms/83xx/mpc834x_itx.c +17 -75

121 lines not on this page · raw message

arch/powerpc/platforms/83xx/mpc834x_itx.h deleted +0 -23
deleted file mode 100644
index 174ca4e..0000000
@@ -1,23 +0,0 @@
-/*
- * arch/powerpc/platforms/83xx/mpc834x_itx.h
- *
- * MPC834X ITX common board definitions
- *
- * Maintainer: Kumar Gala <[email protected]>
- *
- * 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.
- *
- */
-
-#ifndef __MACH_MPC83XX_ITX_H__
-#define __MACH_MPC83XX_ITX_H__
-
-#define PIRQA	MPC83xx_IRQ_EXT4
-#define PIRQB	MPC83xx_IRQ_EXT5
-#define PIRQC	MPC83xx_IRQ_EXT6
-#define PIRQD	MPC83xx_IRQ_EXT7
-
-#endif				/* __MACH_MPC83XX_ITX_H__ */
arch/powerpc/platforms/83xx/mpc834x_sys.c +17 -94

139 lines not on this page · raw message

arch/powerpc/platforms/83xx/mpc834x_sys.h deleted +0 -23
deleted file mode 100644
index 7d5bbef..0000000
@@ -1,23 +0,0 @@
-/*
- * arch/powerpc/platforms/83xx/mpc834x_sys.h
- *
- * MPC834X SYS common board definitions
- *
- * Maintainer: Kumar Gala <[email protected]>
- *
- * 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.
- *
- */
-
-#ifndef __MACH_MPC83XX_SYS_H__
-#define __MACH_MPC83XX_SYS_H__
-
-#define PIRQA	MPC83xx_IRQ_EXT4
-#define PIRQB	MPC83xx_IRQ_EXT5
-#define PIRQC	MPC83xx_IRQ_EXT6
-#define PIRQD	MPC83xx_IRQ_EXT7
-
-#endif				/* __MACH_MPC83XX_SYS_H__ */
arch/powerpc/platforms/83xx/mpc8360e_pb.c +3 -172

199 lines not on this page · raw message

arch/powerpc/platforms/83xx/mpc83xx.h +2 -0
index 01cae10..7419db4 100644
@@ -13,5 +13,7 @@ extern int add_bridge(struct device_node
 extern int mpc83xx_exclude_device(u_char bus, u_char devfn);
 extern void mpc83xx_restart(char *cmd);
 extern long mpc83xx_time_init(void);
+extern void __init mpc83xx_setup_arch(void);
+extern void __init mpc83xx_init_IRQ(void);
 
 #endif				/* __MPC83XX_H__ */
arch/powerpc/platforms/83xx/setup.c new file +176 -0

176 lines not on this page · raw message

Signature · 1 line
1.4.4
#1 lore raw
Quoted 29 lines · Kim Phillips

Eliminate platforms/83xx code redundancy. Common mpc83xx code cleaned up and merged into setup.c. Each board maintains its own machine definition and corresponding probe fn in its own file. Kconfig modified to allow for multiple board selection in a single kernel image.

This patch also utilizes of_platform_bus_probe() in lieu of manually calling of_platform_device_create for each ucc_geth device (consequently, the QE is added to of_default_bus_ids).

The loops_per_jiffy assignment is removed since udelay now uses the timebase.

---
 arch/powerpc/kernel/of_platform.c         |    1 +
 arch/powerpc/platforms/83xx/Kconfig       |    6 -
 arch/powerpc/platforms/83xx/Makefile      |    2 +-
 arch/powerpc/platforms/83xx/mpc832x_mds.c |  176  
+----------------------------
 arch/powerpc/platforms/83xx/mpc832x_mds.h |   19 ---
 arch/powerpc/platforms/83xx/mpc834x_itx.c |   92 +++------------
 arch/powerpc/platforms/83xx/mpc834x_itx.h |   23 ----
 arch/powerpc/platforms/83xx/mpc834x_sys.c |  111 +++---------------
 arch/powerpc/platforms/83xx/mpc834x_sys.h |   23 ----
 arch/powerpc/platforms/83xx/mpc8360e_pb.c |  175  
+----------------------------
 arch/powerpc/platforms/83xx/mpc83xx.h     |    2 +
 arch/powerpc/platforms/83xx/setup.c       |  176 ++++++++++++++++++ 
+++++++++++
 12 files changed, 220 insertions(+), 586 deletions(-)

[snip]

Quoted 65 lines
arch/powerpc/platforms/83xx/setup.c new file +2 -0
new file mode 100644
index 0000000..4d59aa0
@@ -0,0 +1,176 @@
+/*
+ * Copyright (C) Freescale Semicondutor, Inc. 2006. All rights  

reserved.
+ *
+ * Author: Li Yang <[email protected]>
+ * Yin Olivia <[email protected]>
+ *
+ * Description:
+ * MPC83xx board routines.
+ *
+ * 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.
+ */

arch/powerpc/platforms/83xx/setup.c new file +41 -0
+
+#include <linux/stddef.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/errno.h>
+#include <linux/reboot.h>
+#include <linux/pci.h>
+#include <linux/kdev_t.h>
+#include <linux/major.h>
+#include <linux/console.h>
+#include <linux/delay.h>
+#include <linux/seq_file.h>
+#include <linux/root_dev.h>
+#include <linux/initrd.h>
+
+#include <asm/of_device.h>
+#include <asm/of_platform.h>
+#include <asm/system.h>
+#include <asm/atomic.h>
+#include <asm/time.h>
+#include <asm/io.h>
+#include <asm/machdep.h>
+#include <asm/ipic.h>
+#include <asm/bootinfo.h>
+#include <asm/irq.h>
+#include <asm/prom.h>
+#include <asm/udbg.h>
+#include <sysdev/fsl_soc.h>
+#include <asm/qe.h>
+#include <asm/qe_ic.h>
+
+#include "mpc83xx.h"
+
+#undef DEBUG
+#ifdef DEBUG
+#define DBG(fmt...) udbg_printf(fmt)
+#else
+#define DBG(fmt...)
+#endif
+
+#ifndef CONFIG_PCI

arch/powerpc/platforms/83xx/setup.c line 65

Quoted 10 lines
arch/powerpc/platforms/83xx/setup.c new file +10 -0
+unsigned long isa_io_base = 0;
+unsigned long isa_mem_base = 0;
+#endif
+
+static u8 __iomem *bcsr_regs = NULL;
+
+u8 *get_bcsr(void)
+{
+	return bcsr_regs;
+}

I don't think bcsr code should be setup.c as its not generic, but its not causing any harm.

Quoted 52 lines
arch/powerpc/platforms/83xx/setup.c new file +2 -0
+
+/*  

************************************************************************
+ *
+ * Setup the architecture
+ *
+ */

arch/powerpc/platforms/83xx/setup.c new file +45 -0
+void __init mpc83xx_setup_arch(void)
+{
+	struct device_node *np;
+
+	if (ppc_md.progress)
+		ppc_md.progress("mpc83xx_setup_arch()", 0);
+
+	/* Map BCSR area */
+	np = of_find_node_by_name(NULL, "bcsr");
+	if (np != 0) {
+		struct resource res;
+
+		of_address_to_resource(np, 0, &res);
+		bcsr_regs = ioremap(res.start, res.end - res.start + 1);
+		of_node_put(np);
+	}
+
+#ifdef CONFIG_PCI
+	for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;)
+		add_bridge(np);
+	ppc_md.pci_exclude_device = mpc83xx_exclude_device;
+#endif
+
+#ifdef CONFIG_QUICC_ENGINE
+	if ((np = of_find_node_by_type(NULL, "qe")) != NULL) {
+		qe_reset();
+		of_node_put(np);
+	}
+
+	if ((np = of_find_node_by_name(np, "par_io")) != NULL) {
+		par_io_init(np);
+		of_node_put(np);
+
+		for (np = NULL; (np = of_find_node_by_name(np, "ucc")) != NULL;)
+			par_io_of_config(np);
+	}
+
+	if ((np = of_find_compatible_node(NULL, "network", "ucc_geth"))
+			!= NULL){
+		/* Reset the Ethernet PHY */
+		bcsr_regs[9] &= ~0x20;
+		udelay(1000);
+		bcsr_regs[9] |= 0x20;
+		iounmap(bcsr_regs);
+		of_node_put(np);

arch/powerpc/platforms/83xx/setup.c line 126

Quoted 10 lines
arch/powerpc/platforms/83xx/setup.c new file +10 -0
+	}
+
+#endif				/* CONFIG_QUICC_ENGINE */
+}
+
+static int __init mpc83xx_publish_devices(void)
+{
+	if (machine_is(mpc83xx))
+		of_platform_bus_probe(NULL, NULL, NULL);
+

Does this every get called, meaning does anything match machine_is(mpc83xx)?

Quoted 40 lines
arch/powerpc/platforms/83xx/setup.c new file +40 -0
+	return 0;
+}
+device_initcall(mpc83xx_publish_devices);
+
+void __init mpc83xx_init_IRQ(void)
+{
+	struct device_node *np;
+
+	np = of_find_node_by_type(NULL, "ipic");
+	if (!np)
+		return;
+
+	ipic_init(np, 0);
+
+	/* Initialize the default interrupt mapping priorities,
+	 * in case the boot rom changed something on us.
+	 */
+	ipic_set_default_priority();
+	of_node_put(np);
+
+#ifdef CONFIG_QUICC_ENGINE
+	np = of_find_node_by_type(NULL, "qeic");
+	if (!np)
+		return;
+
+	qe_ic_init(np, 0);
+	of_node_put(np);
+#endif				/* CONFIG_QUICC_ENGINE */
+}
+
+#if defined(CONFIG_I2C_MPC) && defined(CONFIG_SENSORS_DS1374)
+extern ulong ds1374_get_rtc_time(void);
+extern int ds1374_set_rtc_time(ulong);
+
+static int __init mpc83xx_rtc_hookup(void)
+{
+	struct timespec tv;
+
+	ppc_md.get_rtc_time = ds1374_get_rtc_time;
+	ppc_md.set_rtc_time = ds1374_set_rtc_time;

arch/powerpc/platforms/83xx/setup.c line 176

Quoted 10 lines
arch/powerpc/platforms/83xx/setup.c new file +10 -0
+
+	tv.tv_nsec = 0;
+	tv.tv_sec = (ppc_md.get_rtc_time) ();
+	do_settimeofday(&tv);
+
+	return 0;
+}
+
+late_initcall(mpc83xx_rtc_hookup);
+#endif

This is sort of evil and we need to clean it up, but we have some time for 2.6.21. Does the MPC832x MDS have the DS1374?

- k

#2 lore raw
Quoted 7 lines · Kumar Gala

arch/powerpc/platforms/83xx/setup.c line 126

Quoted 4 lines
arch/powerpc/platforms/83xx/setup.c new file +3 -0
+	if (machine_is(mpc83xx))
+		of_platform_bus_probe(NULL, NULL, NULL);
+

Does this every get called, meaning does anything match machine_is (mpc83xx)?

I truly dislike this "machine_is" method. Other architectures do this and it becomes a real PITA. It seems to evolve into something that never has the proper, useful granularity. Surprisingly, it often ends up as a guarantee you can't boot common kernels on similar boards, which is what
I suspect you are trying to achieve.

This is a case where your board specific initialization should call this, or fill in a ppc_md indirect pointer that if set is called at the proper time.

Thanks.

	-- Dan
#3 lore raw
Quoted 11 lines · Dan Malek
Quoted 7 lines · Kumar Gala

arch/powerpc/platforms/83xx/setup.c line 126

Quoted 4 lines
arch/powerpc/platforms/83xx/setup.c new file +3 -0
+	if (machine_is(mpc83xx))
+		of_platform_bus_probe(NULL, NULL, NULL);
+

Does this every get called, meaning does anything match machine_is (mpc83xx)?

Quoted 6 lines

I truly dislike this "machine_is" method. Other architectures do this and it becomes a real PITA. It seems to evolve into something that never has the proper, useful granularity. Surprisingly, it often ends up as a guarantee you can't boot common kernels on similar boards, which is what
I suspect you are trying to achieve.

Well, machine_is(mpc83xx) is certainly wrong, it should be machine_is(whatver_my_board_name_is). It's a way to test for a given bsp and nothing else. It's served us well for powermac/prep/chrp though I agree that abusing it is often a sign that something is wrong with the design.

There is one area on which is needs right now is when a platform adds initcalls as those will be called regardless of wether that platform was actually selected at boot or not, though I've been thinking about a way to add board_xxx_initcall() thingies to fix that.

In general, for better granularity, code shall test specific properties in the device-tree exposing a given feature.

Quoted 3 lines

This is a case where your board specific initialization should call this, or fill in a ppc_md indirect pointer that if set is called at the proper time.

Agreed.

Ben.

#4 lore raw
In reply to Kumar Gala
Quoted 15 lines · On Fri, 15 Dec 2006 10:09:09 -0600 Kumar Gala <[email protected]> wrote:
Quoted 15 lines
(quoted diff) +15 -0
+#if defined(CONFIG_I2C_MPC) && defined(CONFIG_SENSORS_DS1374)
+extern ulong ds1374_get_rtc_time(void);
+extern int ds1374_set_rtc_time(ulong);
+
+static int __init mpc83xx_rtc_hookup(void)
+{
+	struct timespec tv;
+
+	ppc_md.get_rtc_time = ds1374_get_rtc_time;
+	ppc_md.set_rtc_time = ds1374_set_rtc_time;
+
+	tv.tv_nsec = 0;
+	tv.tv_sec = (ppc_md.get_rtc_time) ();
+	do_settimeofday(&tv);
+
Quoted 8 lines

Review

Quoted 5 lines
(quoted diff) +5 -0
+	return 0;
+}
+
+late_initcall(mpc83xx_rtc_hookup);
+#endif  

This is sort of evil and we need to clean it up, but we have some time for 2.6.21. Does the MPC832x MDS have the DS1374?

s/sort of/pure/

Something like this should work just as well. Seems to work fine on my system here (that has a DS1338, i.e. ds1307 driver).

Let me know if it works on 83xx and I'll post it with a signed-off-line.

-Olof

arch/powerpc/Kconfig +6 -0
Index: linux-2.6/arch/powerpc/Kconfig
===================================================================
@@ -600,6 +600,12 @@ config PPC_TODC
 	---help---
 	  This adds support for many TODC/RTC chips.
 
+config PPC_GENRTC
+	bool "Generic RTC support"
+	help
+	  This adds support for using regular RTC registered with the RTC
+	  framework as the main clock on powerpc.
+
 endmenu
 
 source arch/powerpc/platforms/embedded6xx/Kconfig
arch/powerpc/sysdev/Makefile +1 -0
Index: linux-2.6/arch/powerpc/sysdev/Makefile
===================================================================
@@ -10,6 +10,7 @@ obj-$(CONFIG_40x)		+= dcr.o
 obj-$(CONFIG_U3_DART)		+= dart_iommu.o
 obj-$(CONFIG_MMIO_NVRAM)	+= mmio_nvram.o
 obj-$(CONFIG_FSL_SOC)		+= fsl_soc.o
+obj-$(CONFIG_PPC_GENRTC)	+= genrtc.o
 obj-$(CONFIG_PPC_TODC)		+= todc.o
 obj-$(CONFIG_TSI108_BRIDGE)	+= tsi108_pci.o tsi108_dev.o
 obj-$(CONFIG_QUICC_ENGINE)	+= qe_lib/
arch/powerpc/sysdev/genrtc.c new file +77 -0

77 lines not on this page · raw message

#5 lore raw

Hi Olaf,

arch/powerpc/sysdev/genrtc.c line 62

Quoted 6 lines · On Fri, 15 Dec 2006 11:59:02 -0600 Olof Johansson <[email protected]> wrote:
arch/powerpc/sysdev/genrtc.c new file +5 -0
+static int __init genrtc_rtc_hookup(void)
+{
+	/* Don't init if the platform has already set up rtc functions. */
+	if (ppc_md.get_rtc_time || ppc_md.set_rtc_time)
+		return -1;

If this is considered not an error, then please return -ENODEV so that if initcall_debug is set, the kernel won't consider this worth noting.

arch/powerpc/sysdev/genrtc.c line 67

Quoted 4 lines
arch/powerpc/sysdev/genrtc.c new file +4 -0
+	rtc_dev = rtc_class_open("rtc0");
+
+	if (!rtc_dev) {
+		printk("genrtc_rtc_hookup: Failed to open rtc0\n");

KERN_ERR?

Review

Quoted 1 line
(quoted diff) +1 -0
+		return -1;

init routines should return 0/-<errno number> so that initcall_debug is useful. Though what Evalue is appropriate here I don't know.

--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/

#6 lore raw
In reply to Olof Johansson
Quoted 11 lines
arch/powerpc/sysdev/genrtc.c new file +10 -0
+static int __init genrtc_rtc_hookup(void)
+{
+	/* Don't init if the platform has already set up rtc functions. */
+	if (ppc_md.get_rtc_time || ppc_md.set_rtc_time)
+		return -1;
+
+	rtc_dev = rtc_class_open("rtc0");
+
+	if (!rtc_dev) {
+		printk("genrtc_rtc_hookup: Failed to open rtc0\n");

arch/powerpc/sysdev/genrtc.c line 77

Quoted 10 lines
arch/powerpc/sysdev/genrtc.c new file +10 -0
+		return -1;
+	}
+
+	ppc_md.get_rtc_time = genrtc_get_rtc_time;
+	ppc_md.set_rtc_time = genrtc_set_rtc_time;
+
+	return 0;
+}
+late_initcall(genrtc_rtc_hookup);
+

This should be called by the platform code. Not all platform want to hook on genrtc. Even worth, some of the RTC drivers provided by genrtc aren't suitable at all because the NTP code will call them at interrupt time (like the i2c ones).

Ben.

#7 lore raw
In reply to Kumar Gala
Quoted 16 lines
Quoted 16 lines
arch/powerpc/platforms/83xx/setup.c new file +15 -0
+#if defined(CONFIG_I2C_MPC) && defined(CONFIG_SENSORS_DS1374)
+extern ulong ds1374_get_rtc_time(void);
+extern int ds1374_set_rtc_time(ulong);
+
+static int __init mpc83xx_rtc_hookup(void)
+{
+	struct timespec tv;
+
+	ppc_md.get_rtc_time = ds1374_get_rtc_time;
+	ppc_md.set_rtc_time = ds1374_set_rtc_time;
+
+	tv.tv_nsec = 0;
+	tv.tv_sec = (ppc_md.get_rtc_time) ();
+	do_settimeofday(&tv);
+
Quoted 8 lines

arch/powerpc/platforms/83xx/setup.c line 176

Quoted 5 lines
arch/powerpc/platforms/83xx/setup.c new file +5 -0
+	return 0;
+}
+
+late_initcall(mpc83xx_rtc_hookup);
+#endif

This is sort of evil and we need to clean it up, but we have some time for 2.6.21. Does the MPC832x MDS have the DS1374?

Also, always test if (machine_is(xxx)) in your initcalls since they'll be called regardless of what machine has been selected.

Ben.