From patchwork Fri Feb 23 15:21:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 13569250 X-Patchwork-Delegate: manivannanece23@gmail.com Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 618FA82866; Fri, 23 Feb 2024 15:23:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708701787; cv=none; b=EAUklM5PjLcor+YQbrByo9lzk3C7/Qy9xr3TNpLzUENTiBAQgfAPaXJXGZQ0lihny3ui8bt453rDPdh6PdHzEUZeT9NQIQXH3ZRaSgb3aUtJ1jzXF5vRbLYkN+oGM6YGLLijg/s3RUgMpSuhOXAB9rDRUICK1mbc5hNbG7R1L/o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708701787; c=relaxed/simple; bh=jSrJkfIN1qAWzxJsRTl7DfvhSeqHU9HH07knGCfmKHk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CCX1pagZ6LRVUooGatlg23JfgiyukTz2TpBS7PF1aVAR41Fdsf4TAnB49Nth/x5ha84Q0NHdPYb2/0wWhRJpj/dcPVmPVkXpI126TwysJTnjbDmeyDFtfRgA/LalnOz0kuJlNdzQWqrrY1riJGilstzUdSX/yFtS31kxycV+3BU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=fl5esR1J; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="fl5esR1J" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8CFA2C433C7; Fri, 23 Feb 2024 15:23:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708701786; bh=jSrJkfIN1qAWzxJsRTl7DfvhSeqHU9HH07knGCfmKHk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fl5esR1JlBLC32MubsqkqReluCkKzF9p1XmsrALW6QYtrbSfz5f9Hj1QH9VeFNG1F twC8+mwwaJvx7f/2+7aP0HKsPgQcxOxFLYeDOscVDvWY5PvhrcI+LQd+iPY0xph2xm mNCB638j/w9XfNGwFSWQH+CWcU4hqPWXuYIORv7upi29Oux8islrzdgPr8ABy6lunC qbb7+p8S6EGanN14Y4dBrz/V0OfkQr0b4eo1uKV58ngOXjmkw2+SXSyZ1yxCL6DL5V ZzItuyb6YQMpLJpvFZRbde4q/Lydkxptilv7M7xmpR+S7jbmEb0Uhu1AlRln0mnGWs f0pIsILf0MEfQ== Received: from johan by xi.lan with local (Exim 4.97.1) (envelope-from ) id 1rdXOI-000000005FV-3iz9; Fri, 23 Feb 2024 16:23:10 +0100 From: Johan Hovold To: Bjorn Helgaas , Bjorn Andersson Cc: Konrad Dybcio , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Manivannan Sadhasivam , linux-arm-msm@vger.kernel.org, linux-pci@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , Krzysztof Kozlowski Subject: [PATCH v2 01/12] dt-bindings: PCI: qcom: Allow 'required-opps' Date: Fri, 23 Feb 2024 16:21:13 +0100 Message-ID: <20240223152124.20042-2-johan+linaro@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240223152124.20042-1-johan+linaro@kernel.org> References: <20240223152124.20042-1-johan+linaro@kernel.org> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Some Qualcomm SoCs require a minimum performance level for the power domain so add 'required-opps' to the binding. Reviewed-by: Krzysztof Kozlowski Signed-off-by: Johan Hovold --- Documentation/devicetree/bindings/pci/qcom,pcie.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml index a93ab3b54066..5eda4e72f681 100644 --- a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml +++ b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml @@ -123,6 +123,9 @@ properties: description: GPIO controlled connection to PERST# signal maxItems: 1 + required-opps: + maxItems: 1 + wake-gpios: description: GPIO controlled connection to WAKE# signal maxItems: 1 From patchwork Fri Feb 23 15:21:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 13569248 X-Patchwork-Delegate: manivannanece23@gmail.com Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1CA008289E; Fri, 23 Feb 2024 15:23:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708701787; cv=none; b=AkSWTj+KvtUW0xStKq6N4dNs1gBHEoeRu/YgAhUp0tW2ck/RNzmWg3FyEoUgZ/AuNYmywO2sxH1itloyFuH6cyomK6hTDmSac4wjbF4GR/IJKRuIenq7p8bGeEmB8fZcAgKa1bQCfJaMe3Lgm9UsJcucyJQyZ5ELnW0SYxk8QzY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708701787; c=relaxed/simple; bh=PoDeEFZKMM5sUBAoDnRImQrfjwOwvKT2JU4hjPgvF6s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iXbRhXS2ZyJw7PKmFGTYBpauq4u1ShhDD2NU8yGMkKMZmEJYevHqUBNhPp3ENqkEObfUQNay3cN5BupYDX4wmZ2CddjWdj929EjNwaHvIZ805KUQkZnh3Qv/ygaiz7cl8M570YQGfTYg6NoMDvc+BEfeAc09k1QJe1Ho8AeHOJY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=p8JqInj4; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="p8JqInj4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8A66CC43394; Fri, 23 Feb 2024 15:23:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708701786; bh=PoDeEFZKMM5sUBAoDnRImQrfjwOwvKT2JU4hjPgvF6s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p8JqInj4eWTc/Dq15O3aGReyVmV6LLV31cevUgbT6ufHuz2WGfmFb0RwlpTwLnxeC KMcT7DP4e4qaenE9WqOLZZT34xy7nz0TMi82sbfd7cJciUKOmtFBSODPSgDcYa7ZQj Y63dYc+Z00T3qRVNxbSJdIaybiPwa+7tG6nWpBYLcFP+SzgBLYiQh3V/nwdb47sOuL BGypnfRLmtkH+4uK7864yeo1Bn8XSs+OMJuy4J5zNmxl2aLdpApQYBACsMbHtgi+cr wk51VOMMf1liYZqQZNUIC0sh1q9q57r2y5TUhYubCSkRwYL0/td4orj+YZbc9x4bI6 V2I8QFtpmoHqw== Received: from johan by xi.lan with local (Exim 4.97.1) (envelope-from ) id 1rdXOI-000000005FX-435q; Fri, 23 Feb 2024 16:23:10 +0100 From: Johan Hovold To: Bjorn Helgaas , Bjorn Andersson Cc: Konrad Dybcio , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Manivannan Sadhasivam , linux-arm-msm@vger.kernel.org, linux-pci@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , Krzysztof Kozlowski Subject: [PATCH v2 02/12] dt-bindings: PCI: qcom: Do not require 'msi-map-mask' Date: Fri, 23 Feb 2024 16:21:14 +0100 Message-ID: <20240223152124.20042-3-johan+linaro@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240223152124.20042-1-johan+linaro@kernel.org> References: <20240223152124.20042-1-johan+linaro@kernel.org> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Whether the 'msi-map-mask' property is needed or not depends on how the MSI interrupts are mapped and it should therefore not be described as required. Note that the current schema fails to detect omissions of the mask property if the internal MSI controller properties are also present. Acked-by: Krzysztof Kozlowski Signed-off-by: Johan Hovold --- Documentation/devicetree/bindings/pci/qcom,pcie.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml index 5eda4e72f681..b28517047db2 100644 --- a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml +++ b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml @@ -146,7 +146,6 @@ anyOf: - "#interrupt-cells" - required: - msi-map - - msi-map-mask allOf: - $ref: /schemas/pci/pci-bus.yaml# From patchwork Fri Feb 23 15:21:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 13569247 X-Patchwork-Delegate: manivannanece23@gmail.com Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1C376839E8; Fri, 23 Feb 2024 15:23:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708701787; cv=none; b=Ub73KDJ21QZLFBwYOaRGjQvHk/jz+GvlqaTtGucMJH6LlHn3+lTOIFeIgUYaloDak8CcWmZerIAlxcSAUk3YVoo01S/bye9Lz7NPSLj1duEqe3EhrxH1i9mlIXCKUqabmvhKgOb2f9n8X9fW861Njf+RkH/ZMbDHq8L11iuk27g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708701787; c=relaxed/simple; bh=nc4MqV6YaWXP4nv2pZ90dCQqT4i4GYj2D270C7X4X5g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=a4CzU0GsxcXmxm/2NZ+4R4KHJFnSL2cwVdcYPvC/DdkjsTTCwpgovrOz6QLq8/kcxUESCtwpbQjyMw+2bwsyrCVpm3nijhg3dws6baxuHS3pU13V1lasHBQsXr52UErcYzZzWhxPHn4RdizpDlI3s/QteuoOOAVLdsGfZ0GPQeU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Ydyu1SR8; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Ydyu1SR8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 908B0C433A6; Fri, 23 Feb 2024 15:23:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708701786; bh=nc4MqV6YaWXP4nv2pZ90dCQqT4i4GYj2D270C7X4X5g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ydyu1SR8lpLQzpzB3X2h06K49YWtAISIGICtzLov1pVdvuuemjHzdi9XuRSexfKQX pkbziFhPoPSLqSSNiwrauPsgZEdLgfCdE2e6YilkGMttkMFmVl2Q9ODhe9whw1TGoj Nn9JmQP3RuhduIjAYJ5qs9F9kRZ+SCc3hdRPRHUa1Pxl5kJWSAqi7KyG9+ZMjYRpCu Y+4DVIeAAdX0kIE2m9dejvSbZnzMjRd/Z4lXUF8Ce9Bd8+BLeOUyxEkhuMvDUNealQ 0K2Ijlnp02ifK9PXNXURp+Epo3KWY/AI4lkS1Gv5XklYEToE258SMsdtWnM20Cc1ov iwRAu1VX9xIvQ== Received: from johan by xi.lan with local (Exim 4.97.1) (envelope-from ) id 1rdXOJ-000000005FZ-0BSl; Fri, 23 Feb 2024 16:23:11 +0100 From: Johan Hovold To: Bjorn Helgaas , Bjorn Andersson Cc: Konrad Dybcio , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Manivannan Sadhasivam , linux-arm-msm@vger.kernel.org, linux-pci@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH v2 03/12] dt-bindings: PCI: qcom: Allow 'aspm-no-l0s' Date: Fri, 23 Feb 2024 16:21:15 +0100 Message-ID: <20240223152124.20042-4-johan+linaro@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240223152124.20042-1-johan+linaro@kernel.org> References: <20240223152124.20042-1-johan+linaro@kernel.org> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add 'aspm-no-l0s', which can be used to indicate that ASPM L0s is not supported, to the binding. Signed-off-by: Johan Hovold Acked-by: Rob Herring --- Documentation/devicetree/bindings/pci/qcom,pcie.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml index b28517047db2..4d1060b52592 100644 --- a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml +++ b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml @@ -130,6 +130,8 @@ properties: description: GPIO controlled connection to WAKE# signal maxItems: 1 + aspm-no-l0s: true + required: - compatible - reg From patchwork Fri Feb 23 15:21:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 13569256 X-Patchwork-Delegate: manivannanece23@gmail.com Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4AE2583A03; Fri, 23 Feb 2024 15:23:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708701788; cv=none; b=hbec8dflC5S7s91RBP6pVaAgDhMczjQ7wEyy5Yo9ZrJVGcfFchxQWiTTQKq1z2Zz4IqMIHmJnXiNB2vcLevcdsIrjBSuXWhrGF5xjPX6GjmKkomLRgByRkJFR8vQjS2zWQTsfCNmYvgnXbcw/WOTDK2cmURmfcXVqv4NTWYkkps= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708701788; c=relaxed/simple; bh=+MZNQen3wcYHTNycJniWNvbay9tcVWDXKsVdslC0djE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IBtIAcMEr1r2cRjLnROtygymYwemCt1EbYte3qNRWSONDkGq4D0j7ivfV3cvZyzdirUfdnnLjDdg3GJB7soglysIxE7hUU3e22+jKrCH1OpVWK8oc+59VcLCD+hJA6Nq8HL6JZ5231nBHgn2YXp8JYts7bJ4rTsGK7TERsfoHG4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=fOTuRidG; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="fOTuRidG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 98205C433B1; Fri, 23 Feb 2024 15:23:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708701786; bh=+MZNQen3wcYHTNycJniWNvbay9tcVWDXKsVdslC0djE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fOTuRidGnMQVuYfe+pILwzBb1KejZ6SdNH5TybZzzp0ZE51C+sdgTDdjy3KDp19HJ zmvwwGLN7Z/gL9Kd2jBapVUZ/AN9825OlvtsFegQ+AWLMPq9uML2LKUj+sYKgMAgqf M7O+Qm0MHlzYf9FiHAZFV48eJEE3VGan9R9QP09tapmCPAiOU5WqeLwP5GFd4gV+6C +3PWB/iSV/+mEhlUoOts/CCQI584PNxJCPq4+T7zyE6GEePehLNTKfZAkNtzp9yHZG Dq53LJql+qwxam9g4WJU3cHTjIMqdtiODX+x4leBpT2cYWjsZBvQ6DXNlANPeCcgk/ fjkNuQfBDW8GA== Received: from johan by xi.lan with local (Exim 4.97.1) (envelope-from ) id 1rdXOJ-000000005Fb-0VmY; Fri, 23 Feb 2024 16:23:11 +0100 From: Johan Hovold To: Bjorn Helgaas , Bjorn Andersson Cc: Konrad Dybcio , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Manivannan Sadhasivam , linux-arm-msm@vger.kernel.org, linux-pci@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH v2 04/12] PCI: qcom: Add support for disabling ASPM L0s in devicetree Date: Fri, 23 Feb 2024 16:21:16 +0100 Message-ID: <20240223152124.20042-5-johan+linaro@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240223152124.20042-1-johan+linaro@kernel.org> References: <20240223152124.20042-1-johan+linaro@kernel.org> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Commit 9f4f3dfad8cf ("PCI: qcom: Enable ASPM for platforms supporting 1.9.0 ops") started enabling ASPM unconditionally when the hardware claims to support it. This triggers Correctable Errors for some PCIe devices on machines like the Lenovo ThinkPad X13s, which could indicate an incomplete driver ASPM implementation or that the hardware does in fact not support L0s. Add support for disabling ASPM L0s in the devicetree when it is not supported on a particular machine and controller. Note that only the 1.9.0 ops enable ASPM currently. Fixes: 9f4f3dfad8cf ("PCI: qcom: Enable ASPM for platforms supporting 1.9.0 ops") Cc: stable@vger.kernel.org # 6.7 Signed-off-by: Johan Hovold --- drivers/pci/controller/dwc/pcie-qcom.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c index 09d485df34b9..0fb5dc06d2ef 100644 --- a/drivers/pci/controller/dwc/pcie-qcom.c +++ b/drivers/pci/controller/dwc/pcie-qcom.c @@ -273,6 +273,25 @@ static int qcom_pcie_start_link(struct dw_pcie *pci) return 0; } +static void qcom_pcie_clear_aspm_l0s(struct dw_pcie *pci) +{ + u16 offset; + u32 val; + + if (!of_property_read_bool(pci->dev->of_node, "aspm-no-l0s")) + return; + + offset = dw_pcie_find_capability(pci, PCI_CAP_ID_EXP); + + dw_pcie_dbi_ro_wr_en(pci); + + val = readl(pci->dbi_base + offset + PCI_EXP_LNKCAP); + val &= ~PCI_EXP_LNKCAP_ASPM_L0S; + writel(val, pci->dbi_base + offset + PCI_EXP_LNKCAP); + + dw_pcie_dbi_ro_wr_dis(pci); +} + static void qcom_pcie_clear_hpc(struct dw_pcie *pci) { u16 offset = dw_pcie_find_capability(pci, PCI_CAP_ID_EXP); @@ -962,6 +981,7 @@ static int qcom_pcie_init_2_7_0(struct qcom_pcie *pcie) static int qcom_pcie_post_init_2_7_0(struct qcom_pcie *pcie) { + qcom_pcie_clear_aspm_l0s(pcie->pci); qcom_pcie_clear_hpc(pcie->pci); return 0; From patchwork Fri Feb 23 15:21:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 13569253 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 710F882897; Fri, 23 Feb 2024 15:23:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708701788; cv=none; b=i+v1w9TE4n32L/Vns6i+Pfb9R6aNjEw3ttjbeUvy96Cw4dlu4Slc/rBEmYzc0NGb8AhuEMA/C+xZM9UWAsd/GxfmCx9lmuOB7s8+hVUC7GLJMZr3BAVCnpnJKEXynWEhoVsJv0dw0umUd+XS5XghEN9GMNOSly9Yiy2s4HSjwMg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708701788; c=relaxed/simple; bh=gJZHjSh3y+j7s4q6gU9xs2cqQ5VjywqHBbKDaqt8bfM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AjL9OCuZLrvwXPKJBDUnoS5igpjZYuA91F4zumxkbn5vX3j5CKXGZc1VqrhrRrCew68rW7FCtayy33AsVyP0kX/YkvvKdEfLd0B+AEHb6pZ51lSuFlo/E28z2Ce84B2C7WqDtOH4Mg6g6eTJXMXOrCDPuEpUlg1kJsOZwjrK1tw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=RiMkzcS5; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="RiMkzcS5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9BC6BC43330; Fri, 23 Feb 2024 15:23:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708701786; bh=gJZHjSh3y+j7s4q6gU9xs2cqQ5VjywqHBbKDaqt8bfM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RiMkzcS5oV2wh7PEl8kSNanLJNv9U7lFD6i8q8LVXxXNHLUXjNvxiuc0rYsong6Wc ssaUlKFv2vUQxAvUh5ohXotOVix5xcW6mw0RzrerVcMqjFetoIlEERDmqr5mce6Qcc XwnYtEkq/uLvlQRpceVaADrgfs9Imbm+dGSZqIgHIwtBcxkdEhBRt0N2VYIrLO/Vt0 sp8ZyJ78zBABDxRmwmdR2VcxdeiT5HdliQYerU4Hz/Jv+sqYfnLXkbCs/sq2yCSsQL bzIviGKvXSsQ3QW8HIMa+y5YX0YE+ktaMj0f6cCVBqChoIby88UN58LnYLyJeNguVV LGkJxduKxYYHQ== Received: from johan by xi.lan with local (Exim 4.97.1) (envelope-from ) id 1rdXOJ-000000005Fd-0t1U; Fri, 23 Feb 2024 16:23:11 +0100 From: Johan Hovold To: Bjorn Helgaas , Bjorn Andersson Cc: Konrad Dybcio , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Manivannan Sadhasivam , linux-arm-msm@vger.kernel.org, linux-pci@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH v2 05/12] arm64: dts: qcom: sc8280xp: add missing PCIe minimum OPP Date: Fri, 23 Feb 2024 16:21:17 +0100 Message-ID: <20240223152124.20042-6-johan+linaro@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240223152124.20042-1-johan+linaro@kernel.org> References: <20240223152124.20042-1-johan+linaro@kernel.org> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add the missing PCIe CX performance level votes to avoid relying on other drivers (e.g. USB or UFS) to maintain the nominal performance level required for Gen3 speeds. Fixes: 813e83157001 ("arm64: dts: qcom: sc8280xp/sa8540p: add PCIe2-4 nodes") Cc: stable@vger.kernel.org # 6.2 Signed-off-by: Johan Hovold Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi index 0a40b8dec14e..95c7b746407f 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi +++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi @@ -1780,6 +1780,7 @@ pcie4: pcie@1c00000 { reset-names = "pci"; power-domains = <&gcc PCIE_4_GDSC>; + required-opps = <&rpmhpd_opp_nom>; phys = <&pcie4_phy>; phy-names = "pciephy"; @@ -1878,6 +1879,7 @@ pcie3b: pcie@1c08000 { reset-names = "pci"; power-domains = <&gcc PCIE_3B_GDSC>; + required-opps = <&rpmhpd_opp_nom>; phys = <&pcie3b_phy>; phy-names = "pciephy"; @@ -1976,6 +1978,7 @@ pcie3a: pcie@1c10000 { reset-names = "pci"; power-domains = <&gcc PCIE_3A_GDSC>; + required-opps = <&rpmhpd_opp_nom>; phys = <&pcie3a_phy>; phy-names = "pciephy"; @@ -2077,6 +2080,7 @@ pcie2b: pcie@1c18000 { reset-names = "pci"; power-domains = <&gcc PCIE_2B_GDSC>; + required-opps = <&rpmhpd_opp_nom>; phys = <&pcie2b_phy>; phy-names = "pciephy"; @@ -2175,6 +2179,7 @@ pcie2a: pcie@1c20000 { reset-names = "pci"; power-domains = <&gcc PCIE_2A_GDSC>; + required-opps = <&rpmhpd_opp_nom>; phys = <&pcie2a_phy>; phy-names = "pciephy"; From patchwork Fri Feb 23 15:21:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 13569251 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1C7A0839EC; Fri, 23 Feb 2024 15:23:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708701787; cv=none; b=nK2b6Duu4Jier3vGZRlkgCSP0cOVEn/1Ia3xkMT0Zt0/pMKg7/z7rHZV2DyoHmFy//4endgYJ3LDgQJN6ckQ9V1NsEoJovXXOnXzQtlXymXW2oilOyoKDLWZDtrrxdQeYQ+pFLXpMNtD/T7RkrdR3rSl0YLF/IUSqMD2GVht074= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708701787; c=relaxed/simple; bh=hKdAU8xGeWoBEDF62SIFZ8ycEZqo56n2cRdtQJsOYWI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BGdwhzOJJ/YuvjpGuQvOGzzkOjUatnLZjGMnr55zWUnhG908YdOyd1WO1pja3CbSw98DIOvSKGrZ5Yv0kDQM0owyCWIxp8O+r3KW8zqTXRlAXFzCvQVLcLZKQuWavGCz8eaQKqG0WPaMV7IixcQI/+shaNeoOHV4BZMZDCHOpOQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=cXTUmzaX; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="cXTUmzaX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 852CBC43390; Fri, 23 Feb 2024 15:23:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708701786; bh=hKdAU8xGeWoBEDF62SIFZ8ycEZqo56n2cRdtQJsOYWI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cXTUmzaXMkILnO7RQP11RNpxQxwSqANnovUfeLsNj/+qwgrEIDdtEsiEC3SBLJa7D zCN57TEjBeF7KkzYGum7kYT5t2cEST8NtvRFz3IdjwHCb1jbmhNgPEVhn32aZCYdq1 kq56BfhR7wynQ1vQpmCypa7P3SnCbmH+t3PEFPH0YVnMEhBmEKM+NG0OKKXDpfRyoB 7o4YCezeFA6Un2PCF99Yuw3zoq6IT5SS2rEwrAm/06o/BOAXpgj6D2f+Sy0bofGHGP adGEbKQnBfZjcXtf7GhjbB4Vwjz1N4KBAYkUbuXEiNZF3uM2U4V/zfvhjgF6WfwAHB oIxUTvAjG3SFw== Received: from johan by xi.lan with local (Exim 4.97.1) (envelope-from ) id 1rdXOJ-000000005Ff-1Da7; Fri, 23 Feb 2024 16:23:11 +0100 From: Johan Hovold To: Bjorn Helgaas , Bjorn Andersson Cc: Konrad Dybcio , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Manivannan Sadhasivam , linux-arm-msm@vger.kernel.org, linux-pci@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH v2 06/12] arm64: dts: qcom: sc8280xp-crd: limit pcie4 link speed Date: Fri, 23 Feb 2024 16:21:18 +0100 Message-ID: <20240223152124.20042-7-johan+linaro@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240223152124.20042-1-johan+linaro@kernel.org> References: <20240223152124.20042-1-johan+linaro@kernel.org> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Limit the WiFi PCIe link speed to Gen2 speed (500 MB/s), which is the speed that Windows uses. Signed-off-by: Johan Hovold Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts index ffc4406422ae..41215567b3ae 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts @@ -563,6 +563,8 @@ &pcie3a_phy { }; &pcie4 { + max-link-speed = <2>; + perst-gpios = <&tlmm 141 GPIO_ACTIVE_LOW>; wake-gpios = <&tlmm 139 GPIO_ACTIVE_LOW>; From patchwork Fri Feb 23 15:21:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 13569258 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6893D83CC3; Fri, 23 Feb 2024 15:23:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708701789; cv=none; b=mOO5sZKYspBS4ZC2AnFU07tqw9iUmNpLOl20fV6NCmPnn/svHz+iquyfANXYii5Kae1TNO2d1nTM+sjLWxxbVcqdxmnUY7UIwuYpl+RZEgBj0slKFxbedo3S93sFIFYUfF/AyH40xOMtwtcSPbbdCvP5EEBjFmumnUj9WZY2OrU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708701789; c=relaxed/simple; bh=OWj2b5i7fpfFVzm3D5FLX7tedf5qUfedcLWseSq8y7Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gWNseEvwfg3CVg4Em64aHMzUurlDNDliN3nP47UXO+dKaa64gmOlhfegf+TCu7Uih6EzF0ipPjAHnB7B/cizeXr7HEucRsbCWlv9uNdoygKUX+xGYu7DX/C6Y48aGznF1UGje/2ObutmyAywTofHb3WWAq5ltLIZfBF+p0EEf98= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=QMrhpPkq; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="QMrhpPkq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A3C76C43609; Fri, 23 Feb 2024 15:23:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708701786; bh=OWj2b5i7fpfFVzm3D5FLX7tedf5qUfedcLWseSq8y7Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QMrhpPkqFG9r00mtXMNDXeW0UgnlRmsYPdHbyg/9/4Z0HEmdvntpW5CGszqUtomla B+EPNYxM2lTEWEirudMCLMviRTm9sQPqwXZrL9zYTIjn2gsYMJCX9q+BxKrGDpc4cx YyKPwjDbXwaqfZoxeHZG9GjXD/UfKyCkK8Uf4oy1NFCfeuuCcUbMHwDRGpbfRw1lzs nRBKklaoM1guPH/h4JCPEggS4Ton0f8E9jMSlkRXpriINSLhY/5xKbLBoPS1HgJqWs 8NumliXEAp6iJN/qM2FrnRQejdl0UECHN7VoaSTjEJaK792mlHVYoUjvEOnBQ0pD3D WfuUvasNTOkBQ== Received: from johan by xi.lan with local (Exim 4.97.1) (envelope-from ) id 1rdXOJ-000000005Fh-1XsO; Fri, 23 Feb 2024 16:23:11 +0100 From: Johan Hovold To: Bjorn Helgaas , Bjorn Andersson Cc: Konrad Dybcio , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Manivannan Sadhasivam , linux-arm-msm@vger.kernel.org, linux-pci@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH v2 07/12] arm64: dts: qcom: sc8280xp-x13s: limit pcie4 link speed Date: Fri, 23 Feb 2024 16:21:19 +0100 Message-ID: <20240223152124.20042-8-johan+linaro@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240223152124.20042-1-johan+linaro@kernel.org> References: <20240223152124.20042-1-johan+linaro@kernel.org> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Limit the WiFi PCIe link speed to Gen2 speed (500 MB/s), which is the speed that the boot firmware has brought up the link at (and that Windows uses). This is specifically needed to avoid a large amount of link errors when restarting the link during boot (but which are currently not reported). This also appears to fix intermittent failures to download the ath11k firmware during boot which can be seen when there is a longer delay between restarting the link and loading the WiFi driver (e.g. when using full disk encryption). Fixes: 123b30a75623 ("arm64: dts: qcom: sc8280xp-x13s: enable WiFi controller") Cc: stable@vger.kernel.org # 6.2 Signed-off-by: Johan Hovold Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts index 2c17e137563a..a67756ada990 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts @@ -768,6 +768,8 @@ &pcie3a_phy { }; &pcie4 { + max-link-speed = <2>; + perst-gpios = <&tlmm 141 GPIO_ACTIVE_LOW>; wake-gpios = <&tlmm 139 GPIO_ACTIVE_LOW>; From patchwork Fri Feb 23 15:21:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 13569257 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 280E383A0F; Fri, 23 Feb 2024 15:23:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708701789; cv=none; b=FOa4kPp5vAFuv/P6ne9fQg4FOtO8rzx6+ZTK/ie7RFy00HdGFq4G71GXG3T4TJpD4HngbTyo0/rkJCpZa2ESqapDWNKImWLQhexFz0ETCP42boMnU4mhbmGXc0trjlrwVDA5HFTn2Wwcvg4TbzjApiLQzg8BwtGEpBLF1oshDaE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708701789; c=relaxed/simple; bh=N1lJfJsT0X5pb0MCpBJjAnSC5f6053KInsrfpjOCKaY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NP4ozAEEf+kPksVc3r4H9SiGC/q5ydI3U9Z7nwfog8WMk6VpCuR3oZyeSfaPOFwjlbA5DG0UxwMcit5MlAyRx/1V3ABaVMU5kCbJusmUGmuG+mm00qK7KLiBH760O1fGfN+AmUQo3VOx96tRb0YFMq8QXd4Z0P8fl8ECx71Aymo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=A8zvAImA; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="A8zvAImA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A130BC43601; Fri, 23 Feb 2024 15:23:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708701786; bh=N1lJfJsT0X5pb0MCpBJjAnSC5f6053KInsrfpjOCKaY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A8zvAImAr1MqUBYI5vxImRdSOuHk2sxTSfrG62ZHC16ADhX8y+4DNiagcklJbqwre O2IoWidiH5rqUjXaoTZ+BbSRhl03S8xJLDBu0fvUTAGmsNGZC7UU/5Zh9UmpBezh+c ZeKH5L8y3HsWb0sYv3MghGApcXdMRxhmpvUtepst2VTr9WddM9BFj4DUSUkFXIlpfm fjQMlxLaZeidHtvXCaLrjyF3zf3lIX23Q12qMAKPa0KAs7JxpdVuoqkmGE8Zm9xUCW CACDdJhazbYCG6sCFbI4v7VIYf5c+bSEWs1TYldrtmKJjTXeshPAaxUSjA2UgkUojw ypuqfG1Vc7uZg== Received: from johan by xi.lan with local (Exim 4.97.1) (envelope-from ) id 1rdXOJ-000000005Fj-1s8o; Fri, 23 Feb 2024 16:23:11 +0100 From: Johan Hovold To: Bjorn Helgaas , Bjorn Andersson Cc: Konrad Dybcio , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Manivannan Sadhasivam , linux-arm-msm@vger.kernel.org, linux-pci@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH v2 08/12] arm64: dts: qcom: sc8280xp-crd: disable ASPM L0s for NVMe Date: Fri, 23 Feb 2024 16:21:20 +0100 Message-ID: <20240223152124.20042-9-johan+linaro@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240223152124.20042-1-johan+linaro@kernel.org> References: <20240223152124.20042-1-johan+linaro@kernel.org> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Enabling ASPM L0s on the CRD results in a large amount of Correctable Errors (Timeout) when accessing the NVMe controller so disable it for now. Fixes: 9f4f3dfad8cf ("PCI: qcom: Enable ASPM for platforms supporting 1.9.0 ops") Cc: stable@vger.kernel.org # 6.7 Signed-off-by: Johan Hovold Reviewed-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts index 41215567b3ae..7e94a68d5d9f 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts @@ -525,6 +525,8 @@ keyboard@68 { }; &pcie2a { + aspm-no-l0s; + perst-gpios = <&tlmm 143 GPIO_ACTIVE_LOW>; wake-gpios = <&tlmm 145 GPIO_ACTIVE_LOW>; From patchwork Fri Feb 23 15:21:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 13569255 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 271788288A; Fri, 23 Feb 2024 15:23:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708701789; cv=none; b=fLt0eeRFhyWL6okvqf+x8tEEPxALMJl833mYOFR03MpwRjVuvH2XUqt5F3/fm2asleScPQ0+Yy0fAK7tHw+BBDYi5G7/fXPXME5JCJtPfUH/f46AcWdUJ2Chj0GeeKrsN00LBzrqUwA/emGJL8+3tPeIhyxd2MbbUq11bejFt5w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708701789; c=relaxed/simple; bh=CrZ5ilwQu4dqM9fOfVslL0lVToxLm2aDUIvFF2TgBD0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=o4NuPQ19IIF8P/Cr6s8B09hDVkMqrDoDhJJk2ZrgqByh5vD0jde5uYsXor4bBxGks0UARS/Dwz2LvIBpHfdVH69d6iYFVdLTHZ6YkSl2ld3sBnlo2EDTNIq5E+z6Ptqoq234OLTyXJqt92iKMFAiQDm2aERnWsyldNmWgm0nLOw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gOvQbWkD; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="gOvQbWkD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A192DC43141; Fri, 23 Feb 2024 15:23:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708701786; bh=CrZ5ilwQu4dqM9fOfVslL0lVToxLm2aDUIvFF2TgBD0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gOvQbWkDRnfkrzZuP2H2k7hnyQfaBAfjbnY8Kc6FcUaAA+StKmWwvUHaCKr5LoRzy EVmK6oz5NpmMom+vxhAhKxmFE1P23Z2zvWndfXUuGWrq3uwibD0igZDeqBUZO33w75 4ais53pwKx+xXyT4gc8mcKwIf4tjym4sv0E0Dkv2ufGjup2thhi4HwBWE241Vif/4N LgdEhOTWlLxAH3atanshZYLIUCinr9KN6PDpsRvAez0HHjmxAYFemvRWkZJkSMt4xA l9ucolIypeabofmj8tspxb+Da+dGW5dockGI7mIeS5uYdTWAGjI0KZVKkUfZqUd5YQ LyyfMQBlLr8cA== Received: from johan by xi.lan with local (Exim 4.97.1) (envelope-from ) id 1rdXOJ-000000005Fl-29ue; Fri, 23 Feb 2024 16:23:11 +0100 From: Johan Hovold To: Bjorn Helgaas , Bjorn Andersson Cc: Konrad Dybcio , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Manivannan Sadhasivam , linux-arm-msm@vger.kernel.org, linux-pci@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH v2 09/12] arm64: dts: qcom: sc8280xp-crd: disable ASPM L0s for modem and Wi-Fi Date: Fri, 23 Feb 2024 16:21:21 +0100 Message-ID: <20240223152124.20042-10-johan+linaro@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240223152124.20042-1-johan+linaro@kernel.org> References: <20240223152124.20042-1-johan+linaro@kernel.org> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 There are indications that ASPM L0s is not working very well on this machine so disable it also for the modem and Wi-Fi controllers for now. This specifically avoids having the modem and Wi-Fi controllers bounce in an out of L0s when not used (the modem still bounces in and out of L1) as well as intermittent Correctable errors on the Wi-Fi link when not used. Fixes: 9f4f3dfad8cf ("PCI: qcom: Enable ASPM for platforms supporting 1.9.0 ops") Cc: stable@vger.kernel.org # 6.7 Signed-off-by: Johan Hovold --- arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts index 7e94a68d5d9f..8fc0380f65a0 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts @@ -546,6 +546,8 @@ &pcie2a_phy { }; &pcie3a { + aspm-no-l0s; + perst-gpios = <&tlmm 151 GPIO_ACTIVE_LOW>; wake-gpios = <&tlmm 148 GPIO_ACTIVE_LOW>; @@ -566,6 +568,7 @@ &pcie3a_phy { &pcie4 { max-link-speed = <2>; + aspm-no-l0s; perst-gpios = <&tlmm 141 GPIO_ACTIVE_LOW>; wake-gpios = <&tlmm 139 GPIO_ACTIVE_LOW>; From patchwork Fri Feb 23 15:21:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 13569252 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4BF9483A0E; Fri, 23 Feb 2024 15:23:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708701788; cv=none; b=PfhPz7E+32a4rYOWwbD3hzUG+W6bOVqxJKjLUdTcq0zWxw2Q73IA3MIv+GFaQq9LshZ87sR/i3uq5UulrVd7zemSZ9txVEuhiWPoqXIR4m8YVLKAmuUaxm3rgbFXqSK6x0+OjMpIxWbeX78c2r/CJykWms1ePGVxyVTOFDvzFYg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708701788; c=relaxed/simple; bh=jVZUt4YG+wPeP4sDqHFS9RcmoM+nVy3+c7gqaqdvxNc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=X0IccknntARvR2NskJz4pUGpDEBkLptEIyVUS5FwoiXncdd6lsrv9SaD4Z/QL96G6QhTnh2Cm9FW2vwGXBeIQLLW334aIsi8auZUIAvjlERAjpYftkdOOKEje3fqer8x187tWJU4j+wvU7IlYXS0L/0JTzhSNOZEaWqvAQaBVDE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=uRY9ySyF; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="uRY9ySyF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 95172C43399; Fri, 23 Feb 2024 15:23:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708701786; bh=jVZUt4YG+wPeP4sDqHFS9RcmoM+nVy3+c7gqaqdvxNc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uRY9ySyF+q/Bqrj1OVKddGDpv1hliLUQkBbjGwzajppkTt/imWCpi3zjflQf5Gnf0 jZupC3jRkOpAyb74BHUzODkJClItg77QjE/bwy31Q1p3OfkutaE5ftbGDd9BdDuHO7 ls4Ildmwurs13GNyzDlMfhIZnM5YDw33oA3h8Lg820WcVCKMntpKVeBJJFGxqhkBSZ GwiQBFT5YVqf9JAPh7lzBJB25tqAhDPAuyLy6uTQR5Tamcv+4p577efVtzmIEatBsp 5uRTGdC36/XLYtH3AW2h7LWj4ItppftXlzMzMNoiFDQ7QJwqmTn1VR1Kj/KrrjD/Jj ho/4D6azXpg0Q== Received: from johan by xi.lan with local (Exim 4.97.1) (envelope-from ) id 1rdXOJ-000000005Fn-2a69; Fri, 23 Feb 2024 16:23:11 +0100 From: Johan Hovold To: Bjorn Helgaas , Bjorn Andersson Cc: Konrad Dybcio , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Manivannan Sadhasivam , linux-arm-msm@vger.kernel.org, linux-pci@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH v2 10/12] arm64: dts: qcom: sc8280xp-x13s: disable ASPM L0s for Wi-Fi Date: Fri, 23 Feb 2024 16:21:22 +0100 Message-ID: <20240223152124.20042-11-johan+linaro@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240223152124.20042-1-johan+linaro@kernel.org> References: <20240223152124.20042-1-johan+linaro@kernel.org> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Enabling ASPM L0s on the Lenovo Thinkpad X13s results in Correctable Errors (BadTLP, Timeout) when accessing the Wi-Fi controller so disable it for now. Fixes: 9f4f3dfad8cf ("PCI: qcom: Enable ASPM for platforms supporting 1.9.0 ops") Cc: stable@vger.kernel.org # 6.7 Signed-off-by: Johan Hovold --- arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts index a67756ada990..70824294108e 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts @@ -769,6 +769,7 @@ &pcie3a_phy { &pcie4 { max-link-speed = <2>; + aspm-no-l0s; perst-gpios = <&tlmm 141 GPIO_ACTIVE_LOW>; wake-gpios = <&tlmm 139 GPIO_ACTIVE_LOW>; From patchwork Fri Feb 23 15:21:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 13569249 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1C74B839E9; Fri, 23 Feb 2024 15:23:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708701787; cv=none; b=YdGkCuFaZra5ZMJzCCTvbQuWkfuvs18TZzYdaqUkuDpUs0ADA7N4fNuK3EDGyRnfJiWGCy1WPKOz4Gg1Uv+lBMeNRR8DQPZWn/bRbe1m+olsLEV1ob0R6LpB7tAldbMnuRnsc64UxP+QCesVx6EX0sNdbjNGCbpFbpG5z73KwaI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708701787; c=relaxed/simple; bh=z+xNJkOnkPu4NA9y+sepSglA9ZK8sFGfzstRMLlnHqg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VTwki4s50OhCAup6esaRyE15X/5fVKUsji5Q5eivZDhJcTKLtUnG2GaPUtXMrEPV9vU+7djJl7GhOO28FbNGv3Qo7wKr0qBX0/P07p1Az9tb+H7muDFj8agrocakebzmVhwIOR1VLb+YO5DVnna3xpb1hetQRWjam3OChW2f15E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Pq1iHvpQ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Pq1iHvpQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 817F6C433F1; Fri, 23 Feb 2024 15:23:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708701786; bh=z+xNJkOnkPu4NA9y+sepSglA9ZK8sFGfzstRMLlnHqg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Pq1iHvpQPJc25pdkX9izR9+w19YL7duFOwQjdtKPK6T/7leudryEtHQTE18kUOt2u YgVZ0BLfP0vp5uYqyf/4j7iQ5ojoXzfBJF+W5v+hTZ5GoLJG1m1GIkpbVFVzdadG7f MtJEgh/MU+HhMudb9puj6DK6tpx2KlLYVvEZdpa1KM3WqshTckQs/SCePQtPIxc1v9 Q3UrDhyPz7F78EseRUNulsY2artyR9UdCedcqrKS19eyGWBsDN1J56YVLCRaYcdRas cMHRX3TlYssE4a9jsovqSrHGVzNIQZ6rS5R65dh30LDWhnCpHmGUY9OnHhZ7h8akKm KVbL4NqELE2RQ== Received: from johan by xi.lan with local (Exim 4.97.1) (envelope-from ) id 1rdXOJ-000000005Ft-2wsE; Fri, 23 Feb 2024 16:23:11 +0100 From: Johan Hovold To: Bjorn Helgaas , Bjorn Andersson Cc: Konrad Dybcio , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Manivannan Sadhasivam , linux-arm-msm@vger.kernel.org, linux-pci@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH v2 11/12] arm64: dts: qcom: sc8280xp-x13s: disable ASPM L0s for NVMe and modem Date: Fri, 23 Feb 2024 16:21:23 +0100 Message-ID: <20240223152124.20042-12-johan+linaro@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240223152124.20042-1-johan+linaro@kernel.org> References: <20240223152124.20042-1-johan+linaro@kernel.org> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 There are indications that ASPM L0s is not working very well on this machine so disable it also for the NVMe and modem controllers for now. Note that this is done as a precaution based on problems with the Wi-Fi on the X13s as well as the NVMe, modem and Wi-Fi on the sc8280xp-crd reference design (the NVMe controller on my X13s does not support L0 and the machine lacks a modem). Fixes: 9f4f3dfad8cf ("PCI: qcom: Enable ASPM for platforms supporting 1.9.0 ops") Cc: stable@vger.kernel.org # 6.7 Signed-off-by: Johan Hovold --- arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts index 70824294108e..06fc88d5d025 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts @@ -730,6 +730,8 @@ keyboard@68 { }; &pcie2a { + aspm-no-l0s; + perst-gpios = <&tlmm 143 GPIO_ACTIVE_LOW>; wake-gpios = <&tlmm 145 GPIO_ACTIVE_LOW>; @@ -749,6 +751,8 @@ &pcie2a_phy { }; &pcie3a { + aspm-no-l0s; + perst-gpios = <&tlmm 151 GPIO_ACTIVE_LOW>; wake-gpios = <&tlmm 148 GPIO_ACTIVE_LOW>; From patchwork Fri Feb 23 15:21:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 13569254 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6876783CBD; Fri, 23 Feb 2024 15:23:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708701789; cv=none; b=oRYmBLctHLhXSU1501YhtkBfyIBBrNgcd4uQDH/JQmHno5hS8JHzJj1xXwt2QG3qDIU1B+Y9Z1VbOkmtEoqshA7GjGIxWytgeoQUBZcwWfgZ+GJcFu4LTaBVSamoAvLPq/RmxexprMTpKVzm9jY9ZQ+5Q9JmQGWacLXwiDW9vQ0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708701789; c=relaxed/simple; bh=m8pSgG+tILjksUnIEn47rNQsq3jlzF02sVC9//IqHf8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=foS2W48zS8LHp8GoGiLrI0vWq8oTKYTXAEYPC/6Uovxh+V4DpIT45NQ8ZCIfMMWG4+WvS1Qca65AVzHtspSk+sD4wYSBGjkSxLQz3iIzfWb4FJ2KX1Wt0KkjkUzPfpOccCYYx4Si3HZnBkZ8vw+7DFLWg56PlgoFtJkt7NS+epo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Hg+OdIcd; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Hg+OdIcd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AA93EC43142; Fri, 23 Feb 2024 15:23:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708701786; bh=m8pSgG+tILjksUnIEn47rNQsq3jlzF02sVC9//IqHf8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Hg+OdIcd6RZ2ZAkx29PIE2bh37UR/Tzmf8W53YxXYFJJixQYlOJTc4rHr6N8mVi/6 x93Mk6D1NPk92Lyy1e2zZe4c+c9Nvp2rmykNVJ2GP0vszUrvQwjiRPDoQhEBynY7Zw zjHnOkkuKoNeNJdyfkcJ/nTGwbYOubN21KrU2Sf98WHjDkAzjixiLph/+6J7ketfGE WwArB7M9YIVGSRuQg4d06tCzohE+Sh/H8N6bcXQd+GFOopFA8XzbRIMO2Ov+y6tcgk WJe7oMh2Wg7sGiEg2ziCRehwPcwTQZc69Yw/K5EXxRQlHfev8NmJ6MnERgjK9/thm5 SmBGXbEh8RHtQ== Received: from johan by xi.lan with local (Exim 4.97.1) (envelope-from ) id 1rdXOJ-000000005Fy-3KpN; Fri, 23 Feb 2024 16:23:11 +0100 From: Johan Hovold To: Bjorn Helgaas , Bjorn Andersson Cc: Konrad Dybcio , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Manivannan Sadhasivam , linux-arm-msm@vger.kernel.org, linux-pci@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH v2 12/12] arm64: dts: qcom: sc8280xp: enable GICv3 ITS for PCIe Date: Fri, 23 Feb 2024 16:21:24 +0100 Message-ID: <20240223152124.20042-13-johan+linaro@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240223152124.20042-1-johan+linaro@kernel.org> References: <20240223152124.20042-1-johan+linaro@kernel.org> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The DWC PCIe controller can be used with its internal MSI controller or with an external one such as the GICv3 Interrupt Translation Service (ITS). Add the msi-map properties needed to use the GIC ITS. This will also make Linux switch to the ITS implementation, which allows for assigning affinity to individual MSIs. Note that using the GIC ITS on SC8280XP will cause Advanced Error Reporting (AER) interrupts to be received on errors unlike when using the internal MSI controller. This will specifically lead to notifications about Correctable Errors being logged for the Wi-Fi controller on the Lenovo ThinkPad X13s when ASPM L0s is enabled. Suggested-by: Manivannan Sadhasivam Reviewed-by: Konrad Dybcio Signed-off-by: Johan Hovold --- arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi index 95c7b746407f..3e5063f67fc6 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi +++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi @@ -1737,6 +1737,8 @@ pcie4: pcie@1c00000 { linux,pci-domain = <6>; num-lanes = <1>; + msi-map = <0x0 &its 0xe0000 0x10000>; + interrupts = , , , @@ -1838,6 +1840,8 @@ pcie3b: pcie@1c08000 { linux,pci-domain = <5>; num-lanes = <2>; + msi-map = <0x0 &its 0xd0000 0x10000>; + interrupts = , , , @@ -1937,6 +1941,8 @@ pcie3a: pcie@1c10000 { linux,pci-domain = <4>; num-lanes = <4>; + msi-map = <0x0 &its 0xc0000 0x10000>; + interrupts = , , , @@ -2039,6 +2045,8 @@ pcie2b: pcie@1c18000 { linux,pci-domain = <3>; num-lanes = <2>; + msi-map = <0x0 &its 0xb0000 0x10000>; + interrupts = , , , @@ -2138,6 +2146,8 @@ pcie2a: pcie@1c20000 { linux,pci-domain = <2>; num-lanes = <4>; + msi-map = <0x0 &its 0xa0000 0x10000>; + interrupts = , , , @@ -4426,7 +4436,7 @@ intc: interrupt-controller@17a00000 { #size-cells = <2>; ranges; - msi-controller@17a40000 { + its: msi-controller@17a40000 { compatible = "arm,gic-v3-its"; reg = <0 0x17a40000 0 0x20000>; msi-controller;