From nobody Mon Apr 08 19:04:27 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 4VCz6M5MRtz5HYgx; Mon, 8 Apr 2024 19:04:27 +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 4VCz6M3qPjz4gMW; Mon, 8 Apr 2024 19:04:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712603067; 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=XcJjhFIhXDLAPmxb95hsQBOwjAi8BS8xZGEMo+knWXA=; b=mIta+BLgA+VCzy85LaQ9IyjpNv8OVmNSsyNv5EZx1HgtY2u6Hs1ZLa9xS9Bo0dqcSfCmDF MZUjIQX3mWtO5qfMrDJ00u+U+qLb9gM/O3CPXV+U/klPlTSeSrA+SKgUrZYD4EwGGA+Z/f ri1akiG7eccagVCdZtzuI4Sr1zcWOzrgieLiqZZEIXcfmZfxeMk76dV1wbF9Hjb6DDZ8mA lE4gj73dCloG7ECVkuV2O7EzJwi5SX3qcjwGLjFnH24am7/JprxIxdOzTh7LYf981yB8jW pyk+sYnpowOywV76CU6hIs5CtwFfhNl1XVfBZpSEZAuJDL8NB031ixFD4V0p4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712603067; a=rsa-sha256; cv=none; b=NRRA/4kvBBwfMBfExjKe63jvqLbOdHmbkWSkrMj8+UN92Df/ytz6NFEMXvNmJTUknWZ9xw 7Nss8xH2weGMV80VXmLV+cpMQdFwhXiVoL82qeUZtO0rEvtl7RIKe8dyLcikN/j6w8sNgY UbYUgj8RhlIgaQSBsF+taPIMV9ZDAI4/26oS1l8XCO/jng7vIuyOkan9nyPQrBNkNVAiMj vsae3+3Zmx16NLq0spn8iWG9hc38vkSwoBAKMAVTe87FpimzIXF5KcsnpHIdeG+ChZSZue b8e9LgBU1skQpD5tWBjnOlJ5U//OsCsEl0d7p6lLsrwkVQAVAXrdT1kfUh3mFA== 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=1712603067; 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=XcJjhFIhXDLAPmxb95hsQBOwjAi8BS8xZGEMo+knWXA=; b=E2ncuGv8Ipz2GPFaqjE/M5CH0BqxnZBhX4PcACQ6WoLAHGDepQ9fbPowVYCrbAmWK3OcSD l+KX3qUtudQvY7XG3Bn8gkBfOLKyhXvD8IPeFxtpQuYNbBtWqYb/LhNmtwgEYmnF9n2Zwz HWSFHXmIbOgrsn1NTrgK2AezbuoE1lNX/MTLeniOfA5Zdz7VlMGj9P/lG3SqzJ2A7qq+Lf 5SeDdyUjxKQKAhDtKlysd1QbgyC5zQreLsHYTj8UWcLGifgogNQFhtRhn+wYN3opyoGu+C fIombB8Ot2EXNFWUrSnk9/dSUrQ8MzMBpqeSVIqzhZudhFNUGssmdTP+7Hd0Iw== 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 4VCz6M3LVXzMx7; Mon, 8 Apr 2024 19:04:27 +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 438J4RTb094178; Mon, 8 Apr 2024 19:04:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 438J4RjL094175; Mon, 8 Apr 2024 19:04:27 GMT (envelope-from git) Date: Mon, 8 Apr 2024 19:04:27 GMT Message-Id: <202404081904.438J4RjL094175@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: 93d2cc308890 - stable/14 - pcib: Make various bus methods private to pci_pci.c 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 93d2cc30889026547c7942858cbbf1282848db60 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=93d2cc30889026547c7942858cbbf1282848db60 commit 93d2cc30889026547c7942858cbbf1282848db60 Author: John Baldwin AuthorDate: 2024-02-09 18:27:45 +0000 Commit: John Baldwin CommitDate: 2024-04-08 17:52:43 +0000 pcib: Make various bus methods private to pci_pci.c These functions are not used by pcib subclasses so do not need to be exposed in pcib_private.h. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D43688 (cherry picked from commit 03719c651430d46cd8aa95aead02a7f0c43dcb04) --- sys/dev/pci/pci_pci.c | 18 +++++++++++++----- sys/dev/pci/pcib_private.h | 10 ---------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/sys/dev/pci/pci_pci.c b/sys/dev/pci/pci_pci.c index 6ef04251cd74..2659e64f364d 100644 --- a/sys/dev/pci/pci_pci.c +++ b/sys/dev/pci/pci_pci.c @@ -60,6 +60,15 @@ static int pcib_probe(device_t dev); static int pcib_suspend(device_t dev); static int pcib_resume(device_t dev); + +static bus_child_present_t pcib_child_present; +static bus_alloc_resource_t pcib_alloc_resource; +#ifdef NEW_PCIB +static bus_adjust_resource_t pcib_adjust_resource; +static bus_release_resource_t pcib_release_resource; +#endif +static int pcib_reset_child(device_t dev, device_t child, int flags); + static int pcib_power_for_sleep(device_t pcib, device_t dev, int *pstate); static int pcib_ari_get_id(device_t pcib, device_t dev, @@ -81,7 +90,6 @@ static void pcib_pcie_dll_timeout(void *arg, int pending); #endif static int pcib_request_feature_default(device_t pcib, device_t dev, enum pci_feature feature); -static int pcib_reset_child(device_t dev, device_t child, int flags); static device_method_t pcib_methods[] = { /* Device interface */ @@ -2269,7 +2277,7 @@ updatewin: * We have to trap resource allocation requests and ensure that the bridge * is set up to, or capable of handling them. */ -struct resource * +static struct resource * pcib_alloc_resource(device_t dev, device_t child, int type, int *rid, rman_res_t start, rman_res_t end, rman_res_t count, u_int flags) { @@ -2358,7 +2366,7 @@ pcib_alloc_resource(device_t dev, device_t child, int type, int *rid, return (r); } -int +static int pcib_adjust_resource(device_t bus, device_t child, int type, struct resource *r, rman_res_t start, rman_res_t end) { @@ -2426,7 +2434,7 @@ pcib_adjust_resource(device_t bus, device_t child, int type, struct resource *r, return (rman_adjust_resource(r, start, end)); } -int +static int pcib_release_resource(device_t dev, device_t child, int type, int rid, struct resource *r) { @@ -2449,7 +2457,7 @@ pcib_release_resource(device_t dev, device_t child, int type, int rid, * We have to trap resource allocation requests and ensure that the bridge * is set up to, or capable of handling them. */ -struct resource * +static struct resource * pcib_alloc_resource(device_t dev, device_t child, int type, int *rid, rman_res_t start, rman_res_t end, rman_res_t count, u_int flags) { diff --git a/sys/dev/pci/pcib_private.h b/sys/dev/pci/pcib_private.h index cf689026a033..d4c66407d739 100644 --- a/sys/dev/pci/pcib_private.h +++ b/sys/dev/pci/pcib_private.h @@ -174,19 +174,9 @@ void pcib_bridge_init(device_t dev); #ifdef NEW_PCIB const char *pcib_child_name(device_t child); #endif -int pcib_child_present(device_t dev, device_t child); int pcib_detach(device_t dev); int pcib_read_ivar(device_t dev, device_t child, int which, uintptr_t *result); int pcib_write_ivar(device_t dev, device_t child, int which, uintptr_t value); -struct resource *pcib_alloc_resource(device_t dev, device_t child, int type, int *rid, - rman_res_t start, rman_res_t end, - rman_res_t count, u_int flags); -#ifdef NEW_PCIB -int pcib_adjust_resource(device_t bus, device_t child, int type, - struct resource *r, rman_res_t start, rman_res_t end); -int pcib_release_resource(device_t dev, device_t child, int type, int rid, - struct resource *r); -#endif int pcib_maxslots(device_t dev); int pcib_maxfuncs(device_t dev); int pcib_route_interrupt(device_t pcib, device_t dev, int pin);