From patchwork Wed Mar 31 11:00:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 412872 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp386271jai; Wed, 31 Mar 2021 04:02:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwydX4ZwK/v8Xp7GYni1BeMcu8xtL1Zhm5VQhhnkBRI1eswr/TihBUeXk6KWuxJZo5pwXrY X-Received: by 2002:a5d:49c7:: with SMTP id t7mr3014801wrs.306.1617188536577; Wed, 31 Mar 2021 04:02:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617188536; cv=none; d=google.com; s=arc-20160816; b=WzYhIt6YG+INKxCBjnl357jaMWWs9stw5qy1eZobpYYKjSlugzFQ8a2tisDwEU/1/P YelG4J8wpl03CcP/fWRnGf3+XTPsm1Pv7Y1Lqg6F8QaL3qFsN6DS4mkFw68IGYjgHnL2 GYO1M2wchgQd3RbKCMVbv+cfAKnEBqWRO1zb0GyJL0HUK7jYKFXwFnwV6ropEFki3Wcd NZ6y1CBiUh0R8MwYWQ/J8d0kaKMK3NGDLE7kmFX5kLEz1nPWQGeiTFrNPWYrOA5TpvGe ScfpU+GOkZSyPOsQzic5IRcruormGz+/StK82fI9uieBJqL8VNjee/OZ2SsQbDbwDVpk 1iig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=wS83U3PlCAQKDrzEYnjqkchqohrJ402wKL3+09F+PoY=; b=iBEg9gVZF5J/XtQEfT6lfyemPHsEQKzt80KwZP0H1tXp6Y+zXWWvK7slMmoLNAenxZ t4kah0ATuCI8T+PFDyOWuNF57qubbl8uXUvIp5Z1s5lFxJL2Ox7uLhH6Z9JCONirLlAF j++3bMf2jZomk5HhU7SjbIwC63akSuQYnU/LnlWixQ1lYyFCR5jz6hlYzH9dBzmnd6E+ z5etmMRYjwRobKtXglptZJrNr6EPb1uq041kxKBeJGxxCXyGcrQqZRLPvCzrCboJEByu B+C6f4jgogtz83qJEDRUUmhumfwzEPBHRsdCkt57Nf9EadLXbWGcXdthR3cxFvL702xE 9iUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=D+7P2wLV; spf=pass (google.com: domain of linux-pm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-pm-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. [23.128.96.18]) by mx.google.com with ESMTP id r16si1445467edw.458.2021.03.31.04.02.16; Wed, 31 Mar 2021 04:02:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-pm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=D+7P2wLV; spf=pass (google.com: domain of linux-pm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-pm-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 S235420AbhCaLBp (ORCPT + 7 others); Wed, 31 Mar 2021 07:01:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235519AbhCaLBI (ORCPT ); Wed, 31 Mar 2021 07:01:08 -0400 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A0547C061762 for ; Wed, 31 Mar 2021 04:01:07 -0700 (PDT) Received: by mail-wr1-x42a.google.com with SMTP id j18so19229919wra.2 for ; Wed, 31 Mar 2021 04:01:07 -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=wS83U3PlCAQKDrzEYnjqkchqohrJ402wKL3+09F+PoY=; b=D+7P2wLVbI7e2JBtAwClLChJ6zsnQXns0riW4htlbQnpD+1y8qhVf1IkJKYiPxu1Dn aRwabjL+Rqe1QHsr/qXc3NGON//a1IxfX61wBoEgykwZFTIZ7CqAXayazQfe5BfgSsaX Nq7ijsGwJw/Uh6CR0MKnHVRYUleoFUK85d3yzoIw2+gI+XvS5Z0M9ewWgrsgTlQfPGn1 f6tYpWgL6PaLmguRYgq7mmGoxJpNQiNgVjrBT9amYzJB9gczzMBFyvnbHFfWgXQJ28Er LkclzIpFf7KgEZ99Y0cq5OYGUCCym6hvJGBOZzgBfUItvfpYhXJxpy3tLMv16jL6IUQG uYbg== 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=wS83U3PlCAQKDrzEYnjqkchqohrJ402wKL3+09F+PoY=; b=rzLU6LG+RhJHNz71S67q2qJFBmiSVyQFrFb0Nfrkha/fG/2xSix6ib1/orDWddqrVV vOeA/gEyMD54g63nAH+Tiu7SnGVW4eTMQwx2RCoqGrz6A9VWH8BWRfaOd4BM0d32y6Dz tOClNAIMXWvkKbni9uNhvKx1W3IujbnEbgTq8gQE4rS3pVOdcQRuUgkXWTe/+4m06kXW zj3gQ/rZoig+7TP/62Q/IxbX/OKjflh50jOsCApRGmWN53TqqqJTeb47/jWKsnpKBv3w ROVr2k4lTXRbc8/vLsMTkwBwqKccny/w5xiJsfiJ0bB3Ms1vCQTs+X+ah8PEQlbIEjJG Mocw== X-Gm-Message-State: AOAM5303n86WXWhaic1S8zmLkWUU/+kD4u9l1wn4f9Tx8ynBhU8ohd94 L8VuEQRs9CuCHTWk7SJdCeC1uw== X-Received: by 2002:adf:e54a:: with SMTP id z10mr2970586wrm.87.1617188466235; Wed, 31 Mar 2021 04:01:06 -0700 (PDT) Received: from localhost.localdomain ([82.142.26.252]) by smtp.gmail.com with ESMTPSA id u23sm3376275wmn.26.2021.03.31.04.01.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Mar 2021 04:01:05 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, lukasz.luba@arm.com, rafael@kernel.org, gregkh@linuxfoundation.org Subject: [PATCH v5 4/5] powercap/drivers/dtpm: Use container_of instead of a private data field Date: Wed, 31 Mar 2021 13:00:47 +0200 Message-Id: <20210331110048.24956-4-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210331110048.24956-1-daniel.lezcano@linaro.org> References: <20210331110048.24956-1-daniel.lezcano@linaro.org> Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org The dtpm framework provides an API to allocate a dtpm node. However when a backend dtpm driver needs to allocate a dtpm node it must define its own structure and store the pointer of this structure in the private field of the dtpm structure. It is more elegant to use the container_of macro and add the dtpm structure inside the dtpm backend specific structure. The code will be able to deal properly with the dtpm structure as a generic entity, making all this even more self-encapsulated. The dtpm_alloc() function does no longer make sense as the dtpm structure will be allocated when allocating the device specific dtpm structure. The dtpm_init() is provided instead. Signed-off-by: Daniel Lezcano Reviewed-by: Lukasz Luba --- drivers/powercap/dtpm.c | 24 +++++++++---------- drivers/powercap/dtpm_cpu.c | 46 ++++++++++++++++++------------------- include/linux/dtpm.h | 3 +-- 3 files changed, 35 insertions(+), 38 deletions(-) -- 2.17.1 diff --git a/drivers/powercap/dtpm.c b/drivers/powercap/dtpm.c index 3bcd8374baf8..03dbabc1ffd0 100644 --- a/drivers/powercap/dtpm.c +++ b/drivers/powercap/dtpm.c @@ -190,6 +190,12 @@ struct dtpm *dtpm_lookup(const char *name) dtpm = __dtpm_lookup(name); mutex_unlock(&dtpm_lock); + if (!dtpm) { + dtpm = kzalloc(sizeof(*dtpm), GFP_KERNEL); + if (dtpm) + dtpm_init(dtpm, NULL); + } + return dtpm; } @@ -470,24 +476,18 @@ static struct powercap_zone_ops zone_ops = { }; /** - * dtpm_alloc - Allocate and initialize a dtpm struct - * @name: a string specifying the name of the node - * - * Return: a struct dtpm pointer, NULL in case of error + * dtpm_init - Allocate and initialize a dtpm struct + * @dtpm: The dtpm struct pointer to be initialized + * @ops: The dtpm device specific ops, NULL for a virtual node */ -struct dtpm *dtpm_alloc(struct dtpm_ops *ops) +void dtpm_init(struct dtpm *dtpm, struct dtpm_ops *ops) { - struct dtpm *dtpm; - - dtpm = kzalloc(sizeof(*dtpm), GFP_KERNEL); if (dtpm) { INIT_LIST_HEAD(&dtpm->children); INIT_LIST_HEAD(&dtpm->sibling); dtpm->weight = 1024; dtpm->ops = ops; } - - return dtpm; } /** @@ -578,7 +578,7 @@ int dtpm_register(const char *name, struct dtpm *dtpm, struct dtpm *parent) return 0; } -static int __init dtpm_init(void) +static int __init init_dtpm(void) { struct dtpm_descr *dtpm_descr; @@ -593,4 +593,4 @@ static int __init dtpm_init(void) return 0; } -late_initcall(dtpm_init); +late_initcall(init_dtpm); diff --git a/drivers/powercap/dtpm_cpu.c b/drivers/powercap/dtpm_cpu.c index 74b39a1082e5..f4092d1b01d7 100644 --- a/drivers/powercap/dtpm_cpu.c +++ b/drivers/powercap/dtpm_cpu.c @@ -25,16 +25,22 @@ #include #include -static DEFINE_PER_CPU(struct dtpm *, dtpm_per_cpu); - struct dtpm_cpu { + struct dtpm dtpm; struct freq_qos_request qos_req; int cpu; }; +static DEFINE_PER_CPU(struct dtpm_cpu *, dtpm_per_cpu); + +static struct dtpm_cpu *to_dtpm_cpu(struct dtpm *dtpm) +{ + return container_of(dtpm, struct dtpm_cpu, dtpm); +} + static u64 set_pd_power_limit(struct dtpm *dtpm, u64 power_limit) { - struct dtpm_cpu *dtpm_cpu = dtpm->private; + struct dtpm_cpu *dtpm_cpu = to_dtpm_cpu(dtpm); struct em_perf_domain *pd = em_cpu_get(dtpm_cpu->cpu); struct cpumask cpus; unsigned long freq; @@ -64,7 +70,7 @@ static u64 set_pd_power_limit(struct dtpm *dtpm, u64 power_limit) static u64 get_pd_power_uw(struct dtpm *dtpm) { - struct dtpm_cpu *dtpm_cpu = dtpm->private; + struct dtpm_cpu *dtpm_cpu = to_dtpm_cpu(dtpm); struct em_perf_domain *pd; struct cpumask cpus; unsigned long freq; @@ -90,7 +96,7 @@ static u64 get_pd_power_uw(struct dtpm *dtpm) static int update_pd_power_uw(struct dtpm *dtpm) { - struct dtpm_cpu *dtpm_cpu = dtpm->private; + struct dtpm_cpu *dtpm_cpu = to_dtpm_cpu(dtpm); struct em_perf_domain *em = em_cpu_get(dtpm_cpu->cpu); struct cpumask cpus; int nr_cpus; @@ -111,7 +117,7 @@ static int update_pd_power_uw(struct dtpm *dtpm) static void pd_release(struct dtpm *dtpm) { - struct dtpm_cpu *dtpm_cpu = dtpm->private; + struct dtpm_cpu *dtpm_cpu = to_dtpm_cpu(dtpm); if (freq_qos_request_active(&dtpm_cpu->qos_req)) freq_qos_remove_request(&dtpm_cpu->qos_req); @@ -129,20 +135,19 @@ static struct dtpm_ops dtpm_ops = { static int cpuhp_dtpm_cpu_offline(unsigned int cpu) { struct em_perf_domain *pd; - struct dtpm *dtpm; + struct dtpm_cpu *dtpm_cpu; pd = em_cpu_get(cpu); if (!pd) return -EINVAL; - dtpm = per_cpu(dtpm_per_cpu, cpu); + dtpm_cpu = per_cpu(dtpm_per_cpu, cpu); - return dtpm_update_power(dtpm); + return dtpm_update_power(&dtpm_cpu->dtpm); } static int cpuhp_dtpm_cpu_online(unsigned int cpu) { - struct dtpm *dtpm; struct dtpm_cpu *dtpm_cpu; struct cpufreq_policy *policy; struct em_perf_domain *pd; @@ -157,27 +162,23 @@ static int cpuhp_dtpm_cpu_online(unsigned int cpu) if (!pd) return -EINVAL; - dtpm = per_cpu(dtpm_per_cpu, cpu); - if (dtpm) - return dtpm_update_power(dtpm); - - dtpm = dtpm_alloc(&dtpm_ops); - if (!dtpm) - return -EINVAL; + dtpm_cpu = per_cpu(dtpm_per_cpu, cpu); + if (dtpm_cpu) + return dtpm_update_power(&dtpm_cpu->dtpm); dtpm_cpu = kzalloc(sizeof(*dtpm_cpu), GFP_KERNEL); if (!dtpm_cpu) - goto out_kfree_dtpm; + return -ENOMEM; - dtpm->private = dtpm_cpu; + dtpm_init(&dtpm_cpu->dtpm, &dtpm_ops); dtpm_cpu->cpu = cpu; for_each_cpu(cpu, policy->related_cpus) - per_cpu(dtpm_per_cpu, cpu) = dtpm; + per_cpu(dtpm_per_cpu, cpu) = dtpm_cpu; snprintf(name, sizeof(name), "cpu%d-cpufreq", dtpm_cpu->cpu); - ret = dtpm_add(name, dtpm); + ret = dtpm_add(name, &dtpm_cpu->dtpm); if (ret) goto out_kfree_dtpm_cpu; @@ -192,15 +193,12 @@ static int cpuhp_dtpm_cpu_online(unsigned int cpu) out_dtpm_del: dtpm_del(name); dtpm_cpu = NULL; - dtpm = NULL; out_kfree_dtpm_cpu: for_each_cpu(cpu, policy->related_cpus) per_cpu(dtpm_per_cpu, cpu) = NULL; kfree(dtpm_cpu); -out_kfree_dtpm: - kfree(dtpm); return ret; } diff --git a/include/linux/dtpm.h b/include/linux/dtpm.h index 2ec2821111d1..e47bd5bbf56e 100644 --- a/include/linux/dtpm.h +++ b/include/linux/dtpm.h @@ -23,7 +23,6 @@ struct dtpm { u64 power_max; u64 power_min; int weight; - void *private; }; struct dtpm_ops { @@ -65,7 +64,7 @@ int dtpm_update_power(struct dtpm *dtpm); int dtpm_release_zone(struct powercap_zone *pcz); -struct dtpm *dtpm_alloc(struct dtpm_ops *ops); +void dtpm_init(struct dtpm *dtpm, struct dtpm_ops *ops); void dtpm_unregister(struct dtpm *dtpm);