From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A8367C433F5 for ; Wed, 24 Nov 2021 14:28:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344057AbhKXObT (ORCPT ); Wed, 24 Nov 2021 09:31:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46992 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352426AbhKXOa7 (ORCPT ); Wed, 24 Nov 2021 09:30:59 -0500 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3BDD3C127931 for ; Wed, 24 Nov 2021 04:55:24 -0800 (PST) Received: by mail-wr1-x429.google.com with SMTP id i5so4059279wrb.2 for ; Wed, 24 Nov 2021 04:55:24 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=JXIYabK6ZewRD4vP7R+kD9rZl3/XxOM5JXs9rSVNxs0=; b=bn7YHF4vAtjw3Js41QkfWoBQX1kdrF5vS94s+Vho5CY7y0JLUa+Y7Ze8xQBqQQyvvn 4qoZeeLBVQJMhZa9kEgHt0wyGycVaXdvBrgyNRlHi6QSahwkAgVfvRx6pjfCUTa+7JBx mIZ27jlre2LI+H9dR8sVKLdoehQOTOFoPLwkEOT+3mdwNayaz5CHaxao8nPc0UinAqPB DUfJJS+iw6NcgDzYSmAeVQxmCkJCUFbwD/X2LoV9ygbofdxNoMm6PfaP6+GUsWEUvHgF g+5wWeZm8Egr+UoLrx01aH/O87aS2WoF1wCBiqyKhJa1cYy8DNTJxbgmxPAUUNsQCNPz zc9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JXIYabK6ZewRD4vP7R+kD9rZl3/XxOM5JXs9rSVNxs0=; b=Nxr52qedGXo+nDQ1IGkWU8rXvABoSX4NMD9POEHfL3maXGIXW39n7FSYj2WGToaxRv cDUgHhsQOOKFAehx52wbbYOnF4S+m69S5l6zffVfLd+5+iONPaBBYWQtcppe6l4uWAvD g8P99awL256bgNeH7N9kL1h8J8BwRoW+JGEDOIDCxD4j8nesPwGJlxqKFf454qpTSnvU OejcdcBuQzXFc91/I1/Lpen1T67if8axnEIXVDv2A4nZqLk1kgkBQo8DbftN9cvd+UIt zawCngAYstPZrx9BM2nfOrWNknxQ3e1ow9VLY3EfoUHCuBZH78YAJoqsOILusYI4ma0/ xOGw== X-Gm-Message-State: AOAM530U6aQGCGXa/k+PDJu/SPC/j8G+0uj8yv/WFTOxrUcSIkuc6vqu CWx+dTEiE4gGcc7gAG1yZiGiXQ== X-Google-Smtp-Source: ABdhPJzMQb4HhuD781LIHkzfvor84m0P279E1IGkjEIBAm2LlSzytQARNySGhjmbsHsw7jBMW4QVZA== X-Received: by 2002:a5d:47a9:: with SMTP id 9mr18681507wrb.42.1637758522631; Wed, 24 Nov 2021 04:55:22 -0800 (PST) Received: from localhost.localdomain ([2a01:e34:ed2f:f020:3395:9073:b941:501e]) by smtp.gmail.com with ESMTPSA id v8sm14916443wrd.84.2021.11.24.04.55.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Nov 2021 04:55:22 -0800 (PST) From: Daniel Lezcano To: daniel.lezcano@linaro.org Cc: robh@kernel.org, arnd@linaro.org, heiko@sntech.de, ulf.hansson@linaro.org, rjw@rjwysocki.net, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, lukasz.luba@arm.com, Daniel Lezcano , "Rafael J. Wysocki" Subject: [PATCH 4/5] powercap/drivers/dtpm: Add CPU DT initialization support Date: Wed, 24 Nov 2021 13:55:03 +0100 Message-Id: <20211124125506.2971069-4-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211124125506.2971069-1-daniel.lezcano@linaro.org> References: <20211124125506.2971069-1-daniel.lezcano@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Based on the previous DT changes in the core code, use the 'setup' callback to initialize the CPU DTPM backend. Code is reorganized to stick to the DTPM table description. No functional changes. Signed-off-by: Daniel Lezcano --- drivers/powercap/dtpm_cpu.c | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/drivers/powercap/dtpm_cpu.c b/drivers/powercap/dtpm_cpu.c index 6bffb44c75aa..64cec0770803 100644 --- a/drivers/powercap/dtpm_cpu.c +++ b/drivers/powercap/dtpm_cpu.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -176,6 +177,17 @@ static int cpuhp_dtpm_cpu_offline(unsigned int cpu) } static int cpuhp_dtpm_cpu_online(unsigned int cpu) +{ + struct dtpm_cpu *dtpm_cpu; + + dtpm_cpu = per_cpu(dtpm_per_cpu, cpu); + if (dtpm_cpu) + return dtpm_update_power(&dtpm_cpu->dtpm); + + return 0; +} + +static int __dtpm_cpu_setup(int cpu, struct dtpm *parent) { struct dtpm_cpu *dtpm_cpu; struct cpufreq_policy *policy; @@ -183,6 +195,10 @@ static int cpuhp_dtpm_cpu_online(unsigned int cpu) char name[CPUFREQ_NAME_LEN]; int ret = -ENOMEM; + dtpm_cpu = per_cpu(dtpm_per_cpu, cpu); + if (dtpm_cpu) + return 0; + policy = cpufreq_cpu_get(cpu); if (!policy) return 0; @@ -191,10 +207,6 @@ static int cpuhp_dtpm_cpu_online(unsigned int cpu) if (!pd) 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) return -ENOMEM; @@ -207,7 +219,7 @@ static int cpuhp_dtpm_cpu_online(unsigned int cpu) snprintf(name, sizeof(name), "cpu%d-cpufreq", dtpm_cpu->cpu); - ret = dtpm_register(name, &dtpm_cpu->dtpm, NULL); + ret = dtpm_register(name, &dtpm_cpu->dtpm, parent); if (ret) goto out_kfree_dtpm_cpu; @@ -231,6 +243,17 @@ static int cpuhp_dtpm_cpu_online(unsigned int cpu) return ret; } +static int __init dtpm_cpu_setup(struct dtpm *dtpm, struct device_node *np) +{ + int cpu; + + cpu = of_cpu_node_to_id(np); + if (cpu < 0) + return 0; + + return __dtpm_cpu_setup(cpu, dtpm); +} + static int __init dtpm_cpu_init(void) { int ret; @@ -269,4 +292,4 @@ static int __init dtpm_cpu_init(void) return 0; } -DTPM_DECLARE(dtpm_cpu, dtpm_cpu_init, NULL); +DTPM_DECLARE(dtpm_cpu, dtpm_cpu_init, dtpm_cpu_setup); -- 2.25.1