From nobody Tue Apr 22 11:22:46 2025 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 4Zhfwl1G0fz5sTtv; Tue, 22 Apr 2025 11:22:47 +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 4Zhfwk6G4Tz3Bsn; Tue, 22 Apr 2025 11:22:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745320966; 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=VLI3TQ/FI/9t4NDjyOryVPY5YJQxQpKtcutorto+zxI=; b=Yzclh8kmZxd6bkuNzQWPPenNePoBZ82DtgJOYGpUelWkajRBtu5Uk1Q2Vv/jxUBitlhcsw PFCl09SuUgKcDw+gQ3NwSGxToLrCQfHvA6f48caBioVdmuULRfOmSfBYn8VynUje70Dx3N zQQn70gEW1gFUlEZbPT958zKTz7z7dca/lP+D0OLclLkQWJXXh7P90kidGL/4EVzkkXOsh XBiFEtG+cMz+sy2lMr+SXwY/xY4k+REJtV/BxYvKMrHi9SmZYFcRE1a2a5KnuIKxHJ2p8e RahGgMRt+avlVodUSt7q7NrDFRwp2eCydsVK6Xxca20VcyLx6uEl6chU4k6Ieg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745320966; a=rsa-sha256; cv=none; b=mSiRybt28hLXxk4HP2OL1tlW5I/o5z6BYgLPPg14JGJ0R11/WfUCc3De8S4UezMdLIcidL Vri+aS5LMkSU2jwEft3R+GUXj2m3yWY+rHX19DwqfTuw2E1QJi+DVICkSaTWxARwledn7d FEebk8WcGBDZRlckxm0HbrPilxeByQnEamJAan4V/QBHsMlxEi9XJ9ljpD6z4sE7sV6INL fCj6RX4AT5WaVZTdInsiW7gxGDVY9C7qaIqqg+irqwG/b2APbpU4fz0cAaJFLZHk4yW/rT 9Zxn3M09FW4AzRRtKH7uzTPFMIHyNQfAHR0gEc84IaFxWkWxH9n1IO7D0XFHHQ== 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=1745320966; 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=VLI3TQ/FI/9t4NDjyOryVPY5YJQxQpKtcutorto+zxI=; b=ycVm1/a+X4cDTNikFSqSMElQ7N2oEm0lgz2RwhWx1lZWhwxrkDPxYFnF0i19DRybsNkT2J dnTM2VkVLBatmPM0/Wfppfdt5zTo8b4cf2reBGCsouPk6IWKomcRV5FjaWW5E0BchL5mVZ TWBaPFbSYtzUOrtXoM/uGcGoazDocs6MDLXNc7djOHoRrEFEWMGS0QfqC7yc4QjTXRySaR UCzKtW81SKkyhjVPh8M2Lq/aTW5fMIzXlxw1a3Asfz7EOVHudZsYu5CM6KmcJM4gBlakZ6 U5x0vvd4oTNLG1c1EEXv1mud+sdnZEjQYTotD8ECK1ROmUXKg6E5cBs9YDKpqg== 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 4Zhfwk5dQDz2g3; Tue, 22 Apr 2025 11:22:46 +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 53MBMk0L026086; Tue, 22 Apr 2025 11:22:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53MBMkGh026083; Tue, 22 Apr 2025 11:22:46 GMT (envelope-from git) Date: Tue, 22 Apr 2025 11:22:46 GMT Message-Id: <202504221122.53MBMkGh026083@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: f2c75b13f3ea - stable/14 - cxgb(4): Use routines from pci(9) instead of hand rolled equivalents. 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f2c75b13f3eaab6f3d16cd3869203ded8fddf4c9 Auto-Submitted: auto-generated The branch stable/14 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=f2c75b13f3eaab6f3d16cd3869203ded8fddf4c9 commit f2c75b13f3eaab6f3d16cd3869203ded8fddf4c9 Author: Navdeep Parhar AuthorDate: 2024-12-09 00:05:33 +0000 Commit: Navdeep Parhar CommitDate: 2025-04-22 11:12:45 +0000 cxgb(4): Use routines from pci(9) instead of hand rolled equivalents. There is no need to include private PCI headers in the driver. Sponsored by: Chelsio Communications (cherry picked from commit 762d32354a18517c28933ddc29f9d3d855e450b1) --- sys/dev/cxgb/cxgb_main.c | 55 +++++------------------------------------------- 1 file changed, 5 insertions(+), 50 deletions(-) diff --git a/sys/dev/cxgb/cxgb_main.c b/sys/dev/cxgb/cxgb_main.c index c159849076c5..4fc07dc126a1 100644 --- a/sys/dev/cxgb/cxgb_main.c +++ b/sys/dev/cxgb/cxgb_main.c @@ -36,7 +36,6 @@ POSSIBILITY OF SUCH DAMAGE. #include #include #include -#include #include #include #include @@ -76,7 +75,6 @@ POSSIBILITY OF SUCH DAMAGE. #include #include -#include #include @@ -1138,66 +1136,23 @@ t3_fatal_err(struct adapter *sc) int t3_os_find_pci_capability(adapter_t *sc, int cap) { - device_t dev; - struct pci_devinfo *dinfo; - pcicfgregs *cfg; - uint32_t status; - uint8_t ptr; + int rc, reg = 0; - dev = sc->dev; - dinfo = device_get_ivars(dev); - cfg = &dinfo->cfg; - - status = pci_read_config(dev, PCIR_STATUS, 2); - if (!(status & PCIM_STATUS_CAPPRESENT)) - return (0); - - switch (cfg->hdrtype & PCIM_HDRTYPE) { - case 0: - case 1: - ptr = PCIR_CAP_PTR; - break; - case 2: - ptr = PCIR_CAP_PTR_2; - break; - default: - return (0); - break; - } - ptr = pci_read_config(dev, ptr, 1); - - while (ptr != 0) { - if (pci_read_config(dev, ptr + PCICAP_ID, 1) == cap) - return (ptr); - ptr = pci_read_config(dev, ptr + PCICAP_NEXTPTR, 1); - } - - return (0); + rc = pci_find_cap(sc->dev, cap, ®); + return (rc == 0 ? reg : 0); } int t3_os_pci_save_state(struct adapter *sc) { - device_t dev; - struct pci_devinfo *dinfo; - - dev = sc->dev; - dinfo = device_get_ivars(dev); - - pci_cfg_save(dev, dinfo, 0); + pci_save_state(sc->dev); return (0); } int t3_os_pci_restore_state(struct adapter *sc) { - device_t dev; - struct pci_devinfo *dinfo; - - dev = sc->dev; - dinfo = device_get_ivars(dev); - - pci_cfg_restore(dev, dinfo); + pci_restore_state(sc->dev); return (0); }