From patchwork Fri Oct 12 11:11:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 148751 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp598966lji; Fri, 12 Oct 2018 04:12:00 -0700 (PDT) X-Google-Smtp-Source: ACcGV60/yzLhbaozykczn1ejfU8CO/vNk44caDaH6AItQeKIZd8BhnU09bXsqcZ64DjcRPuCMqBZ X-Received: by 2002:a17:902:263:: with SMTP id 90-v6mr5476021plc.190.1539342720012; Fri, 12 Oct 2018 04:12:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539342720; cv=none; d=google.com; s=arc-20160816; b=Cu9ske7LFSnf6CvQfYnsN9f95VBBVbfZhHTVXJN8zik4MXyhsd6dYWJA7WnxvFFcgG fmc1JTWcCgv1rlUYhgWUmsO0YfzVY2nhGctOSnw4fB9SW4++IL8poUeIrr7BnOdWtwHw Fy55q2NfK9XEtZpJeaKOvcBTvAhQF9HF2+Z0JHt5n9gm91RdaD7rglCxZRz75EfCmK98 UVNnDjISqZW+A7TKPKt97x8ccptNypk64QvOl3z5XoOxqqf4rE4MuLYOsHAOg/sqRQwT UBMcPsbjArQj4HeOfqZPn6XCaQ7jWxyAAJbQWgjlpOkD7Q9GqIAJ3vFYoa3uxfDKu7gn UPlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=DQoC/dGulf7GeSU4tYiMeHj0m5zjqTSJW02yJ/gDIGc=; b=EnLszTEXUWKIE95EC5WDL23VLY+SxbwcDAh6zEY9v0zDs0QCxlbmrrXwGUPu0nUNoe uoeON8DLRDzatI4fFv4oUMqLlpegn9noh0mFjTPVB7iQKTeOq+MHywU67hal72rQj+yK /9Q2rpGbqGamZE6nXqp+UIoSPvQQ2F7eNTPwc92exRgRh+NtTbODLxN/mGOp/YgznL47 G9L1fHkjpu82VSTGYpy1EYDJljn8DGdVF0ws8ACArKcgWTpypvVCFmuHlmbiqKgkqq9N sNF2nxvXy8oaI0mg6AEacUGIR91kthk575uSGng5qhtgVhYkwAdbQDRI5J1HN7+Q7avN CIPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VPGChhOU; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e92-v6si995780pld.358.2018.10.12.04.11.58; Fri, 12 Oct 2018 04:11:59 -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=@linaro.org header.s=google header.b=VPGChhOU; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728433AbeJLSnv (ORCPT + 32 others); Fri, 12 Oct 2018 14:43:51 -0400 Received: from mail-pl1-f194.google.com ([209.85.214.194]:38407 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728368AbeJLSnu (ORCPT ); Fri, 12 Oct 2018 14:43:50 -0400 Received: by mail-pl1-f194.google.com with SMTP id q19-v6so2707463pll.5 for ; Fri, 12 Oct 2018 04:11:54 -0700 (PDT) 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=DQoC/dGulf7GeSU4tYiMeHj0m5zjqTSJW02yJ/gDIGc=; b=VPGChhOU/EqM6/yck0FUGBiRf8kidRyRqg6f0gzXWR+IxmnZ/Ut+uUg3Rf+MGaIu5T JN5NwQH/9MhZj162Inqwcpt7M3ZL55+JHl5wvDcpGfdLF4BEf7eFjZV1LFAqwd1eCoGe mJNManKmK6IqGy4MQzm7XD7caUj7zR1N6fjGs= 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=DQoC/dGulf7GeSU4tYiMeHj0m5zjqTSJW02yJ/gDIGc=; b=hEux9d4vEhw1uc/9yLkg85Xjtg2P8cPoTbmy+x9Gh1pPVSBJAF2+UXnmlNq2FTJBhW M1hL6pUz8nUeQiCBm/ofJbFf6wyjKYEFx7FGvHy4/+41vxOERDSSl3XLewTjTPtEgyGZ qm43ETh3W8P9EOpsa6Ezk6wawMvuLYat8dbkU0hv71q4UoP6MJ5BUpPgrouce3XSaVRF 9pKC4e00kXz+vLjWzKrT16q+QXt5fCw6xwgQBJPLLyoDzOm1pMSJqjb2nCmf49UNhido vD/x7GtsBNkRQiif29j75iLLErnYQug8oEIRNBSMllL87vji53Mjk+aedJPIBlQB7Ll9 O4NA== X-Gm-Message-State: ABuFfog/StZt9D7V+wDpE5MDudwolPdWg0Gm4e1m0tHq5oP8FExOuIPv bkE9/2Ym+31oHmfHFwqfDwWY0w== X-Received: by 2002:a17:902:850b:: with SMTP id bj11-v6mr5594013plb.107.1539342714321; Fri, 12 Oct 2018 04:11:54 -0700 (PDT) Received: from localhost ([122.171.67.41]) by smtp.gmail.com with ESMTPSA id m10-v6sm1293959pgp.94.2018.10.12.04.11.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Oct 2018 04:11:53 -0700 (PDT) From: Viresh Kumar To: ulf.hansson@linaro.org, Viresh Kumar , Nishanth Menon , Stephen Boyd Cc: Viresh Kumar , linux-pm@vger.kernel.org, Vincent Guittot , Rafael Wysocki , niklas.cassel@linaro.org, rnayak@codeaurora.org, linux-kernel@vger.kernel.org Subject: [PATCH V2 4/9] OPP: Populate OPPs from "required-opps" property Date: Fri, 12 Oct 2018 16:41:12 +0530 Message-Id: <16fe09d146a2bcd892a62fec595252b1cb2e539d.1539341929.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.18.0.rc1.242.g61856ae69a2c In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org An earlier commit populated the OPP tables from the "required-opps" property, this commit populates the individual OPPs. This is repeated for each OPP in the OPP table and these populated OPPs will be used by later commits. Signed-off-by: Viresh Kumar --- drivers/opp/core.c | 1 + drivers/opp/of.c | 81 ++++++++++++++++++++++++++++++++++++++++++++-- drivers/opp/opp.h | 6 ++++ 3 files changed, 86 insertions(+), 2 deletions(-) -- 2.18.0.rc1.242.g61856ae69a2c Reviewed-by: Ulf Hansson diff --git a/drivers/opp/core.c b/drivers/opp/core.c index 85174a5c4850..02a69a62dac8 100644 --- a/drivers/opp/core.c +++ b/drivers/opp/core.c @@ -976,6 +976,7 @@ static void _opp_kref_release(struct kref *kref) * frequency/voltage list. */ blocking_notifier_call_chain(&opp_table->head, OPP_EVENT_REMOVE, opp); + _of_opp_free_required_opps(opp_table, opp); opp_debug_remove_one(opp); list_del(&opp->node); kfree(opp); diff --git a/drivers/opp/of.c b/drivers/opp/of.c index b5605196122a..ffaeefef98ce 100644 --- a/drivers/opp/of.c +++ b/drivers/opp/of.c @@ -259,6 +259,77 @@ void _of_clear_opp_table(struct opp_table *opp_table) _opp_table_free_required_tables(opp_table); } +/* + * Release all resources previously acquired with a call to + * _of_opp_alloc_required_opps(). + */ +void _of_opp_free_required_opps(struct opp_table *opp_table, + struct dev_pm_opp *opp) +{ + struct dev_pm_opp **required_opps = opp->required_opps; + int i; + + if (!required_opps) + return; + + for (i = 0; i < opp_table->required_opp_count; i++) { + if (!required_opps[i]) + break; + + /* Put the reference back */ + dev_pm_opp_put(required_opps[i]); + } + + kfree(required_opps); + opp->required_opps = NULL; +} + +/* Populate all required OPPs which are part of "required-opps" list */ +static int _of_opp_alloc_required_opps(struct opp_table *opp_table, + struct dev_pm_opp *opp) +{ + struct dev_pm_opp **required_opps; + struct opp_table *required_table; + struct device_node *np; + int i, ret, count = opp_table->required_opp_count; + + if (!count) + return 0; + + required_opps = kcalloc(count, sizeof(*required_opps), GFP_KERNEL); + if (!required_opps) + return -ENOMEM; + + opp->required_opps = required_opps; + + for (i = 0; i < count; i++) { + required_table = opp_table->required_opp_tables[i]; + + np = of_parse_required_opp(opp->np, i); + if (unlikely(!np)) { + ret = -ENODEV; + goto free_required_opps; + } + + required_opps[i] = _find_opp_of_np(required_table, np); + of_node_put(np); + + if (!required_opps[i]) { + pr_err("%s: Unable to find required OPP node: %pOF (%d)\n", + __func__, opp->np, i); + ret = -ENODEV; + goto free_required_opps; + } + } + + return 0; + +free_required_opps: + _of_opp_free_required_opps(opp_table, opp); + + return ret; +} + static bool _opp_is_supported(struct device *dev, struct opp_table *opp_table, struct device_node *np) { @@ -503,6 +574,10 @@ static struct dev_pm_opp *_opp_add_static_v2(struct opp_table *opp_table, new_opp->dynamic = false; new_opp->available = true; + ret = _of_opp_alloc_required_opps(opp_table, new_opp); + if (ret) + goto free_opp; + if (!of_property_read_u32(np, "clock-latency-ns", &val)) new_opp->clock_latency_ns = val; @@ -510,14 +585,14 @@ static struct dev_pm_opp *_opp_add_static_v2(struct opp_table *opp_table, ret = opp_parse_supplies(new_opp, dev, opp_table); if (ret) - goto free_opp; + goto free_required_opps; ret = _opp_add(dev, new_opp, opp_table, rate_not_available); if (ret) { /* Don't return error for duplicate OPPs */ if (ret == -EBUSY) ret = 0; - goto free_opp; + goto free_required_opps; } /* OPP to select on device suspend */ @@ -547,6 +622,8 @@ static struct dev_pm_opp *_opp_add_static_v2(struct opp_table *opp_table, blocking_notifier_call_chain(&opp_table->head, OPP_EVENT_ADD, new_opp); return new_opp; +free_required_opps: + _of_opp_free_required_opps(opp_table, new_opp); free_opp: _opp_free(new_opp); diff --git a/drivers/opp/opp.h b/drivers/opp/opp.h index 024e1be23d37..24b340ad18d1 100644 --- a/drivers/opp/opp.h +++ b/drivers/opp/opp.h @@ -63,6 +63,7 @@ extern struct list_head opp_tables; * @supplies: Power supplies voltage/current values * @clock_latency_ns: Latency (in nanoseconds) of switching to this OPP's * frequency from any other OPP's frequency. + * @required_opps: List of OPPs that are required by this OPP. * @opp_table: points back to the opp_table struct this opp belongs to * @np: OPP's device node. * @dentry: debugfs dentry pointer (per opp) @@ -84,6 +85,7 @@ struct dev_pm_opp { unsigned long clock_latency_ns; + struct dev_pm_opp **required_opps; struct opp_table *opp_table; struct device_node *np; @@ -216,10 +218,14 @@ void _put_opp_list_kref(struct opp_table *opp_table); void _of_init_opp_table(struct opp_table *opp_table, struct device *dev, int index); void _of_clear_opp_table(struct opp_table *opp_table); struct opp_table *_managed_opp(struct device *dev, int index); +void _of_opp_free_required_opps(struct opp_table *opp_table, + struct dev_pm_opp *opp); #else static inline void _of_init_opp_table(struct opp_table *opp_table, struct device *dev, int index) {} static inline void _of_clear_opp_table(struct opp_table *opp_table) {} static inline struct opp_table *_managed_opp(struct device *dev, int index) { return NULL; } +static inline void _of_opp_free_required_opps(struct opp_table *opp_table, + struct dev_pm_opp *opp) {} #endif #ifdef CONFIG_DEBUG_FS