From nobody Sun Feb 20 18:15:45 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 6677019CF563; Sun, 20 Feb 2022 18:15:46 +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 4K1tsG1dN6z4Xpg; Sun, 20 Feb 2022 18:15:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645380946; 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=mqcr0EWJiU2YTvHBIEViCjfV9UB4y/oBCQKRzBH40Dg=; b=SVbbnNOq5850rpusq90kqSfk/noT53vrymhBtzr2gfhM5Nn17k6/GL9meBdqTzokIn77Zy pwPgZHihpFwbWipP20KTU8zwz889wqTAK+AQY3Rfif8ARZykJtM1fQtbkXZRflP0yhITgA roEjvGZ9kPiacTKEZ0okL2SNFmkJBIH+8u/aXTnupW44Pq6jGsjBbV96+zT5leYnKWSnJM zE5WUYdV2hrK+30XsiHuohOrRfYnEBPDUT3FMUQvVVKGPqcREVg65QFuB2Yp1gh7zfCyOL QuvwqZZcuF+nsqqXIl1lpi4b451T8jLxvYmTB4aGabDtjz87hvJmAVFG6OcX7A== 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 720C220DF8; Sun, 20 Feb 2022 18:15:45 +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 21KIFjo1023104; Sun, 20 Feb 2022 18:15:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21KIFjHn023103; Sun, 20 Feb 2022 18:15:45 GMT (envelope-from git) Date: Sun, 20 Feb 2022 18:15:45 GMT Message-Id: <202202201815.21KIFjHn023103@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 0422c155419d - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 0422c155419d1d4247f78257543572dcca06b473 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645380946; 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=mqcr0EWJiU2YTvHBIEViCjfV9UB4y/oBCQKRzBH40Dg=; b=uWvdMXh39hJTcw9KrReuTntuOy+aEibyUGsj2wNhyJSmMRiEZygZ5uCGAu1YoIY0IibwCD Wk6iFNftWj//dqVqqxQOScnK9Hx+8TTApBI0crgArRSf7M4ezFTYfKNCLJw5j94Ds/f/og 7u8pBcU9rcv5ZmseiZAiC+4H+xT22qbc3rHNpTfYEJdLAWZTJn5rRPXkOfh/aoX8fUkSeZ OCGFAQ4hudX3Z09G+0azjPyBtLx3fDCPeefareSvWJIDoCU3cbRnurGLy2+ZGX9KgC7Awn UNeZttVD+TG3fkBklXmgnMnPi39opcca/lD7I15qtrIHfvuUv/5VjUDupEhQRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645380946; a=rsa-sha256; cv=none; b=GMDUrWXzKqghi+6WA6Od+F8bJ9Ao8ut66PBnl9PRsMLt3MYAhmggZr25jFAwd3OlJvmspa NtDJVhqFHYKXg6zuTZQfYS3ct60QTUSXNEjcKbQBCs1vorCoclt57KkwThjY4mVTxssr0e x49S9HXbPVQ9mScaKakdGmVop/u4tXUQ+5vm9YceJVpp2YEnWdF2UGwn5zBioORaZIUyQ+ ylRUnvCXn4wrQ9+zTNCxdDBDWZAFZptXUw4RCJlqAvWrKLB6tEkRZxxGka193pS7APNlou 87GVbL4fERFuPXv//tNrd3Fjuer/KBmMRTjLXcDFg68EuBoUPT70GM2WATGalA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=0422c155419d1d4247f78257543572dcca06b473 commit 0422c155419d1d4247f78257543572dcca06b473 Author: Bjoern A. Zeeb AuthorDate: 2022-02-15 23:51:40 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-02-20 16:25:13 +0000 LinuxKPI: pci.h add more defines Add and sort in more defines needed by newer drivers. Reviewed by: hselasky Differential Revision: https://reviews.freebsd.org/D34293 (cherry picked from commit c4f52f71de98a575dab84f5654f73d7022d40795) --- 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 14f80c23c37b..2891f9f0fa75 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