From patchwork Fri Aug 4 15:27:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicola Vetrini X-Patchwork-Id: 13342044 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 30444C41513 for ; Fri, 4 Aug 2023 15:28:34 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.577190.904148 (Exim 4.92) (envelope-from ) id 1qRwis-00084T-2I; Fri, 04 Aug 2023 15:28:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 577190.904148; Fri, 04 Aug 2023 15:28:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qRwir-000841-RG; Fri, 04 Aug 2023 15:28:13 +0000 Received: by outflank-mailman (input) for mailman id 577190; Fri, 04 Aug 2023 15:28:12 +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 1qRwiq-00080Z-CJ for xen-devel@lists.xenproject.org; Fri, 04 Aug 2023 15:28:12 +0000 Received: from support.bugseng.com (mail.bugseng.com [162.55.131.47]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 8479d03b-32db-11ee-8613-37d641c3527e; Fri, 04 Aug 2023 17:28:09 +0200 (CEST) Received: from nico.bugseng.com (unknown [147.123.100.131]) by support.bugseng.com (Postfix) with ESMTPSA id D589A4EE0740; Fri, 4 Aug 2023 17:28:08 +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: 8479d03b-32db-11ee-8613-37d641c3527e From: Nicola Vetrini To: xen-devel@lists.xenproject.org Cc: sstabellini@kernel.org, michal.orzel@amd.com, xenia.ragiadakou@amd.com, ayan.kumar.halder@amd.com, consulting@bugseng.com, Nicola Vetrini , Jan Beulich , Andrew Cooper , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Wei Liu Subject: [XEN PATCH 1/6] x86: rename variable 'e820' to address MISRA C:2012 Rule 5.3 Date: Fri, 4 Aug 2023 17:27:44 +0200 Message-Id: <896a2235560fd348f79eded33731609c5d2e74ab.1691162261.git.nicola.vetrini@bugseng.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 The variable declared in the header file 'xen/arch/x86/include/asm/e820.h' is shadowed by many function parameters, so it is renamed to avoid these violations. No functional changes. Signed-off-by: Nicola Vetrini --- This patch is similar to other renames done on previous patches, and the preferred strategy there was to rename the global variable. This one has more occurrences that are spread in various files, but the general pattern is the same. --- xen/arch/x86/dom0_build.c | 10 ++-- xen/arch/x86/e820.c | 66 ++++++++++++------------ xen/arch/x86/guest/xen/xen.c | 4 +- xen/arch/x86/hvm/dom0_build.c | 6 +-- xen/arch/x86/include/asm/e820.h | 2 +- xen/arch/x86/mm.c | 49 +++++++++--------- xen/arch/x86/numa.c | 8 +-- xen/arch/x86/setup.c | 22 ++++---- xen/arch/x86/srat.c | 6 +-- xen/arch/x86/x86_64/mmconf-fam10h.c | 2 +- xen/drivers/passthrough/amd/iommu_acpi.c | 2 +- 11 files changed, 89 insertions(+), 88 deletions(-) diff --git a/xen/arch/x86/dom0_build.c b/xen/arch/x86/dom0_build.c index 8b1fcc6471..bfb6400376 100644 --- a/xen/arch/x86/dom0_build.c +++ b/xen/arch/x86/dom0_build.c @@ -534,13 +534,13 @@ int __init dom0_setup_permissions(struct domain *d) } /* Remove access to E820_UNUSABLE I/O regions above 1MB. */ - for ( i = 0; i < e820.nr_map; i++ ) + for ( i = 0; i < e820_map.nr_map; i++ ) { unsigned long sfn, efn; - sfn = max_t(unsigned long, paddr_to_pfn(e820.map[i].addr), 0x100ul); - efn = paddr_to_pfn(e820.map[i].addr + e820.map[i].size - 1); - if ( (e820.map[i].type == E820_UNUSABLE) && - (e820.map[i].size != 0) && + sfn = max_t(unsigned long, paddr_to_pfn(e820_map.map[i].addr), 0x100ul); + efn = paddr_to_pfn(e820_map.map[i].addr + e820_map.map[i].size - 1); + if ( (e820_map.map[i].type == E820_UNUSABLE) && + (e820_map.map[i].size != 0) && (sfn <= efn) ) rc |= iomem_deny_access(d, sfn, efn); } diff --git a/xen/arch/x86/e820.c b/xen/arch/x86/e820.c index 0b89935510..4425011c01 100644 --- a/xen/arch/x86/e820.c +++ b/xen/arch/x86/e820.c @@ -34,7 +34,7 @@ boolean_param("e820-mtrr-clip", e820_mtrr_clip); static bool __initdata e820_verbose; boolean_param("e820-verbose", e820_verbose); -struct e820map e820; +struct e820map e820_map; struct e820map __initdata e820_raw; /* @@ -47,8 +47,8 @@ int __init e820_all_mapped(u64 start, u64 end, unsigned type) { unsigned int i; - for (i = 0; i < e820.nr_map; i++) { - struct e820entry *ei = &e820.map[i]; + for (i = 0; i < e820_map.nr_map; i++) { + struct e820entry *ei = &e820_map.map[i]; if (type && ei->type != type) continue; @@ -75,17 +75,17 @@ int __init e820_all_mapped(u64 start, u64 end, unsigned type) static void __init add_memory_region(unsigned long long start, unsigned long long size, int type) { - unsigned int x = e820.nr_map; + unsigned int x = e820_map.nr_map; - if (x == ARRAY_SIZE(e820.map)) { + if (x == ARRAY_SIZE(e820_map.map)) { printk(KERN_ERR "Ooops! Too many entries in the memory map!\n"); return; } - e820.map[x].addr = start; - e820.map[x].size = size; - e820.map[x].type = type; - e820.nr_map++; + e820_map.map[x].addr = start; + e820_map.map[x].size = size; + e820_map.map[x].type = type; + e820_map.nr_map++; } void __init print_e820_memory_map(const struct e820entry *map, @@ -347,13 +347,13 @@ static unsigned long __init find_max_pfn(void) unsigned int i; unsigned long max_pfn = 0; - for (i = 0; i < e820.nr_map; i++) { + for (i = 0; i < e820_map.nr_map; i++) { unsigned long start, end; /* RAM? */ - if (e820.map[i].type != E820_RAM) + if (e820_map.map[i].type != E820_RAM) continue; - start = PFN_UP(e820.map[i].addr); - end = PFN_DOWN(e820.map[i].addr + e820.map[i].size); + start = PFN_UP(e820_map.map[i].addr); + end = PFN_DOWN(e820_map.map[i].addr + e820_map.map[i].size); if (start >= end) continue; if (end > max_pfn) @@ -372,21 +372,21 @@ static void __init clip_to_limit(uint64_t limit, const char *warnmsg) for ( ; ; ) { /* Find a RAM region needing clipping. */ - for ( i = 0; i < e820.nr_map; i++ ) - if ( (e820.map[i].type == E820_RAM) && - ((e820.map[i].addr + e820.map[i].size) > limit) ) + for ( i = 0; i < e820_map.nr_map; i++ ) + if ( (e820_map.map[i].type == E820_RAM) && + ((e820_map.map[i].addr + e820_map.map[i].size) > limit) ) break; /* If none found, we are done. */ - if ( i == e820.nr_map ) - break; + if ( i == e820_map.nr_map ) + break; old_limit = max_t( - uint64_t, old_limit, e820.map[i].addr + e820.map[i].size); + uint64_t, old_limit, e820_map.map[i].addr + e820_map.map[i].size); /* We try to convert clipped RAM areas to E820_UNUSABLE. */ - if ( e820_change_range_type(&e820, max(e820.map[i].addr, limit), - e820.map[i].addr + e820.map[i].size, + if ( e820_change_range_type(&e820_map, max(e820_map.map[i].addr, limit), + e820_map.map[i].addr + e820_map.map[i].size, E820_RAM, E820_UNUSABLE) ) continue; @@ -394,15 +394,15 @@ static void __init clip_to_limit(uint64_t limit, const char *warnmsg) * If the type change fails (e.g., not space in table) then we clip or * delete the region as appropriate. */ - if ( e820.map[i].addr < limit ) + if ( e820_map.map[i].addr < limit ) { - e820.map[i].size = limit - e820.map[i].addr; + e820_map.map[i].size = limit - e820_map.map[i].addr; } else { - memmove(&e820.map[i], &e820.map[i+1], - (e820.nr_map - i - 1) * sizeof(struct e820entry)); - e820.nr_map--; + memmove(&e820_map.map[i], &e820_map.map[i+1], + (e820_map.nr_map - i - 1) * sizeof(struct e820entry)); + e820_map.nr_map--; } } @@ -497,7 +497,7 @@ static void __init reserve_dmi_region(void) if ( !what ) break; if ( ((base + len) > base) && - reserve_e820_ram(&e820, base, base + len) ) + reserve_e820_ram(&e820_map, base, base + len) ) printk("WARNING: %s table located in E820 RAM %"PRIpaddr"-%"PRIpaddr". Fixed.\n", what, base, base + len); } @@ -517,12 +517,12 @@ static void __init machine_specific_memory_setup(struct e820map *raw) if ( opt_availmem ) { - for ( i = size = 0; (i < e820.nr_map) && (size <= opt_availmem); i++ ) - if ( e820.map[i].type == E820_RAM ) - size += e820.map[i].size; + for ( i = size = 0; (i < e820_map.nr_map) && (size <= opt_availmem); i++ ) + if ( e820_map.map[i].type == E820_RAM ) + size += e820_map.map[i].size; if ( size > opt_availmem ) clip_to_limit( - e820.map[i-1].addr + e820.map[i-1].size - (size-opt_availmem), + e820_map.map[i-1].addr + e820_map.map[i-1].size - (size-opt_availmem), NULL); } @@ -694,10 +694,10 @@ unsigned long __init init_e820(const char *str, struct e820map *raw) machine_specific_memory_setup(raw); if ( cpu_has_hypervisor ) - hypervisor_e820_fixup(&e820); + hypervisor_e820_fixup(&e820_map); printk("%s RAM map:\n", str); - print_e820_memory_map(e820.map, e820.nr_map); + print_e820_memory_map(e820_map.map, e820_map.nr_map); return find_max_pfn(); } diff --git a/xen/arch/x86/guest/xen/xen.c b/xen/arch/x86/guest/xen/xen.c index f93dfc89f7..3ec828b98d 100644 --- a/xen/arch/x86/guest/xen/xen.c +++ b/xen/arch/x86/guest/xen/xen.c @@ -147,9 +147,9 @@ static void __init init_memmap(void) PFN_DOWN(GB(4) - 1))) ) panic("unable to add RAM to in-use PFN rangeset\n"); - for ( i = 0; i < e820.nr_map; i++ ) + for ( i = 0; i < e820_map.nr_map; i++ ) { - struct e820entry *e = &e820.map[i]; + struct e820entry *e = &e820_map.map[i]; if ( rangeset_add_range(mem, PFN_DOWN(e->addr), PFN_UP(e->addr + e->size - 1)) ) diff --git a/xen/arch/x86/hvm/dom0_build.c b/xen/arch/x86/hvm/dom0_build.c index bc0e290db6..98203f7a52 100644 --- a/xen/arch/x86/hvm/dom0_build.c +++ b/xen/arch/x86/hvm/dom0_build.c @@ -333,13 +333,13 @@ static __init void pvh_setup_e820(struct domain *d, unsigned long nr_pages) * Add an extra entry in case we have to split a RAM entry into a RAM and a * UNUSABLE one in order to truncate it. */ - d->arch.e820 = xzalloc_array(struct e820entry, e820.nr_map + 1); + d->arch.e820 = xzalloc_array(struct e820entry, e820_map.nr_map + 1); if ( !d->arch.e820 ) panic("Unable to allocate memory for Dom0 e820 map\n"); entry_guest = d->arch.e820; /* Clamp e820 memory map to match the memory assigned to Dom0 */ - for ( i = 0, entry = e820.map; i < e820.nr_map; i++, entry++ ) + for ( i = 0, entry = e820_map.map; i < e820_map.nr_map; i++, entry++ ) { *entry_guest = *entry; @@ -392,7 +392,7 @@ static __init void pvh_setup_e820(struct domain *d, unsigned long nr_pages) next: d->arch.nr_e820++; entry_guest++; - ASSERT(d->arch.nr_e820 <= e820.nr_map + 1); + ASSERT(d->arch.nr_e820 <= e820_map.nr_map + 1); } ASSERT(cur_pages == nr_pages); } diff --git a/xen/arch/x86/include/asm/e820.h b/xen/arch/x86/include/asm/e820.h index 213d5b5dd2..0865825f7d 100644 --- a/xen/arch/x86/include/asm/e820.h +++ b/xen/arch/x86/include/asm/e820.h @@ -34,7 +34,7 @@ extern int e820_add_range( extern unsigned long init_e820(const char *str, struct e820map *raw); extern void print_e820_memory_map(const struct e820entry *map, unsigned int entries); -extern struct e820map e820; +extern struct e820map e820_map; extern struct e820map e820_raw; /* These symbols live in the boot trampoline. */ diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index be2b10a391..6920ac939f 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -295,12 +295,12 @@ void __init arch_init_memory(void) /* Any areas not specified as RAM by the e820 map are considered I/O. */ for ( i = 0, pfn = 0; pfn < max_page; i++ ) { - while ( (i < e820.nr_map) && - (e820.map[i].type != E820_RAM) && - (e820.map[i].type != E820_UNUSABLE) ) + while ( (i < e820_map.nr_map) && + (e820_map.map[i].type != E820_RAM) && + (e820_map.map[i].type != E820_UNUSABLE) ) i++; - if ( i >= e820.nr_map ) + if ( i >= e820_map.nr_map ) { /* No more RAM regions: mark as I/O right to end of memory map. */ rstart_pfn = rend_pfn = max_page; @@ -309,9 +309,10 @@ void __init arch_init_memory(void) { /* Mark as I/O just up as far as next RAM region. */ rstart_pfn = min_t(unsigned long, max_page, - PFN_UP(e820.map[i].addr)); + PFN_UP(e820_map.map[i].addr)); rend_pfn = max_t(unsigned long, rstart_pfn, - PFN_DOWN(e820.map[i].addr + e820.map[i].size)); + PFN_DOWN(e820_map.map[i].addr + + e820_map.map[i].size)); } /* @@ -387,9 +388,9 @@ int page_is_ram_type(unsigned long mfn, unsigned long mem_type) uint64_t maddr = pfn_to_paddr(mfn); int i; - for ( i = 0; i < e820.nr_map; i++ ) + for ( i = 0; i < e820_map.nr_map; i++ ) { - switch ( e820.map[i].type ) + switch ( e820_map.map[i].type ) { case E820_RAM: if ( mem_type & RAM_TYPE_CONVENTIONAL ) @@ -414,8 +415,8 @@ int page_is_ram_type(unsigned long mfn, unsigned long mem_type) } /* Test the range. */ - if ( (e820.map[i].addr <= maddr) && - ((e820.map[i].addr + e820.map[i].size) >= (maddr + PAGE_SIZE)) ) + if ( (e820_map.map[i].addr <= maddr) && + ((e820_map.map[i].addr + e820_map.map[i].size) >= (maddr + PAGE_SIZE)) ) return 1; } @@ -427,17 +428,17 @@ unsigned int page_get_ram_type(mfn_t mfn) uint64_t last = 0, maddr = mfn_to_maddr(mfn); unsigned int i, type = 0; - for ( i = 0; i < e820.nr_map; - last = e820.map[i].addr + e820.map[i].size, i++ ) + for ( i = 0; i < e820_map.nr_map; + last = e820_map.map[i].addr + e820_map.map[i].size, i++ ) { - if ( (maddr + PAGE_SIZE) > last && maddr < e820.map[i].addr ) + if ( (maddr + PAGE_SIZE) > last && maddr < e820_map.map[i].addr ) type |= RAM_TYPE_UNKNOWN; - if ( (maddr + PAGE_SIZE) <= e820.map[i].addr || - maddr >= (e820.map[i].addr + e820.map[i].size) ) + if ( (maddr + PAGE_SIZE) <= e820_map.map[i].addr || + maddr >= (e820_map.map[i].addr + e820_map.map[i].size) ) continue; - switch ( e820.map[i].type ) + switch ( e820_map.map[i].type ) { case E820_RAM: type |= RAM_TYPE_CONVENTIONAL; @@ -778,9 +779,9 @@ bool is_memory_hole(mfn_t start, mfn_t end) unsigned long e = mfn_x(end); unsigned int i; - for ( i = 0; i < e820.nr_map; i++ ) + for ( i = 0; i < e820_map.nr_map; i++ ) { - const struct e820entry *entry = &e820.map[i]; + const struct e820entry *entry = &e820_map.map[i]; if ( !entry->size ) continue; @@ -4763,16 +4764,16 @@ long arch_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) store = !guest_handle_is_null(ctxt.map.buffer); - if ( store && ctxt.map.nr_entries < e820.nr_map + 1 ) + if ( store && ctxt.map.nr_entries < e820_map.nr_map + 1 ) return -EINVAL; buffer = guest_handle_cast(ctxt.map.buffer, e820entry_t); if ( store && !guest_handle_okay(buffer, ctxt.map.nr_entries) ) return -EFAULT; - for ( i = 0, ctxt.n = 0, ctxt.s = 0; i < e820.nr_map; ++i, ++ctxt.n ) + for ( i = 0, ctxt.n = 0, ctxt.s = 0; i < e820_map.nr_map; ++i, ++ctxt.n ) { - unsigned long s = PFN_DOWN(e820.map[i].addr); + unsigned long s = PFN_DOWN(e820_map.map[i].addr); if ( s > ctxt.s ) { @@ -4786,12 +4787,12 @@ long arch_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) } if ( store ) { - if ( ctxt.map.nr_entries <= ctxt.n + (e820.nr_map - i) ) + if ( ctxt.map.nr_entries <= ctxt.n + (e820_map.nr_map - i) ) return -EINVAL; - if ( __copy_to_guest_offset(buffer, ctxt.n, e820.map + i, 1) ) + if ( __copy_to_guest_offset(buffer, ctxt.n, e820_map.map + i, 1) ) return -EFAULT; } - ctxt.s = PFN_UP(e820.map[i].addr + e820.map[i].size); + ctxt.s = PFN_UP(e820_map.map[i].addr + e820_map.map[i].size); } if ( ctxt.s ) diff --git a/xen/arch/x86/numa.c b/xen/arch/x86/numa.c index 4b0b297c7e..76827f5f32 100644 --- a/xen/arch/x86/numa.c +++ b/xen/arch/x86/numa.c @@ -102,14 +102,14 @@ unsigned int __init arch_get_dma_bitsize(void) int __init arch_get_ram_range(unsigned int idx, paddr_t *start, paddr_t *end) { - if ( idx >= e820.nr_map ) + if ( idx >= e820_map.nr_map ) return -ENOENT; - if ( e820.map[idx].type != E820_RAM ) + if ( e820_map.map[idx].type != E820_RAM ) return -ENODATA; - *start = e820.map[idx].addr; - *end = *start + e820.map[idx].size; + *start = e820_map.map[idx].addr; + *end = *start + e820_map.map[idx].size; return 0; } diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 80ae973d64..9c6003e374 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1163,7 +1163,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) } else if ( efi_enabled(EFI_BOOT) ) memmap_type = "EFI"; - else if ( (e820_raw.nr_map = + else if ( (e820_raw.nr_map = copy_bios_e820(e820_raw.map, ARRAY_SIZE(e820_raw.map))) != 0 ) { @@ -1300,13 +1300,13 @@ void __init noreturn __start_xen(unsigned long mbi_p) } /* Create a temporary copy of the E820 map. */ - memcpy(&boot_e820, &e820, sizeof(e820)); + memcpy(&boot_e820, &e820_map, sizeof(e820_map)); /* Early kexec reservation (explicit static start address). */ nr_pages = 0; - for ( i = 0; i < e820.nr_map; i++ ) - if ( e820.map[i].type == E820_RAM ) - nr_pages += e820.map[i].size >> PAGE_SHIFT; + for ( i = 0; i < e820_map.nr_map; i++ ) + if ( e820_map.map[i].type == E820_RAM ) + nr_pages += e820_map.map[i].size >> PAGE_SHIFT; set_kexec_crash_area_size((u64)nr_pages << PAGE_SHIFT); kexec_reserve_area(&boot_e820); @@ -1631,7 +1631,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) unsigned long e = min(s + PFN_UP(kexec_crash_area.size), PFN_UP(__pa(HYPERVISOR_VIRT_END - 1))); - if ( e > s ) + if ( e > s ) map_pages_to_xen((unsigned long)__va(kexec_crash_area.start), _mfn(s), e - s, PAGE_HYPERVISOR); } @@ -1677,9 +1677,9 @@ void __init noreturn __start_xen(unsigned long mbi_p) PAGE_HYPERVISOR_RO); nr_pages = 0; - for ( i = 0; i < e820.nr_map; i++ ) - if ( e820.map[i].type == E820_RAM ) - nr_pages += e820.map[i].size >> PAGE_SHIFT; + for ( i = 0; i < e820_map.nr_map; i++ ) + if ( e820_map.map[i].type == E820_RAM ) + nr_pages += e820_map.map[i].size >> PAGE_SHIFT; printk("System RAM: %luMB (%lukB)\n", nr_pages >> (20 - PAGE_SHIFT), nr_pages << (PAGE_SHIFT - 10)); @@ -1771,7 +1771,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) open_softirq(NEW_TLBFLUSH_CLOCK_PERIOD_SOFTIRQ, new_tlbflush_clock_period); - if ( opt_watchdog ) + if ( opt_watchdog ) nmi_watchdog = NMI_LOCAL_APIC; find_smp_config(); @@ -1983,7 +1983,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) do_initcalls(); - if ( opt_watchdog ) + if ( opt_watchdog ) watchdog_setup(); if ( !tboot_protect_mem_regions() ) diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c index 3f70338e6e..bbd04978ae 100644 --- a/xen/arch/x86/srat.c +++ b/xen/arch/x86/srat.c @@ -301,11 +301,11 @@ void __init srat_parse_regions(paddr_t addr) acpi_table_parse_srat(ACPI_SRAT_TYPE_MEMORY_AFFINITY, srat_parse_region, 0); - for (mask = srat_region_mask, i = 0; mask && i < e820.nr_map; i++) { - if (e820.map[i].type != E820_RAM) + for (mask = srat_region_mask, i = 0; mask && i < e820_map.nr_map; i++) { + if (e820_map.map[i].type != E820_RAM) continue; - if (~mask & pdx_region_mask(e820.map[i].addr, e820.map[i].size)) + if (~mask & pdx_region_mask(e820_map.map[i].addr, e820_map.map[i].size)) mask = 0; } diff --git a/xen/arch/x86/x86_64/mmconf-fam10h.c b/xen/arch/x86/x86_64/mmconf-fam10h.c index a834ab3149..bbebf9219f 100644 --- a/xen/arch/x86/x86_64/mmconf-fam10h.c +++ b/xen/arch/x86/x86_64/mmconf-fam10h.c @@ -135,7 +135,7 @@ static void __init get_fam10h_pci_mmconf_base(void) return; out: - if (e820_add_range(&e820, start, start + SIZE, E820_RESERVED)) + if (e820_add_range(&e820_map, start, start + SIZE, E820_RESERVED)) fam10h_pci_mmconf_base = start; } diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index 3b577c9b39..7ad9e12b8a 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -418,7 +418,7 @@ static int __init parse_ivmd_block(const struct acpi_ivrs_memory *ivmd_block) if ( type == RAM_TYPE_UNKNOWN ) { - if ( e820_add_range(&e820, addr, addr + PAGE_SIZE, + if ( e820_add_range(&e820_map, addr, addr + PAGE_SIZE, E820_RESERVED) ) continue; AMD_IOMMU_ERROR("IVMD: page at %lx couldn't be reserved\n", From patchwork Fri Aug 4 15:27:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicola Vetrini X-Patchwork-Id: 13342040 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 3BD63C001DF for ; Fri, 4 Aug 2023 15:28:33 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.577191.904155 (Exim 4.92) (envelope-from ) id 1qRwis-0008Aw-Bc; Fri, 04 Aug 2023 15:28:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 577191.904155; Fri, 04 Aug 2023 15:28:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qRwis-00089g-3f; Fri, 04 Aug 2023 15:28:14 +0000 Received: by outflank-mailman (input) for mailman id 577191; Fri, 04 Aug 2023 15:28:12 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qRwiq-00080a-Pm for xen-devel@lists.xenproject.org; Fri, 04 Aug 2023 15:28:12 +0000 Received: from support.bugseng.com (mail.bugseng.com [162.55.131.47]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 8517a4f9-32db-11ee-b26d-6b7b168915f2; Fri, 04 Aug 2023 17:28:11 +0200 (CEST) Received: from nico.bugseng.com (unknown [147.123.100.131]) by support.bugseng.com (Postfix) with ESMTPSA id C39364EE0741; Fri, 4 Aug 2023 17:28:09 +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: 8517a4f9-32db-11ee-b26d-6b7b168915f2 From: Nicola Vetrini To: xen-devel@lists.xenproject.org Cc: sstabellini@kernel.org, michal.orzel@amd.com, xenia.ragiadakou@amd.com, ayan.kumar.halder@amd.com, consulting@bugseng.com, Nicola Vetrini , Andrew Cooper , George Dunlap , Jan Beulich , Julien Grall , Wei Liu Subject: [XEN PATCH 2/6] libelf: address MISRA C:2012 Rule 5.3 Date: Fri, 4 Aug 2023 17:27:45 +0200 Message-Id: <55624244c42297da7da954009ba0559c47fc245e.1691162261.git.nicola.vetrini@bugseng.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 The types u{8,16,32,64} defined in 'xen/arch/x86/include/asm/types.h' shadow the variables in the modified function, hence violating Rule 5.3. Therefore, the rename takes care of the shadowing. No functional changes. Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini --- xen/common/libelf/libelf-tools.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/xen/common/libelf/libelf-tools.c b/xen/common/libelf/libelf-tools.c index a9edb6a8dc..f0d5da1abf 100644 --- a/xen/common/libelf/libelf-tools.c +++ b/xen/common/libelf/libelf-tools.c @@ -91,10 +91,10 @@ uint64_t elf_access_unsigned(struct elf_binary * elf, elf_ptrval base, { elf_ptrval ptrval = base + moreoffset; bool need_swap = elf_swap(elf); - const uint8_t *u8; - const uint16_t *u16; - const uint32_t *u32; - const uint64_t *u64; + const uint8_t *uint8; + const uint16_t *uint16; + const uint32_t *uint32; + const uint64_t *uint64; if ( !elf_access_ok(elf, ptrval, size) ) return 0; @@ -102,17 +102,17 @@ uint64_t elf_access_unsigned(struct elf_binary * elf, elf_ptrval base, switch ( size ) { case 1: - u8 = (const void*)ptrval; - return *u8; + uint8 = (const void*)ptrval; + return *uint8; case 2: - u16 = (const void*)ptrval; - return need_swap ? bswap_16(*u16) : *u16; + uint16 = (const void*)ptrval; + return need_swap ? bswap_16(*uint16) : *uint16; case 4: - u32 = (const void*)ptrval; - return need_swap ? bswap_32(*u32) : *u32; + uint32 = (const void*)ptrval; + return need_swap ? bswap_32(*uint32) : *uint32; case 8: - u64 = (const void*)ptrval; - return need_swap ? bswap_64(*u64) : *u64; + uint64 = (const void*)ptrval; + return need_swap ? bswap_64(*uint64) : *uint64; default: return 0; } From patchwork Fri Aug 4 15:27:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicola Vetrini X-Patchwork-Id: 13342041 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 880ACC04FE1 for ; Fri, 4 Aug 2023 15:28:33 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.577192.904161 (Exim 4.92) (envelope-from ) id 1qRwis-0008Gj-Nv; Fri, 04 Aug 2023 15:28:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 577192.904161; Fri, 04 Aug 2023 15:28:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qRwis-0008Ee-Da; Fri, 04 Aug 2023 15:28:14 +0000 Received: by outflank-mailman (input) for mailman id 577192; Fri, 04 Aug 2023 15:28:13 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qRwir-00080a-0c for xen-devel@lists.xenproject.org; Fri, 04 Aug 2023 15:28:13 +0000 Received: from support.bugseng.com (mail.bugseng.com [162.55.131.47]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 85a05acc-32db-11ee-b26d-6b7b168915f2; Fri, 04 Aug 2023 17:28:11 +0200 (CEST) Received: from nico.bugseng.com (unknown [147.123.100.131]) by support.bugseng.com (Postfix) with ESMTPSA id C05BB4EE0742; Fri, 4 Aug 2023 17:28:10 +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: 85a05acc-32db-11ee-b26d-6b7b168915f2 From: Nicola Vetrini To: xen-devel@lists.xenproject.org Cc: sstabellini@kernel.org, michal.orzel@amd.com, xenia.ragiadakou@amd.com, ayan.kumar.halder@amd.com, consulting@bugseng.com, Nicola Vetrini , Andrew Cooper , George Dunlap , Jan Beulich , Julien Grall , Wei Liu Subject: [XEN PATCH 3/6] xen/delay: address MISRA C:2012 Rule 5.3. Date: Fri, 4 Aug 2023 17:27:46 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 The variable 'msec' shadows the local variable in 'ehci_dbgp_bios_handoff', but to prevent any future clashes, the one in the macro gains a suffix. No functional change. Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini --- Unless that file should remain as-is, because it's clearly taken from linux, but this does not prevent future name clashes with msec. --- xen/include/xen/delay.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/include/xen/delay.h b/xen/include/xen/delay.h index 9d70ef035f..f2d9270e83 100644 --- a/xen/include/xen/delay.h +++ b/xen/include/xen/delay.h @@ -5,6 +5,6 @@ #include #define mdelay(n) (\ - {unsigned long msec=(n); while (msec--) udelay(1000);}) + {unsigned long msec_=(n); while (msec_--) udelay(1000);}) #endif /* defined(_LINUX_DELAY_H) */ From patchwork Fri Aug 4 15:27:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicola Vetrini X-Patchwork-Id: 13342038 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 49AACC001DB for ; Fri, 4 Aug 2023 15:28:31 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.577194.904187 (Exim 4.92) (envelope-from ) id 1qRwiu-0000aN-Ck; Fri, 04 Aug 2023 15:28:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 577194.904187; Fri, 04 Aug 2023 15:28:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qRwiu-0000YN-4z; Fri, 04 Aug 2023 15:28:16 +0000 Received: by outflank-mailman (input) for mailman id 577194; Fri, 04 Aug 2023 15:28:14 +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 1qRwis-00080Z-Ap for xen-devel@lists.xenproject.org; Fri, 04 Aug 2023 15:28:14 +0000 Received: from support.bugseng.com (mail.bugseng.com [162.55.131.47]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 863935ce-32db-11ee-8613-37d641c3527e; Fri, 04 Aug 2023 17:28:12 +0200 (CEST) Received: from nico.bugseng.com (unknown [147.123.100.131]) by support.bugseng.com (Postfix) with ESMTPSA id D99AB4EE0743; Fri, 4 Aug 2023 17:28:11 +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: 863935ce-32db-11ee-8613-37d641c3527e From: Nicola Vetrini To: xen-devel@lists.xenproject.org Cc: sstabellini@kernel.org, michal.orzel@amd.com, xenia.ragiadakou@amd.com, ayan.kumar.halder@amd.com, consulting@bugseng.com, Nicola Vetrini , Jan Beulich , Andrew Cooper , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Wei Liu Subject: [XEN PATCH 4/6] x86/include: address MISRA C:2012 Rule 5.3. Date: Fri, 4 Aug 2023 17:27:47 +0200 Message-Id: <40823fbaa9e0a9b026e5ff3b01af9d83583889fd.1691162261.git.nicola.vetrini@bugseng.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 s/mpc_default_type/mpc_default in 'xen/arch/x86/include/asm/mpspec.h' to avoid clashing with function parameter names in 'mpparse.c'. No functional changes. Signed-off-by: Nicola Vetrini --- Even though the global variable does not seem to be used anywhere and is perhaps better to remove it entirely. --- xen/arch/x86/include/asm/mpspec.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/include/asm/mpspec.h b/xen/arch/x86/include/asm/mpspec.h index 1246eece0b..cc96ee63bd 100644 --- a/xen/arch/x86/include/asm/mpspec.h +++ b/xen/arch/x86/include/asm/mpspec.h @@ -15,7 +15,7 @@ extern void get_smp_config (void); extern unsigned char apic_version [MAX_APICS]; extern int mp_irq_entries; extern struct mpc_config_intsrc mp_irqs [MAX_IRQ_SOURCES]; -extern int mpc_default_type; +extern int mpc_default; extern unsigned long mp_lapic_addr; extern bool pic_mode; From patchwork Fri Aug 4 15:27:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicola Vetrini X-Patchwork-Id: 13342042 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 148D6C04FE2 for ; Fri, 4 Aug 2023 15:28:34 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.577193.904182 (Exim 4.92) (envelope-from ) id 1qRwiu-0000WS-1k; Fri, 04 Aug 2023 15:28:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 577193.904182; Fri, 04 Aug 2023 15:28:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qRwit-0000WF-U1; Fri, 04 Aug 2023 15:28:15 +0000 Received: by outflank-mailman (input) for mailman id 577193; Fri, 04 Aug 2023 15:28:14 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qRwis-00080a-36 for xen-devel@lists.xenproject.org; Fri, 04 Aug 2023 15:28:14 +0000 Received: from support.bugseng.com (mail.bugseng.com [162.55.131.47]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 86b2be7b-32db-11ee-b26d-6b7b168915f2; Fri, 04 Aug 2023 17:28:13 +0200 (CEST) Received: from nico.bugseng.com (unknown [147.123.100.131]) by support.bugseng.com (Postfix) with ESMTPSA id A877E4EE0744; Fri, 4 Aug 2023 17:28:12 +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: 86b2be7b-32db-11ee-b26d-6b7b168915f2 From: Nicola Vetrini To: xen-devel@lists.xenproject.org Cc: sstabellini@kernel.org, michal.orzel@amd.com, xenia.ragiadakou@amd.com, ayan.kumar.halder@amd.com, consulting@bugseng.com, Nicola Vetrini , Jan Beulich , Andrew Cooper , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Wei Liu Subject: [XEN PATCH 5/6] x86/xstate: address MISRA C:2012 Rule 5.3 Date: Fri, 4 Aug 2023 17:27:48 +0200 Message-Id: <1ea70e5f8293fdca2bb69ec75f532722136e52a5.1691162261.git.nicola.vetrini@bugseng.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Rename the local variables to avoid clashing with function 'xstate' defined below, but declared in the corresponding header file. No functional changes. Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini --- xen/arch/x86/xstate.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index 3d566252ea..180455b26d 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -174,10 +174,10 @@ static void setup_xstate_comp(uint16_t *comp_offsets, */ void expand_xsave_states(const struct vcpu *v, void *dest, unsigned int size) { - const struct xsave_struct *xsave = v->arch.xsave_area; + const struct xsave_struct *xsave_area = v->arch.xsave_area; const void *src; uint16_t comp_offsets[sizeof(xfeature_mask)*8]; - u64 xstate_bv = xsave->xsave_hdr.xstate_bv; + u64 xstate_bv = xsave_area->xsave_hdr.xstate_bv; u64 valid; /* Check there is state to serialise (i.e. at least an XSAVE_HDR) */ @@ -185,19 +185,19 @@ void expand_xsave_states(const struct vcpu *v, void *dest, unsigned int size) /* Check there is the correct room to decompress into. */ BUG_ON(size != xstate_ctxt_size(v->arch.xcr0_accum)); - if ( !(xsave->xsave_hdr.xcomp_bv & XSTATE_COMPACTION_ENABLED) ) + if ( !(xsave_area->xsave_hdr.xcomp_bv & XSTATE_COMPACTION_ENABLED) ) { - memcpy(dest, xsave, size); + memcpy(dest, xsave_area, size); return; } - ASSERT(xsave_area_compressed(xsave)); - setup_xstate_comp(comp_offsets, xsave->xsave_hdr.xcomp_bv); + ASSERT(xsave_area_compressed(xsave_area)); + setup_xstate_comp(comp_offsets, xsave_area->xsave_hdr.xcomp_bv); /* * Copy legacy XSAVE area and XSAVE hdr area. */ - memcpy(dest, xsave, XSTATE_AREA_MIN_SIZE); + memcpy(dest, xsave_area, XSTATE_AREA_MIN_SIZE); memset(dest + XSTATE_AREA_MIN_SIZE, 0, size - XSTATE_AREA_MIN_SIZE); ((struct xsave_struct *)dest)->xsave_hdr.xcomp_bv = 0; @@ -206,7 +206,7 @@ void expand_xsave_states(const struct vcpu *v, void *dest, unsigned int size) * Copy each region from the possibly compacted offset to the * non-compacted offset. */ - src = xsave; + src = xsave_area; valid = xstate_bv & ~XSTATE_FP_SSE; while ( valid ) { @@ -239,7 +239,7 @@ void expand_xsave_states(const struct vcpu *v, void *dest, unsigned int size) */ void compress_xsave_states(struct vcpu *v, const void *src, unsigned int size) { - struct xsave_struct *xsave = v->arch.xsave_area; + struct xsave_struct *xsave_area = v->arch.xsave_area; void *dest; uint16_t comp_offsets[sizeof(xfeature_mask)*8]; u64 xstate_bv, valid; @@ -252,7 +252,7 @@ void compress_xsave_states(struct vcpu *v, const void *src, unsigned int size) if ( !(v->arch.xcr0_accum & XSTATE_XSAVES_ONLY) ) { - memcpy(xsave, src, size); + memcpy(xsave_area, src, size); return; } @@ -260,19 +260,19 @@ void compress_xsave_states(struct vcpu *v, const void *src, unsigned int size) * Copy legacy XSAVE area, to avoid complications with CPUID * leaves 0 and 1 in the loop below. */ - memcpy(xsave, src, FXSAVE_SIZE); + memcpy(xsave_area, src, FXSAVE_SIZE); /* Set XSTATE_BV and XCOMP_BV. */ - xsave->xsave_hdr.xstate_bv = xstate_bv; - xsave->xsave_hdr.xcomp_bv = v->arch.xcr0_accum | XSTATE_COMPACTION_ENABLED; + xsave_area->xsave_hdr.xstate_bv = xstate_bv; + xsave_area->xsave_hdr.xcomp_bv = v->arch.xcr0_accum | XSTATE_COMPACTION_ENABLED; - setup_xstate_comp(comp_offsets, xsave->xsave_hdr.xcomp_bv); + setup_xstate_comp(comp_offsets, xsave_area->xsave_hdr.xcomp_bv); /* * Copy each region from the non-compacted offset to the * possibly compacted offset. */ - dest = xsave; + dest = xsave_area; valid = xstate_bv & ~XSTATE_FP_SSE; while ( valid ) { From patchwork Fri Aug 4 15:27:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicola Vetrini X-Patchwork-Id: 13342043 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 412D5C04A6A for ; Fri, 4 Aug 2023 15:28:34 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.577195.904203 (Exim 4.92) (envelope-from ) id 1qRwiv-00012h-Mf; Fri, 04 Aug 2023 15:28:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 577195.904203; Fri, 04 Aug 2023 15:28:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qRwiv-00010p-FN; Fri, 04 Aug 2023 15:28:17 +0000 Received: by outflank-mailman (input) for mailman id 577195; Fri, 04 Aug 2023 15:28:16 +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 1qRwit-00080Z-Vc for xen-devel@lists.xenproject.org; Fri, 04 Aug 2023 15:28:15 +0000 Received: from support.bugseng.com (mail.bugseng.com [162.55.131.47]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 872664d2-32db-11ee-8613-37d641c3527e; Fri, 04 Aug 2023 17:28:14 +0200 (CEST) Received: from nico.bugseng.com (unknown [147.123.100.131]) by support.bugseng.com (Postfix) with ESMTPSA id 7446F4EE0745; Fri, 4 Aug 2023 17:28:13 +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: 872664d2-32db-11ee-8613-37d641c3527e From: Nicola Vetrini To: xen-devel@lists.xenproject.org Cc: sstabellini@kernel.org, michal.orzel@amd.com, xenia.ragiadakou@amd.com, ayan.kumar.halder@amd.com, consulting@bugseng.com, Nicola Vetrini , Jan Beulich , Andrew Cooper , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Wei Liu Subject: [XEN PATCH 6/6] x86: refactor macros in 'xen-mca.h' to address MISRA C:2012 Rule 5.3 Date: Fri, 4 Aug 2023 17:27:49 +0200 Message-Id: <9d89a58ef016d96da7c3f329fb367f99d169cae6.1691162261.git.nicola.vetrini@bugseng.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 The macros defined 'xen/include/public/arch-x86/xen-mca.h' have needless underscore prefixes for parameter names and variable names that cause shadowing with e.g. the variable 'i' in function 'mce_action'. Therefore, the renaming aims to resolve present shadowing issues and lessen the probability of future ones. No functional change. Signed-off-by: Nicola Vetrini Reviewed-by: Stefano Stabellini --- The spirit of this patch is similar to this one [1] made by Jan that arose from a violation of this rule. [1] https://gitlab.com/xen-project/xen/-/commit/c0579c65f6bef794cd449fbc946feacccf485f2e --- xen/include/public/arch-x86/xen-mca.h | 38 +++++++++++++-------------- 1 file changed, 19 insertions(+), 19 deletions(-) -- 2.34.1 diff --git a/xen/include/public/arch-x86/xen-mca.h b/xen/include/public/arch-x86/xen-mca.h index b897536ec5..55b999ab21 100644 --- a/xen/include/public/arch-x86/xen-mca.h +++ b/xen/include/public/arch-x86/xen-mca.h @@ -280,39 +280,39 @@ DEFINE_XEN_GUEST_HANDLE(xen_mc_logical_cpu_t); /* Prototype: * uint32_t x86_mcinfo_nentries(struct mc_info *mi); */ -#define x86_mcinfo_nentries(_mi) \ - (_mi)->mi_nentries +#define x86_mcinfo_nentries(mi) \ + (mi)->mi_nentries /* Prototype: * struct mcinfo_common *x86_mcinfo_first(struct mc_info *mi); */ -#define x86_mcinfo_first(_mi) \ - ((struct mcinfo_common *)(_mi)->mi_data) +#define x86_mcinfo_first(mi) \ + ((struct mcinfo_common *)(mi)->mi_data) /* Prototype: * struct mcinfo_common *x86_mcinfo_next(struct mcinfo_common *mic); */ -#define x86_mcinfo_next(_mic) \ - ((struct mcinfo_common *)((uint8_t *)(_mic) + (_mic)->size)) +#define x86_mcinfo_next(mic) \ + ((struct mcinfo_common *)((uint8_t *)(mic) + (mic)->size)) /* Prototype: - * void x86_mcinfo_lookup(void *ret, struct mc_info *mi, uint16_t type); + * void x86_mcinfo_lookup(void *ret, struct mc_info *mi, uint16_t mc_type); */ -#define x86_mcinfo_lookup(_ret, _mi, _type) \ +#define x86_mcinfo_lookup(ret, mi, mc_type) \ do { \ - uint32_t found, i; \ - struct mcinfo_common *_mic; \ + uint32_t found_, i_; \ + struct mcinfo_common *mic_; \ \ - found = 0; \ - (_ret) = NULL; \ - if (_mi == NULL) break; \ - _mic = x86_mcinfo_first(_mi); \ - for (i = 0; i < x86_mcinfo_nentries(_mi); i++) { \ - if (_mic->type == (_type)) { \ - found = 1; \ + found_ = 0; \ + (ret) = NULL; \ + if (mi == NULL) break; \ + mic_ = x86_mcinfo_first(mi); \ + for (i_ = 0; i_ < x86_mcinfo_nentries(mi); i_++) { \ + if (mic_->type == (mc_type)) { \ + found_ = 1; \ break; \ } \ - _mic = x86_mcinfo_next(_mic); \ + mic_ = x86_mcinfo_next(mic_); \ } \ - (_ret) = found ? _mic : NULL; \ + (ret) = found_ ? mic_ : NULL; \ } while (0)