From nobody Tue Mar 07 16:55:41 2023 X-Original-To: dev-commits-src-branches@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 4PWM5T6Xs1z3wMmS; Tue, 7 Mar 2023 16:55:41 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PWM5T5qcwz4KCl; Tue, 7 Mar 2023 16:55:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678208141; 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=ae10gqyj+iKkBZcf9npojksHN0d9f4ZVJXfeqUc4QzI=; b=hUdHBMWid3FdvHtAWXZWoFsxy+5nyqkaeeJDEDJO6JcuFHcdT43QghGsbFAY+Qw4Beih+T z2G6vhRuvloILxZYEWlcjKoiZMF6JS0qSl7iBezqEJjCIglq1EJzbTkXbk5ZeIVrd+VAGC o6Kl0rRmdzCgyqy14q6rbTOsD3tJIZ0ec3xRCP9RsINs002jo6M312YTk5Yb1Q4rDF12/l yfLN4pWb7ebw0YXl8aW9sLfzYVclpZit2oyVZNyGY3Q8Ef2sOCq7womo87iyLmkunCKLmb x9x5r+gjqdOl00O8dvKq5fTONndzOh3gMMPsr9KHapig/vcpxVBKjTScvnnG4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678208141; 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=ae10gqyj+iKkBZcf9npojksHN0d9f4ZVJXfeqUc4QzI=; b=N6d/CYhW5fshiNsDMNtJD3obpOS1/tmRG5iV6XcNq3AWZHkbVqOAaNZSEgef9L97ch2LpP NQ/NLDHKEssKu865g74gSUtvcnHjdfEDywHwYQbT0bhsP6b7xurQAgG6aYsknmnnD45Lvj 8l/FpmEZ7OHfbsH6JStAag7MZ5Ce7992bwkyvp9XVrTAmaaZNoJgIZRpiZOA713UenPBcC O1GZQrtP3/eAfu9PcZiPIy/g6zsh86fyuZp7RFZJV8/fKIILEK0LDTmeFB315+6kFxp7CB 1/B2AnN06J8+AUTUYc+97qa4z/KpGueYoSc8DNsqD/E80+hHucZde+z82/bBaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678208141; a=rsa-sha256; cv=none; b=NRwduBgMXnO4GvF1rBX48B7nPW8qvR2mK7nJ4m7KhIERfCzGbMVsTtmlpfjIAmcFJyji4s 3ggFicGa8rRDCVudGmNcSTTYYzSZP6OTECm2GnUR+YTufo5K6SQELfig4S29cgbBuLyqOP awhk5hTGneV4fJSadmTkbKBFp+0vt4L0Al7HKa5z43Wsu72wg1/QNi4wjumhMfUTflE8gv JKJB5zyD/5jnI+vGWrSJdeK/0Swef+cJnpiXON1m2BWZPz9bosAKdtfLySmpVUA5yCKBIT sBQ7BB7zG9L53DAaVkOORuGQcFoztQ9fI7dROMgeETZ6A9QwAYc3tpLsPOoL5g== 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 4PWM5T4wB1zrMJ; Tue, 7 Mar 2023 16:55:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 327Gtftl022891; Tue, 7 Mar 2023 16:55:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 327GtfdI022890; Tue, 7 Mar 2023 16:55:41 GMT (envelope-from git) Date: Tue, 7 Mar 2023 16:55:41 GMT Message-Id: <202303071655.327GtfdI022890@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 5b6edfc577fb - stable/13 - bcm_dma: attach at an earlier bus pass List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5b6edfc577fbb4e9703c112713c7fb472e144346 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=5b6edfc577fbb4e9703c112713c7fb472e144346 commit 5b6edfc577fbb4e9703c112713c7fb472e144346 Author: Mark Millard AuthorDate: 2023-02-17 20:30:35 +0000 Commit: Mitchell Horne CommitDate: 2023-03-07 16:55:01 +0000 bcm_dma: attach at an earlier bus pass The sdhci_bcm driver attach routine relies on bcm_dma already being attached, in order to allocate a DMA channel. However, both drivers attached at the default pass so this is not guaranteed. Newer RPI firmware exposes this assumption, and the result is a NULL-dereference in bcm_dma_allocate(). To fix this, use BUS_PASS_SUPPORTDEV for bcm_dma. PR: 268835 Reviewed by: mhorne MFC after: 1 week (cherry picked from commit 9873b171697033f9f19608d98bcd1c16cacb92af) --- sys/arm/broadcom/bcm2835/bcm2835_dma.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/arm/broadcom/bcm2835/bcm2835_dma.c b/sys/arm/broadcom/bcm2835/bcm2835_dma.c index cab8639bb607..af86647704f6 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_dma.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_dma.c @@ -766,5 +766,6 @@ static driver_t bcm_dma_driver = { static devclass_t bcm_dma_devclass; -DRIVER_MODULE(bcm_dma, simplebus, bcm_dma_driver, bcm_dma_devclass, 0, 0); +EARLY_DRIVER_MODULE(bcm_dma, simplebus, bcm_dma_driver, bcm_dma_devclass, 0, 0, + BUS_PASS_SUPPORTDEV + BUS_PASS_ORDER_MIDDLE); MODULE_VERSION(bcm_dma, 1);