aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/dpaa/bman_fdt.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/dpaa/bman_fdt.c')
-rw-r--r--sys/dev/dpaa/bman_fdt.c38
1 files changed, 29 insertions, 9 deletions
diff --git a/sys/dev/dpaa/bman_fdt.c b/sys/dev/dpaa/bman_fdt.c
index c7950270e34d..454af67ae6b1 100644
--- a/sys/dev/dpaa/bman_fdt.c
+++ b/sys/dev/dpaa/bman_fdt.c
@@ -33,11 +33,10 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/bus.h>
#include <sys/module.h>
+#include <sys/smp.h>
#include <machine/bus.h>
-#include <dev/fdt/fdt_common.h>
-
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
#include <dev/ofw/ofw_subr.h>
@@ -107,7 +106,8 @@ static driver_t bm_portals_driver = {
};
static devclass_t bm_portals_devclass;
-DRIVER_MODULE(bman_portals, ofwbus, bm_portals_driver, bm_portals_devclass, 0, 0);
+EARLY_DRIVER_MODULE(bman_portals, ofwbus, bm_portals_driver,
+ bm_portals_devclass, 0, 0, BUS_PASS_BUS);
static void
get_addr_props(phandle_t node, uint32_t *addrp, uint32_t *sizep)
@@ -123,7 +123,7 @@ static int
bman_portals_fdt_probe(device_t dev)
{
- if (!ofw_bus_is_compatible(dev, "bman-portals"))
+ if (!ofw_bus_is_compatible(dev, "fsl,bman-portals"))
return (ENXIO);
device_set_desc(dev, BMAN_PORT_DEVSTR);
@@ -131,6 +131,25 @@ bman_portals_fdt_probe(device_t dev)
return (BUS_PROBE_DEFAULT);
}
+static phandle_t
+bman_portal_find_cpu(int cpu)
+{
+ phandle_t node;
+ pcell_t reg;
+
+ node = OF_finddevice("/cpus");
+ if (node == -1)
+ return (node);
+
+ for (node = OF_child(node); node != 0; node = OF_peer(node)) {
+ if (OF_getprop(node, "reg", &reg, sizeof(reg)) <= 0)
+ continue;
+ if (reg == cpu)
+ return (node);
+ }
+ return (-1);
+}
+
static int
bman_portals_fdt_attach(device_t dev)
{
@@ -154,13 +173,17 @@ bman_portals_fdt_attach(device_t dev)
/* Find portals tied to CPUs */
for (child = OF_child(node); child != 0; child = OF_peer(child)) {
- if (!fdt_is_compatible(child, "fsl,bman-portal")) {
+ if (cpus >= mp_ncpus)
+ break;
+ if (!ofw_bus_node_is_compatible(child, "fsl,bman-portal")) {
continue;
}
/* Checkout related cpu */
if (OF_getprop(child, "cpu-handle", (void *)&cpu,
sizeof(cpu)) <= 0) {
- continue;
+ cpu = bman_portal_find_cpu(cpus);
+ if (cpu <= 0)
+ continue;
}
/* Acquire cpu number */
cpu_node = OF_instance_to_package(cpu);
@@ -171,9 +194,6 @@ bman_portals_fdt_attach(device_t dev)
cpus++;
- if (cpus > MAXCPU)
- break;
-
if (ofw_bus_gen_setup_devinfo(&ofw_di, child) != 0) {
device_printf(dev, "could not set up devinfo\n");
continue;