From patchwork Thu Oct 26 12:09:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Federico Serafini X-Patchwork-Id: 13437536 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 lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D01C1C25B48 for ; Thu, 26 Oct 2023 12:09:37 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.623758.971910 (Exim 4.92) (envelope-from ) id 1qvzB1-0001dA-Ba; Thu, 26 Oct 2023 12:09:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 623758.971910; Thu, 26 Oct 2023 12:09:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qvzB1-0001d3-8n; Thu, 26 Oct 2023 12:09:27 +0000 Received: by outflank-mailman (input) for mailman id 623758; Thu, 26 Oct 2023 12:09:26 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qvzB0-0001ck-Ft for xen-devel@lists.xenproject.org; Thu, 26 Oct 2023 12:09:26 +0000 Received: from support.bugseng.com (mail.bugseng.com [162.55.131.47]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 807e6133-73f8-11ee-9b0e-b553b5be7939; Thu, 26 Oct 2023 14:09:24 +0200 (CEST) Received: from Dell.homenet.telecomitalia.it (host-95-247-204-25.retail.telecomitalia.it [95.247.204.25]) by support.bugseng.com (Postfix) with ESMTPSA id 4941E4EE0742; Thu, 26 Oct 2023 14:09:23 +0200 (CEST) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 807e6133-73f8-11ee-9b0e-b553b5be7939 From: Federico Serafini To: xen-devel@lists.xenproject.org Cc: consulting@bugseng.com, Federico Serafini , Jan Beulich , Andrew Cooper , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Wei Liu , George Dunlap , Julien Grall , Stefano Stabellini Subject: [XEN PATCH] xen/set_{c,p}x_pminfo: address violations od MISRA C:2012 Rule 8.3 Date: Thu, 26 Oct 2023 14:09:06 +0200 Message-Id: <88499ca9a61b59d13d90f6c5f77cbb2e124d850e.1698322083.git.federico.serafini@bugseng.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Make function definitions and declarations consistent. No functional change. Signed-off-by: Federico Serafini Reviewed-by: Stefano Stabellini --- xen/arch/x86/x86_64/cpu_idle.c | 5 ++-- xen/arch/x86/x86_64/cpufreq.c | 6 ++-- xen/drivers/cpufreq/cpufreq.c | 52 ++++++++++++++++------------------ xen/include/xen/pmstat.h | 4 +-- 4 files changed, 33 insertions(+), 34 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..6fc1aadb9f 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,21 +488,21 @@ 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, + (void *)&perf->control_register, sizeof(struct xen_pct_register)); memcpy ((void *)&pxpt->status_register, - (void *)&dom0_px_info->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; + pxpt->shared_type = perf->shared_type; memcpy ((void *)&pxpt->domain_info, - (void *)&dom0_px_info->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; @@ -675,16 +673,16 @@ static int __init cpufreq_cmdline_parse(const char *s, const char *e) static int cf_check cpu_callback( struct notifier_block *nfb, unsigned long action, void *hcpu) { - unsigned int cpu = (unsigned long)hcpu; + unsigned int acpi_id = (unsigned long)hcpu; switch ( action ) { case CPU_DOWN_FAILED: case CPU_ONLINE: - (void)cpufreq_add_cpu(cpu); + (void)cpufreq_add_cpu(acpi_id); break; case CPU_DOWN_PREPARE: - (void)cpufreq_del_cpu(cpu); + (void)cpufreq_del_cpu(acpi_id); break; default: break; 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 /* for struct xen_processor_power */ #include /* 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);