From nobody Fri Feb 9 18:44:26 2024 X-Original-To: dev-commits-src-main@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 4TWjSV6Mfpz5B8G9; Fri, 9 Feb 2024 18:44:26 +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 4TWjSV4BZbz4g78; Fri, 9 Feb 2024 18:44:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707504266; 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=9E8f2Cm+nOKydaFd8xk3p5L/0RRsJK2VmMxjl//Kv7k=; b=J5QSQyFNVmzwdDHDQmHNXlDS+oalxVy+ybMZnX18Gh6L3fQO6kz8yWe1pNRGyJ62pOc4T7 h7D4uXa8pe+9nUfQ6aiUTn7IKxGqD7KJn8lJ85Nr/RRKjHrTXVAEpiGStsg5xFDL7bmiuy hhOi4FFM3Yc6ZsqoKHabBfpUv3h104hv3Y2rtxpthgImZPFsjZZRjn+/UsZKa3+x7U4Xd1 EQyKrz5AhVd4DaTYaphGoSmzAg3YL6RYwUFeSCcnr/ysiHoGn02zHops992WuVPQcxwc5q Apo6sZatJLcFsCMv7Yl4aZTNEsIwjzyGl0o18sG2wTJ0EJ/LsT7vl6/0Qf6MIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707504266; 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=9E8f2Cm+nOKydaFd8xk3p5L/0RRsJK2VmMxjl//Kv7k=; b=J0ZtdbqfrQIowCarW7oNzIZS+ikdVRjxh902AvIWkm3jZCuQ7JomurdfUJJNd2oFyC4x9T lH27FVnLAfyaPNiYqDlg6fiXTizWw3lpraNAoIekjSKu7rIK0OHmyQgR7+WqooT87Gbsp9 xIkFo5r4XI5o0o1T+4RQgU5j+HDgouFz2zAZ+6j3OPf5vMaQDxRphnErBQv9ih1MjAnMmy BG9sajN7navY9ubXm3r+hSZwXn+jypwtsCixVHmbbFGB88ep4KfBFltGu9MxNlD5aU78Mr GqjTTiwoL2mgiMlEmYC/PgpvMS+Wffq+p/P2FvKVRYi7iSAngB/9EiMxBQCxBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707504266; a=rsa-sha256; cv=none; b=ZSXnB05UTXIY2aZH2hU2BBc9kopD2UJ46SKZ1v+pqtxdmlFR4Er1coXoCP1+nbOyaxNmLp zDJsBpfBf0seb8iIaS8te6kN5zEEZxloaqLFZwMthOwYaVtMYCGtLZypN9uH3p0yw+Xor6 DNEy0IhZzYvDq25tS+9+dSBwD/MsbYHeZLKl3D3YihujKYGyrNsw8cURXsalQH9gAQNBYu wdx/QvyNDxJA/G5Av2mPl3yJ762CDCm7fXcY+6bR+RHLu8b1mNB2NE26C27F4WZGp2ETj/ 19jsIMoIRD/xgkiTXfGaOtVMew7BHBMJTj71ir9Hj6Zuoe6O6d6TOWhGpAtVHQ== 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 4TWjSV3G4rzkPt; Fri, 9 Feb 2024 18:44:26 +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 419IiQ8q054875; Fri, 9 Feb 2024 18:44:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 419IiQM5054872; Fri, 9 Feb 2024 18:44:26 GMT (envelope-from git) Date: Fri, 9 Feb 2024 18:44:26 GMT Message-Id: <202402091844.419IiQM5054872@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: 03719c651430 - main - pcib: Make various bus methods private to pci_pci.c List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 03719c651430d46cd8aa95aead02a7f0c43dcb04 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=03719c651430d46cd8aa95aead02a7f0c43dcb04 commit 03719c651430d46cd8aa95aead02a7f0c43dcb04 Author: John Baldwin AuthorDate: 2024-02-09 18:27:45 +0000 Commit: John Baldwin CommitDate: 2024-02-09 18:27:45 +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 --- 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 d8a354c0e498..bc0b48d9f031 100644 --- a/sys/dev/pci/pcib_private.h +++ b/sys/dev/pci/pcib_private.h @@ -178,19 +178,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);