Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp2459394yba; Mon, 15 Apr 2019 12:05:49 -0700 (PDT) X-Google-Smtp-Source: APXvYqyXwM/kGWoAdlfyataIVLbTmYsJTlXXjVlKJWY5eDBTeAqAdCa0mv18L1NJAZFdrgi49L+D X-Received: by 2002:a65:6289:: with SMTP id f9mr72631017pgv.380.1555355149777; Mon, 15 Apr 2019 12:05:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555355149; cv=none; d=google.com; s=arc-20160816; b=PkFT5p8BqWhUukdgj0RN6qKDPaDyJz1FtnM13ffaSd2p3qvcP/J7xcp1xm7s0tB8pY VLrqA53GJmD37YhO6BTucDGozgdTBU8VZ0/4DfwYuv0GxwOS5Dbp8EBNJ4ZzGOquL6XW fMSqbgSJgIk0EOSn14gRlYC3P54lceSCFmg8gzWvXz3dIaNndbTg+mQpvJVJBcxI7Sbm gitSRW40CwDF1/aG7mtbvFM5Rl1supWfu64W3gLhVL1JESx63u9R45ddjo3JmxVdNUvf FvZft18tFLfrBPkGpLUYiUtkMS2wSc9XxwwdWj/yeVKiRzu+muIJ/YJlB/LWKuIt+msz XMlA== 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=e+Q4VLQqXfuileWBjO3cvWd4bgCWRWsg2gYUNKz9yuk=; b=bHfQuU++gM/ViY1rG/JS48u/4qVjn1BXDb4GIFVZHig8+jg8K4dcxcKmMxlH8wqsMe 51AAWxvhdqVUxmvV4evy3BMzh+pYlDpVwSNjRbvSB2MLAPDzIuJnu8qL1TfI7YBvxWvH FO28NVVyJQOZLz/Ag/6faSEuWREMSvt8DSkfdoD7JjWE5uA1Q+lRQMD/qzmPND1mbMTt EWN5zGBXhLktdlAR7EacBVCuyM4cVhQRIqcAE7+7myTk1tOn/irRSswE2NGhN4ZbziGy /0/wtuWc9gUdnyJW98QPsZCNH8JlYxzVXx1q5xgxSv13EZSSgskjDFUV+v3l3OYiw3sq ypEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ABuqXD9Z; 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 bj1si38286169plb.214.2019.04.15.12.05.33; Mon, 15 Apr 2019 12:05:49 -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=ABuqXD9Z; 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 S1729496AbfDOTEQ (ORCPT + 99 others); Mon, 15 Apr 2019 15:04:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:36968 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729477AbfDOTEO (ORCPT ); Mon, 15 Apr 2019 15:04:14 -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 E3FB1218EA; Mon, 15 Apr 2019 19:04:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555355053; bh=WtaBDuq0NA4/RUVItlvbe3TCcXvsCced7Ftp4xa6t+E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ABuqXD9ZY03455gm+GEj9+yiV6KWk8AhIYFAwhCCGR2Y2CPO4g9QKMHNPG96HY/8A HHz6zmlZuuN+men7AWFTQKFZlF9b0NJSVlviQFH5gRmymfXI9HBiXhKS4F9GOe5IvZ qDGyRcGnfpN2EQPyEhMXUj4kVUdtBLauPcxZJTJE= 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.14 51/69] genirq: Respect IRQCHIP_SKIP_SET_WAKE in irq_chip_set_wake_parent() Date: Mon, 15 Apr 2019 20:59:09 +0200 Message-Id: <20190415183734.224301875@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190415183726.036654568@linuxfoundation.org> References: <20190415183726.036654568@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 @@ -1363,6 +1363,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);