Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp2446606yba; Mon, 15 Apr 2019 11:49:04 -0700 (PDT) X-Google-Smtp-Source: APXvYqxSWh/q8BqBS63pJLH+buYulwog4NMDqRzdSIMKrABq13frKvPemlJ6ERrbfq2HtmcVgwFV X-Received: by 2002:a62:e412:: with SMTP id r18mr76920778pfh.207.1555354144656; Mon, 15 Apr 2019 11:49:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555354144; cv=none; d=google.com; s=arc-20160816; b=pA9ugt0eDY5QJWVvQu4EJYHeBTOSy/a5/yyRWIb+u8LNa82akdNzfsd+Vv56s/DEsC DuvjWY4A1owzVgoeg9HGhM8VQ9LRFWtRoY1kBM+yUZTWQ0RkAMx8jeCKLt+SewKUR78S wWvnR7Tt8nHCHn4sIoQvN20OdsNpyCFlYjAOERsEmtvjeVH67TVgHaNGrDToY1Kvq1Uu hLKMRIcgxmQiBEq8WGnfSXB6MNMC//iBEdMnCuOtCz7hyyChg5QLE7A84dJGvY4SLzXt k1WSfLWT7CfSrf3mH5wn/aZcvP4ShI2yLQTV2FBy4TkNG3ch0tHnmHmhFTvmZjM/TPmj OMwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ZurFJgJ465qf9EBdHTV/o8nfntXqursdBpE3JgovG/Q=; b=GgNXLh+92TMGdmUEggnUkS/WZEa+RjjwpS1btjLifV3HeMrwy2RBbmYASLHJ+7HNuv MadusuUtpmpCQAJtreLQ455+JciazAqkkTS3bcvGy/9wGKKTbtwO+IzRiV7mGPDlZXdE LQ/+2T4q/SjvHxiW/3YIXbzX8g/gwxLhXUdrqH+ZWw8SNFWiV4KGrizv3MOL7fCQ1GD3 dG9kJRbYUsFql0OgAUdjibaNLwuAyA/R9JpsKDK+QmdVBOuez7u4AsEH7kKrTd3fiBgs n0JRIhvQi53yX3gWIJ5iM2dLdyBHdWecSFlyL2Emxk350Tce11EX3Xsndj/zDKYXOq0v SqNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="ir5FUD/n"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e192si42411758pgc.222.2019.04.15.11.48.48; Mon, 15 Apr 2019 11:49:04 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="ir5FUD/n"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728072AbfDOSrg (ORCPT + 99 others); Mon, 15 Apr 2019 14:47:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:50990 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728425AbfDOSre (ORCPT ); Mon, 15 Apr 2019 14:47:34 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F12212087C; Mon, 15 Apr 2019 18:47:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555354053; bh=5KIFgbR3W9uNMNXMZSSwDsHJQAIatttwczJ7D6dDCAI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ir5FUD/nPQwAS9e2Z4uMldV6B2SLi5NAzL4fvirZl3lnb4nrA85xnTriMS9wa8SSB DvNw4GZ0zbzO48XzJhDrG2GyA090xo5XMgG72Iff6G/S+ZkQkrKNMBPKtrzvGqQFa1 CsQrZxe/CZgr70T4gryrETFoqADR926BNByonQwM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stephen Boyd , Thomas Gleixner , Marc Zyngier , linux-arm-kernel@lists.infradead.org, linux-gpio@vger.kernel.org, Lina Iyer Subject: [PATCH 4.9 69/76] genirq: Respect IRQCHIP_SKIP_SET_WAKE in irq_chip_set_wake_parent() Date: Mon, 15 Apr 2019 20:44:33 +0200 Message-Id: <20190415183728.383414729@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190415183707.712011689@linuxfoundation.org> References: <20190415183707.712011689@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Stephen Boyd commit 325aa19598e410672175ed50982f902d4e3f31c5 upstream. If a child irqchip calls irq_chip_set_wake_parent() but its parent irqchip has the IRQCHIP_SKIP_SET_WAKE flag set an error is returned. This is inconsistent behaviour vs. set_irq_wake_real() which returns 0 when the irqchip has the IRQCHIP_SKIP_SET_WAKE flag set. It doesn't attempt to walk the chain of parents and set irq wake on any chips that don't have the flag set either. If the intent is to call the .irq_set_wake() callback of the parent irqchip, then we expect irqchip implementations to omit the IRQCHIP_SKIP_SET_WAKE flag and implement an .irq_set_wake() function that calls irq_chip_set_wake_parent(). The problem has been observed on a Qualcomm sdm845 device where set wake fails on any GPIO interrupts after applying work in progress wakeup irq patches to the GPIO driver. The chain of chips looks like this: QCOM GPIO -> QCOM PDC (SKIP) -> ARM GIC (SKIP) The GPIO controllers parent is the QCOM PDC irqchip which in turn has ARM GIC as parent. The QCOM PDC irqchip has the IRQCHIP_SKIP_SET_WAKE flag set, and so does the grandparent ARM GIC. The GPIO driver doesn't know if the parent needs to set wake or not, so it unconditionally calls irq_chip_set_wake_parent() causing this function to return a failure because the parent irqchip (PDC) doesn't have the .irq_set_wake() callback set. Returning 0 instead makes everything work and irqs from the GPIO controller can be configured for wakeup. Make it consistent by returning 0 (success) from irq_chip_set_wake_parent() when a parent chip has IRQCHIP_SKIP_SET_WAKE set. [ tglx: Massaged changelog ] Fixes: 08b55e2a9208e ("genirq: Add irqchip_set_wake_parent") Signed-off-by: Stephen Boyd Signed-off-by: Thomas Gleixner Acked-by: Marc Zyngier Cc: linux-arm-kernel@lists.infradead.org Cc: linux-gpio@vger.kernel.org Cc: Lina Iyer Cc: stable@vger.kernel.org Link: https://lkml.kernel.org/r/20190325181026.247796-1-swboyd@chromium.org Signed-off-by: Greg Kroah-Hartman --- kernel/irq/chip.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c @@ -1142,6 +1142,10 @@ int irq_chip_set_vcpu_affinity_parent(st int irq_chip_set_wake_parent(struct irq_data *data, unsigned int on) { data = data->parent_data; + + if (data->chip->flags & IRQCHIP_SKIP_SET_WAKE) + return 0; + if (data->chip->irq_set_wake) return data->chip->irq_set_wake(data, on);