From patchwork Wed Sep 3 10:52:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 36551 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f199.google.com (mail-ob0-f199.google.com [209.85.214.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7E3472039B for ; Wed, 3 Sep 2014 10:53:05 +0000 (UTC) Received: by mail-ob0-f199.google.com with SMTP id wn1sf44472448obc.10 for ; Wed, 03 Sep 2014 03:53:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=PJmNSazkWWym0DyrcJ5BtYwWsCcTX5ysw7lnc7OaFeg=; b=OqF0wUchIR+/F7s/ysIiqX0S9ADGRwE2Ug0YrThEhvQ3Ye/ndG1bav+LLpOaYY6QA+ JytGtS8uAWyqEJjt92rsVEOMv90ZOYLM85BusSlDh67FIQPY1MQdhdYSobeTg8SoABds 4TvX2FBfF88fv95C33YmP7c6BJqAFycxlYPfNucxQf1/+nI+AeVz+r/Suj81136qLNSy bSw8dtdIeJCpVNOPgN/Ev2D+oK+vutnQHChg2XUkM0ep7BxBxVBQhzKmbMWGCbl4rPhl Qbqta+aUfFLUjVQSyJ73JaWLCqTq5SY6xumEacjvrt0CCldEoBBY1/4mYywlwGk1UlK5 z0MQ== X-Gm-Message-State: ALoCoQl4SOCc60EO1zo4eChMcQNQjtQYl5tfYMfHgSM8oOUo1kwh8dzTNJQFiGY0gNjgZMZpk0NN X-Received: by 10.42.26.12 with SMTP id d12mr23718810icc.24.1409741585064; Wed, 03 Sep 2014 03:53:05 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.92.228 with SMTP id b91ls2849848qge.88.gmail; Wed, 03 Sep 2014 03:53:04 -0700 (PDT) X-Received: by 10.52.239.108 with SMTP id vr12mr24236327vdc.30.1409741584933; Wed, 03 Sep 2014 03:53:04 -0700 (PDT) Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by mx.google.com with ESMTPS id rx9si676630vdc.64.2014.09.03.03.53.04 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 03 Sep 2014 03:53:04 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.179 as permitted sender) client-ip=209.85.220.179; Received: by mail-vc0-f179.google.com with SMTP id hy4so8521699vcb.38 for ; Wed, 03 Sep 2014 03:53:04 -0700 (PDT) X-Received: by 10.220.105.201 with SMTP id u9mr34724801vco.11.1409741584872; Wed, 03 Sep 2014 03:53:04 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.221.45.67 with SMTP id uj3csp660732vcb; Wed, 3 Sep 2014 03:53:04 -0700 (PDT) X-Received: by 10.180.90.207 with SMTP id by15mr34868413wib.76.1409741583986; Wed, 03 Sep 2014 03:53:03 -0700 (PDT) Received: from mail-wg0-f47.google.com (mail-wg0-f47.google.com [74.125.82.47]) by mx.google.com with ESMTPS id hc1si9860046wjc.84.2014.09.03.03.53.03 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 03 Sep 2014 03:53:03 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 74.125.82.47 as permitted sender) client-ip=74.125.82.47; Received: by mail-wg0-f47.google.com with SMTP id z12so8163456wgg.6 for ; Wed, 03 Sep 2014 03:53:03 -0700 (PDT) X-Received: by 10.194.95.8 with SMTP id dg8mr46637976wjb.1.1409741583418; Wed, 03 Sep 2014 03:53:03 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id j7sm3968190wia.9.2014.09.03.03.53.01 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 03 Sep 2014 03:53:02 -0700 (PDT) From: Ulf Hansson To: "Rafael J. Wysocki" , Len Brown , Pavel Machek , linux-pm@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-sh@vger.kernel.org, linux-samsung-soc@vger.kernel.org, Geert Uytterhoeven , Kevin Hilman , Daniel Lezcano , Tomasz Figa , Simon Horman , Magnus Damm , Ben Dooks , Kukjin Kim , Stephen Boyd , Philipp Zabel , Mark Brown , Ulf Hansson Subject: [PATCH 06/15] PM / Domains: Remove dev_irq_safe from genpd config Date: Wed, 3 Sep 2014 12:52:22 +0200 Message-Id: <1409741551-16437-7-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1409741551-16437-1-git-send-email-ulf.hansson@linaro.org> References: <1409741551-16437-1-git-send-email-ulf.hansson@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ulf.hansson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.179 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The genpd dev_irq_safe configuration somewhat overlaps with the runtime PM pm_runtime_irq_safe() option. Also, currently genpd don't have a good way to deal with these device. So, until we figured out if and how to support this in genpd, let's remove the option to configure it. Signed-off-by: Ulf Hansson --- drivers/base/power/domain.c | 4 ---- include/linux/pm_domain.h | 1 - 2 files changed, 5 deletions(-) diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index e777609..4298a2b 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -615,8 +615,6 @@ static int pm_genpd_runtime_suspend(struct device *dev) if (IS_ERR(genpd)) return -EINVAL; - might_sleep_if(!genpd->dev_irq_safe); - stop_ok = genpd->gov ? genpd->gov->stop_ok : NULL; if (stop_ok && !stop_ok(dev)) return -EBUSY; @@ -661,8 +659,6 @@ static int pm_genpd_runtime_resume(struct device *dev) if (IS_ERR(genpd)) return -EINVAL; - might_sleep_if(!genpd->dev_irq_safe); - /* If power.irq_safe, the PM domain is never powered off. */ if (dev->power.irq_safe) return genpd_start_dev_no_timing(genpd, dev); diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index fd5efc8..f2545a8 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h @@ -63,7 +63,6 @@ struct generic_pm_domain { unsigned int suspended_count; /* System suspend device counter */ unsigned int prepared_count; /* Suspend counter of prepared devices */ bool suspend_power_off; /* Power status before system suspend */ - bool dev_irq_safe; /* Device callbacks are IRQ-safe */ int (*power_off)(struct generic_pm_domain *domain); s64 power_off_latency_ns; int (*power_on)(struct generic_pm_domain *domain);