From nobody Wed Jun 10 04:01:08 2026 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 4gZsX52rLyz6gv4V for ; Wed, 10 Jun 2026 04:01:09 +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 4gZsX46FDZz3wB6 for ; Wed, 10 Jun 2026 04:01:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781064068; 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=WeyZLnWTj9b2BHquSH0NnFWjb4cod1+je4r+IMcdvmw=; b=WyMkRLoJXwCZWDEKD4A3bn7V5Yi2ym83eLPQOXYjl9tAUQ7KzDQ/nJkqHn13MiTsdeRTjb JLUCtPkEf9jDAzgzlkAs5T0+YmRt6YXUfkkUP3aYZOQkFprIGnj5MtnbXpGONhZT7KU90d UKjcxJhVDF6XWUj6HewCRSNmP5ZoZvnKk+KB0EjpNJGReok/B0MYrHim3HMSN9KCYngkOR vj7dK3bqlzYh41srnLq5xzYpgZEy9nKs04eNZ/L/pUrcw7bKJEo2QKP5U57bnhCqd9z9pr zg8/o/GHQH/EoUYpL2v0zUOUoAaRoQOxuwrxuSVFdbqrPcXvKWRucsCorJ/k6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781064068; a=rsa-sha256; cv=none; b=WjSHc/hQQwkt9kQYzValwvR3VHE9g4qP1JEn+wP+oU0r8/GpT8goBnhELsQyr4ejSpom4H Hs3cuHYux5RD09oNqj5tLm2Y0MekERs5tEsrUjUVy6jsK2b2gpDK+oB6AuI8A3DnZ2nCBu zbGKoQ3NZ9XQgEQzmC7Q/Up/x/r6JoMIkGW+IMmv2TToi9OZ9C1xfVi7aXhvC4HBGLlTb8 CIZ5aZbuR7QtmtTj53EiwKJskC7UQdJTyDaIbmf6aPtk555CZe805NsIXRLNw/CYGGjKtw UbKlTukDsb83dq9kA8ESkZM4+osBEPPut1aaNOZsHpAKd+e/OvabH61VNirwmQ== 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=1781064068; 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=WeyZLnWTj9b2BHquSH0NnFWjb4cod1+je4r+IMcdvmw=; b=soliEuY6kO63Q1Cyqdmupd/EG3E+XjhnCW1SZBDBVGGHhKtmlb+CFrPMKFjyhoGt9SfER8 M934h+ZfGMHElVwpy/37mKAgFStNmpNxgRJ2DIuXSmjqiwW1nMJllx09gMu81dX3x55a1o Pn1NF2On/Nv5f6ckf8meCzUdj3BfeXwCFrI/zQLivtUY4qNnbXQVJ9La4SOdzrjsXyH9SV dtrCclTEC1w8dmOqmS2KeyLfy5xjIjWjBg0B6ptoWk86lWPr4FP4AxpqwYLVRfepo7DSId XSlAHRgMNycT/OJ5/e5tob4K8pDiAzv1AZ2DRIk6VQzKlIxlXQ175K1eoWPeHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gZsX45qV0z14PK for ; Wed, 10 Jun 2026 04:01:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27b9e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 10 Jun 2026 04:01:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 800c4034d201 - stable/14 - kern: ofw: provide ofw_bus_destroy_iinfo to teardown interrupt-map 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 800c4034d201034345be462de6f2f9178971fd92 Auto-Submitted: auto-generated Date: Wed, 10 Jun 2026 04:01:08 +0000 Message-Id: <6a28e184.27b9e.4b268298@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=800c4034d201034345be462de6f2f9178971fd92 commit 800c4034d201034345be462de6f2f9178971fd92 Author: Kyle Evans AuthorDate: 2026-05-09 02:42:50 +0000 Commit: Kyle Evans CommitDate: 2026-06-10 04:00:48 +0000 kern: ofw: provide ofw_bus_destroy_iinfo to teardown interrupt-map For symmetry with ofw_bus_setup_iinfo, the next commits will use it to properly cleanup on failure in bcm2838_pci. Reviewed by: andrew (cherry picked from commit b230a7b9a52c0fc948f4f1dcd1225a94674073f6) --- sys/dev/ofw/ofw_bus_subr.c | 12 ++++++++++++ sys/dev/ofw/ofw_bus_subr.h | 1 + 2 files changed, 13 insertions(+) diff --git a/sys/dev/ofw/ofw_bus_subr.c b/sys/dev/ofw/ofw_bus_subr.c index a21c5fa2735b..adc5ccdf1869 100644 --- a/sys/dev/ofw/ofw_bus_subr.c +++ b/sys/dev/ofw/ofw_bus_subr.c @@ -349,6 +349,18 @@ ofw_bus_setup_iinfo(phandle_t node, struct ofw_bus_iinfo *ii, int intrsz) } } +void +ofw_bus_destroy_iinfo(struct ofw_bus_iinfo *ii) +{ + + if (ii->opi_imapsz > 0) { + OF_prop_free(ii->opi_imapmsk); + ii->opi_imapsz = 0; + } + + OF_prop_free(ii->opi_imap); +} + int ofw_bus_lookup_imap(phandle_t node, struct ofw_bus_iinfo *ii, void *reg, int regsz, void *pintr, int pintrsz, void *mintr, int mintrsz, diff --git a/sys/dev/ofw/ofw_bus_subr.h b/sys/dev/ofw/ofw_bus_subr.h index 1a33d7655f77..2e13f29a67f6 100644 --- a/sys/dev/ofw/ofw_bus_subr.h +++ b/sys/dev/ofw/ofw_bus_subr.h @@ -86,6 +86,7 @@ bus_get_device_path_t ofw_bus_gen_get_device_path; /* Routines for processing firmware interrupt maps */ void ofw_bus_setup_iinfo(phandle_t, struct ofw_bus_iinfo *, int); +void ofw_bus_destroy_iinfo(struct ofw_bus_iinfo *); int ofw_bus_lookup_imap(phandle_t, struct ofw_bus_iinfo *, void *, int, void *, int, void *, int, phandle_t *); int ofw_bus_search_intrmap(void *, int, void *, int, void *, int, void *,