From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6E21FC433DF for ; Sun, 11 Oct 2020 17:57:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 353D222365 for ; Sun, 11 Oct 2020 17:57:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="QjYer8G/"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="BGKdUIEs" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388424AbgJKR5a (ORCPT ); Sun, 11 Oct 2020 13:57:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46690 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388392AbgJKR5Z (ORCPT ); Sun, 11 Oct 2020 13:57:25 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 88682C0613D6; Sun, 11 Oct 2020 10:57:25 -0700 (PDT) Date: Sun, 11 Oct 2020 17:57:23 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1602439044; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=92SAXetGlqbdQ7jidG3RojveO8mpUrZod2CVvMNOXPQ=; b=QjYer8G/EN1AsRsRz7m8/Y1P/zg7PHzI4wBdXP0za//a7zNgkgWflpcAfGyxtKshHF9Bsz OQLR395rE7q12SVMafXaae//jzysKYsspsTCx7I/rrO0Z52VPgu/MmP9PMldMcoZPCgx06 /h7HZ+N05Godmp3kEgXq8UmTzLaJ3PnmAQAttFsa+DjMdWcYTbG1PLjjrj2i4qzUIIfmFA D+rOdFie63UoHnL15x+KhJ9o/sApS6QmQ/wbh8vYp2cG2VbInWz7+yue17RvNh4pOgwrFB 2U0raAYMrzrYyKNIzSmJ2vIRFQUpMQPNo156wuMbIDnE6zQpxuqOsdGbSS6E6w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1602439044; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=92SAXetGlqbdQ7jidG3RojveO8mpUrZod2CVvMNOXPQ=; b=BGKdUIEsSQlqULqqhpLKPb2FmA3poZGcm/nbgDdCkCHWhz1U2FT0W/cgtQTnumishLL+Jk Ws6X4HUBKTeX5TDw== From: "tip-bot2 for Maulik Shah" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: irq/core] pinctrl: qcom: Use return value from irq_set_wake() call Cc: Maulik Shah , Marc Zyngier , Stephen Boyd , Douglas Anderson , Bjorn Andersson , Linus Walleij , x86 , LKML In-Reply-To: <1601267524-20199-3-git-send-email-mkshah@codeaurora.org> References: <1601267524-20199-3-git-send-email-mkshah@codeaurora.org> MIME-Version: 1.0 Message-ID: <160243904330.7002.4809705687735318637.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the irq/core branch of tip: Commit-ID: f41aaca593377a4fe3984459fd4539481263b4cd Gitweb: https://git.kernel.org/tip/f41aaca593377a4fe3984459fd4539481263b4cd Author: Maulik Shah AuthorDate: Mon, 28 Sep 2020 10:02:00 +05:30 Committer: Marc Zyngier CommitterDate: Tue, 06 Oct 2020 11:23:14 +01:00 pinctrl: qcom: Use return value from irq_set_wake() call msmgpio irqchip was not using return value of irq_set_irq_wake() callback since previously GIC-v3 irqchip neither had IRQCHIP_SKIP_SET_WAKE flag nor it implemented .irq_set_wake callback. This lead to irq_set_irq_wake() return error -ENXIO. However from 'commit 4110b5cbb014 ("irqchip/gic-v3: Allow interrupt to be configured as wake-up sources")' GIC irqchip has IRQCHIP_SKIP_SET_WAKE flag. Use return value from irq_set_irq_wake() and irq_chip_set_wake_parent() instead of always returning success. Fixes: e35a6ae0eb3a ("pinctrl/msm: Setup GPIO chip in hierarchy") Signed-off-by: Maulik Shah Signed-off-by: Marc Zyngier Tested-by: Stephen Boyd Reviewed-by: Douglas Anderson Reviewed-by: Stephen Boyd Acked-by: Bjorn Andersson Acked-by: Linus Walleij Link: https://lore.kernel.org/r/1601267524-20199-3-git-send-email-mkshah@codeaurora.org --- drivers/pinctrl/qcom/pinctrl-msm.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c index 1c23f5c..1df2322 100644 --- a/drivers/pinctrl/qcom/pinctrl-msm.c +++ b/drivers/pinctrl/qcom/pinctrl-msm.c @@ -1077,12 +1077,10 @@ static int msm_gpio_irq_set_wake(struct irq_data *d, unsigned int on) * when TLMM is powered on. To allow that, enable the GPIO * summary line to be wakeup capable at GIC. */ - if (d->parent_data) - irq_chip_set_wake_parent(d, on); - - irq_set_irq_wake(pctrl->irq, on); + if (d->parent_data && test_bit(d->hwirq, pctrl->skip_wake_irqs)) + return irq_chip_set_wake_parent(d, on); - return 0; + return irq_set_irq_wake(pctrl->irq, on); } static int msm_gpio_irq_reqres(struct irq_data *d)