[U-Boot] [PATCH 1/2] fdt: add prototype for fdt_increase_size()

[U-Boot] [PATCH 1/2] fdt: add prototype for fdt_increase_size()

[Timur Tabi]

Add a prototype for fdt_increase_size() so that anyone can call it.

Signed-off-by: Timur Tabi <timur@freescale.com>
---
 include/fdt_support.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/include/fdt_support.h b/include/fdt_support.h
index ce6817b..7333c0c 100644
--- a/include/fdt_support.h
+++ b/include/fdt_support.h
@@ -79,6 +79,7 @@ void ft_pci_setup(void *blob, bd_t *bd);
 
 void set_working_fdt_addr(void *addr);
 int fdt_resize(void *blob);
+int fdt_increase_size(void *fdt, int add_len);
 
 int fdt_fixup_nor_flash_size(void *blob);
 
-- 
1.7.3.4

[U-Boot] [PATCH 2/2] fman: insert the Fman firmware into the device tree

[Timur Tabi]

The Fman device tree node binding allows for the entire Fman firmware binary
data to be embedded in the device tree.  This eliminates the need to have
NOR flash mapped to Linux just so that the Fman driver can see the firmware.

The location of the Fman firmware is taken from the 'fman_ucode' environment
variable.

Signed-off-by: Timur Tabi <timur@freescale.com>
---
 arch/powerpc/cpu/mpc85xx/fdt.c |  119 ++++++++++++++++++++++++++++++++++++++++
 include/configs/corenet_ds.h   |    8 +--
 2 files changed, 121 insertions(+), 6 deletions(-)

diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c
index 6e909b5..42bc51a 100644
--- a/arch/powerpc/cpu/mpc85xx/fdt.c
+++ b/arch/powerpc/cpu/mpc85xx/fdt.c
@@ -33,6 +33,7 @@
 #ifdef CONFIG_FSL_ESDHC
 #include <fsl_esdhc.h>
 #endif
+#include "../../../../drivers/qe/qe.h"		/* For struct qe_firmware */
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -397,6 +398,122 @@ static void ft_fixup_qe_snum(void *blob)
 }
 #endif
 
+/**
+ * fdt_fixup_fman_firmware -- insert the Fman firmware into the device tree
+ *
+ * The binding for an Fman firmware node is documented in
+ * Documentation/powerpc/dts-bindings/fsl/dpaa/fman.txt.  This node contains
+ * the actual Fman firmware binary data.  The operating system is expected to
+ * be able to parse the binary data to determine any attributes it needs.
+ */
+void fdt_fixup_fman_firmware(void *blob)
+{
+	int rc, fmnode, fwnode = -1;
+	uint32_t phandle;
+	struct qe_firmware *fmanfw;
+	const struct qe_header *hdr;
+	unsigned int length;
+	uint32_t crc;
+	const char *p;
+
+	/* The first Fman we find will contain the actual firmware. */
+	fmnode = fdt_node_offset_by_compatible(blob, -1, "fsl,fman");
+	if (fmnode < 0)
+		/* Exit silently if there are no Fman devices */
+		return;
+
+	/* If we already have a firmware node, then also exit silently. */
+	if (fdt_node_offset_by_compatible(blob, -1, "fsl,fman-firmware") > 0)
+		return;
+
+	/* If the environment variable is not set, then exit silently */
+	p = getenv("fman_ucode");
+	if (!p)
+		return;
+
+	fmanfw = (struct qe_firmware *) simple_strtoul(p, NULL, 0);
+	if (!fmanfw)
+		return;
+
+	hdr = &fmanfw->header;
+	length = be32_to_cpu(hdr->length);
+
+	/* Verify the firmware. */
+	if ((hdr->magic[0] != 'Q') || (hdr->magic[1] != 'E') ||
+		(hdr->magic[2] != 'F')) {
+		printf("Data at %p is not an Fman firmware\n", fmanfw);
+		return;
+	}
+
+	if (length > 16384) {
+		printf("Fman firmware at %p is too large (size=%u)\n",
+		       fmanfw, length);
+		return;
+	}
+
+	length -= sizeof(u32);	/* Subtract the size of the CRC */
+	crc = be32_to_cpu(*(u32 *)((void *)fmanfw + length));
+	if (crc != crc32_no_comp(0, (void *)fmanfw, length)) {
+		printf("Fman firmware at %p has invalid CRC\n", fmanfw);
+		return;
+	}
+
+	/* Increase the size of the fdt to make room for the node. */
+	rc = fdt_increase_size(blob, fmanfw->header.length);
+	if (rc < 0) {
+		printf("Unable to make room for Fman firmware: %s\n",
+			fdt_strerror(rc));
+		return;
+	}
+
+	/* Create the firmware node. */
+	fwnode = fdt_add_subnode(blob, fmnode, "fman-firmware");
+	if (fwnode < 0) {
+		char s[64];
+		fdt_get_path(blob, fmnode, s, sizeof(s));
+		printf("Could not add firmware node to %s: %s\n", s,
+		       fdt_strerror(fwnode));
+		return;
+	}
+	rc = fdt_setprop_string(blob, fwnode, "compatible", "fsl,fman-firmware");
+	if (rc < 0) {
+		char s[64];
+		fdt_get_path(blob, fwnode, s, sizeof(s));
+		printf("Could not add compatible property to node %s: %s\n", s,
+		       fdt_strerror(rc));
+		return;
+	}
+	phandle = fdt_alloc_phandle(blob);
+	rc = fdt_setprop_cell(blob, fwnode, "linux,phandle", phandle);
+	if (rc < 0) {
+		char s[64];
+		fdt_get_path(blob, fwnode, s, sizeof(s));
+		printf("Could not add phandle property to node %s: %s\n", s,
+		       fdt_strerror(rc));
+		return;
+	}
+	rc = fdt_setprop(blob, fwnode, "fsl,firmware", fmanfw, fmanfw->header.length);
+	if (rc < 0) {
+		char s[64];
+		fdt_get_path(blob, fwnode, s, sizeof(s));
+		printf("Could not add firmware property to node %s: %s\n", s,
+		       fdt_strerror(rc));
+		return;
+	}
+
+	/* Find all other Fman nodes and point them to the firmware node. */
+	while ((fmnode = fdt_node_offset_by_compatible(blob, fmnode, "fsl,fman")) > 0) {
+		rc = fdt_setprop_cell(blob, fmnode, "fsl,firmware-phandle", phandle);
+		if (rc < 0) {
+			char s[64];
+			fdt_get_path(blob, fmnode, s, sizeof(s));
+			printf("Could not add pointer property to node %s: %s\n",
+			       s, fdt_strerror(rc));
+			return;
+		}
+	}
+}
+
 void ft_cpu_setup(void *blob, bd_t *bd)
 {
 	int off;
@@ -436,6 +553,8 @@ void ft_cpu_setup(void *blob, bd_t *bd)
 	ft_fixup_qe_snum(blob);
 #endif
 
+	fdt_fixup_fman_firmware(blob);
+
 #ifdef CONFIG_SYS_NS16550
 	do_fixup_by_compat_u32(blob, "ns16550",
 		"clock-frequency", CONFIG_SYS_NS16550_CLK, 1);
diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index d1cda15..cba0ac2 100644
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -443,11 +443,7 @@
 #define CONFIG_SYS_DPAA_PME
 /* Default address of microcode for the Linux Fman driver */
 #define CONFIG_SYS_FMAN_FW_ADDR		0xEF000000
-#ifdef CONFIG_PHYS_64BIT
-#define CONFIG_SYS_FMAN_FW_ADDR_PHYS	0xFEF000000ULL
-#else
-#define CONFIG_SYS_FMAN_FW_ADDR_PHYS	CONFIG_SYS_FMAN_FW_ADDR
-#endif
+#define CONFIG_SYS_FDT_PAD		0x5000	/* extra room for firmware */
 
 #ifdef CONFIG_SYS_DPAA_FMAN
 #define CONFIG_FMAN_ENET
@@ -616,7 +612,7 @@
 	"fdtfile=p4080ds/p4080ds.dtb\0"				\
 	"bdev=sda3\0"						\
 	"c=ffe\0"						\
-	"fman_ucode="MK_STR(CONFIG_SYS_FMAN_FW_ADDR_PHYS)"\0"
+	"fman_ucode="MK_STR(CONFIG_SYS_FMAN_FW_ADDR)"\0"
 
 #define CONFIG_HDBOOT					\
 	"setenv bootargs root=/dev/$bdev rw "		\
-- 
1.7.3.4

[U-Boot] [PATCH 1/2] fdt: add prototype for fdt_increase_size()

[Kumar Gala]

On May 3, 2011, at 1:35 PM, Timur Tabi wrote:

> Add a prototype for fdt_increase_size() so that anyone can call it.
> 
> Signed-off-by: Timur Tabi <timur@freescale.com>
> ---
> include/fdt_support.h |    1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)

Jerry,

Any comments on this?

- k

[U-Boot] [PATCH 1/2] fdt: add prototype for fdt_increase_size()

[Gerald Van Baren]

Hi Kumar, Timur,

On 07/14/2011 09:32 AM, Kumar Gala wrote:
>
> On May 3, 2011, at 1:35 PM, Timur Tabi wrote:
>
>> Add a prototype for fdt_increase_size() so that anyone can call it.
>>
>> Signed-off-by: Timur Tabi<timur@freescale.com>
>> ---
>> include/fdt_support.h |    1 +
>> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> Jerry,
>
> Any comments on this?
>
> - k

I put it in my todo list on patchworks.

gvb

[U-Boot] [PATCH 1/2] fdt: add prototype for fdt_increase_size()

[Jerry Van Baren]

On 05/03/2011 02:35 PM, Timur Tabi wrote:
> Add a prototype for fdt_increase_size() so that anyone can call it.
>
> Signed-off-by: Timur Tabi<timur@freescale.com>
> ---
>   include/fdt_support.h |    1 +
>   1 files changed, 1 insertions(+), 0 deletions(-)

Applied to u-boot-fdt.

Thanks,
gvb

[U-Boot] [PATCH 2/2] fman: insert the Fman firmware into the device tree

[Kumar Gala]

On May 3, 2011, at 1:35 PM, Timur Tabi wrote:

> The Fman device tree node binding allows for the entire Fman firmware binary
> data to be embedded in the device tree.  This eliminates the need to have
> NOR flash mapped to Linux just so that the Fman driver can see the firmware.
> 
> The location of the Fman firmware is taken from the 'fman_ucode' environment
> variable.
> 
> Signed-off-by: Timur Tabi <timur@freescale.com>
> ---
> arch/powerpc/cpu/mpc85xx/fdt.c |  119 ++++++++++++++++++++++++++++++++++++++++
> include/configs/corenet_ds.h   |    8 +--
> 2 files changed, 121 insertions(+), 6 deletions(-)

applied to 85xx (since fdt bits are pulled in)

- k