From nobody Wed Feb 16 09:48:17 2022 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 A9BB819DBA8F; Wed, 16 Feb 2022 09:48:17 +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 4JzCnY4N9Kz4kLH; Wed, 16 Feb 2022 09:48:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645004897; 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=syMxrRf0zxDgvxAgY3P+/RHyRBRe4mOD4H5UM6SUq0s=; b=FliGzxasbdfujNEaLwa/nfhxi2Wbk3rONPqMFRyjOH8gdEFmp+D8IeCgfS5o0nsE52L3C6 SWB+6rg7cgp6868m2orPBT+2T1sUIciBnGembkJ6DVBbL4lK7+PAN1rS9kF+HsYz519vmh RaEsVXjmAR6H7ennXAbUL4Y67mPUG5Fljx/wnHi0mFxO5pGVPpYIMNTVgirhSjAMIM61f1 WuZ9sizSU3zJlc7jqUSllP3mno+WAYroq3So4J8ROJH9vCApkkTLT9l5azJXswZsfdh1Lk kkQOGF+RVge162X47Cu51On94+3KyKnEgEahfrnqt2l531+/YgeI1glSziW3Fg== 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 7254013BF4; Wed, 16 Feb 2022 09:48:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21G9mH6e094030; Wed, 16 Feb 2022 09:48:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21G9mHRH094029; Wed, 16 Feb 2022 09:48:17 GMT (envelope-from git) Date: Wed, 16 Feb 2022 09:48:17 GMT Message-Id: <202202160948.21G9mHRH094029@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: c4f52f71de98 - main - LinuxKPI: pci.h add more defines 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c4f52f71de98a575dab84f5654f73d7022d40795 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645004897; 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=syMxrRf0zxDgvxAgY3P+/RHyRBRe4mOD4H5UM6SUq0s=; b=H4AusZRurUmt2UROBw30uPXkGRI5uw7gOCMKgMIxqkx/5t99pomSrxL+skN1OYF64Udasv O8zqUODb70VKo8fMf1EFimASQHHIRAhSYyfPI5XyvneOjxkF2PDVx6eLuY8z7PM5TDDHLx x+G7Em9T50TSORmp/0Wze6cOiGyjcVoHQJR6EmhoqCwtQAwZZMiDlWrE+js3rveDeTBnX6 aO7YTWf737AzmX98ssSSwsWUk0RGqTIfuQHc4j2UY8Wp6EjwSq67tL7jkvbLKTtRgW7X+I Rl1zcJzvm9cNJyITtT30lKASmYaexhzEt3iQDV5LdmHCtZaYC9h1I6MnDdI6Wg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645004897; a=rsa-sha256; cv=none; b=FMNQA7AFm8KqrzzS4E/Bx/dyHre4GMTCF0upR8OD3hFOd4VelqlbUfbgy/w8wcvFuXrWUz 3A9C/kMta2gpuPDbEqwoPiLzebC4ztX3Ij1H48dTj6l538Iqn47aHP/rnAKfKA+3H2z8Sy ohfSHPA/xyMHglAQW+TLqOlCoVmzHhHDt0urT+mDLQHbBGkez9mXouvHDxP85k+dlXwtBU 2n831PUd6VDll7orUyBwKedOEnka0nZ8FvWYcRmAyEQqkZDLiSHvB2Ud5Dquqg4BziKLaW JoP1KEPCegFzX+WmcvPWDNicEeIDjSKecUA2PaqMDYiulEomVCcDbGqfLX+uvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c4f52f71de98a575dab84f5654f73d7022d40795 commit c4f52f71de98a575dab84f5654f73d7022d40795 Author: Bjoern A. Zeeb AuthorDate: 2022-02-15 23:51:40 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-02-16 09:47:14 +0000 LinuxKPI: pci.h add more defines Add and sort in more defines needed by newer drivers. MFC after: 3 days Reviewed by: hselasky Differential Revision: https://reviews.freebsd.org/D34293 --- sys/compat/linuxkpi/common/include/linux/pci.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h index 5dfdfa2e86ca..ff3fbba9102a 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -95,7 +95,9 @@ struct pci_device_id { #define PCI_EXP_LNKCTL PCIER_LINK_CTL /* Link Control */ #define PCI_EXP_LNKCTL_ASPM_L0S PCIEM_LINK_CTL_ASPMC_L0S #define PCI_EXP_LNKCTL_ASPM_L1 PCIEM_LINK_CTL_ASPMC_L1 +#define PCI_EXP_LNKCTL_ASPMC PCIEM_LINK_CTL_ASPMC #define PCI_EXP_LNKCTL_CLKREQ_EN PCIEM_LINK_CTL_ECPM /* Enable clock PM */ +#define PCI_EXP_LNKCTL_HAWD PCIEM_LINK_CTL_HAWD #define PCI_EXP_FLAGS_TYPE PCIEM_FLAGS_TYPE /* Device/Port type */ #define PCI_EXP_DEVCAP PCIER_DEVICE_CAP /* Device capabilities */ #define PCI_EXP_DEVSTA PCIER_DEVICE_STA /* Device Status */ @@ -139,7 +141,6 @@ struct pci_device_id { #define PCI_EXP_LNKCTL2_ENTER_COMP 0x0010 /* Enter Compliance */ #define PCI_EXP_LNKCTL2_TX_MARGIN 0x0380 /* Transmit Margin */ -#define PCI_EXP_LNKCTL_HAWD PCIEM_LINK_CTL_HAWD #define PCI_EXP_LNKCAP_CLKPM 0x00040000 #define PCI_EXP_DEVSTA_TRPND 0x0020 @@ -185,6 +186,10 @@ typedef int pci_power_t; #define PCI_ERR_ROOT_ERR_SRC PCIR_AER_COR_SOURCE_ID #define PCI_EXT_CAP_ID_ERR PCIZ_AER +#define PCI_EXT_CAP_ID_L1SS PCIZ_L1PM + +#define PCI_L1SS_CTL1 0x8 +#define PCI_L1SS_CTL1_L1SS_MASK 0xf #define PCI_IRQ_LEGACY 0x01 #define PCI_IRQ_MSI 0x02