From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756281AbbIYNEp (ORCPT ); Fri, 25 Sep 2015 09:04:45 -0400 Received: from mail-wi0-f171.google.com ([209.85.212.171]:33223 "EHLO mail-wi0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756238AbbIYNEh (ORCPT ); Fri, 25 Sep 2015 09:04:37 -0400 From: Marc Titinger X-Google-Original-From: Marc Titinger To: khilman@kernel.org, rjw@rjwysocki.net Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, ahaslam@baylibre.com, bcousson@baylibre.com, lina.iyer@linaro.org, Marc Titinger Subject: [RFC 5/7] PM / Domains: succeed & warn when attaching non-irqsafe devices to an irq-safe domain. Date: Fri, 25 Sep 2015 15:04:07 +0200 Message-Id: <1443186249-14596-6-git-send-email-mtitinger+renesas@baylibre.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1443186249-14596-1-git-send-email-mtitinger+renesas@baylibre.com> References: <1443186249-14596-1-git-send-email-mtitinger+renesas@baylibre.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Marc Titinger This patch checks for irq-safe compatibility in suspend/resume instead of failing the attach operation early on. Non-cpu devices attaching to an irq-safe power domain will have to call pm_runtime_irq_safe from their probe function. Signed-off-by: Marc Titinger --- drivers/base/power/domain.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 8259654..b747e9e 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -585,6 +585,14 @@ static int pm_genpd_runtime_suspend(struct device *dev) if (dev->power.irq_safe && !genpd->irq_safe) return 0; + /* The device probe may have missed calling pm_runtime_irq_safe. + */ + if (!dev->power.irq_safe && genpd->irq_safe) { + dev_err(dev, "trying to %s a non-irqsafe device in an irq-safe domain\n", + __func__); + return -EINVAL; + } + genpd_lock(genpd); genpd->in_progress++; @@ -624,6 +632,14 @@ static int pm_genpd_runtime_resume(struct device *dev) goto out; } + /* The device probe may have missed calling pm_runtime_irq_safe. + */ + if (!dev->power.irq_safe && genpd->irq_safe) { + dev_err(dev, "trying to %s a non-irqsafe device in an irq-safe domain\n", + __func__); + return -EINVAL; + } + genpd_lock(genpd); ret = __pm_genpd_poweron(genpd); genpd_unlock(genpd); @@ -1365,11 +1381,11 @@ int __pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev, if (IS_ERR_OR_NULL(genpd) || IS_ERR_OR_NULL(dev)) return -EINVAL; - if (genpd->irq_safe && !dev->power.irq_safe) { - dev_err(dev, + /* Only issue a warning, runtime_irqsafe may be called later on + * from the driver probe. */ + if (genpd->irq_safe && !dev->power.irq_safe) + dev_warn(dev, "Devices in an IRQ safe domain have to be IRQ safe.\n"); - return -EINVAL; - } gpd_data = genpd_alloc_dev_data(dev, genpd, td); if (IS_ERR(gpd_data)) -- 1.9.1