fm: fdt: Move fman ucode fixup to driver code

Not only powerpc/mpc85xx but also Freescale Layerscape platforms will
use fdt_fixup_fman_firmware() to insert Fman ucode blob into the device
tree. So move the function to Fman driver code.

Signed-off-by: Gong Qianyu <Qianyu.Gong@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>

diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c
index 50eef05..ced216c 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/fdt.c
+++ b/arch/powerpc/cpu/mpc85xx/fdt.c
@@ -19,7 +19,9 @@
 #ifdef CONFIG_FSL_ESDHC
 #include <fsl_esdhc.h>
 #endif
-#include <fsl_qe.h>            /* For struct qe_firmware */
+#ifdef CONFIG_SYS_DPAA_FMAN
+#include <fsl_fman.h>
+#endif
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -488,125 +490,6 @@ 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.
- */
-#ifdef CONFIG_SYS_DPAA_FMAN
-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, 16);
-       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 > CONFIG_SYS_QE_FMAN_FW_LENGTH) {
-               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_create_phandle(blob, fwnode);
-       if (!phandle) {
-               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;
-               }
-       }
-}
-#else
-#define fdt_fixup_fman_firmware(x)
-#endif
-
 #if defined(CONFIG_PPC_P4080)
 static void fdt_fixup_usb(void *fdt)
 {
@@ -752,7 +635,9 @@ void ft_cpu_setup(void *blob, bd_t *bd)
        ft_fixup_qe_snum(blob);
 #endif
 
+#ifdef CONFIG_SYS_DPAA_FMAN
        fdt_fixup_fman_firmware(blob);
+#endif
 
 #ifdef CONFIG_SYS_NS16550
        do_fixup_by_compat_u32(blob, "ns16550",

diff --git a/drivers/net/fm/Makefile b/drivers/net/fm/Makefile
index a3c9f99..493cdc6 100644 (file)
--- a/drivers/net/fm/Makefile
+++ b/drivers/net/fm/Makefile
@@ -6,6 +6,7 @@
 
 obj-y += dtsec.o
 obj-y += eth.o
+obj-y += fdt.o
 obj-y += fm.o
 obj-y += init.o
 obj-y += tgec.o

diff --git a/drivers/net/fm/fdt.c b/drivers/net/fm/fdt.c
new file mode 100644 (file)
index 0000000..830d228
--- /dev/null
+++ b/drivers/net/fm/fdt.c
@@ -0,0 +1,128 @@
+/*
+ * Copyright 2016 Freescale Semiconductor, Inc.
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+#include <asm/io.h>
+#include <fsl_qe.h>    /* For struct qe_firmware */
+
+#ifdef CONFIG_SYS_DPAA_FMAN
+/**
+ * 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, 16);
+       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 > CONFIG_SYS_QE_FMAN_FW_LENGTH) {
+               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_create_phandle(blob, fwnode);
+       if (!phandle) {
+               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;
+               }
+       }
+}
+#endif

diff --git a/include/fsl_fman.h b/include/fsl_fman.h
index 4d04415..f3e35f8 100644 (file)
--- a/include/fsl_fman.h
+++ b/include/fsl_fman.h
@@ -460,4 +460,5 @@ typedef struct ccsr_fman {
        u8                      res5[4*1024];
 } ccsr_fman_t;
 
+void fdt_fixup_fman_firmware(void *blob);
 #endif /*__FSL_FMAN_H__*/