Changeset e4923c8 in rtems-libbsd

Timestamp:

01/17/18 13:30:44 (5 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, 5-freebsd-12, 6-freebsd-12, master

Children:

cfc149b

Parents:

0f1d2f6

git-author:

Sebastian Huber <sebastian.huber@…> (01/17/18 13:30:44)

git-committer:

Sebastian Huber <sebastian.huber@…> (01/23/18 13:54:59)

Message:

linux/of_address.h: of_address_to_resource()

Translate address in of_address_to_resource().

Update #3277.

Files:

• linux/drivers/net/ethernet/freescale/fman/fman.c (modified) (3 diffs)
• linux/drivers/soc/fsl/qbman/qman_ccsr.c (modified) (1 diff)
• rtemsbsd/powerpc/include/linux/device.h (modified) (1 diff)
• rtemsbsd/sys/powerpc/compat.c (modified) (3 diffs)

linux/drivers/net/ethernet/freescale/fman/fman.c

@@ -2789 +2789 @@
         const char *fdt = bsp_fdt_get();
         struct device_node *fm_node;
+        struct device_node muram_node_storage;
+        struct device_node *muram_node;
 #endif /* __rtems__ */
         u32 val, range[2];
@@ -2892 +2894 @@
                 goto fman_node_put;
         }
+#else /* __rtems__ */
+        memset(&muram_node_storage, 0, sizeof(muram_node_storage));
+        muram_node = &muram_node_storage;
+        muram_node->offset = fdt_node_offset_by_compatible(fdt,
+            fm_node->offset, "fsl,fman-muram");
+#endif /* __rtems__ */
 
         err = of_address_to_resource(muram_node, 0,
@@ -2901 +2909 @@
                 goto fman_node_put;
         }
-#else /* __rtems__ */
-        {
-                int node = fdt_node_offset_by_compatible(fdt,
-                    fm_node->offset, "fsl,fman-muram");
-                struct device_node muram_node = {
-                        .offset = node
-                };
-                struct resource res;
-
-                err = of_address_to_resource(&muram_node, 0, &res);
-                if (err != 0) {
-                        pr_err("could not find MURAM node\n");
-                        goto fman_node_put;
-                }
-                fman->dts_params.muram_res.start = phys_base_addr + res.start;
-                fman->dts_params.muram_res.end = phys_base_addr + res.end - 1;
-        }
-#endif /* __rtems__ */
-#ifndef __rtems__
         of_node_put(muram_node);
-#endif /* __rtems__ */
 
         err = devm_request_irq(&of_dev->dev, irq, fman_irq, 0, "fman", fman);

linux/drivers/soc/fsl/qbman/qman_ccsr.c

@@ -873 +873 @@
         memset(&dev, 0, sizeof(dev));
         dev.pdev.dev.of_node = &dev.of_node;
-#if QORIQ_CHIP_IS_T_VARIANT(QORIQ_CHIP_VARIANT)
-        dev.pdev.dev.base = (uintptr_t)&qoriq;
-#endif
         dev.of_node.offset = node;
         dev.of_node.full_name = name;

rtemsbsd/powerpc/include/linux/device.h

@@ -80 +80 @@
 {
 
-        return (void __iomem *)(dev->base + (uintptr_t)offset);
+        return (void __iomem *)(uintptr_t)offset;
 }
 

rtemsbsd/sys/powerpc/compat.c

@@ -330 +330 @@
 {
         const void *fdt = bsp_fdt_get();
+        int node;
         int ac;
         int sc;
@@ -337 +338 @@
 
         memset(res, 0, sizeof(*res));
-
-        ac = get_address_cells(fdt, dn->offset);
+        node = dn->offset;
+
+        ac = get_address_cells(fdt, node);
         if (ac < 0)
                 return (-EINVAL);
 
-        sc = get_size_cells(fdt, dn->offset);
+        sc = get_size_cells(fdt, node);
         if (sc < 0)
                 return (-EINVAL);
 
-        p = fdt_getprop(fdt, dn->offset, "reg", &len);
+        p = fdt_getprop(fdt, node, "reg", &len);
         if (p == NULL)
                 return (-EINVAL);
@@ -355 +357 @@
                 return (-EINVAL);
 
-        while (ac > 0) {
-                res->start = (res->start << 32) | fdt32_to_cpu(p[i]);
-                ++i;
-                --ac;
-        }
-
-        while (sc > 0) {
-                res->end = (res->end << 32) | fdt32_to_cpu(p[i]);
-                ++i;
-                --sc;
-        }
+        res->start = translate_address(fdt, node, ac, sc, &p[i]);
+        res->end = of_read_number(&p[i + ac], sc);
         res->end += res->start;
-
         return (0);
 }