From patchwork Thu Jun 4 22:29:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lina Iyer X-Patchwork-Id: 49480 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 36B9D20DDC for ; Wed, 3 Jun 2015 15:53:28 +0000 (UTC) Received: by wibut5 with SMTP id ut5sf6497316wib.0 for ; Wed, 03 Jun 2015 08:53:27 -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:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=l/RQBUY5O+8NF5/oRiU60QYMB7BA/WMequZf5Lxc4rc=; b=dFR9nL0U7f5tf0tfgbaXt2LkK5yLrS/4VERm136KEDglblGUe0/pra+1BEldEac/O2 SVSVXRUQTWDY3jwDTvU3/R4Nr/nuIbGkISPhEdTsmEHgqozlo57HSh3UrIyOcHrdAXSu qnOg7PbhwkYBX4avf3xY4dNdWpYaE8T+kScw+tp2YOTv8Xc5KN3wENDKOrlQSzjeM76e P2wlVDiAYmo41zvSm1dYdtxpZkZlCKuBzyUUKGw+b4umfm2qNJU/1xj6mF/Oaif8eU88 xxY5pjHLfWzAui3yHin1LM7ohgyBIehh6HYD4LJ26fmmitwYxbFlhADkZqm5Pj7/88YI ZQYA== X-Gm-Message-State: ALoCoQnDjhhO3YO049qW+5HOwjicqSb5v4mdcw77uEkukrOjKjBZFsUkChDvFA/C2K+Too+IKwAD X-Received: by 10.180.221.203 with SMTP id qg11mr18374091wic.7.1433346807491; Wed, 03 Jun 2015 08:53:27 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.19.162 with SMTP id g2ls81488lae.80.gmail; Wed, 03 Jun 2015 08:53:27 -0700 (PDT) X-Received: by 10.112.125.33 with SMTP id mn1mr32513701lbb.82.1433346807332; Wed, 03 Jun 2015 08:53:27 -0700 (PDT) Received: from mail-lb0-f173.google.com (mail-lb0-f173.google.com. [209.85.217.173]) by mx.google.com with ESMTPS id xa2si18330698lbb.156.2015.06.03.08.53.27 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jun 2015 08:53:27 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.173 as permitted sender) client-ip=209.85.217.173; Received: by lbcue7 with SMTP id ue7so10056800lbc.0 for ; Wed, 03 Jun 2015 08:53:27 -0700 (PDT) X-Received: by 10.152.6.69 with SMTP id y5mr32218486lay.72.1433346807034; Wed, 03 Jun 2015 08:53:27 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp3965559lbb; Wed, 3 Jun 2015 08:53:25 -0700 (PDT) X-Received: by 10.68.163.68 with SMTP id yg4mr23141317pbb.4.1433346804594; Wed, 03 Jun 2015 08:53:24 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id vb4si1563975pac.93.2015.06.03.08.53.23; Wed, 03 Jun 2015 08:53:24 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754927AbbFCPxW (ORCPT + 11 others); Wed, 3 Jun 2015 11:53:22 -0400 Received: from mail-pa0-f54.google.com ([209.85.220.54]:33421 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751950AbbFCPxV (ORCPT ); Wed, 3 Jun 2015 11:53:21 -0400 Received: by padj3 with SMTP id j3so9932103pad.0 for ; Wed, 03 Jun 2015 08:53:20 -0700 (PDT) X-Received: by 10.67.11.98 with SMTP id eh2mr59976749pad.21.1433346800313; Wed, 03 Jun 2015 08:53:20 -0700 (PDT) Received: from ubuntu.localdomain (i-global254.qualcomm.com. [199.106.103.254]) by mx.google.com with ESMTPSA id q3sm1216066pdr.10.2015.06.03.08.53.18 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 03 Jun 2015 08:53:19 -0700 (PDT) From: Lina Iyer To: rjw@rjwysocki.net, ulf.hansson@linaro.org, khilman@linaro.org Cc: mathieu.poirier@linaro.org, galak@codeaurora.org, linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, msivasub@codeaurora.org, agross@codeaurora.org, Lina Iyer Subject: [PATCH RFC 1/3] PM / Domains: Allocate memory outside domain locks Date: Thu, 4 Jun 2015 16:29:04 -0600 Message-Id: <1433456946-53296-2-git-send-email-lina.iyer@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1433456946-53296-1-git-send-email-lina.iyer@linaro.org> References: <1433456946-53296-1-git-send-email-lina.iyer@linaro.org> Sender: linux-pm-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: lina.iyer@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.217.173 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , In order for domains to be powered on/off in irq locked context, the domain locks could either be a spinlock or a mutex, depending on the domain. In preparation for atomic support, allocate domain data outside the domain locks, so the allocation calls dont have to be context sensitive. Cc: Ulf Hansson Cc: Rafael J. Wysocki Cc: Kevin Hilman Signed-off-by: Lina Iyer --- drivers/base/power/domain.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 3b3367b..dfd7595 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -1367,13 +1367,17 @@ int pm_genpd_remove_device(struct generic_pm_domain *genpd, int pm_genpd_add_subdomain(struct generic_pm_domain *genpd, struct generic_pm_domain *subdomain) { - struct gpd_link *link; + struct gpd_link *link, *itr; int ret = 0; if (IS_ERR_OR_NULL(genpd) || IS_ERR_OR_NULL(subdomain) || genpd == subdomain) return -EINVAL; + link = kzalloc(sizeof(*link), GFP_KERNEL); + if (!link) + return -ENOMEM; + mutex_lock(&genpd->lock); mutex_lock_nested(&subdomain->lock, SINGLE_DEPTH_NESTING); @@ -1383,18 +1387,13 @@ int pm_genpd_add_subdomain(struct generic_pm_domain *genpd, goto out; } - list_for_each_entry(link, &genpd->master_links, master_node) { - if (link->slave == subdomain && link->master == genpd) { + list_for_each_entry(itr, &genpd->master_links, master_node) { + if (itr->slave == subdomain && itr->master == genpd) { ret = -EINVAL; goto out; } } - link = kzalloc(sizeof(*link), GFP_KERNEL); - if (!link) { - ret = -ENOMEM; - goto out; - } link->master = genpd; list_add_tail(&link->master_node, &genpd->master_links); link->slave = subdomain; @@ -1496,17 +1495,17 @@ int pm_genpd_attach_cpuidle(struct generic_pm_domain *genpd, int state) if (IS_ERR_OR_NULL(genpd) || state < 0) return -EINVAL; + cpuidle_data = kzalloc(sizeof(*cpuidle_data), GFP_KERNEL); + if (!cpuidle_data) + return -ENOMEM; + mutex_lock(&genpd->lock); if (genpd->cpuidle_data) { ret = -EEXIST; goto out; } - cpuidle_data = kzalloc(sizeof(*cpuidle_data), GFP_KERNEL); - if (!cpuidle_data) { - ret = -ENOMEM; - goto out; - } + cpuidle_drv = cpuidle_driver_ref(); if (!cpuidle_drv) { ret = -ENODEV;