From patchwork Fri Dec 29 13:31:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 10137099 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CB3E160233 for ; Fri, 29 Dec 2017 13:32:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BB42C2DE56 for ; Fri, 29 Dec 2017 13:32:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AFF0F2DE58; Fri, 29 Dec 2017 13:32:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4CEB52DE56 for ; Fri, 29 Dec 2017 13:32:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751191AbdL2NcC (ORCPT ); Fri, 29 Dec 2017 08:32:02 -0500 Received: from mail-lf0-f65.google.com ([209.85.215.65]:46508 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751125AbdL2Nb6 (ORCPT ); Fri, 29 Dec 2017 08:31:58 -0500 Received: by mail-lf0-f65.google.com with SMTP id a12so11848106lfe.13 for ; Fri, 29 Dec 2017 05:31:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=LwXAnuGJ78+XbOZKC0valKzvmjWZjg9Ac88HF/6yWzo=; b=i5CJp2XO2/mXX0ZpkzNUAh3/qCUDEc8FyZQI1QpkmeFTEyLhVXoybiXTpB5u0ed9FF WJ0rWDiy1nmjfwRDa3Ea6qzp9AGAtf3pnHnMr1oiNZ+QwiX1w/lrKG39Tc7/Z/vRVoje yHd0ZGuWf7qPpeHayKiGp+vFxDzjMBhtuO/PE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=LwXAnuGJ78+XbOZKC0valKzvmjWZjg9Ac88HF/6yWzo=; b=MRnLyl6n1CwiQsohtH+VI+nJdp9FSEgN7yqiKZofFns63DNaSUYeGo84EpX6yyS3J0 u7w0cA1TVimEJ2IqwfIrMClybVjaiygLIbaqUYDIIcUo2nL1S1BlCa9pGDbGZnURj8l5 PD4SL9V35B7v7b9BKl+AevdwEzhS/SZu/H4Hum4TVfYxlSbtbZgFNOtH+4WW+gviNArS Uvw5KYbKEeM/EjOFAnbWbokIduqtcoyb5zCDsbFUadcMICHkR2GEfgpNvDl+62103s9D 20EuekzEEfMAKKRSpm7p8THfoQDI9qCYKIKv0TO00e70jIcQ1IJGwvraSsoq2KjeKp76 FFFg== X-Gm-Message-State: AKGB3mJozxZB6c1O4ASoFO1g1p/zgU9nlqNiO3MhvfTIYLA8mdEvyirk dEEIwsaS+nSL40xE8uu7nyQhxQ== X-Google-Smtp-Source: ACJfBotRIkud8MQBR33jmJQ0z/bhxdvB1gtmj+4/vZTKVUuaKB7yVUtFUR50DlnHb0J6u6Ky0RN19g== X-Received: by 10.46.21.13 with SMTP id s13mr17325658ljd.70.1514554317217; Fri, 29 Dec 2017 05:31:57 -0800 (PST) Received: from localhost.localdomain (h-158-174-22-67.NA.cust.bahnhof.se. [158.174.22.67]) by smtp.gmail.com with ESMTPSA id e72sm7521063lji.63.2017.12.29.05.31.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 29 Dec 2017 05:31:56 -0800 (PST) From: Ulf Hansson To: "Rafael J . Wysocki" , linux-pm@vger.kernel.org Cc: Thomas Gleixner , Jason Cooper , Marc Zyngier , Linus Walleij , Simon Horman , Niklas Soderlund , Geert Uytterhoeven , Ulf Hansson , linux-renesas-soc@vger.kernel.org, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/3] irqchip/renesas-irqc: Use WAKEUP_PATH driver PM flag Date: Fri, 29 Dec 2017 14:31:43 +0100 Message-Id: <1514554304-18989-3-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1514554304-18989-1-git-send-email-ulf.hansson@linaro.org> References: <1514554304-18989-1-git-send-email-ulf.hansson@linaro.org> Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Geert Uytterhoeven Since commit 6f46aedb9c85873b ("irqchip: renesas-irqc: Add wake-up support"), when an IRQ is used for wakeup, the INTC block's module clock is manually kept running during system suspend, to make sure the device stays active. However, this explicit clock handling is merely a workaround for a failure to properly communicate wakeup information to the PM core. Instead, set the WAKEUP_PATH driver PM flag to indicate that the device is part of the wakeup path, which further also enables middle-layers and PM domains (like genpd) to act on this. In case the device is attached to genpd and depending on if it has an active wakeup configuration, genpd will keep the device active (the clock running) during system suspend when needed. This enables us to remove all explicit clock handling code from the driver, so let's do that as well. Signed-off-by: Geert Uytterhoeven [Ulf: Converted to use the WAKEUP_PATH driver PM flag] Signed-off-by: Ulf Hansson --- drivers/irqchip/irq-renesas-irqc.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/drivers/irqchip/irq-renesas-irqc.c b/drivers/irqchip/irq-renesas-irqc.c index 52304b1..70d1409 100644 --- a/drivers/irqchip/irq-renesas-irqc.c +++ b/drivers/irqchip/irq-renesas-irqc.c @@ -17,7 +17,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include #include #include #include @@ -64,7 +63,7 @@ struct irqc_priv { struct platform_device *pdev; struct irq_chip_generic *gc; struct irq_domain *irq_domain; - struct clk *clk; + unsigned wakeup_path:1; }; static struct irqc_priv *irq_data_to_priv(struct irq_data *data) @@ -111,15 +110,7 @@ static int irqc_irq_set_wake(struct irq_data *d, unsigned int on) int hw_irq = irqd_to_hwirq(d); irq_set_irq_wake(p->irq[hw_irq].requested_irq, on); - - if (!p->clk) - return 0; - - if (on) - clk_enable(p->clk); - else - clk_disable(p->clk); - + p->wakeup_path = on; return 0; } @@ -159,12 +150,6 @@ static int irqc_probe(struct platform_device *pdev) p->pdev = pdev; platform_set_drvdata(pdev, p); - p->clk = devm_clk_get(&pdev->dev, NULL); - if (IS_ERR(p->clk)) { - dev_warn(&pdev->dev, "unable to get clock\n"); - p->clk = NULL; - } - pm_runtime_enable(&pdev->dev); pm_runtime_get_sync(&pdev->dev); @@ -276,6 +261,18 @@ static int irqc_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_PM_SLEEP +static int irqc_suspend(struct device *dev) +{ + struct irqc_priv *p = dev_get_drvdata(dev); + + dev_pm_set_driver_flags(dev, p->wakeup_path ? DPM_FLAG_WAKEUP_PATH : 0); + return 0; +} +#endif + +static SIMPLE_DEV_PM_OPS(irqc_pm_ops, irqc_suspend, NULL); + static const struct of_device_id irqc_dt_ids[] = { { .compatible = "renesas,irqc", }, {}, @@ -288,6 +285,7 @@ static struct platform_driver irqc_device_driver = { .driver = { .name = "renesas_irqc", .of_match_table = irqc_dt_ids, + .pm = &irqc_pm_ops, } };