xen/arch/x86/x86_64/cpu_idle.c | 5 +-- xen/arch/x86/x86_64/cpufreq.c | 6 ++-- xen/drivers/cpufreq/cpufreq.c | 58 ++++++++++++++++------------------ xen/include/xen/pmstat.h | 4 +-- 4 files changed, 36 insertions(+), 37 deletions(-)
Make function definitions and declarations consistent.
No functional change.
Signed-off-by: Federico Serafini <federico.serafini@bugseng.com>
---
Changes in v2:
- removed unwanted changes to cpu_callback();
- improved code style.
---
xen/arch/x86/x86_64/cpu_idle.c | 5 +--
xen/arch/x86/x86_64/cpufreq.c | 6 ++--
xen/drivers/cpufreq/cpufreq.c | 58 ++++++++++++++++------------------
xen/include/xen/pmstat.h | 4 +--
4 files changed, 36 insertions(+), 37 deletions(-)
diff --git a/xen/arch/x86/x86_64/cpu_idle.c b/xen/arch/x86/x86_64/cpu_idle.c
index e2195d57be..fcd6fc0fc2 100644
--- a/xen/arch/x86/x86_64/cpu_idle.c
+++ b/xen/arch/x86/x86_64/cpu_idle.c
@@ -62,7 +62,8 @@ static int copy_from_compat_state(xen_processor_cx_t *xen_state,
return 0;
}
-long compat_set_cx_pminfo(uint32_t cpu, struct compat_processor_power *power)
+long compat_set_cx_pminfo(uint32_t acpi_id,
+ struct compat_processor_power *power)
{
struct xen_processor_power *xen_power;
unsigned long xlat_page_current;
@@ -106,5 +107,5 @@ long compat_set_cx_pminfo(uint32_t cpu, struct compat_processor_power *power)
XLAT_processor_power(xen_power, power);
#undef XLAT_processor_power_HNDL_states
- return set_cx_pminfo(cpu, xen_power);
+ return set_cx_pminfo(acpi_id, xen_power);
}
diff --git a/xen/arch/x86/x86_64/cpufreq.c b/xen/arch/x86/x86_64/cpufreq.c
index 9e1e2050da..e4f3d5b436 100644
--- a/xen/arch/x86/x86_64/cpufreq.c
+++ b/xen/arch/x86/x86_64/cpufreq.c
@@ -30,8 +30,8 @@ CHECK_processor_px;
DEFINE_XEN_GUEST_HANDLE(compat_processor_px_t);
-int
-compat_set_px_pminfo(uint32_t cpu, struct compat_processor_performance *perf)
+int compat_set_px_pminfo(uint32_t acpi_id,
+ struct compat_processor_performance *perf)
{
struct xen_processor_performance *xen_perf;
unsigned long xlat_page_current;
@@ -52,5 +52,5 @@ compat_set_px_pminfo(uint32_t cpu, struct compat_processor_performance *perf)
XLAT_processor_performance(xen_perf, perf);
#undef XLAT_processor_performance_HNDL_states
- return set_px_pminfo(cpu, xen_perf);
+ return set_px_pminfo(acpi_id, xen_perf);
}
diff --git a/xen/drivers/cpufreq/cpufreq.c b/xen/drivers/cpufreq/cpufreq.c
index 6e5c400849..f5c714611e 100644
--- a/xen/drivers/cpufreq/cpufreq.c
+++ b/xen/drivers/cpufreq/cpufreq.c
@@ -457,14 +457,14 @@ static void print_PPC(unsigned int platform_limit)
printk("\t_PPC: %d\n", platform_limit);
}
-int set_px_pminfo(uint32_t acpi_id, struct xen_processor_performance *dom0_px_info)
+int set_px_pminfo(uint32_t acpi_id, struct xen_processor_performance *perf)
{
int ret=0, cpuid;
struct processor_pminfo *pmpt;
struct processor_performance *pxpt;
cpuid = get_cpu_id(acpi_id);
- if ( cpuid < 0 || !dom0_px_info)
+ if ( cpuid < 0 || !perf )
{
ret = -EINVAL;
goto out;
@@ -488,22 +488,22 @@ int set_px_pminfo(uint32_t acpi_id, struct xen_processor_performance *dom0_px_in
pmpt->acpi_id = acpi_id;
pmpt->id = cpuid;
- if ( dom0_px_info->flags & XEN_PX_PCT )
+ if ( perf->flags & XEN_PX_PCT )
{
/* space_id check */
- if (dom0_px_info->control_register.space_id !=
- dom0_px_info->status_register.space_id)
+ if ( perf->control_register.space_id !=
+ perf->status_register.space_id )
{
ret = -EINVAL;
goto out;
}
- memcpy ((void *)&pxpt->control_register,
- (void *)&dom0_px_info->control_register,
- sizeof(struct xen_pct_register));
- memcpy ((void *)&pxpt->status_register,
- (void *)&dom0_px_info->status_register,
- sizeof(struct xen_pct_register));
+ memcpy((void *)&pxpt->control_register,
+ (void *)&perf->control_register,
+ sizeof(struct xen_pct_register));
+ memcpy((void *)&pxpt->status_register,
+ (void *)&perf->status_register,
+ sizeof(struct xen_pct_register));
if ( cpufreq_verbose )
{
@@ -512,69 +512,67 @@ int set_px_pminfo(uint32_t acpi_id, struct xen_processor_performance *dom0_px_in
}
}
- if ( dom0_px_info->flags & XEN_PX_PSS )
+ if ( perf->flags & XEN_PX_PSS )
{
/* capability check */
- if (dom0_px_info->state_count <= 1)
+ if ( perf->state_count <= 1 )
{
ret = -EINVAL;
goto out;
}
if ( !(pxpt->states = xmalloc_array(struct xen_processor_px,
- dom0_px_info->state_count)) )
+ perf->state_count)) )
{
ret = -ENOMEM;
goto out;
}
- if ( copy_from_guest(pxpt->states, dom0_px_info->states,
- dom0_px_info->state_count) )
+ if ( copy_from_guest(pxpt->states, perf->states, perf->state_count) )
{
ret = -EFAULT;
goto out;
}
- pxpt->state_count = dom0_px_info->state_count;
+ pxpt->state_count = perf->state_count;
if ( cpufreq_verbose )
print_PSS(pxpt->states,pxpt->state_count);
}
- if ( dom0_px_info->flags & XEN_PX_PSD )
+ if ( perf->flags & XEN_PX_PSD )
{
/* check domain coordination */
- if (dom0_px_info->shared_type != CPUFREQ_SHARED_TYPE_ALL &&
- dom0_px_info->shared_type != CPUFREQ_SHARED_TYPE_ANY &&
- dom0_px_info->shared_type != CPUFREQ_SHARED_TYPE_HW)
+ if ( perf->shared_type != CPUFREQ_SHARED_TYPE_ALL &&
+ perf->shared_type != CPUFREQ_SHARED_TYPE_ANY &&
+ perf->shared_type != CPUFREQ_SHARED_TYPE_HW )
{
ret = -EINVAL;
goto out;
}
- pxpt->shared_type = dom0_px_info->shared_type;
- memcpy ((void *)&pxpt->domain_info,
- (void *)&dom0_px_info->domain_info,
- sizeof(struct xen_psd_package));
+ pxpt->shared_type = perf->shared_type;
+ memcpy((void *)&pxpt->domain_info,
+ (void *)&perf->domain_info,
+ sizeof(struct xen_psd_package));
if ( cpufreq_verbose )
print_PSD(&pxpt->domain_info);
}
- if ( dom0_px_info->flags & XEN_PX_PPC )
+ if ( perf->flags & XEN_PX_PPC )
{
- pxpt->platform_limit = dom0_px_info->platform_limit;
+ pxpt->platform_limit = perf->platform_limit;
if ( cpufreq_verbose )
print_PPC(pxpt->platform_limit);
if ( pxpt->init == XEN_PX_INIT )
{
- ret = cpufreq_limit_change(cpuid);
+ ret = cpufreq_limit_change(cpuid);
goto out;
}
}
- if ( dom0_px_info->flags == ( XEN_PX_PCT | XEN_PX_PSS |
- XEN_PX_PSD | XEN_PX_PPC ) )
+ if ( perf->flags == ( XEN_PX_PCT | XEN_PX_PSS | XEN_PX_PSD | XEN_PX_PPC ) )
{
pxpt->init = XEN_PX_INIT;
diff --git a/xen/include/xen/pmstat.h b/xen/include/xen/pmstat.h
index 266bc16d86..43b826ad4d 100644
--- a/xen/include/xen/pmstat.h
+++ b/xen/include/xen/pmstat.h
@@ -5,8 +5,8 @@
#include <public/platform.h> /* for struct xen_processor_power */
#include <public/sysctl.h> /* for struct pm_cx_stat */
-int set_px_pminfo(uint32_t cpu, struct xen_processor_performance *perf);
-long set_cx_pminfo(uint32_t cpu, struct xen_processor_power *power);
+int set_px_pminfo(uint32_t acpi_id, struct xen_processor_performance *perf);
+long set_cx_pminfo(uint32_t acpi_id, struct xen_processor_power *power);
uint32_t pmstat_get_cx_nr(uint32_t cpuid);
int pmstat_get_cx_stat(uint32_t cpuid, struct pm_cx_stat *stat);
int pmstat_reset_cx_stat(uint32_t cpuid);
--
2.34.1
On 31.10.2023 09:33, Federico Serafini wrote: > Make function definitions and declarations consistent. > No functional change. > > Signed-off-by: Federico Serafini <federico.serafini@bugseng.com> Reviewed-by: Jan Beulich <jbeulich@suse.com> > @@ -488,22 +488,22 @@ int set_px_pminfo(uint32_t acpi_id, struct xen_processor_performance *dom0_px_in > pmpt->acpi_id = acpi_id; > pmpt->id = cpuid; > > - if ( dom0_px_info->flags & XEN_PX_PCT ) > + if ( perf->flags & XEN_PX_PCT ) > { > /* space_id check */ > - if (dom0_px_info->control_register.space_id != > - dom0_px_info->status_register.space_id) > + if ( perf->control_register.space_id != > + perf->status_register.space_id ) > { > ret = -EINVAL; > goto out; > } > > - memcpy ((void *)&pxpt->control_register, > - (void *)&dom0_px_info->control_register, > - sizeof(struct xen_pct_register)); > - memcpy ((void *)&pxpt->status_register, > - (void *)&dom0_px_info->status_register, > - sizeof(struct xen_pct_register)); > + memcpy((void *)&pxpt->control_register, > + (void *)&perf->control_register, > + sizeof(struct xen_pct_register)); > + memcpy((void *)&pxpt->status_register, > + (void *)&perf->status_register, > + sizeof(struct xen_pct_register)); Along with the other coding style changes it might have been nice to also drop the bogus casts here and ... > @@ -512,69 +512,67 @@ int set_px_pminfo(uint32_t acpi_id, struct xen_processor_performance *dom0_px_in > } > } > > - if ( dom0_px_info->flags & XEN_PX_PSS ) > + if ( perf->flags & XEN_PX_PSS ) > { > /* capability check */ > - if (dom0_px_info->state_count <= 1) > + if ( perf->state_count <= 1 ) > { > ret = -EINVAL; > goto out; > } > > if ( !(pxpt->states = xmalloc_array(struct xen_processor_px, > - dom0_px_info->state_count)) ) > + perf->state_count)) ) > { > ret = -ENOMEM; > goto out; > } > - if ( copy_from_guest(pxpt->states, dom0_px_info->states, > - dom0_px_info->state_count) ) > + if ( copy_from_guest(pxpt->states, perf->states, perf->state_count) ) > { > ret = -EFAULT; > goto out; > } > - pxpt->state_count = dom0_px_info->state_count; > + pxpt->state_count = perf->state_count; > > if ( cpufreq_verbose ) > print_PSS(pxpt->states,pxpt->state_count); > } > > - if ( dom0_px_info->flags & XEN_PX_PSD ) > + if ( perf->flags & XEN_PX_PSD ) > { > /* check domain coordination */ > - if (dom0_px_info->shared_type != CPUFREQ_SHARED_TYPE_ALL && > - dom0_px_info->shared_type != CPUFREQ_SHARED_TYPE_ANY && > - dom0_px_info->shared_type != CPUFREQ_SHARED_TYPE_HW) > + if ( perf->shared_type != CPUFREQ_SHARED_TYPE_ALL && > + perf->shared_type != CPUFREQ_SHARED_TYPE_ANY && > + perf->shared_type != CPUFREQ_SHARED_TYPE_HW ) > { > ret = -EINVAL; > goto out; > } > > - pxpt->shared_type = dom0_px_info->shared_type; > - memcpy ((void *)&pxpt->domain_info, > - (void *)&dom0_px_info->domain_info, > - sizeof(struct xen_psd_package)); > + pxpt->shared_type = perf->shared_type; > + memcpy((void *)&pxpt->domain_info, > + (void *)&perf->domain_info, > + sizeof(struct xen_psd_package)); ... here. If I end up committing this, I may take the liberty to do so. Jan
© 2016 - 2024 Red Hat, Inc.