From nobody Mon Apr 08 19:04:31 2024 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 4VCz6S325sz5HYlc; Mon, 8 Apr 2024 19:04:32 +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 4VCz6S1PM8z4gf7; Mon, 8 Apr 2024 19:04:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712603072; 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=5V0APuppMW2or+w0B8bR4ZPZTBLo7OUVp9H9c5tiCCo=; b=Pr2Mqu084PwpZDrHwfOPO5aLlVBVRtvu77C5HUJDVGo/1yAwRQfNO1dGT+hlALwNtRW4OA hoS3QnULLQCFD/EcuEm85hkiOkNo1WrU761N1eL0GsPrMa/EDBQvFAZOCgwwJpYOEDqne+ fxHcmqJorYsLpdy5/4+zNjGYtqeKBwnBoxIEbtNRVsDESvA8aR+EUCDZmQNt8QQLjkMG7k X3y53EBWuKd8ZjTUuWMWHHCg1sK92WF8jO4cV4E5gcnklmurLelV/AZF79iFv/K5VXtLqr cLgLCzvmTvCxrXteZMOhsEgLbmjRLyHvIf7AWw4+8NDnfQ3PqPN0SkddrNZQmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712603072; a=rsa-sha256; cv=none; b=WTSQGNOotqv0lvMfc/XnJyW0cWDjLFFPBo1bNqlwZ6JYZsL0j6tUfqyEb7bK0RdUF5gy25 WJkxCNgzSXTixsNO6suqNLUpJJ5pSTJ/4FnmE+PEIPZ3W9MrJs59gVWZVjRt/grne5f1zQ 95ZJWW05XDkRfYyZAk1EjvUQghr+BkDNG5aeKOCKG2oHkns5NFn6EsV7ngWoDAZugWrqzO /EK6oSi04CU+DFVCkJE0Iy8S046Gdg/jpUUl77s7PwN38Nbtjn+3A4eZEAb9k2PS3uNxDO eFHnFN4zZQl394k+h+oyfia6nfcUHXZFiNG8pakBofhSJI0cet+6hOnlw32e4Q== 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=1712603072; 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=5V0APuppMW2or+w0B8bR4ZPZTBLo7OUVp9H9c5tiCCo=; b=fP+FtQsTKupBxDMhWCVTKIRdilwkRqvRmt5H7RhJq+PoZ1LJkyIGDV/uJW4lH+VLOeMmST plNpCmCJaoA6Y8JPZ5vN66cNemSzRDU/FcUZjyTNZ4BOi7aE6HyPxrPdMumBXoCb0iX45B LWkIs/YSZWRRO0aZhe+FnEqkhk3i180cWrqKSS4jarI56HC4Xz0u5F/BhHIta7roOQCWdt 2QSLbxqp1knXlt1WdLawxk5lVlqlzTV+wAnAbxwcEphG8TS3kpo7jGnBVw1JMk4oPo+UfU pXXo//eI6rFF/LxakvWxCnRxWtDg3+eDYKOYSwguqMyZL+M7S2o7o7qQEpXoKA== 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 4VCz6S0kG9zNdj; Mon, 8 Apr 2024 19:04:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 438J4WIg094408; Mon, 8 Apr 2024 19:04:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 438J4VM7094405; Mon, 8 Apr 2024 19:04:31 GMT (envelope-from git) Date: Mon, 8 Apr 2024 19:04:31 GMT Message-Id: <202404081904.438J4VM7094405@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 9c699850011b - stable/14 - pci_host_generic: Include the bridge's device name in rman descriptions 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9c699850011b216ed98cd0de866739e834f083d6 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9c699850011b216ed98cd0de866739e834f083d6 commit 9c699850011b216ed98cd0de866739e834f083d6 Author: John Baldwin AuthorDate: 2024-02-14 22:07:32 +0000 Commit: John Baldwin CommitDate: 2024-04-08 17:54:50 +0000 pci_host_generic: Include the bridge's device name in rman descriptions The rman description strings now match those used in the PCI-PCI bridge driver. Using more specific names removes ambiguity in devinfo -u output on systems with multiple host to PCI bridges. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D43890 (cherry picked from commit 51f8ac224f3b87555ea17c7e7c4015a2a2b8b191) --- sys/dev/pci/pci_host_generic.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/sys/dev/pci/pci_host_generic.c b/sys/dev/pci/pci_host_generic.c index 90361a7258ed..082d083fc681 100644 --- a/sys/dev/pci/pci_host_generic.c +++ b/sys/dev/pci/pci_host_generic.c @@ -83,6 +83,7 @@ pci_host_generic_core_attach(device_t dev) uint64_t phys_base; uint64_t pci_base; uint64_t size; + char buf[64]; int domain, error; int rid, tuple; @@ -135,13 +136,19 @@ pci_host_generic_core_attach(device_t dev) sc->has_pmem = false; sc->pmem_rman.rm_type = RMAN_ARRAY; - sc->pmem_rman.rm_descr = "PCIe Prefetch Memory"; + snprintf(buf, sizeof(buf), "%s prefetch window", + device_get_nameunit(dev)); + sc->pmem_rman.rm_descr = strdup(buf, M_DEVBUF); sc->mem_rman.rm_type = RMAN_ARRAY; - sc->mem_rman.rm_descr = "PCIe Memory"; + snprintf(buf, sizeof(buf), "%s memory window", + device_get_nameunit(dev)); + sc->mem_rman.rm_descr = strdup(buf, M_DEVBUF); sc->io_rman.rm_type = RMAN_ARRAY; - sc->io_rman.rm_descr = "PCIe IO window"; + snprintf(buf, sizeof(buf), "%s I/O port window", + device_get_nameunit(dev)); + sc->io_rman.rm_descr = strdup(buf, M_DEVBUF); /* Initialize rman and allocate memory regions */ error = rman_init(&sc->pmem_rman); @@ -201,6 +208,9 @@ err_io_rman: err_mem_rman: rman_fini(&sc->pmem_rman); err_pmem_rman: + free(__DECONST(char *, sc->io_rman.rm_descr), M_DEVBUF); + free(__DECONST(char *, sc->mem_rman.rm_descr), M_DEVBUF); + free(__DECONST(char *, sc->pmem_rman.rm_descr), M_DEVBUF); if (sc->res != NULL) bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->res); err_resource: @@ -223,6 +233,9 @@ pci_host_generic_core_detach(device_t dev) rman_fini(&sc->io_rman); rman_fini(&sc->mem_rman); rman_fini(&sc->pmem_rman); + free(__DECONST(char *, sc->io_rman.rm_descr), M_DEVBUF); + free(__DECONST(char *, sc->mem_rman.rm_descr), M_DEVBUF); + free(__DECONST(char *, sc->pmem_rman.rm_descr), M_DEVBUF); if (sc->res != NULL) bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->res); bus_dma_tag_destroy(sc->dmat);