From nobody Fri Feb 14 06:39:05 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 4YvMpL0528z5nt3V; Fri, 14 Feb 2025 06:39:06 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YvMpK3h4hz3d6s; Fri, 14 Feb 2025 06:39:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739515145; 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=UAGq1V+P2vNjkq8+m/J16dvtuU9ge0KmaTKWwYvF6MM=; b=ER4PLwctlBZlR05w3/77fuiyA7KZlBJ+xSsCitMJqdsx7q6ppxOE8cnWNAl1jtsRu2q0Ol ZsLx8lI16XyG0eXtIsXz5e9SSGJpqn7AfWzUbagTBrN8YaU0kIxG7JDxk8gzKTvBDRqjEm XnihVr5qb9914WwQUCJ4cl17Ympr+xVhDG43LanfTGQB9QUFSLcn7zIiECUxyNoyi+5yLx Kp11IAQuuZXYCUObae6Bp7lORJ0xgCXu36hjTAIjfE6ZC9hhpeUo329Lmvc1sEL2GGu1X6 z2qbM69XGdo007UXFpxUILXwpOnJaTPtwTprk5/HZ3CH6mmMg/0fxl/2l1QVhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739515145; 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=UAGq1V+P2vNjkq8+m/J16dvtuU9ge0KmaTKWwYvF6MM=; b=fEdwYgDrD6diZN0AIsB7/YKkFSwn3MllYyQxsaxzrkVnhGeh2ZIniphbBrcO+AFb9CBzFO t2ho70QEvoZmfvi/UNwcxJw7ZaaRzw9O/l0ugTv6HyU/HTKDwsNvX1f9FDWLHZayzzwrKV eRyecF4sM31yhQkmtl7ooaCw27eXh31bjzaT5It/RR48DhgYSngH9stftEicKIeEYj+GRt 2W1/4Uss/0rn2gzEJ3RHD5RaHh5j97u653cZfA/gjyy4THbzvs8pfT8b/3bOwR4mmHZbGH zwjKCEW03kXa+Pw/XNMuGTAXquzMVUz4eOcvUIJbj5uxeBG604h++FAUp8IlYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739515145; a=rsa-sha256; cv=none; b=EhLaoQar3gOfYqY1eTHXYWuyZwA+VkjMUixBoMpTeYNA7230IENDKpVX9udpO4CCH2dKp5 9Tuk2ZpMqs4aag+HsxXaj6uBn2wEf7fl0Y3FsCkdGpoE5haEtVI8SFUXlc68WNTT+2plMP E68d6nA8WBAGXWo+f1+3FV7PfrvO6jrf0ClWwK1qhxlgt57BvJcxCSUipL2GllGFwV+rI9 1wBuOPlN/3lUSl9nN49LUz+gGp8wRzTtCmjNsamb7pd/jAZ71md+EnF8qeMDKUYTr24iWy nPHDL0hrgULZ/3EHHkOPdP7McnlOIkOuaSVTgG8EgINvrOwss2zyt3oui03w7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YvMpK3Hfhz4DN; Fri, 14 Feb 2025 06:39:05 +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 51E6d5fH097798; Fri, 14 Feb 2025 06:39:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51E6d56S097795; Fri, 14 Feb 2025 06:39:05 GMT (envelope-from git) Date: Fri, 14 Feb 2025 06:39:05 GMT Message-Id: <202502140639.51E6d56S097795@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: 762d32354a18 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 762d32354a18517c28933ddc29f9d3d855e450b1 Auto-Submitted: auto-generated The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=762d32354a18517c28933ddc29f9d3d855e450b1 commit 762d32354a18517c28933ddc29f9d3d855e450b1 Author: Navdeep Parhar AuthorDate: 2024-12-09 00:05:33 +0000 Commit: Navdeep Parhar CommitDate: 2025-02-14 04:44:23 +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. MFC after: 1 week Sponsored by: Chelsio Communications --- 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 a19483c7cbbf..882d1c6cc4a4 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 @@ -1137,66 +1135,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); }