From nobody Fri Mar 01 22:20:30 2024 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 4TmjG64XYfz5D8qd; Fri, 1 Mar 2024 22:20:30 +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 4TmjG643CVz4CBJ; Fri, 1 Mar 2024 22:20:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709331630; 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=bmWr6JpvWluQNWwLGe7OAQ02YVmluOEb3EQP0GCTCSk=; b=f/z9FgaRK7rWkWNDayCP2WucxMfLdNeRtxkb4Ervv2Le+tlBKH+VEgQSgY1EwhWqdlExCh 8dzNShnyYtOKqkjC0N8t2kE5mHAytlSb5FBQLvfYztTCZYOAnbxZQTK47gxdgHDBQ9m3/b YRWxnn4vdOB1K3yOSlXy+J3GoW9aeGLME2B7Peg5HBYkLrLDaouZweip46G1iCyic/L3pX OeBFgYFljEfAoIjAR4PIdi0UvyNcArThf9CeUyAPnkrheL8TWPedvFSanqssu8u4vu4ZcF E26Cp8vbc1IqRDFN646mqO3fY7RV6g3QzYTeRoT2aFsLsmB17s+VRZZbBqTltg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709331630; a=rsa-sha256; cv=none; b=DmLF26ffrZ9sWJ+T77ViU18dALYKFArYYSE7z5HQQbk4dB4DQjAaXZAXgcw8BVkJKiLAOE A5l2ojFmiWZCUxBZpRY2WOwvMlLOtRdQt9AqPDNOvZL7nkVkKYjYSrvC0t6Wct4zJuUWwv +FRz02IKfMiOCYagdWzS4PdxRPZF10pTE2mOqJA9Pj61S3XkxDohQ5kQh3wGrhQ7/ZGDns t0OURKWMUb3qcKPgLO7v9vmp8c2pDBhWJAD/WRGYoMSUHuNrMKlYPNHh6sbiqGuTUl1Biz jK2/9RhaJvN2rz8+1BOKNq0JRJsoW48auirsgbgFEpV/708UlCA/quOJDwnQzw== 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=1709331630; 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=bmWr6JpvWluQNWwLGe7OAQ02YVmluOEb3EQP0GCTCSk=; b=md39ObQ7yOhxMNkQbigF99HuKf1g63kNLs6SgL0okuB+jbxBaUSx4wP5yRmOpSahSlUCHE RSUo+uzfBNxy56O7d422KkHen7QIjyas1aOjgrRri6wdeM9fxLIiZUYujqKdmT6ASZ715X 7G7FXia+qfDllc4t4OFRA1JQ9WDruqxoW7+zs5fTqaz1a9igYQoB51gITEpfhSYauFrBhL J0agW/MvD3I1SiE/AhmcJ1Yne9HFn516kMvD2Nydm2dEw/jaJpvoS6UPJnxZR9fP7GTqjb VhNZe1UjTlD0Ys2sJp+Z6E0Yeq/b5P/g5zXUPyJd5Y+bTNxSnmEco73ayK2xAQ== 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 4TmjG63fNMzkbD; Fri, 1 Mar 2024 22:20:30 +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 421MKUtq063457; Fri, 1 Mar 2024 22:20:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 421MKUUZ063454; Fri, 1 Mar 2024 22:20:30 GMT (envelope-from git) Date: Fri, 1 Mar 2024 22:20:30 GMT Message-Id: <202403012220.421MKUUZ063454@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: b28670018dbc - main - pci_host_generic: Enumerate resource ranges under bootverbose 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: b28670018dbcc7d6ebc0d05584189d6d04aa079f Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b28670018dbcc7d6ebc0d05584189d6d04aa079f commit b28670018dbcc7d6ebc0d05584189d6d04aa079f Author: John Baldwin AuthorDate: 2024-03-01 22:20:10 +0000 Commit: John Baldwin CommitDate: 2024-03-01 22:20:10 +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 --- 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); }