[PATCH 0/4] Update P2020RDB board support to allow NFS booting.

[PATCH 0/4] Update P2020RDB board support to allow NFS booting.

[Renaud Barbier]

This patchset updates the PPC and board support to enable NFS boot.

Device tree fixup functionality for SOC version specific properties has
been added, these were imported from U-Boot files commom/fdt_support.c
and arch/powerpc/cpu/mpc85xx/fdt.c - version git-2b26201.

Since the boot memory mapping for the MPC85xx is limited to the first
64MiB, support has been added to ensure that the device tree is located
in this region before booting.

The P2020RDB configuration is updated to have device tree support
to boot Linux and environment support for the user to automate the boot
mechanism.

These modifications have been tested using a recent kernel (3.7-rc8).
There is no guarantee that older kernel and dtb versions will boot
correctly since support for older device tree fixup properties has not
been included.


Renaud Barbier (4):
  of: base: import of_find_node_by_type
  ppc: add mpc85xx device tree fixup functions
  ppc: bootm: relocate fdt to valid boot memory
  ppc: P2020RDB configuration update

 arch/ppc/boards/freescale-p2020rdb/env/bin/init |    3 +
 arch/ppc/boards/freescale-p2020rdb/env/config   |    2 +
 arch/ppc/boards/freescale-p2020rdb/p2020rdb.c   |    7 +
 arch/ppc/configs/p2020rdb_defconfig             |   13 ++-
 arch/ppc/include/asm/processor.h                |    2 +
 arch/ppc/lib/ppclinux.c                         |   49 ++++++-
 arch/ppc/mach-mpc85xx/Makefile                  |    1 +
 arch/ppc/mach-mpc85xx/eth-devices.c             |    2 +-
 arch/ppc/mach-mpc85xx/fdt.c                     |  197 +++++++++++++++++++++++
 drivers/of/base.c                               |   29 ++++
 include/of.h                                    |    2 +
 11 files changed, 304 insertions(+), 3 deletions(-)
 create mode 100644 arch/ppc/boards/freescale-p2020rdb/env/bin/init
 create mode 100644 arch/ppc/boards/freescale-p2020rdb/env/config
 create mode 100644 arch/ppc/mach-mpc85xx/fdt.c


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 1/4] of: base: import of_find_node_by_type

[Renaud Barbier]

Import of_find_node_by_type from Linux drivers/of/base.c -
commit id d8dfad3.
This function retrieves a node pointer based on the "device_type"
property of the node.

This is used by device tree update functions in PPC support.

Signed-off-by: Renaud Barbier <renaud.barbier@ge.com>
---
 drivers/of/base.c |   29 +++++++++++++++++++++++++++++
 include/of.h      |    2 ++
 2 files changed, 31 insertions(+), 0 deletions(-)

diff --git a/drivers/of/base.c b/drivers/of/base.c
index 4770421..2f19ea5 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -319,6 +319,35 @@ struct device_node *of_find_node_by_name(struct device_node *from,
 EXPORT_SYMBOL(of_find_node_by_name);
 
 /**
+ *	of_find_node_by_type - Find a node by its "device_type" property
+ *	@from:  The node to start searching from, or NULL to start searching
+ *		the entire device tree. The node you pass will not be
+ *		searched, only the next one will; typically, you pass
+ *		what the previous call returned.
+ *	@type:  The type string to match against.
+ *
+ *	Returns a pointer to the node found or NULL.
+ */
+struct device_node *of_find_node_by_type(struct device_node *from,
+		const char *type)
+{
+	struct device_node *np;
+	const char *device_type;
+	int ret;
+
+	if (!from)
+		from = root_node;
+
+	of_tree_for_each_node_from(np, from) {
+		ret = of_property_read_string(np, "device_type", &device_type);
+		if (!ret && !of_node_cmp(device_type, type))
+			return np;
+	}
+	return NULL;
+}
+EXPORT_SYMBOL(of_find_node_by_type)
+
+/**
  *	of_find_compatible_node - Find a node based on type and one of the
  *                                tokens in its "compatible" property
  *	@from:		The node to start searching from or NULL, the node
diff --git a/include/of.h b/include/of.h
index b99f0b2..a565190 100644
--- a/include/of.h
+++ b/include/of.h
@@ -124,6 +124,8 @@ extern struct device_node *of_find_node_by_path_from(struct device_node *from,
 						const char *path);
 extern struct device_node *of_find_node_by_path(const char *path);
 extern struct device_node *of_find_node_by_phandle(phandle phandle);
+extern struct device_node *of_find_node_by_type(struct device_node *from,
+	const char *type);
 extern struct device_node *of_find_compatible_node(struct device_node *from,
 	const char *type, const char *compat);
 extern const struct of_device_id *of_match_node(
-- 
1.7.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 2/4] ppc: add mpc85xx device tree fixup functions

[Renaud Barbier]

This commit is based on U-Boot code from common/fdt_support.c
and arch/powerpc/cpu/mpc85xx/fdt.c - version git-2b26201.

This adds support for populating derived properties of the SOC which
are not typically included in the dtb directly.

Adding gianfar instances is modified to explicitly configure the driver
instance so that the "local-mac-address" property can be correctly
assigned.

Signed-off-by: Renaud Barbier <renaud.barbier@ge.com>
---
 arch/ppc/include/asm/processor.h    |    1 +
 arch/ppc/mach-mpc85xx/Makefile      |    1 +
 arch/ppc/mach-mpc85xx/eth-devices.c |    2 +-
 arch/ppc/mach-mpc85xx/fdt.c         |  197 +++++++++++++++++++++++++++++++++++
 4 files changed, 200 insertions(+), 1 deletions(-)
 create mode 100644 arch/ppc/mach-mpc85xx/fdt.c

diff --git a/arch/ppc/include/asm/processor.h b/arch/ppc/include/asm/processor.h
index 29e0622..04cfb60 100644
--- a/arch/ppc/include/asm/processor.h
+++ b/arch/ppc/include/asm/processor.h
@@ -845,6 +845,7 @@
 
 /* Some parts define SVR[0:23] as the SOC version */
 #define SVR_SOC_VER(svr) (((svr) >> 8) & 0xFFFFFF)	/* SOC Version fields */
+#define IS_E_PROCESSOR(svr)    ((svr) & 0x80000)
 
 /*
  * SVR_VER() Version Values
diff --git a/arch/ppc/mach-mpc85xx/Makefile b/arch/ppc/mach-mpc85xx/Makefile
index cc412c5..81d6853 100644
--- a/arch/ppc/mach-mpc85xx/Makefile
+++ b/arch/ppc/mach-mpc85xx/Makefile
@@ -5,4 +5,5 @@ obj-y			+= fsl_law.o
 obj-y			+= speed.o
 obj-y			+=time.o
 obj-$(CONFIG_MP)	+= mp.o
+obj-$(CONFIG_OFTREE)	+= fdt.o
 obj-$(CONFIG_DRIVER_NET_GIANFAR) += eth-devices.o
diff --git a/arch/ppc/mach-mpc85xx/eth-devices.c b/arch/ppc/mach-mpc85xx/eth-devices.c
index 611a578..09464f4 100644
--- a/arch/ppc/mach-mpc85xx/eth-devices.c
+++ b/arch/ppc/mach-mpc85xx/eth-devices.c
@@ -54,7 +54,7 @@ coredevice_initcall(fsl_phy_init);
 
 int fsl_eth_init(int num, struct gfar_info_struct *gf)
 {
-	add_generic_device("gfar", DEVICE_ID_DYNAMIC, NULL,
+	add_generic_device("gfar", num - 1, NULL,
 			GFAR_BASE_ADDR + ((num - 1) * 0x1000), 0x1000,
 			IORESOURCE_MEM, gf);
 	return 0;
diff --git a/arch/ppc/mach-mpc85xx/fdt.c b/arch/ppc/mach-mpc85xx/fdt.c
new file mode 100644
index 0000000..737550f
--- /dev/null
+++ b/arch/ppc/mach-mpc85xx/fdt.c
@@ -0,0 +1,197 @@
+/*
+ * Copyright 2013 GE Intelligent Platforms, Inc.
+ * Copyright 2007-2011 Freescale Semiconductor, Inc.
+ *
+ * (C) Copyright 2000
+ * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * Based on U-Boot arch/powerpc/cpu/mpc85xx/fdt.c and
+ * common/fdt_support.c - version git-2b26201.
+ */
+#include <common.h>
+#include <init.h>
+#include <errno.h>
+#include <environment.h>
+#include <asm/processor.h>
+#include <mach/clock.h>
+#include <of.h>
+
+static void of_setup_crypto_node(void *blob)
+{
+	struct device_node *crypto_node;
+
+	crypto_node = of_find_compatible_node(blob, NULL, "fsl,sec2.0");
+	if (crypto_node == NULL)
+		return;
+
+	of_delete_node(crypto_node);
+}
+
+/* These properties specify whether the hardware supports the stashing
+ * of buffer descriptors in L2 cache.
+ */
+static void fdt_add_enet_stashing(void *fdt)
+{
+	struct device_node *node;
+
+	node = of_find_compatible_node(fdt, NULL, "gianfar");
+	while (node) {
+		of_set_property(node, "bd-stash", NULL, 0, 1);
+		of_property_write_u32(node, "rx-stash-len", 96);
+		of_property_write_u32(node, "rx-stash-idx", 0);
+		node = of_find_compatible_node(node, NULL, "gianfar");
+	}
+}
+
+static int fdt_stdout_setup(struct device_node *blob)
+{
+	struct device_node *node, *alias;
+	char sername[9] = { 0 };
+	const char *prop;
+	struct console_device *cdev;
+	int len;
+
+	node = of_find_node_by_path("/chosen");
+	if (node == NULL)
+		node = of_create_node(blob, "/chosen");
+
+	if (node == NULL) {
+		pr_err("%s: could not open /chosen node\n", __func__);
+		goto error;
+	}
+
+	for_each_console(cdev)
+		if ((cdev->f_active & (CONSOLE_STDIN | CONSOLE_STDOUT)))
+			break;
+	if (cdev)
+		sprintf(sername, "serial%d", cdev->dev->id);
+	else
+		sprintf(sername, "serial%d", 0);
+
+	alias = of_find_node_by_path_from(blob, "/aliases");
+	if (!alias) {
+		pr_err("%s: could not get aliases node.\n", __func__);
+		goto error;
+	}
+	prop = of_get_property(alias, sername, &len);
+	of_set_property(node, "linux,stdout-path", prop, len, 1);
+	return 0;
+error:
+	return 1;
+}
+
+static void fdt_mac_setup(struct device_node *blob)
+{
+	struct device_node *alias, *node;
+	const char *path, *tmp;
+	char mac[16], eth[12], *end;
+	unsigned char mac_addr[6];
+	struct device_d *dev;
+	int ix, idx = 0;
+
+	alias = of_find_node_by_path_from(blob, "/aliases");
+	if (!alias) {
+		pr_err("%s: Failed to get /aliases node\n", __func__);
+		return;
+	}
+
+	sprintf(mac, "eth%d.ethaddr", idx);
+	while ((tmp = getenv(mac)) != NULL) {
+		sprintf(eth, "eth%d", idx);
+		dev = get_device_by_name(eth);
+
+		/* If the parent id is not set correctly by
+		 * the board support, the wrong device path
+		 * may be obtained.
+		 */
+		sprintf(eth, "ethernet%d", dev->parent->id);
+		path = of_get_property(alias, eth, NULL);
+		if (!path) {
+			idx++;
+			sprintf(mac, "eth%d.ethaddr", idx);
+			continue;
+		}
+
+		for (ix = 0; ix < 6; ix++) {
+			mac_addr[ix] = tmp ? simple_strtoul(tmp, &end, 16) : 0;
+			if (tmp)
+				tmp = (*end) ? end+1 : end;
+		}
+
+		node = of_find_node_by_path_from(blob, path);
+		of_set_property(node, "mac-address", mac_addr,
+				sizeof(mac_addr), 1);
+		of_set_property(node, "local-mac-address", mac_addr,
+				sizeof(mac_addr), 1);
+		idx++;
+		sprintf(mac, "eth%d.ethaddr", idx);
+	}
+}
+
+static int fdt_cpu_setup(struct device_node *blob)
+{
+	struct device_node *node;
+	struct sys_info sysinfo;
+
+	/* delete crypto node if not on an E-processor */
+	if (!IS_E_PROCESSOR(get_svr()))
+		of_setup_crypto_node(blob);
+
+	fdt_add_enet_stashing(blob);
+	fdt_mac_setup(blob);
+	fsl_get_sys_info(&sysinfo);
+
+	node = of_find_node_by_type(blob, "cpu");
+	while (node) {
+		const uint32_t *reg;
+
+		of_property_write_u32(node, "timebase-frequency",
+				fsl_get_timebase_clock());
+		of_property_write_u32(node, "bus-frequency",
+				sysinfo.freqSystemBus);
+		reg = of_get_property(node, "reg", NULL);
+		of_property_write_u32(node, "clock-frequency",
+				sysinfo.freqProcessor[*reg]);
+		node = of_find_node_by_type(node, "cpu");
+	}
+
+	node = of_find_node_by_type(blob, "soc");
+	if (node)
+		of_property_write_u32(node, "bus-frequency",
+				sysinfo.freqSystemBus);
+
+	node = of_find_compatible_node(blob, NULL, "fsl,elbc");
+	if (node)
+		of_property_write_u32(node, "bus-frequency",
+				sysinfo.freqLocalBus);
+
+	node = of_find_compatible_node(blob, NULL, "ns16550");
+	while (node) {
+		of_property_write_u32(node, "clock-frequency",
+				sysinfo.freqSystemBus);
+		node = of_find_compatible_node(node, NULL, "ns16550");
+	}
+
+	fdt_stdout_setup(blob);
+
+	return 0;
+}
+
+static int of_register_mpc85xx_fixup(void)
+{
+	return of_register_fixup(fdt_cpu_setup);
+}
+late_initcall(of_register_mpc85xx_fixup);
-- 
1.7.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 3/4] ppc: bootm: relocate fdt to valid boot memory

[Renaud Barbier]

For the MPC85xx family of SOCs Linux expects any boot firmware
information to be passed in the first 64MiB of memory. This adds support
to ensure that the device tree is relocated to a valid location if it is
outside that address range.

Signed-off-by: Renaud Barbier <renaud.barbier@ge.com>
---
 arch/ppc/include/asm/processor.h |    1 +
 arch/ppc/lib/ppclinux.c          |   49 +++++++++++++++++++++++++++++++++++++-
 2 files changed, 49 insertions(+), 1 deletions(-)

diff --git a/arch/ppc/include/asm/processor.h b/arch/ppc/include/asm/processor.h
index 04cfb60..6b9b7dd 100644
--- a/arch/ppc/include/asm/processor.h
+++ b/arch/ppc/include/asm/processor.h
@@ -966,6 +966,7 @@ struct cpu_type {
 struct cpu_type *identify_cpu(u32 ver);
 
 #if defined(CONFIG_MPC85xx)
+#define LINUX_TLB1_MAX_ADDR	((void *)(64 << 20))
 #define CPU_TYPE_ENTRY(n, v, nc) \
 	{ .name = #n, .soc_ver = SVR_##v, .num_cores = (nc), }
 #endif
diff --git a/arch/ppc/lib/ppclinux.c b/arch/ppc/lib/ppclinux.c
index ef69ead..e6cdcad 100644
--- a/arch/ppc/lib/ppclinux.c
+++ b/arch/ppc/lib/ppclinux.c
@@ -4,12 +4,45 @@
 #include <command.h>
 #include <image.h>
 #include <init.h>
+#include <malloc.h>
 #include <environment.h>
 #include <asm/bitops.h>
+#include <asm/processor.h>
 #include <boot.h>
 #include <errno.h>
 #include <fs.h>
 
+static int bootm_relocate_fdt(void *addr, struct image_data *data)
+{
+	if (addr < LINUX_TLB1_MAX_ADDR) {
+		/* The kernel is within  the boot TLB mapping.
+		 * Put the DTB above if there is no space
+		 * below.
+		 */
+		if (addr < (void *)data->oftree->totalsize) {
+			addr = (void *)PAGE_ALIGN((phys_addr_t)addr +
+					data->os->header.ih_size);
+			addr += data->oftree->totalsize;
+			if (addr < LINUX_TLB1_MAX_ADDR)
+				addr = LINUX_TLB1_MAX_ADDR;
+		}
+	}
+
+	if (addr > LINUX_TLB1_MAX_ADDR) {
+		pr_crit("Unable to relocate DTB to Linux TLB\n");
+		return 1;
+	}
+
+	addr = (void *)PAGE_ALIGN_DOWN((phys_addr_t)addr -
+			data->oftree->totalsize);
+	memcpy(addr, data->oftree, data->oftree->totalsize);
+	free(data->oftree);
+	data->oftree = addr;
+
+	pr_info("Relocating device tree to 0x%p\n", addr);
+	return 0;
+}
+
 static int do_bootm_linux(struct image_data *data)
 {
 	void	(*kernel)(void *, void *, unsigned long,
@@ -24,6 +57,20 @@ static int do_bootm_linux(struct image_data *data)
 		return -EINVAL;
 	}
 
+	/* Relocate the device tree if outside the initial
+	 * Linux mapped TLB.
+	 */
+	if (IS_ENABLED(CONFIG_MPC85xx)) {
+		void *addr = data->oftree;
+
+		if ((addr + data->oftree->totalsize) > LINUX_TLB1_MAX_ADDR) {
+			addr = (void *)data->os_address;
+
+			if (bootm_relocate_fdt(addr, data))
+				goto error;
+		}
+	}
+
 	fdt_add_reserve_map(data->oftree);
 
 	kernel = (void *)(data->os_address + data->os_entry);
@@ -37,9 +84,9 @@ static int do_bootm_linux(struct image_data *data)
 	 *   r7: NULL
 	 */
 	kernel(data->oftree, kernel, 0, 0, 0);
-
 	reset_cpu(0);
 
+error:
 	/* not reached */
 	return -1;
 }
-- 
1.7.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 4/4] ppc: P2020RDB configuration update

[Renaud Barbier]

The P2020rdb defconfig has been updated to include
device tree, environment and boot command support for
booting Linux.

Also the P2020RDB board support defines a flash area to
store its environment for users to configure the boot process.

Signed-off-by: Renaud Barbier <renaud.barbier@ge.com>
---
 arch/ppc/boards/freescale-p2020rdb/env/bin/init |    3 +++
 arch/ppc/boards/freescale-p2020rdb/env/config   |    2 ++
 arch/ppc/boards/freescale-p2020rdb/p2020rdb.c   |    7 +++++++
 arch/ppc/configs/p2020rdb_defconfig             |   13 ++++++++++++-
 4 files changed, 24 insertions(+), 1 deletions(-)
 create mode 100644 arch/ppc/boards/freescale-p2020rdb/env/bin/init
 create mode 100644 arch/ppc/boards/freescale-p2020rdb/env/config

diff --git a/arch/ppc/boards/freescale-p2020rdb/env/bin/init b/arch/ppc/boards/freescale-p2020rdb/env/bin/init
new file mode 100644
index 0000000..6bd125c
--- /dev/null
+++ b/arch/ppc/boards/freescale-p2020rdb/env/bin/init
@@ -0,0 +1,3 @@
+#!/bin/sh
+export PATH=/env/bin
+source /env/config
diff --git a/arch/ppc/boards/freescale-p2020rdb/env/config b/arch/ppc/boards/freescale-p2020rdb/env/config
new file mode 100644
index 0000000..26b1a9a
--- /dev/null
+++ b/arch/ppc/boards/freescale-p2020rdb/env/config
@@ -0,0 +1,2 @@
+#!/bin/sh
+export bootargs="root=/dev/nfs rw ip=bootp panic=10"
diff --git a/arch/ppc/boards/freescale-p2020rdb/p2020rdb.c b/arch/ppc/boards/freescale-p2020rdb/p2020rdb.c
index 537565d..3d3a80d 100644
--- a/arch/ppc/boards/freescale-p2020rdb/p2020rdb.c
+++ b/arch/ppc/boards/freescale-p2020rdb/p2020rdb.c
@@ -92,6 +92,13 @@ static int devices_init(void)
 	fsl_eth_init(2, &gfar_info[0]);
 	fsl_eth_init(3, &gfar_info[1]);
 
+	/* The env0 offset 0x770000 is from the base address of the alternate
+	 * boot area where barebox boots from. Programming barebox in the
+	 * primary boot area in place of U-Boot may lead to loss of data when
+	 * saving the environment.
+	 */
+	devfs_add_partition("nor0", 0x770000, 0x10000, DEVFS_PARTITION_FIXED,
+			    "env0");
 	devfs_add_partition("nor0", 0xf80000, 0x80000, DEVFS_PARTITION_FIXED,
 			    "self0");
 	return 0;
diff --git a/arch/ppc/configs/p2020rdb_defconfig b/arch/ppc/configs/p2020rdb_defconfig
index 0f77903..35dd094 100644
--- a/arch/ppc/configs/p2020rdb_defconfig
+++ b/arch/ppc/configs/p2020rdb_defconfig
@@ -5,10 +5,18 @@ CONFIG_LONGHELP=y
 CONFIG_GLOB=y
 CONFIG_CMDLINE_EDITING=y
 CONFIG_AUTO_COMPLETE=y
+CONFIG_CMD_PARTITION=y
 CONFIG_CMD_SLEEP=y
 CONFIG_CMD_FLASH=y
 CONFIG_CMD_RESET=y
 CONFIG_CMD_GO=y
+CONFIG_DEFAULT_ENVIRONMENT_GENERIC=n
+CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/ppc/boards/freescale-p2020rdb/env"
+CONFIG_CMD_LOADENV=y
+CONFIG_CMD_SAVEENV=y
+CONFIG_CMD_PRINTENV=y
+CONFIG_CMD_EXPORT=y
+CONFIG_CMD_EDIT=y
 CONFIG_FSL_ELBC=y
 CONFIG_DRIVER_CFI=y
 CONFIG_DRIVER_CFI_AMD=y
@@ -17,7 +25,7 @@ CONFIG_DRIVER_CFI_BANK_WIDTH_1=n
 CONFIG_DRIVER_CFI_BANK_WIDTH_2=y
 CONFIG_DRIVER_CFI_BANK_WIDTH_4=n
 CONFIG_MTD=y
-CONFIG_MALLOC_SIZE=0x200000
+CONFIG_MALLOC_SIZE=0x800000
 CONFIG_BAUDRATE=115200
 CONFIG_DRIVER_SERIAL_NS16550=y
 CONFIG_RELOCATABLE=y
@@ -32,3 +40,6 @@ CONFIG_I2C=y
 CONFIG_I2C_IMX=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MIITOOL=y
+CONFIG_OFTREE=y
+CONFIG_ZLIB=y
+CONFIG_CMD_OFTREE=y
-- 
1.7.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 2/4] ppc: add mpc85xx device tree fixup functions

[Sascha Hauer]

Hi Renaud,

On Fri, Aug 30, 2013 at 02:34:27PM +0100, Renaud Barbier wrote:
> +/* These properties specify whether the hardware supports the stashing
> + * of buffer descriptors in L2 cache.
> + */
> +static void fdt_add_enet_stashing(void *fdt)
> +{
> +	struct device_node *node;
> +
> +	node = of_find_compatible_node(fdt, NULL, "gianfar");
> +	while (node) {
> +		of_set_property(node, "bd-stash", NULL, 0, 1);
> +		of_property_write_u32(node, "rx-stash-len", 96);
> +		of_property_write_u32(node, "rx-stash-idx", 0);
> +		node = of_find_compatible_node(node, NULL, "gianfar");
> +	}
> +}

Out of curiosity, why is this dynamically added and not part of the
static dts file?

> +
> +static int fdt_stdout_setup(struct device_node *blob)
> +{
> +	struct device_node *node, *alias;
> +	char sername[9] = { 0 };
> +	const char *prop;
> +	struct console_device *cdev;
> +	int len;
> +
> +	node = of_find_node_by_path("/chosen");
> +	if (node == NULL)
> +		node = of_create_node(blob, "/chosen");

You should be able to call of_create_node() without checking for
existence first. If the node already exists of_create_node() will just
return that node.

> +
> +	if (node == NULL) {
> +		pr_err("%s: could not open /chosen node\n", __func__);
> +		goto error;
> +	}
> +
> +	for_each_console(cdev)
> +		if ((cdev->f_active & (CONSOLE_STDIN | CONSOLE_STDOUT)))
> +			break;
> +	if (cdev)
> +		sprintf(sername, "serial%d", cdev->dev->id);
> +	else
> +		sprintf(sername, "serial%d", 0);
> +
> +	alias = of_find_node_by_path_from(blob, "/aliases");
> +	if (!alias) {
> +		pr_err("%s: could not get aliases node.\n", __func__);
> +		goto error;
> +	}
> +	prop = of_get_property(alias, sername, &len);
> +	of_set_property(node, "linux,stdout-path", prop, len, 1);
> +	return 0;
> +error:
> +	return 1;

Please return an error code.

> +}
> +
> +static void fdt_mac_setup(struct device_node *blob)
> +{
> +	struct device_node *alias, *node;
> +	const char *path, *tmp;
> +	char mac[16], eth[12], *end;
> +	unsigned char mac_addr[6];
> +	struct device_d *dev;
> +	int ix, idx = 0;
> +
> +	alias = of_find_node_by_path_from(blob, "/aliases");
> +	if (!alias) {
> +		pr_err("%s: Failed to get /aliases node\n", __func__);
> +		return;
> +	}
> +
> +	sprintf(mac, "eth%d.ethaddr", idx);
> +	while ((tmp = getenv(mac)) != NULL) {
> +		sprintf(eth, "eth%d", idx);
> +		dev = get_device_by_name(eth);
> +
> +		/* If the parent id is not set correctly by
> +		 * the board support, the wrong device path
> +		 * may be obtained.
> +		 */
> +		sprintf(eth, "ethernet%d", dev->parent->id);
> +		path = of_get_property(alias, eth, NULL);
> +		if (!path) {
> +			idx++;
> +			sprintf(mac, "eth%d.ethaddr", idx);
> +			continue;
> +		}
> +
> +		for (ix = 0; ix < 6; ix++) {
> +			mac_addr[ix] = tmp ? simple_strtoul(tmp, &end, 16) : 0;
> +			if (tmp)
> +				tmp = (*end) ? end+1 : end;
> +		}
> +
> +		node = of_find_node_by_path_from(blob, path);
> +		of_set_property(node, "mac-address", mac_addr,
> +				sizeof(mac_addr), 1);
> +		of_set_property(node, "local-mac-address", mac_addr,
> +				sizeof(mac_addr), 1);
> +		idx++;
> +		sprintf(mac, "eth%d.ethaddr", idx);
> +	}
> +}

This function could be simplified by using of_find_node_by_alias().

We already have eth_of_fixup(). Would it be possible to use this by
changing it to something like this:

static int eth_of_fixup(struct device_node *root)
{
	struct eth_device *edev;
	struct device_node *node;
	int ret;

	/*
	 * Add the mac-address property for each network device we
	 * find a nodepath for and which has a valid mac address.
	 */
	list_for_each_entry(edev, &netdev_list, list) {
		if (!is_valid_ether_addr(edev->ethaddr)) {
			dev_dbg(&edev->dev, "%s: no valid mac address, cannot fixup\n",
					__func__);
			continue;
		}

		if (edev->nodepath) {
			node = of_find_node_by_path_from(root, edev->nodepath);
		} else {
			char eth[12];
			sprintf(eth, "ethernet%d", edev->dev.id);
			node = of_find_node_by_alias(root, eth);
		}

		if (!node) {
			dev_dbg(&edev->dev, "%s: no node to fixup\n", __func__);
			continue;
		}

		ret = of_set_property(node, "mac-address", edev->ethaddr, 6, 1);
		if (ret)
			pr_err("Setting mac-address property of %s failed with: %s\n",
					node->full_name, strerror(-ret));
	}

	return 0;
}

(untested)

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 2/4] ppc: add mpc85xx device tree fixup functions

[Renaud Barbier]

On 02/09/2013 09:49, Sascha Hauer wrote:
> Hi Renaud,
> 
> On Fri, Aug 30, 2013 at 02:34:27PM +0100, Renaud Barbier wrote:
>> > +/* These properties specify whether the hardware supports the stashing
>> > + * of buffer descriptors in L2 cache.
>> > + */
>> > +static void fdt_add_enet_stashing(void *fdt)
>> > +{
>> > +	struct device_node *node;
>> > +
>> > +	node = of_find_compatible_node(fdt, NULL, "gianfar");
>> > +	while (node) {
>> > +		of_set_property(node, "bd-stash", NULL, 0, 1);
>> > +		of_property_write_u32(node, "rx-stash-len", 96);
>> > +		of_property_write_u32(node, "rx-stash-idx", 0);
>> > +		node = of_find_compatible_node(node, NULL, "gianfar");
>> > +	}
>> > +}
> Out of curiosity, why is this dynamically added and not part of the
> static dts file?
> 

I will have to quote the original comment from U-Boot as I cannot find
a reasonable explanation why it is done this way.


Original U-boot commit:
Date:   Tue Oct 7 08:09:50 2008 -0500
Have u-boot pass stashing parameters into device tree

Some cores don't support ethernet stashing at all, and some
instances have errata.  Adds 3 properties to gianfar nodes
which support stashing.  For now, just add this support to
85xx SoCs.



_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 3/4] ppc: bootm: relocate fdt to valid boot memory

[Sascha Hauer]

On Fri, Sep 06, 2013 at 11:53:12AM +0100, Renaud Barbier wrote:
> For the MPC85xx family of SOCs Linux expects any boot firmware
> information to be passed in the first 64MiB of memory. This adds support
> to ensure that the device tree is relocated to a valid location if it is
> outside that address range.
> 
> For the other SOC family currently present in the ppc architecture, the
> default is not to relocate as at Linux startup the virtual address
> equals the physical address.
> 
> Signed-off-by: Renaud Barbier <renaud.barbier@ge.com>

Applied, thanks

Sascha

> ---
>  arch/ppc/include/asm/processor.h |  3 +++
>  arch/ppc/lib/ppclinux.c          | 49 +++++++++++++++++++++++++++++++++++++++-
>  2 files changed, 51 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/ppc/include/asm/processor.h b/arch/ppc/include/asm/processor.h
> index 04cfb60..9145257 100644
> --- a/arch/ppc/include/asm/processor.h
> +++ b/arch/ppc/include/asm/processor.h
> @@ -966,8 +966,11 @@ struct cpu_type {
>  struct cpu_type *identify_cpu(u32 ver);
>  
>  #if defined(CONFIG_MPC85xx)
> +#define LINUX_TLB1_MAX_ADDR	((void *)(64 << 20))
>  #define CPU_TYPE_ENTRY(n, v, nc) \
>  	{ .name = #n, .soc_ver = SVR_##v, .num_cores = (nc), }
> +#else
> +#define LINUX_TLB1_MAX_ADDR	((void *)0xffffffff)
>  #endif
>  #ifndef CONFIG_MACH_SPECIFIC
>  extern int _machine;
> diff --git a/arch/ppc/lib/ppclinux.c b/arch/ppc/lib/ppclinux.c
> index ef69ead..7c30ac3 100644
> --- a/arch/ppc/lib/ppclinux.c
> +++ b/arch/ppc/lib/ppclinux.c
> @@ -4,12 +4,45 @@
>  #include <command.h>
>  #include <image.h>
>  #include <init.h>
> +#include <malloc.h>
>  #include <environment.h>
>  #include <asm/bitops.h>
> +#include <asm/processor.h>
>  #include <boot.h>
>  #include <errno.h>
>  #include <fs.h>
>  
> +static int bootm_relocate_fdt(void *addr, struct image_data *data)
> +{
> +	if (addr < LINUX_TLB1_MAX_ADDR) {
> +		/* The kernel is within  the boot TLB mapping.
> +		 * Put the DTB above if there is no space
> +		 * below.
> +		 */
> +		if (addr < (void *)data->oftree->totalsize) {
> +			addr = (void *)PAGE_ALIGN((phys_addr_t)addr +
> +					data->os->header.ih_size);
> +			addr += data->oftree->totalsize;
> +			if (addr < LINUX_TLB1_MAX_ADDR)
> +				addr = LINUX_TLB1_MAX_ADDR;
> +		}
> +	}
> +
> +	if (addr > LINUX_TLB1_MAX_ADDR) {
> +		pr_crit("Unable to relocate DTB to Linux TLB\n");
> +		return 1;
> +	}
> +
> +	addr = (void *)PAGE_ALIGN_DOWN((phys_addr_t)addr -
> +			data->oftree->totalsize);
> +	memcpy(addr, data->oftree, data->oftree->totalsize);
> +	free(data->oftree);
> +	data->oftree = addr;
> +
> +	pr_info("Relocating device tree to 0x%p\n", addr);
> +	return 0;
> +}
> +
>  static int do_bootm_linux(struct image_data *data)
>  {
>  	void	(*kernel)(void *, void *, unsigned long,
> @@ -24,6 +57,20 @@ static int do_bootm_linux(struct image_data *data)
>  		return -EINVAL;
>  	}
>  
> +	/* Relocate the device tree if outside the initial
> +	 * Linux mapped TLB.
> +	 */
> +	if (IS_ENABLED(CONFIG_MPC85xx)) {
> +		void *addr = data->oftree;
> +
> +		if ((addr + data->oftree->totalsize) > LINUX_TLB1_MAX_ADDR) {
> +			addr = (void *)data->os_address;
> +
> +			if (bootm_relocate_fdt(addr, data))
> +				goto error;
> +		}
> +	}
> +
>  	fdt_add_reserve_map(data->oftree);
>  
>  	kernel = (void *)(data->os_address + data->os_entry);
> @@ -40,7 +87,7 @@ static int do_bootm_linux(struct image_data *data)
>  
>  	reset_cpu(0);
>  
> -	/* not reached */
> +error:
>  	return -1;
>  }
>  
> -- 
> 1.8.3.4
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 3/4] ppc: bootm: relocate fdt to valid boot memory

[Renaud Barbier]

For the MPC85xx family of SOCs Linux expects any boot firmware
information to be passed in the first 64MiB of memory. This adds support
to ensure that the device tree is relocated to a valid location if it is
outside that address range.

For the other SOC family currently present in the ppc architecture, the
default is not to relocate as at Linux startup the virtual address
equals the physical address.

Signed-off-by: Renaud Barbier <renaud.barbier@ge.com>
---
 arch/ppc/include/asm/processor.h |  3 +++
 arch/ppc/lib/ppclinux.c          | 49 +++++++++++++++++++++++++++++++++++++++-
 2 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/arch/ppc/include/asm/processor.h b/arch/ppc/include/asm/processor.h
index 04cfb60..9145257 100644
--- a/arch/ppc/include/asm/processor.h
+++ b/arch/ppc/include/asm/processor.h
@@ -966,8 +966,11 @@ struct cpu_type {
 struct cpu_type *identify_cpu(u32 ver);
 
 #if defined(CONFIG_MPC85xx)
+#define LINUX_TLB1_MAX_ADDR	((void *)(64 << 20))
 #define CPU_TYPE_ENTRY(n, v, nc) \
 	{ .name = #n, .soc_ver = SVR_##v, .num_cores = (nc), }
+#else
+#define LINUX_TLB1_MAX_ADDR	((void *)0xffffffff)
 #endif
 #ifndef CONFIG_MACH_SPECIFIC
 extern int _machine;
diff --git a/arch/ppc/lib/ppclinux.c b/arch/ppc/lib/ppclinux.c
index ef69ead..7c30ac3 100644
--- a/arch/ppc/lib/ppclinux.c
+++ b/arch/ppc/lib/ppclinux.c
@@ -4,12 +4,45 @@
 #include <command.h>
 #include <image.h>
 #include <init.h>
+#include <malloc.h>
 #include <environment.h>
 #include <asm/bitops.h>
+#include <asm/processor.h>
 #include <boot.h>
 #include <errno.h>
 #include <fs.h>
 
+static int bootm_relocate_fdt(void *addr, struct image_data *data)
+{
+	if (addr < LINUX_TLB1_MAX_ADDR) {
+		/* The kernel is within  the boot TLB mapping.
+		 * Put the DTB above if there is no space
+		 * below.
+		 */
+		if (addr < (void *)data->oftree->totalsize) {
+			addr = (void *)PAGE_ALIGN((phys_addr_t)addr +
+					data->os->header.ih_size);
+			addr += data->oftree->totalsize;
+			if (addr < LINUX_TLB1_MAX_ADDR)
+				addr = LINUX_TLB1_MAX_ADDR;
+		}
+	}
+
+	if (addr > LINUX_TLB1_MAX_ADDR) {
+		pr_crit("Unable to relocate DTB to Linux TLB\n");
+		return 1;
+	}
+
+	addr = (void *)PAGE_ALIGN_DOWN((phys_addr_t)addr -
+			data->oftree->totalsize);
+	memcpy(addr, data->oftree, data->oftree->totalsize);
+	free(data->oftree);
+	data->oftree = addr;
+
+	pr_info("Relocating device tree to 0x%p\n", addr);
+	return 0;
+}
+
 static int do_bootm_linux(struct image_data *data)
 {
 	void	(*kernel)(void *, void *, unsigned long,
@@ -24,6 +57,20 @@ static int do_bootm_linux(struct image_data *data)
 		return -EINVAL;
 	}
 
+	/* Relocate the device tree if outside the initial
+	 * Linux mapped TLB.
+	 */
+	if (IS_ENABLED(CONFIG_MPC85xx)) {
+		void *addr = data->oftree;
+
+		if ((addr + data->oftree->totalsize) > LINUX_TLB1_MAX_ADDR) {
+			addr = (void *)data->os_address;
+
+			if (bootm_relocate_fdt(addr, data))
+				goto error;
+		}
+	}
+
 	fdt_add_reserve_map(data->oftree);
 
 	kernel = (void *)(data->os_address + data->os_entry);
@@ -40,7 +87,7 @@ static int do_bootm_linux(struct image_data *data)
 
 	reset_cpu(0);
 
-	/* not reached */
+error:
 	return -1;
 }
 
-- 
1.8.3.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 3/4] ppc: bootm: relocate fdt to valid boot memory

[Sascha Hauer]

Hi Renaud,

On Tue, Sep 03, 2013 at 03:54:26PM +0100, Renaud Barbier wrote:
> For the MPC85xx family of SOCs Linux expects any boot firmware
> information to be passed in the first 64MiB of memory. This adds support
> to ensure that the device tree is relocated to a valid location if it is
> outside that address range.
> 
> Signed-off-by: Renaud Barbier <renaud.barbier@ge.com>
> ---
>  arch/ppc/include/asm/processor.h |    1 +
>  arch/ppc/lib/ppclinux.c          |   49 +++++++++++++++++++++++++++++++++++++-
>  2 files changed, 49 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/ppc/include/asm/processor.h b/arch/ppc/include/asm/processor.h
> index 04cfb60..6b9b7dd 100644
> --- a/arch/ppc/include/asm/processor.h
> +++ b/arch/ppc/include/asm/processor.h
> @@ -966,6 +966,7 @@ struct cpu_type {
>  struct cpu_type *identify_cpu(u32 ver);
>  
>  #if defined(CONFIG_MPC85xx)
> +#define LINUX_TLB1_MAX_ADDR	((void *)(64 << 20))

I had to drop this patch as it breaks the pcm030 compilation. I have no
idea what the correct value for LINUX_TLB1_MAX_ADDR on MPC5200 is. Can
you send an updated patch?

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 3/4] ppc: bootm: relocate fdt to valid boot memory

[Renaud Barbier]

For the MPC85xx family of SOCs Linux expects any boot firmware
information to be passed in the first 64MiB of memory. This adds support
to ensure that the device tree is relocated to a valid location if it is
outside that address range.

Signed-off-by: Renaud Barbier <renaud.barbier@ge.com>
---
 arch/ppc/include/asm/processor.h |    1 +
 arch/ppc/lib/ppclinux.c          |   49 +++++++++++++++++++++++++++++++++++++-
 2 files changed, 49 insertions(+), 1 deletions(-)

diff --git a/arch/ppc/include/asm/processor.h b/arch/ppc/include/asm/processor.h
index 04cfb60..6b9b7dd 100644
--- a/arch/ppc/include/asm/processor.h
+++ b/arch/ppc/include/asm/processor.h
@@ -966,6 +966,7 @@ struct cpu_type {
 struct cpu_type *identify_cpu(u32 ver);
 
 #if defined(CONFIG_MPC85xx)
+#define LINUX_TLB1_MAX_ADDR	((void *)(64 << 20))
 #define CPU_TYPE_ENTRY(n, v, nc) \
 	{ .name = #n, .soc_ver = SVR_##v, .num_cores = (nc), }
 #endif
diff --git a/arch/ppc/lib/ppclinux.c b/arch/ppc/lib/ppclinux.c
index ef69ead..7c30ac3 100644
--- a/arch/ppc/lib/ppclinux.c
+++ b/arch/ppc/lib/ppclinux.c
@@ -4,12 +4,45 @@
 #include <command.h>
 #include <image.h>
 #include <init.h>
+#include <malloc.h>
 #include <environment.h>
 #include <asm/bitops.h>
+#include <asm/processor.h>
 #include <boot.h>
 #include <errno.h>
 #include <fs.h>
 
+static int bootm_relocate_fdt(void *addr, struct image_data *data)
+{
+	if (addr < LINUX_TLB1_MAX_ADDR) {
+		/* The kernel is within  the boot TLB mapping.
+		 * Put the DTB above if there is no space
+		 * below.
+		 */
+		if (addr < (void *)data->oftree->totalsize) {
+			addr = (void *)PAGE_ALIGN((phys_addr_t)addr +
+					data->os->header.ih_size);
+			addr += data->oftree->totalsize;
+			if (addr < LINUX_TLB1_MAX_ADDR)
+				addr = LINUX_TLB1_MAX_ADDR;
+		}
+	}
+
+	if (addr > LINUX_TLB1_MAX_ADDR) {
+		pr_crit("Unable to relocate DTB to Linux TLB\n");
+		return 1;
+	}
+
+	addr = (void *)PAGE_ALIGN_DOWN((phys_addr_t)addr -
+			data->oftree->totalsize);
+	memcpy(addr, data->oftree, data->oftree->totalsize);
+	free(data->oftree);
+	data->oftree = addr;
+
+	pr_info("Relocating device tree to 0x%p\n", addr);
+	return 0;
+}
+
 static int do_bootm_linux(struct image_data *data)
 {
 	void	(*kernel)(void *, void *, unsigned long,
@@ -24,6 +57,20 @@ static int do_bootm_linux(struct image_data *data)
 		return -EINVAL;
 	}
 
+	/* Relocate the device tree if outside the initial
+	 * Linux mapped TLB.
+	 */
+	if (IS_ENABLED(CONFIG_MPC85xx)) {
+		void *addr = data->oftree;
+
+		if ((addr + data->oftree->totalsize) > LINUX_TLB1_MAX_ADDR) {
+			addr = (void *)data->os_address;
+
+			if (bootm_relocate_fdt(addr, data))
+				goto error;
+		}
+	}
+
 	fdt_add_reserve_map(data->oftree);
 
 	kernel = (void *)(data->os_address + data->os_entry);
@@ -40,7 +87,7 @@ static int do_bootm_linux(struct image_data *data)
 
 	reset_cpu(0);
 
-	/* not reached */
+error:
 	return -1;
 }
 
-- 
1.7.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox