From: Quentin Perret <qperret@qperret.net>
To: edubezval@gmail.com, rui.zhang@intel.com, javi.merino@kernel.org,
viresh.kumar@linaro.org, amit.kachhap@gmail.com,
rjw@rjwysocki.net, catalin.marinas@arm.com, will@kernel.org,
daniel.lezcano@linaro.org
Cc: dietmar.eggemann@arm.com, ionela.voinescu@arm.com,
mka@chromium.org, linux-pm@vger.kernel.org,
linux-kernel@vger.kernel.org, qperret@qperret.net
Subject: [PATCH v8 2/4] PM / EM: Declare EM data types unconditionally
Date: Wed, 11 Sep 2019 15:03:12 +0200 [thread overview]
Message-ID: <20190911130314.29973-3-qperret@qperret.net> (raw)
In-Reply-To: <20190911130314.29973-1-qperret@qperret.net>
From: Quentin Perret <quentin.perret@arm.com>
The structs representing capacity states and performance domains of an
Energy Model are currently only defined for CONFIG_ENERGY_MODEL=y. That
makes it hard for code outside PM_EM to manipulate those structures
without a lot of ifdefery or stubbed accessors.
So, move the declaration of the two structs outside of the
CONFIG_ENERGY_MODEL ifdef. The client code (e.g. EAS or thermal) always
checks the return of em_cpu_get() before using it, so the exising code
is still safe to use as-is.
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Quentin Perret <quentin.perret@arm.com>
---
include/linux/energy_model.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/include/linux/energy_model.h b/include/linux/energy_model.h
index 73f8c3cb9588..d249b88a4d5a 100644
--- a/include/linux/energy_model.h
+++ b/include/linux/energy_model.h
@@ -9,7 +9,6 @@
#include <linux/sched/topology.h>
#include <linux/types.h>
-#ifdef CONFIG_ENERGY_MODEL
/**
* em_cap_state - Capacity state of a performance domain
* @frequency: The CPU frequency in KHz, for consistency with CPUFreq
@@ -40,6 +39,7 @@ struct em_perf_domain {
unsigned long cpus[0];
};
+#ifdef CONFIG_ENERGY_MODEL
#define EM_CPU_MAX_POWER 0xFFFF
struct em_data_callback {
@@ -160,7 +160,6 @@ static inline int em_pd_nr_cap_states(struct em_perf_domain *pd)
}
#else
-struct em_perf_domain {};
struct em_data_callback {};
#define EM_DATA_CB(_active_power_cb) { }
--
2.22.1
next prev parent reply other threads:[~2019-09-11 15:33 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-11 13:03 [PATCH RESEND v8 0/4] Make IPA use PM_EM Quentin Perret
2019-09-11 13:03 ` [PATCH v8 1/4] arm64: defconfig: Enable CONFIG_ENERGY_MODEL Quentin Perret
2019-09-11 13:03 ` Quentin Perret [this message]
2019-09-11 13:03 ` [PATCH v8 3/4] thermal: cpu_cooling: Make the power-related code depend on IPA Quentin Perret
2019-09-11 13:03 ` [PATCH v8 4/4] thermal: cpu_cooling: Migrate to using the EM framework Quentin Perret
2019-10-07 5:35 ` [PATCH RESEND v8 0/4] Make IPA use PM_EM Daniel Lezcano
2019-10-07 13:37 ` Quentin Perret
2019-10-30 10:54 ` Daniel Lezcano
2019-10-30 11:44 ` Quentin Perret
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190911130314.29973-3-qperret@qperret.net \
--to=qperret@qperret.net \
--cc=amit.kachhap@gmail.com \
--cc=catalin.marinas@arm.com \
--cc=daniel.lezcano@linaro.org \
--cc=dietmar.eggemann@arm.com \
--cc=edubezval@gmail.com \
--cc=ionela.voinescu@arm.com \
--cc=javi.merino@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mka@chromium.org \
--cc=rjw@rjwysocki.net \
--cc=rui.zhang@intel.com \
--cc=viresh.kumar@linaro.org \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).