From nobody Thu Jun 11 17:12:02 2026 X-Original-To: dev-commits-src-all@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 4gbq2C4CWjz6htpV for ; Thu, 11 Jun 2026 17:12:03 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gbq2C1Lyzz46nH for ; Thu, 11 Jun 2026 17:12:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781197923; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BOYP03i7orTPg/bUXGkHryvoPxlp+VUTfrvHAFwBI1M=; b=cHYYBkocqj+LZyn0Ies/jJ2aKDwCtmIikMptJvnHjc9YRpxMoRjTHUBIqUIgdXfxMS4I2V ikPQEX8O6bNYmwELmQveGliRZ/ny+KSToF34QHaLc92eK8fkYRDRaE88mrrXn1Q3agttzu 8HaQQy/sUjq5qYkHGOaBWJT/N7YM194zAXOaFPfB0M+NYAK0u/LfrKAFz4p6cG09Ay8Y6F BDWO60xZq2CLrABhdk7tBig5LyPZQWNij3GnGdJB7KtmJg/5bAXOAkVbBZVyRnSei0+wVU diq4kyvemtCb52EkNwiV0n9q7HjRqiRDUO/9p1gHLazV6O0LP4ZN5l2Yyevk2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781197923; a=rsa-sha256; cv=none; b=MG5CyOeAuyTGjVl+haQuEIi8ODyfNOCmB6GHlXkzaSDNKbAi3hej1DvYfflFL7bCLpkoWT REWeYhfYurqdZmGvIdB8RHt8wg00BqhxEPV6+CfY5w5JrnMzm0j1gitFEjO1roFGc87Z8u NBcqBf54QdMKAJvWeulxgMqro1oJ4KlvgEq9on5rG4Demofs+114oirOJavdWQkBwOiHcO AMuZzaHIjE3uXkI7vsoE933+d29HDzD78kWyg0KskIkinw0NeOp6nsVYRvVjQoT4N86y8r Clvk+lVvKMz8zhD8jXZoYLV3Fqf/qC03oxX/6x0XZPlzu6iGro3OZyT1/9bN1Q== 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=1781197923; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BOYP03i7orTPg/bUXGkHryvoPxlp+VUTfrvHAFwBI1M=; b=BeesEdeSzlQN/TonsSUMLxMNuhPdocrGXa6IpFgLt88SfPMkEhwHVC8ZQtnGKnYZUki9Mn bN2KU8jr06mDfvKpjQfsE62aiJlrIjg3agFzcwjhFLOB6IpLuq7xotWQfPKcI1cXilCyFe l+uqLOd5nly74xVHqexWy1C+l5dVys5hpSI1ZV4EIqYxAmJQNlsaSNQBbdVzbyPBwzSDCt CbFDT4e4RB9Q4KuLTE+k5nlozAb00CJidhBI4UB1voYzqLwCzCYXXWFsY+oGZbunTH2UZA xx7Ho5k2Hi7oOcJ1to3Q+Rsn9Ff3r0KFjBwkY7t7HvIjQQcuX5zxCtth3knhug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gbq2B5FN5z10pq for ; Thu, 11 Jun 2026 17:12:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d03f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 11 Jun 2026 17:12:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Haoxiang Li From: Mitchell Horne Subject: git: 3fbdaeeed45c - stable/14 - bcm2835_sdhci: Clean up DMA resources on attach failure List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/14 X-Git-Reftype: branch X-Git-Commit: 3fbdaeeed45c151318d844981a3725f48a6261a5 Auto-Submitted: auto-generated Date: Thu, 11 Jun 2026 17:12:02 +0000 Message-Id: <6a2aec62.3d03f.384251a4@gitrepo.freebsd.org> The branch stable/14 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=3fbdaeeed45c151318d844981a3725f48a6261a5 commit 3fbdaeeed45c151318d844981a3725f48a6261a5 Author: Haoxiang Li AuthorDate: 2026-05-27 02:42:43 +0000 Commit: Mitchell Horne CommitDate: 2026-06-11 17:11:40 +0000 bcm2835_sdhci: Clean up DMA resources on attach failure bcm_sdhci_attach() allocates a DMA channel with bcm_dma_allocate() before creating the bus_dma tag and map. If a later initialization step fails, the common error path releases the interrupt and memory resources, but leaves the DMA channel allocated. Call bcm_dma_free() for cleanup, as it already performs the required internal checks and can therefore be invoked directly. Signed-off-by: Haoxiang Li Reviewed by: mhorne MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/2241 (cherry picked from commit d1488cd762bee79240a715bf04f3d30e9a121b26) --- sys/arm/broadcom/bcm2835/bcm2835_sdhci.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c b/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c index b9d619f8d791..94647a5e9a5d 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c @@ -365,6 +365,7 @@ bcm_sdhci_attach(device_t dev) return (0); fail: + bcm_dma_free(sc->sc_dma_ch); if (sc->sc_intrhand) bus_teardown_intr(dev, sc->sc_irq_res, sc->sc_intrhand); if (sc->sc_irq_res)