| Message ID | 20231213173131.29436-3-johan+linaro@kernel.org |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a05:7300:3b04:b0:fb:cd0c:d3e with SMTP id c4csp7942868dys;
Wed, 13 Dec 2023 09:32:03 -0800 (PST)
X-Google-Smtp-Source:
AGHT+IE2X/O6ofWBjE74JS6ZQTrKoFD9iOgrsiGxBqBsEadBYcrsMZKxQqnY4Vg01p6z4jPa1sh1
X-Received: by 2002:a17:903:1206:b0:1cc:70dd:62c3 with SMTP id
l6-20020a170903120600b001cc70dd62c3mr4642897plh.30.1702488722820;
Wed, 13 Dec 2023 09:32:02 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1702488722; cv=none;
d=google.com; s=arc-20160816;
b=P+nT9l3etCKaY5sxQaac+M2iBen+OmPRqhRft524qCn6FizTea/40T+ocwPrPJL7Pc
C/w3ifmx9Qt/HzYXPsIxqo9aVl5L2HFLNF8GtvT7MR8ChSfjNctCa38LNr4DFTM5kN+C
BGz79QJX+H7SUP6F6YEF04lOQidqD5zwgh9htxW9Mnb4kC1otjzYs1u/tUWr0lGPYlwK
0YMY8SUtITcEuqjtVVdO+KBT3Zt1k6AIiros6NtkRAs3Tw0mLRqtuJrYOHtPaVbZoyfq
hzpyWD4IH4DEQPM3QjK84q/LKLMePeiXkhvDg8EJhxjSsLqHQcYkpdmvXLjUjyq5n9k2
EWzg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:content-transfer-encoding:mime-version
:references:in-reply-to:message-id:date:subject:cc:to:from
:dkim-signature;
bh=9ZE107eqB9dBAakEPSNQ5E/zavfDe8JXW/QUZHwmfCo=;
fh=pq7zxZtKkOG2m+6GgljO+NlQkUKWrzVITxHPZIsHjGY=;
b=xqEYrKBqJI5RXWGCh0PbaWrC2Opb5qLcDhwxDjnVamzP87JYwmXbYZW4hXPLlL5VBQ
DrBSqt+CpOvZI2+hOgpsJGNT1siqq/PerypI3dvxkCXG0/GD5xPcAKNd8qY2NIO42xLF
DHZYUBu2lXN8pJeyGbCXpzb4jwHC9pixEmNq+u7YZ0qQJMxO8NfPQNClK5wdN2ljX6yL
UH+ZOobhHyvxPIZC7WIxRMlCjIt+ljkW6EYcHsakdBTRQux5dpJxX6mOMs3/11NrzRRo
IFJHxKiMgkpZdh8F2zHNAfEGT9TqFER1CsmxeFvFTDk9jxR5Su/RwBNc1RfkVV1aqor8
HoVA==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@kernel.org header.s=k20201202 header.b=kYASBm6m;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.32 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org
Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32])
by mx.google.com with ESMTPS id
bj23-20020a056a02019700b005ca1c765c3dsi4628858pgb.615.2023.12.13.09.32.02
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 13 Dec 2023 09:32:02 -0800 (PST)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32;
Authentication-Results: mx.google.com;
dkim=pass header.i=@kernel.org header.s=k20201202 header.b=kYASBm6m;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 23.128.96.32 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org
Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0])
by agentk.vger.email (Postfix) with ESMTP id C275A80B7C09;
Wed, 13 Dec 2023 09:31:58 -0800 (PST)
X-Virus-Status: Clean
X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S235614AbjLMRbs (ORCPT <rfc822;dexuan.linux@gmail.com>
+ 99 others); Wed, 13 Dec 2023 12:31:48 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52388 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S235520AbjLMRbp (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Wed, 13 Dec 2023 12:31:45 -0500
Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 026BF10E
for <linux-kernel@vger.kernel.org>;
Wed, 13 Dec 2023 09:31:52 -0800 (PST)
Received: by smtp.kernel.org (Postfix) with ESMTPSA id 873B3C433C8;
Wed, 13 Dec 2023 17:31:51 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
s=k20201202; t=1702488711;
bh=xSe1Jsu3GOdkOTtJbp2Lh+/h7FFNNW/h3W6k5JjfVMs=;
h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
b=kYASBm6mT+FY45+m24m+AemNhaaX/5qyYUr8btsfdovQW6TkJD2QTPb2HCp51cdD5
oLZys04mr2u154P9bP3D35oR1FRHbNoHuAWbRmH+OaVwn1MyS6e2PnOsGF4UGDhl2b
cKBcZ6kWkQ2QyttQZugLNrw7h2oUw56MNcRob/CVPWMHk5Bw2KlncEstMmGQbYQQ2M
hULobbeFx66fguSsBIbpCf/JwhLk/Js6E0pmBAwZEjvQYx7Twt7SaLUNnPKHZknurd
LFTkzYZ2++Q8UO+Wr71yugFj81W7XVEKp8OUPJ8er3mNzUUt5nUMm+2tTAf+TEd9Xo
UIfUfYuwcVGcQ==
Received: from johan by xi.lan with local (Exim 4.96.2)
(envelope-from <johan+linaro@kernel.org>)
id 1rDT5J-0007fB-0L;
Wed, 13 Dec 2023 18:31:49 +0100
From: Johan Hovold <johan+linaro@kernel.org>
To: Bjorn Andersson <andersson@kernel.org>
Cc: Andy Gross <agross@kernel.org>,
Konrad Dybcio <konrad.dybcio@linaro.org>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Conor Dooley <conor+dt@kernel.org>,
Krishna Kurapati PSSNV <quic_kriskura@quicinc.com>,
linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
Johan Hovold <johan+linaro@kernel.org>, stable@vger.kernel.org,
Manivannan Sadhasivam <mani@kernel.org>
Subject: [PATCH 2/3] ARM: dts: qcom: sdx55: fix USB DP/DM HS PHY interrupts
Date: Wed, 13 Dec 2023 18:31:30 +0100
Message-ID: <20231213173131.29436-3-johan+linaro@kernel.org>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20231213173131.29436-1-johan+linaro@kernel.org>
References: <20231213173131.29436-1-johan+linaro@kernel.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI,
SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable
autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test,
not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]);
Wed, 13 Dec 2023 09:31:59 -0800 (PST)
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1785188814633539314
X-GMAIL-MSGID: 1785188814633539314
|
| Series |
ARM: dts: qcom: sdx55: fix USB wakeup interrupts
|
|
Commit Message
Johan Hovold
Dec. 13, 2023, 5:31 p.m. UTC
The USB DP/DM HS PHY interrupts need to be provided by the PDC interrupt
controller in order to be able to wake the system up from low-power
states and to be able to detect disconnect events, which requires
triggering on falling edges.
A recent commit updated the trigger type but failed to change the
interrupt provider as required. This leads to the current Linux driver
failing to probe instead of printing an error during suspend and USB
wakeup not working as intended.
Fixes: d0ec3c4c11c3 ("ARM: dts: qcom: sdx55: fix USB wakeup interrupt types")
Fixes: fea4b41022f3 ("ARM: dts: qcom: sdx55: Add USB3 and PHY support")
Cc: stable@vger.kernel.org # 5.12
Cc: Manivannan Sadhasivam <mani@kernel.org>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
---
arch/arm/boot/dts/qcom/qcom-sdx55.dtsi | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
Comments
On 12/13/23 18:31, Johan Hovold wrote: > The USB DP/DM HS PHY interrupts need to be provided by the PDC interrupt > controller in order to be able to wake the system up from low-power > states and to be able to detect disconnect events, which requires > triggering on falling edges. > > A recent commit updated the trigger type but failed to change the > interrupt provider as required. This leads to the current Linux driver > failing to probe instead of printing an error during suspend and USB > wakeup not working as intended. > > Fixes: d0ec3c4c11c3 ("ARM: dts: qcom: sdx55: fix USB wakeup interrupt types") > Fixes: fea4b41022f3 ("ARM: dts: qcom: sdx55: Add USB3 and PHY support") > Cc: stable@vger.kernel.org # 5.12 > Cc: Manivannan Sadhasivam <mani@kernel.org> > Signed-off-by: Johan Hovold <johan+linaro@kernel.org> > --- Matches the downstream kernel too (as it should!) Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Konrad
On Wed, Dec 13, 2023 at 06:31:30PM +0100, Johan Hovold wrote: > The USB DP/DM HS PHY interrupts need to be provided by the PDC interrupt > controller in order to be able to wake the system up from low-power > states and to be able to detect disconnect events, which requires > triggering on falling edges. > > A recent commit updated the trigger type but failed to change the > interrupt provider as required. This leads to the current Linux driver > failing to probe instead of printing an error during suspend and USB > wakeup not working as intended. > > Fixes: d0ec3c4c11c3 ("ARM: dts: qcom: sdx55: fix USB wakeup interrupt types") > Fixes: fea4b41022f3 ("ARM: dts: qcom: sdx55: Add USB3 and PHY support") > Cc: stable@vger.kernel.org # 5.12 > Cc: Manivannan Sadhasivam <mani@kernel.org> > Signed-off-by: Johan Hovold <johan+linaro@kernel.org> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> - Mani > --- > arch/arm/boot/dts/qcom/qcom-sdx55.dtsi | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/boot/dts/qcom/qcom-sdx55.dtsi b/arch/arm/boot/dts/qcom/qcom-sdx55.dtsi > index 0864c99a3da1..49910279cb71 100644 > --- a/arch/arm/boot/dts/qcom/qcom-sdx55.dtsi > +++ b/arch/arm/boot/dts/qcom/qcom-sdx55.dtsi > @@ -585,10 +585,10 @@ usb: usb@a6f8800 { > <&gcc GCC_USB30_MASTER_CLK>; > assigned-clock-rates = <19200000>, <200000000>; > > - interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>, > - <GIC_SPI 198 IRQ_TYPE_LEVEL_HIGH>, > - <GIC_SPI 158 IRQ_TYPE_EDGE_BOTH>, > - <GIC_SPI 157 IRQ_TYPE_EDGE_BOTH>; > + interrupts-extended = <&intc GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>, > + <&intc GIC_SPI 198 IRQ_TYPE_LEVEL_HIGH>, > + <&pdc 11 IRQ_TYPE_EDGE_BOTH>, > + <&pdc 10 IRQ_TYPE_EDGE_BOTH>; > interrupt-names = "hs_phy_irq", "ss_phy_irq", > "dm_hs_phy_irq", "dp_hs_phy_irq"; > > -- > 2.41.0 >
diff --git a/arch/arm/boot/dts/qcom/qcom-sdx55.dtsi b/arch/arm/boot/dts/qcom/qcom-sdx55.dtsi index 0864c99a3da1..49910279cb71 100644 --- a/arch/arm/boot/dts/qcom/qcom-sdx55.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-sdx55.dtsi @@ -585,10 +585,10 @@ usb: usb@a6f8800 { <&gcc GCC_USB30_MASTER_CLK>; assigned-clock-rates = <19200000>, <200000000>; - interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 198 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 158 IRQ_TYPE_EDGE_BOTH>, - <GIC_SPI 157 IRQ_TYPE_EDGE_BOTH>; + interrupts-extended = <&intc GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>, + <&intc GIC_SPI 198 IRQ_TYPE_LEVEL_HIGH>, + <&pdc 11 IRQ_TYPE_EDGE_BOTH>, + <&pdc 10 IRQ_TYPE_EDGE_BOTH>; interrupt-names = "hs_phy_irq", "ss_phy_irq", "dm_hs_phy_irq", "dp_hs_phy_irq";