From nobody Thu Feb 27 14:17:12 2025 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 4Z3YLw6xSvz5qG9r; Thu, 27 Feb 2025 14:17:12 +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 4Z3YLw6M1Zz3xD8; Thu, 27 Feb 2025 14:17:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740665832; 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=KczNIMLtaWst/OfUCcQcFVbnMUoX5OjzPLDLCFEUFSo=; b=rdlPZyd4iDtf4U+O92WwAcl0tZ5uITbvJQBeBdsROmnImvUebWubSappqxe/hV13wG1qml cgUtwxqMJ+MC/55Eg7Hb+9K6j4N4FytNujJIta3PusyDWU2qemyYK94bP+gXS79LBGmONb jll6mHkMgauc9LVTiOMR1yGNC1cM8NLVBBUT8UzYBq70FRLJWCGoCYXi2Do5l7sNTyfjLE UNJqO4ioDXk0pRA6w4hJAT6Wr9GKpIqJlAmLto/uSwDGKxXcTBYpiCF+JMGMfkaiBYdabX 55laN3rVvnAEz+3FgE1bZYlYjFfoaAZH+iIfpt4wIa8eKlxYQ+/w6dR8aUfZPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740665832; a=rsa-sha256; cv=none; b=ucQICvq6wAW9FJv7YoJAXZdc2OBodLxAbsWtK+ru/M1IlvZz64EX1cq/MjtbqDWM+LiAYd voBrMEDyFFEcur065aQA+Qdy3KqWF1ZUPQNsh3SbOxftGVNvjhIoLKp6rwEH5sw11vSiBl BaC7MYqZxCAY9jf6K8Tw1tOV4BRbXUH9pw4marLyHz09BPvuZEhYgf/nf9m0Y5yMGW/TTS sLKefGW9iYQ5jxnqWAtNNYyiZOjhUcRoNuw1UURSRmmnrT6Q8Ad+OT+tWVQFkLsbeU4l27 dTTlFdBQOK9hsJKBxk3dhOzvyXio6YDVkz4v7/MPW5C8Cavo5ib2v5D/BxvwLQ== 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=1740665832; 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=KczNIMLtaWst/OfUCcQcFVbnMUoX5OjzPLDLCFEUFSo=; b=iAOyBt78EBQRgver5gLcEHz7JvNgLPplsB9q2offmbbAoQ66RHunYYhX65X7EvOqbjHlRD 5WbtMkyh4hAqrV7ugiR5U3HFMRioUwz+9DxTAPdhOsgldeowvc3TB+yGFpcsPDi3Jw8tdR q1J0gKcp/XlrCMd2jfZ8z7NA5Nx6XD/xWWGfs1/QLL7xk7zbIMxBLZ7Jct0XS9ceHghdTv 7v3/jzWHkVtWGdUQlDev7IfjseYm68TqAutVrZntSqDjKP4jgt4R9hN673VqqFl1306VKB leX0luz/yZRmHyk7SW/D98lVnP8nMtjSzDUT/EvL6YC5baJ5sOF/7uncxgSVIg== 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 4Z3YLw5tnHzmpc; Thu, 27 Feb 2025 14:17:12 +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 51REHCRm016953; Thu, 27 Feb 2025 14:17:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51REHCcq016950; Thu, 27 Feb 2025 14:17:12 GMT (envelope-from git) Date: Thu, 27 Feb 2025 14:17:12 GMT Message-Id: <202502271417.51REHCcq016950@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: f3d53a9ecad4 - stable/14 - pci_host_generic: Enumerate resource ranges under bootverbose 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 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: f3d53a9ecad45889524b2a224815744f0697536d Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f3d53a9ecad45889524b2a224815744f0697536d commit f3d53a9ecad45889524b2a224815744f0697536d Author: John Baldwin AuthorDate: 2024-03-01 22:20:10 +0000 Commit: John Baldwin CommitDate: 2025-02-27 13:09:22 +0000 pci_host_generic: Enumerate resource ranges under bootverbose Previously ranges were only enumerated for the FDT attachment but not ACPI. This commit moves the enumeration to the shared attach routine so it is done for both. While here, don't list empty ranges but do include the resource type for each range. Reviewed by: andrew Differential Revision: https://reviews.freebsd.org/D44132 (cherry picked from commit b28670018dbcc7d6ebc0d05584189d6d04aa079f) --- sys/dev/pci/pci_host_generic.c | 8 ++++++++ sys/dev/pci/pci_host_generic_fdt.c | 11 ----------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/sys/dev/pci/pci_host_generic.c b/sys/dev/pci/pci_host_generic.c index 520462972a66..67b329b58685 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; + const char *range_descr; char buf[64]; int domain, error; int flags, rid, tuple, type; @@ -179,18 +180,21 @@ pci_host_generic_core_attach(device_t dev) switch (FLAG_TYPE(sc->ranges[tuple].flags)) { case FLAG_TYPE_PMEM: sc->has_pmem = true; + range_descr = "prefetch"; flags = RF_PREFETCHABLE; type = SYS_RES_MEMORY; error = rman_manage_region(&sc->pmem_rman, pci_base, pci_base + size - 1); break; case FLAG_TYPE_MEM: + range_descr = "memory"; flags = 0; type = SYS_RES_MEMORY; error = rman_manage_region(&sc->mem_rman, pci_base, pci_base + size - 1); break; case FLAG_TYPE_IO: + range_descr = "I/O port"; flags = 0; type = SYS_RES_IOPORT; error = rman_manage_region(&sc->io_rman, @@ -219,6 +223,10 @@ pci_host_generic_core_attach(device_t dev) error = ENXIO; goto err_rman_manage; } + if (bootverbose) + device_printf(dev, + "PCI addr: 0x%jx, CPU addr: 0x%jx, Size: 0x%jx, Type: %s\n", + pci_base, phys_base, size, range_descr); } return (0); diff --git a/sys/dev/pci/pci_host_generic_fdt.c b/sys/dev/pci/pci_host_generic_fdt.c index bcee6057ff3c..854ec0be8dfa 100644 --- a/sys/dev/pci/pci_host_generic_fdt.c +++ b/sys/dev/pci/pci_host_generic_fdt.c @@ -183,7 +183,6 @@ parse_pci_mem_ranges(device_t dev, struct generic_pcie_core_softc *sc) int nbase_ranges; phandle_t node; int i, j, k; - int tuple; node = ofw_bus_get_node(dev); @@ -239,16 +238,6 @@ parse_pci_mem_ranges(device_t dev, struct generic_pcie_core_softc *sc) sc->ranges[i].size = 0; } - if (bootverbose) { - for (tuple = 0; tuple < MAX_RANGES_TUPLES; tuple++) { - device_printf(dev, - "\tPCI addr: 0x%jx, CPU addr: 0x%jx, Size: 0x%jx\n", - sc->ranges[tuple].pci_base, - sc->ranges[tuple].phys_base, - sc->ranges[tuple].size); - } - } - free(base_ranges, M_DEVBUF); return (0); }