* [PATCH] cpufreq: intel_pstate: Fix compilation for !CONFIG_ACPI
@ 2018-10-23 18:54 Dominik Brodowski
2018-10-23 19:17 ` Srinivas Pandruvada
0 siblings, 1 reply; 7+ messages in thread
From: Dominik Brodowski @ 2018-10-23 18:54 UTC (permalink / raw)
To: linux-pm, srinivas.pandruvada, lenb; +Cc: rjw, linux-kernel
Fixes: 86d333a8cc7f ("cpufreq: intel_pstate: Add base_frequency attribute")
Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Len Brown <lenb@kernel.org>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index 49c0abf2d48f..50c5699970c5 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -390,11 +390,6 @@ static int intel_pstate_get_cppc_guranteed(int cpu)
static void intel_pstate_set_itmt_prio(int cpu)
{
}
-
-static int intel_pstate_get_cppc_guranteed(int cpu)
-{
- return -ENOTSUPP;
-}
#endif
static void intel_pstate_init_acpi_perf_limits(struct cpufreq_policy *policy)
@@ -490,6 +485,11 @@ static inline bool intel_pstate_acpi_pm_profile_server(void)
{
return false;
}
+
+static int intel_pstate_get_cppc_guranteed(int cpu)
+{
+ return -ENOTSUPP;
+}
#endif
static inline void update_turbo_state(void)
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH] cpufreq: intel_pstate: Fix compilation for !CONFIG_ACPI
2018-10-23 18:54 [PATCH] cpufreq: intel_pstate: Fix compilation for !CONFIG_ACPI Dominik Brodowski
@ 2018-10-23 19:17 ` Srinivas Pandruvada
2018-10-23 19:34 ` Dominik Brodowski
0 siblings, 1 reply; 7+ messages in thread
From: Srinivas Pandruvada @ 2018-10-23 19:17 UTC (permalink / raw)
To: Dominik Brodowski, linux-pm, lenb; +Cc: rjw, linux-kernel
On Tue, 2018-10-23 at 20:54 +0200, Dominik Brodowski wrote:
> Fixes: 86d333a8cc7f ("cpufreq: intel_pstate: Add base_frequency
> attribute")
Thanks for the fix.
> Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
> Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> Cc: Len Brown <lenb@kernel.org>
> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
>
> diff --git a/drivers/cpufreq/intel_pstate.c
> b/drivers/cpufreq/intel_pstate.c
> index 49c0abf2d48f..50c5699970c5 100644
> --- a/drivers/cpufreq/intel_pstate.c
> +++ b/drivers/cpufreq/intel_pstate.c
> @@ -390,11 +390,6 @@ static int intel_pstate_get_cppc_guranteed(int
> cpu)
> static void intel_pstate_set_itmt_prio(int cpu)
> {
> }
> -
> -static int intel_pstate_get_cppc_guranteed(int cpu)
> -{
> - return -ENOTSUPP;
> -}
What is ACPI is defined but SCHED_MC_PRIO is not defined?
Based on
"select ACPI_CPPC_LIB if X86_64 && ACPI && SCHED_MC_PRIO"
So the above is still required. correct?
> #endif
>
> static void intel_pstate_init_acpi_perf_limits(struct cpufreq_policy
> *policy)
> @@ -490,6 +485,11 @@ static inline bool
> intel_pstate_acpi_pm_profile_server(void)
> {
> return false;
> }
> +
> +static int intel_pstate_get_cppc_guranteed(int cpu)
> +{
> + return -ENOTSUPP;
> +}
> #endif
>
> static inline void update_turbo_state(void)
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] cpufreq: intel_pstate: Fix compilation for !CONFIG_ACPI
2018-10-23 19:17 ` Srinivas Pandruvada
@ 2018-10-23 19:34 ` Dominik Brodowski
2018-10-23 19:36 ` Srinivas Pandruvada
0 siblings, 1 reply; 7+ messages in thread
From: Dominik Brodowski @ 2018-10-23 19:34 UTC (permalink / raw)
To: Srinivas Pandruvada; +Cc: linux-pm, lenb, rjw, linux-kernel
On Tue, Oct 23, 2018 at 12:17:28PM -0700, Srinivas Pandruvada wrote:
> On Tue, 2018-10-23 at 20:54 +0200, Dominik Brodowski wrote:
> > Fixes: 86d333a8cc7f ("cpufreq: intel_pstate: Add base_frequency
> > attribute")
> Thanks for the fix.
>
> > Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
> > Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> > Cc: Len Brown <lenb@kernel.org>
> > Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
> >
> > diff --git a/drivers/cpufreq/intel_pstate.c
> > b/drivers/cpufreq/intel_pstate.c
> > index 49c0abf2d48f..50c5699970c5 100644
> > --- a/drivers/cpufreq/intel_pstate.c
> > +++ b/drivers/cpufreq/intel_pstate.c
> > @@ -390,11 +390,6 @@ static int intel_pstate_get_cppc_guranteed(int
> > cpu)
> > static void intel_pstate_set_itmt_prio(int cpu)
> > {
> > }
> > -
> > -static int intel_pstate_get_cppc_guranteed(int cpu)
> > -{
> > - return -ENOTSUPP;
> > -}
> What is ACPI is defined but SCHED_MC_PRIO is not defined?
> Based on
> "select ACPI_CPPC_LIB if X86_64 && ACPI && SCHED_MC_PRIO"
>
> So the above is still required. correct?
Seems so, yes. Though that leads to either complicated #ifdefs or code
duplications.
In any case, I'd suggest marking at least nested #else and #endif lines
with comments denoting which #ifdef they relate to, e.g.
#else /* CONFIG_ACPI */
#endif /* CONFIG_ACPI */
Thanks,
Dominik
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] cpufreq: intel_pstate: Fix compilation for !CONFIG_ACPI
2018-10-23 19:34 ` Dominik Brodowski
@ 2018-10-23 19:36 ` Srinivas Pandruvada
2018-10-23 19:54 ` [PATCH v2] " Dominik Brodowski
0 siblings, 1 reply; 7+ messages in thread
From: Srinivas Pandruvada @ 2018-10-23 19:36 UTC (permalink / raw)
To: Dominik Brodowski; +Cc: linux-pm, lenb, rjw, linux-kernel
On Tue, 2018-10-23 at 21:34 +0200, Dominik Brodowski wrote:
> On Tue, Oct 23, 2018 at 12:17:28PM -0700, Srinivas Pandruvada wrote:
> > On Tue, 2018-10-23 at 20:54 +0200, Dominik Brodowski wrote:
> > > Fixes: 86d333a8cc7f ("cpufreq: intel_pstate: Add base_frequency
> > > attribute")
> >
> > Thanks for the fix.
> >
> > > Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
> > > Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> > > Cc: Len Brown <lenb@kernel.org>
> > > Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
> > >
> > > diff --git a/drivers/cpufreq/intel_pstate.c
> > > b/drivers/cpufreq/intel_pstate.c
> > > index 49c0abf2d48f..50c5699970c5 100644
> > > --- a/drivers/cpufreq/intel_pstate.c
> > > +++ b/drivers/cpufreq/intel_pstate.c
> > > @@ -390,11 +390,6 @@ static int
> > > intel_pstate_get_cppc_guranteed(int
> > > cpu)
> > > static void intel_pstate_set_itmt_prio(int cpu)
> > > {
> > > }
> > > -
> > > -static int intel_pstate_get_cppc_guranteed(int cpu)
> > > -{
> > > - return -ENOTSUPP;
> > > -}
> >
> > What is ACPI is defined but SCHED_MC_PRIO is not defined?
> > Based on
> > "select ACPI_CPPC_LIB if X86_64 && ACPI && SCHED_MC_PRIO"
> >
> > So the above is still required. correct?
>
> Seems so, yes. Though that leads to either complicated #ifdefs or
> code
> duplications.
>
> In any case, I'd suggest marking at least nested #else and #endif
> lines
> with comments denoting which #ifdef they relate to, e.g.
>
> #else /* CONFIG_ACPI */
> #endif /* CONFIG_ACPI */
Will you submit a change?
Thanks,
Srinivas
>
> Thanks,
> Dominik
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH v2] cpufreq: intel_pstate: Fix compilation for !CONFIG_ACPI
2018-10-23 19:36 ` Srinivas Pandruvada
@ 2018-10-23 19:54 ` Dominik Brodowski
2018-10-23 21:52 ` Srinivas Pandruvada
0 siblings, 1 reply; 7+ messages in thread
From: Dominik Brodowski @ 2018-10-23 19:54 UTC (permalink / raw)
To: Srinivas Pandruvada; +Cc: linux-pm, lenb, rjw, linux-kernel
While at it, add a few comments which config options #ifdef
and #else statements refer to.
Fixes: 86d333a8cc7f ("cpufreq: intel_pstate: Add base_frequency attribute")
Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index 49c0abf2d48f..9578312e43f2 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -386,16 +386,11 @@ static int intel_pstate_get_cppc_guranteed(int cpu)
return cppc_perf.guaranteed_perf;
}
-#else
+#else /* CONFIG_ACPI_CPPC_LIB */
static void intel_pstate_set_itmt_prio(int cpu)
{
}
-
-static int intel_pstate_get_cppc_guranteed(int cpu)
-{
- return -ENOTSUPP;
-}
-#endif
+#endif /* CONFIG_ACPI_CPPC_LIB */
static void intel_pstate_init_acpi_perf_limits(struct cpufreq_policy *policy)
{
@@ -477,7 +472,7 @@ static void intel_pstate_exit_perf_limits(struct cpufreq_policy *policy)
acpi_processor_unregister_performance(policy->cpu);
}
-#else
+#else /* CONFIG_ACPI */
static inline void intel_pstate_init_acpi_perf_limits(struct cpufreq_policy *policy)
{
}
@@ -490,7 +485,14 @@ static inline bool intel_pstate_acpi_pm_profile_server(void)
{
return false;
}
-#endif
+#endif /* CONFIG_ACPI */
+
+#ifndef CONFIG_ACPI_CPPC_LIB
+static int intel_pstate_get_cppc_guranteed(int cpu)
+{
+ return -ENOTSUPP;
+}
+#endif /* CONFIG_ACPI_CPPC_LIB */
static inline void update_turbo_state(void)
{
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v2] cpufreq: intel_pstate: Fix compilation for !CONFIG_ACPI
2018-10-23 19:54 ` [PATCH v2] " Dominik Brodowski
@ 2018-10-23 21:52 ` Srinivas Pandruvada
2018-10-26 9:24 ` Rafael J. Wysocki
0 siblings, 1 reply; 7+ messages in thread
From: Srinivas Pandruvada @ 2018-10-23 21:52 UTC (permalink / raw)
To: Dominik Brodowski; +Cc: linux-pm, lenb, rjw, linux-kernel
On Tue, 2018-10-23 at 21:54 +0200, Dominik Brodowski wrote:
> While at it, add a few comments which config options #ifdef
> and #else statements refer to.
>
> Fixes: 86d333a8cc7f ("cpufreq: intel_pstate: Add base_frequency
> attribute")
> Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
> Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
>
> diff --git a/drivers/cpufreq/intel_pstate.c
> b/drivers/cpufreq/intel_pstate.c
> index 49c0abf2d48f..9578312e43f2 100644
> --- a/drivers/cpufreq/intel_pstate.c
> +++ b/drivers/cpufreq/intel_pstate.c
> @@ -386,16 +386,11 @@ static int intel_pstate_get_cppc_guranteed(int
> cpu)
> return cppc_perf.guaranteed_perf;
> }
>
> -#else
> +#else /* CONFIG_ACPI_CPPC_LIB */
> static void intel_pstate_set_itmt_prio(int cpu)
> {
> }
> -
> -static int intel_pstate_get_cppc_guranteed(int cpu)
> -{
> - return -ENOTSUPP;
> -}
> -#endif
> +#endif /* CONFIG_ACPI_CPPC_LIB */
>
> static void intel_pstate_init_acpi_perf_limits(struct cpufreq_policy
> *policy)
> {
> @@ -477,7 +472,7 @@ static void intel_pstate_exit_perf_limits(struct
> cpufreq_policy *policy)
>
> acpi_processor_unregister_performance(policy->cpu);
> }
> -#else
> +#else /* CONFIG_ACPI */
> static inline void intel_pstate_init_acpi_perf_limits(struct
> cpufreq_policy *policy)
> {
> }
> @@ -490,7 +485,14 @@ static inline bool
> intel_pstate_acpi_pm_profile_server(void)
> {
> return false;
> }
> -#endif
> +#endif /* CONFIG_ACPI */
> +
> +#ifndef CONFIG_ACPI_CPPC_LIB
> +static int intel_pstate_get_cppc_guranteed(int cpu)
> +{
> + return -ENOTSUPP;
> +}
> +#endif /* CONFIG_ACPI_CPPC_LIB */
>
> static inline void update_turbo_state(void)
> {
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH v2] cpufreq: intel_pstate: Fix compilation for !CONFIG_ACPI
2018-10-23 21:52 ` Srinivas Pandruvada
@ 2018-10-26 9:24 ` Rafael J. Wysocki
0 siblings, 0 replies; 7+ messages in thread
From: Rafael J. Wysocki @ 2018-10-26 9:24 UTC (permalink / raw)
To: Srinivas Pandruvada, Dominik Brodowski; +Cc: linux-pm, lenb, linux-kernel
On Tuesday, October 23, 2018 11:52:12 PM CEST Srinivas Pandruvada wrote:
> On Tue, 2018-10-23 at 21:54 +0200, Dominik Brodowski wrote:
> > While at it, add a few comments which config options #ifdef
> > and #else statements refer to.
> >
> > Fixes: 86d333a8cc7f ("cpufreq: intel_pstate: Add base_frequency
> > attribute")
> > Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
> > Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> > Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
> Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
>
> >
> > diff --git a/drivers/cpufreq/intel_pstate.c
> > b/drivers/cpufreq/intel_pstate.c
> > index 49c0abf2d48f..9578312e43f2 100644
> > --- a/drivers/cpufreq/intel_pstate.c
> > +++ b/drivers/cpufreq/intel_pstate.c
> > @@ -386,16 +386,11 @@ static int intel_pstate_get_cppc_guranteed(int
> > cpu)
> > return cppc_perf.guaranteed_perf;
> > }
> >
> > -#else
> > +#else /* CONFIG_ACPI_CPPC_LIB */
> > static void intel_pstate_set_itmt_prio(int cpu)
> > {
> > }
> > -
> > -static int intel_pstate_get_cppc_guranteed(int cpu)
> > -{
> > - return -ENOTSUPP;
> > -}
> > -#endif
> > +#endif /* CONFIG_ACPI_CPPC_LIB */
> >
> > static void intel_pstate_init_acpi_perf_limits(struct cpufreq_policy
> > *policy)
> > {
> > @@ -477,7 +472,7 @@ static void intel_pstate_exit_perf_limits(struct
> > cpufreq_policy *policy)
> >
> > acpi_processor_unregister_performance(policy->cpu);
> > }
> > -#else
> > +#else /* CONFIG_ACPI */
> > static inline void intel_pstate_init_acpi_perf_limits(struct
> > cpufreq_policy *policy)
> > {
> > }
> > @@ -490,7 +485,14 @@ static inline bool
> > intel_pstate_acpi_pm_profile_server(void)
> > {
> > return false;
> > }
> > -#endif
> > +#endif /* CONFIG_ACPI */
> > +
> > +#ifndef CONFIG_ACPI_CPPC_LIB
> > +static int intel_pstate_get_cppc_guranteed(int cpu)
> > +{
> > + return -ENOTSUPP;
> > +}
> > +#endif /* CONFIG_ACPI_CPPC_LIB */
> >
> > static inline void update_turbo_state(void)
> > {
>
>
Patch applied, thanks!
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2018-10-26 9:24 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-10-23 18:54 [PATCH] cpufreq: intel_pstate: Fix compilation for !CONFIG_ACPI Dominik Brodowski
2018-10-23 19:17 ` Srinivas Pandruvada
2018-10-23 19:34 ` Dominik Brodowski
2018-10-23 19:36 ` Srinivas Pandruvada
2018-10-23 19:54 ` [PATCH v2] " Dominik Brodowski
2018-10-23 21:52 ` Srinivas Pandruvada
2018-10-26 9:24 ` Rafael J. Wysocki
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).