From nobody Tue Apr 08 03:47:33 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZWsTx4Zcjz5sgMg; Tue, 08 Apr 2025 03:47:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZWsTx1zpZz45gy; Tue, 08 Apr 2025 03:47:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744084053; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cwz65nrx7DcIftFv7AUepJgoPvtTixW7tOZywGQaTtY=; b=GOJbUiIx9QDz+XjXpWVQ/feP0gr9LMl6gMPIy+If5IE7utP4YBfBWDD/TFrkDDROpy7HJR tD+XJvbdlMm0ViGXatDL0/9taqz57DSLgIRszuox1GO7qP6pC17Mc/acQYEvnT/uN8aCsO zPIrSJUdLzA2Yc8Wmg9FMKrMF08/IzfpOLQdUDVI9m4Z5IUm8H1HWFv6oJLGhgs7M9cCYT lfP5gAGE+7+tEHoxqyOUjEq+NH3H6zY62/7OkixElAjl9Tm7c4JY90WaOoMng+4W3GsSxK 59upOUiSbyo3nZpLbukIkpuwlMbqjVjS9VFygg6xhTlml4v74RVJtlLDTarvGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744084053; a=rsa-sha256; cv=none; b=MCK39CDCEvfRyqlp88RvLo131yxbIjuPrgl/TCXEWCBq/vZbBoXRjx0o8ombOlXiuGZKVm sMIVnBr0d5u3tLECCD8ArlDtn83OxHK7Yyxl8T16z+E6D0O6fRmhmnU77JqXoOKigOO5Su QsFPwj8IT2f3gaqyuYNWYHzFMzNnPJkbSVZQo20lDQo0wtT0jll6V50wigKuUGwa/YXsIv pF6IqH5fdXv+F9/AFLm8Vp2GJkLFvO1Yu79tTxAb6iA12TgbbgWtro8NAu712HW1nI2BG/ 6hNEI4fRR7y+fvrkG5ccbIgqoA0TPsWCBq1GMV10csePMzUZxne8MeEYjD22Tg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744084053; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cwz65nrx7DcIftFv7AUepJgoPvtTixW7tOZywGQaTtY=; b=QBajo1CGm32R3hzLLsFyGq4SQaMOqy77Bwtji47C1WrERNhCPKTGsbLhIsgOobsVJL/kDH KYBQMKo9ReZHm0IM97dI9E+0hmnDOwS8LYJHS3UTVHa5Ul9r6gdcHNMpfqJGd+6UXMOzos FKTNF/podl31ETWVZaAOiw2h+Ng+VACNeEvAv6chdWL5WvU4Itxf74q47N6MK8Fs/tW8c0 b7wtCmfuMwocNMo3Hx6HKnuX3XBEoD0R9gAkLDcIfNuLkgDD30EBBqrbSuJ1e1oUWUR8Hs 1a7NqMmX4B1GJStxVnV+6zPOeND4Fpb2krTQ8rK+03XtAOUxI+HYvKJn6vaXew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZWsTx1MGszSh; Tue, 08 Apr 2025 03:47:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5383lXIR016819; Tue, 8 Apr 2025 03:47:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5383lXw1016816; Tue, 8 Apr 2025 03:47:33 GMT (envelope-from git) Date: Tue, 8 Apr 2025 03:47:33 GMT Message-Id: <202504080347.5383lXw1016816@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 0c5a770cc450 - main - fdt: fix panic in fdt_slicer/geom due to recent geom changes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0c5a770cc4504f3becb8df0bbfca57c7a47b71f2 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=0c5a770cc4504f3becb8df0bbfca57c7a47b71f2 commit 0c5a770cc4504f3becb8df0bbfca57c7a47b71f2 Author: Adrian Chadd AuthorDate: 2025-04-06 23:52:29 +0000 Commit: Adrian Chadd CommitDate: 2025-04-08 03:47:09 +0000 fdt: fix panic in fdt_slicer/geom due to recent geom changes A recent change in GEOM ordering (c11b701915116bf512f3d77dfdac7a867f51ca0a - "geom: Push GEOM sysinit ordering to after devctl" changed the GEOM init ordering to SI_ORDER_THIRD. However, the FDT slicer / GEOM flash slice code needs the GEOM subsystem to be initialised before it starts loading in flash slices from FDT, and will panic because the mutex isn't initialised. So bump this now to SI_ORDER_FOURTH, so it occurs after the GEOM initialisation. Differential Revision: https://reviews.freebsd.org/D49692 Reviewed by: jhibbits --- sys/dev/fdt/fdt_slicer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/fdt/fdt_slicer.c b/sys/dev/fdt/fdt_slicer.c index 5c1d11cfdcf5..3ba4eddf8b61 100644 --- a/sys/dev/fdt/fdt_slicer.c +++ b/sys/dev/fdt/fdt_slicer.c @@ -156,12 +156,12 @@ fdt_slicer_cleanup(void) } /* - * Must be initialized after GEOM classes (SI_SUB_DRIVERS/SI_ORDER_SECOND), + * Must be initialized after GEOM classes (SI_SUB_DRIVERS/SI_ORDER_THIRD), * i. e. after g_init() is called, due to the use of the GEOM topology_lock * in flash_register_slicer(). However, must be before SI_SUB_CONFIGURE. */ -SYSINIT(fdt_slicer, SI_SUB_DRIVERS, SI_ORDER_THIRD, fdt_slicer_init, NULL); -SYSUNINIT(fdt_slicer, SI_SUB_DRIVERS, SI_ORDER_THIRD, fdt_slicer_cleanup, NULL); +SYSINIT(fdt_slicer, SI_SUB_DRIVERS, SI_ORDER_FOURTH, fdt_slicer_init, NULL); +SYSUNINIT(fdt_slicer, SI_SUB_DRIVERS, SI_ORDER_FOURTH, fdt_slicer_cleanup, NULL); static int mod_handler(module_t mod, int type, void *data) @@ -178,6 +178,6 @@ static moduledata_t fdt_slicer_mod = { "fdt_slicer", mod_handler, NULL }; -DECLARE_MODULE(fdt_slicer, fdt_slicer_mod, SI_SUB_DRIVERS, SI_ORDER_THIRD); +DECLARE_MODULE(fdt_slicer, fdt_slicer_mod, SI_SUB_DRIVERS, SI_ORDER_FOURTH); MODULE_DEPEND(fdt_slicer, geom_flashmap, 0, 0, 0); MODULE_VERSION(fdt_slicer, 1);