From bff139111b7ba8b07c9168f3562a6e8c5d442816 Mon Sep 17 00:00:00 2001 From: andrew Date: Fri, 6 Nov 2015 14:36:21 +0000 Subject: [PATCH] Mark the arm64 nexus devices to be attached early. This allows multipass to work correctly. Without it the pass quickly moves to the final pass before the nexus device attaches. Sponsored by: ABT Systems Ltd --- sys/arm64/arm64/nexus.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/arm64/arm64/nexus.c b/sys/arm64/arm64/nexus.c index 764012e9415..807993bedf7 100644 --- a/sys/arm64/arm64/nexus.c +++ b/sys/arm64/arm64/nexus.c @@ -134,13 +134,11 @@ static device_method_t nexus_methods[] = { { 0, 0 } }; -static devclass_t nexus_devclass; static driver_t nexus_driver = { "nexus", nexus_methods, 1 /* no softc */ }; -DRIVER_MODULE(nexus, root, nexus_driver, nexus_devclass, 0, 0); static int nexus_attach(device_t dev) @@ -380,7 +378,8 @@ DEFINE_CLASS_1(nexus, nexus_fdt_driver, nexus_fdt_methods, 1, nexus_driver); #undef nexus_baseclasses static devclass_t nexus_fdt_devclass; -DRIVER_MODULE(nexus_fdt, root, nexus_fdt_driver, nexus_fdt_devclass, 0, 0); +EARLY_DRIVER_MODULE(nexus_fdt, root, nexus_fdt_driver, nexus_fdt_devclass, + 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_FIRST); static int nexus_fdt_probe(device_t dev) @@ -433,7 +432,8 @@ DEFINE_CLASS_1(nexus, nexus_acpi_driver, nexus_acpi_methods, 1, #undef nexus_baseclasses static devclass_t nexus_acpi_devclass; -DRIVER_MODULE(nexus_acpi, root, nexus_acpi_driver, nexus_acpi_devclass, 0, 0); +EARLY_DRIVER_MODULE(nexus_acpi, root, nexus_acpi_driver, nexus_acpi_devclass, + 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_FIRST); static int nexus_acpi_probe(device_t dev) -- 2.39.5