[PATCH 0/3] Misc MISRA fixes from Arm allcode report

[PATCH 0/3] Misc MISRA fixes from Arm allcode report

[Michal Orzel]

The number of violations for clean rules drops from 22 down to 5:
https://gitlab.com/xen-project/people/morzel/xen/-/pipelines/2423381226

Michal Orzel (3):
  xen/arm: acpi: Rename local acpi_size to avoid shadowing typedef
  xen/arm: pci: Narrow scope of file-local symbols
  xen/arm: vpci: Move content of xen/arch/arm/vpci.h to arch header

 xen/arch/arm/acpi/domain_build.c   | 14 +++++-----
 xen/arch/arm/domain.c              |  2 +-
 xen/arch/arm/include/asm/vpci.h    | 18 +++++++++++++
 xen/arch/arm/pci/pci-host-common.c |  4 +--
 xen/arch/arm/pci/pci-host-rcar4.c  |  5 ++--
 xen/arch/arm/pci/pci-host-zynqmp.c |  2 +-
 xen/arch/arm/vpci.h                | 42 ------------------------------
 7 files changed, 32 insertions(+), 55 deletions(-)
 delete mode 100644 xen/arch/arm/vpci.h

-- 
2.43.0

[PATCH 1/3] xen/arm: acpi: Rename local acpi_size to avoid shadowing typedef

[Michal Orzel]

Rename the local variable acpi_size to acpi_len in
estimate_acpi_efi_size() to avoid shadowing the acpi_size typedef
from xen/include/acpi/actypes.h.

This resolves a MISRA C Rule 5.6 violation.

Signed-off-by: Michal Orzel <michal.orzel@amd.com>
---
 xen/arch/arm/acpi/domain_build.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/xen/arch/arm/acpi/domain_build.c b/xen/arch/arm/acpi/domain_build.c
index 1c3555d814cc..5a117001ef11 100644
--- a/xen/arch/arm/acpi/domain_build.c
+++ b/xen/arch/arm/acpi/domain_build.c
@@ -447,18 +447,18 @@ static int __init acpi_create_fadt(struct domain *d, struct membank tbl_add[])
 static int __init estimate_acpi_efi_size(struct domain *d,
                                          const struct kernel_info *kinfo)
 {
-    size_t efi_size, acpi_size, madt_size;
+    size_t efi_size, acpi_len, madt_size;
     u64 addr;
     struct acpi_table_rsdp *rsdp_tbl;
     struct acpi_table_header *table;
 
     efi_size = estimate_efi_size(kernel_info_get_mem_const(kinfo)->nr_banks);
 
-    acpi_size = ROUNDUP(sizeof(struct acpi_table_fadt), 8);
-    acpi_size += ROUNDUP(sizeof(struct acpi_table_stao), 8);
+    acpi_len = ROUNDUP(sizeof(struct acpi_table_fadt), 8);
+    acpi_len += ROUNDUP(sizeof(struct acpi_table_stao), 8);
 
     madt_size = gic_get_hwdom_madt_size(d);
-    acpi_size += ROUNDUP(madt_size, 8);
+    acpi_len += ROUNDUP(madt_size, 8);
 
     addr = acpi_os_get_root_pointer();
     if ( !addr )
@@ -484,12 +484,12 @@ static int __init estimate_acpi_efi_size(struct domain *d,
     }
 
     /* Add place for STAO table in XSDT table */
-    acpi_size += ROUNDUP(table->length + sizeof(u64), 8);
+    acpi_len += ROUNDUP(table->length + sizeof(u64), 8);
     acpi_os_unmap_memory(table, sizeof(struct acpi_table_header));
 
-    acpi_size += ROUNDUP(sizeof(struct acpi_table_rsdp), 8);
+    acpi_len += ROUNDUP(sizeof(struct acpi_table_rsdp), 8);
     d->arch.efi_acpi_len = PAGE_ALIGN(ROUNDUP(efi_size, 8)
-                                      + ROUNDUP(acpi_size, 8));
+                                      + ROUNDUP(acpi_len, 8));
 
     return 0;
 }
-- 
2.43.0

Re: [PATCH 1/3] xen/arm: acpi: Rename local acpi_size to avoid shadowing typedef

[Julien Grall]

Hi Michal,

On 01/04/2026 15:58, Michal Orzel wrote:
> Rename the local variable acpi_size to acpi_len in
> estimate_acpi_efi_size() to avoid shadowing the acpi_size typedef
> from xen/include/acpi/actypes.h.

We can't change actypes.h but I wish they were suffixing the types with _t.

> 
> This resolves a MISRA C Rule 5.6 violation.
> 
> Signed-off-by: Michal Orzel <michal.orzel@amd.com>

Acked-by: Julien Grall <julien@xen.org>

Cheers,

-- 
Julien Grall

[PATCH 2/3] xen/arm: pci: Narrow scope of file-local symbols

[Michal Orzel]

Make pci_alloc_host_bridge() and pci_add_host_bridge() in
pci-host-common.c, rcar4_pcie_ops and rcar4_pcie_child_ops in
pci-host-rcar4.c, and nwl_pcie_ops in pci-host-zynqmp.c static, as
they are only used within their respective translation units.

Also include pci-host-rcar4.h in pci-host-rcar4.c so that the
declarations of its externally visible functions are visible at the
point of definition.

This resolves MISRA C Rule 8.4 violations.

Signed-off-by: Michal Orzel <michal.orzel@amd.com>
---
 xen/arch/arm/pci/pci-host-common.c | 4 ++--
 xen/arch/arm/pci/pci-host-rcar4.c  | 5 +++--
 xen/arch/arm/pci/pci-host-zynqmp.c | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/xen/arch/arm/pci/pci-host-common.c b/xen/arch/arm/pci/pci-host-common.c
index 487c545f3a26..9060afc14d93 100644
--- a/xen/arch/arm/pci/pci-host-common.c
+++ b/xen/arch/arm/pci/pci-host-common.c
@@ -158,7 +158,7 @@ err_exit:
     return NULL;
 }
 
-struct pci_host_bridge *pci_alloc_host_bridge(void)
+static struct pci_host_bridge *pci_alloc_host_bridge(void)
 {
     struct pci_host_bridge *bridge = xzalloc(struct pci_host_bridge);
 
@@ -170,7 +170,7 @@ struct pci_host_bridge *pci_alloc_host_bridge(void)
     return bridge;
 }
 
-void pci_add_host_bridge(struct pci_host_bridge *bridge)
+static void pci_add_host_bridge(struct pci_host_bridge *bridge)
 {
     list_add_tail(&bridge->node, &pci_host_bridges);
 }
diff --git a/xen/arch/arm/pci/pci-host-rcar4.c b/xen/arch/arm/pci/pci-host-rcar4.c
index 9290c6cac5d3..e1e8eb0ee1f9 100644
--- a/xen/arch/arm/pci/pci-host-rcar4.c
+++ b/xen/arch/arm/pci/pci-host-rcar4.c
@@ -13,6 +13,7 @@
 #include <asm/pci.h>
 
 #include "pci-designware.h"
+#include "pci-host-rcar4.h"
 
 #define RCAR4_DWC_VERSION       0x520A
 
@@ -61,7 +62,7 @@ static int __init rcar4_child_cfg_reg_index(struct dt_device_node *np)
 }
 
 /* ECAM ops */
-const struct pci_ecam_ops rcar4_pcie_ops = {
+static const struct pci_ecam_ops rcar4_pcie_ops = {
     .bus_shift  = 20,
     .cfg_reg_index = rcar4_cfg_reg_index,
     .pci_ops    = {
@@ -73,7 +74,7 @@ const struct pci_ecam_ops rcar4_pcie_ops = {
     }
 };
 
-const struct pci_ecam_ops rcar4_pcie_child_ops = {
+static const struct pci_ecam_ops rcar4_pcie_child_ops = {
     .bus_shift  = 20,
     .cfg_reg_index = rcar4_child_cfg_reg_index,
     .pci_ops    = {
diff --git a/xen/arch/arm/pci/pci-host-zynqmp.c b/xen/arch/arm/pci/pci-host-zynqmp.c
index 2c4afa7a19d2..2d98b0069647 100644
--- a/xen/arch/arm/pci/pci-host-zynqmp.c
+++ b/xen/arch/arm/pci/pci-host-zynqmp.c
@@ -27,7 +27,7 @@ static int __init nwl_cfg_reg_index(struct dt_device_node *np)
 }
 
 /* ECAM ops */
-const struct pci_ecam_ops nwl_pcie_ops = {
+static const struct pci_ecam_ops nwl_pcie_ops = {
     .bus_shift  = 20,
     .cfg_reg_index = nwl_cfg_reg_index,
     .pci_ops    = {
-- 
2.43.0

Re: [PATCH 2/3] xen/arm: pci: Narrow scope of file-local symbols

[Julien Grall]

Hi Michal,

On 01/04/2026 15:58, Michal Orzel wrote:
> Make pci_alloc_host_bridge() and pci_add_host_bridge() in
> pci-host-common.c, rcar4_pcie_ops and rcar4_pcie_child_ops in
> pci-host-rcar4.c, and nwl_pcie_ops in pci-host-zynqmp.c static, as
> they are only used within their respective translation units.
> 
> Also include pci-host-rcar4.h in pci-host-rcar4.c so that the
> declarations of its externally visible functions are visible at the
> point of definition.
> 
> This resolves MISRA C Rule 8.4 violations.
> 
> Signed-off-by: Michal Orzel <michal.orzel@amd.com>

Acked-by: Julien Grall <julien@xen.org>

Cheers,

-- 
Julien Grall

[PATCH 3/3] xen/arm: vpci: Move content of xen/arch/arm/vpci.h to arch header

[Michal Orzel]

Move domain_vpci_init() and domain_vpci_get_num_mmio_handlers()
declarations from the private xen/arch/arm/vpci.h into the public
xen/arch/arm/include/asm/vpci.h, and remove the now redundant
private header.

Update domain.c to include <asm/vpci.h> instead of the removed private
header.

This ensures the declarations are visible where the functions are
defined, resolving a MISRA C Rule 8.4 violation.

Signed-off-by: Michal Orzel <michal.orzel@amd.com>
---
I'm moving a file with GPL2+ license to a file with GPL2-only. I consider this
ok in this case becase the copyright on a file with just prototypes does not
make any sense and a license text was most likely blindly copy-pasted like for
most of the files in that era.
---
 xen/arch/arm/domain.c           |  2 +-
 xen/arch/arm/include/asm/vpci.h | 18 ++++++++++++++
 xen/arch/arm/vpci.h             | 42 ---------------------------------
 3 files changed, 19 insertions(+), 43 deletions(-)
 delete mode 100644 xen/arch/arm/vpci.h

diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c
index 581f82bddd48..26380a807cad 100644
--- a/xen/arch/arm/domain.c
+++ b/xen/arch/arm/domain.c
@@ -31,10 +31,10 @@
 #include <asm/tee/tee.h>
 #include <asm/vfp.h>
 #include <asm/vgic.h>
+#include <asm/vpci.h>
 #include <asm/vpsci.h>
 #include <asm/vtimer.h>
 
-#include "vpci.h"
 #include "vuart.h"
 
 DEFINE_PER_CPU(struct vcpu *, curr_vcpu);
diff --git a/xen/arch/arm/include/asm/vpci.h b/xen/arch/arm/include/asm/vpci.h
index db04687fc099..0cc6f5a10532 100644
--- a/xen/arch/arm/include/asm/vpci.h
+++ b/xen/arch/arm/include/asm/vpci.h
@@ -2,6 +2,9 @@
 #ifndef ARM_VPCI_H
 #define ARM_VPCI_H
 
+struct domain;
+
+#ifdef CONFIG_HAS_VPCI
 /* Arch-specific MSI data for vPCI. */
 struct vpci_arch_msi {
 };
@@ -10,4 +13,19 @@ struct vpci_arch_msi {
 struct vpci_arch_msix_entry {
 };
 
+
+int domain_vpci_init(struct domain *d);
+unsigned int domain_vpci_get_num_mmio_handlers(struct domain *d);
+#else
+static inline int domain_vpci_init(struct domain *d)
+{
+    return 0;
+}
+
+static inline unsigned int domain_vpci_get_num_mmio_handlers(struct domain *d)
+{
+    return 0;
+}
+#endif /* CONFIG_HAS_VPCI */
+
 #endif /* ARM_VPCI_H */
diff --git a/xen/arch/arm/vpci.h b/xen/arch/arm/vpci.h
deleted file mode 100644
index 3c713f3fcdb5..000000000000
--- a/xen/arch/arm/vpci.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * xen/arch/arm/vpci.h
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#ifndef __ARCH_ARM_VPCI_H__
-#define __ARCH_ARM_VPCI_H__
-
-#ifdef CONFIG_HAS_VPCI
-int domain_vpci_init(struct domain *d);
-unsigned int domain_vpci_get_num_mmio_handlers(struct domain *d);
-#else
-static inline int domain_vpci_init(struct domain *d)
-{
-    return 0;
-}
-
-static inline unsigned int domain_vpci_get_num_mmio_handlers(struct domain *d)
-{
-    return 0;
-}
-#endif
-
-#endif /* __ARCH_ARM_VPCI_H__ */
-
-/*
- * Local variables:
- * mode: C
- * c-file-style: "BSD"
- * c-basic-offset: 4
- * indent-tabs-mode: nil
- * End:
- */
-- 
2.43.0

Re: [PATCH 3/3] xen/arm: vpci: Move content of xen/arch/arm/vpci.h to arch header

[Julien Grall]

Hi Michal,

On 01/04/2026 15:58, Michal Orzel wrote:
> Move domain_vpci_init() and domain_vpci_get_num_mmio_handlers()
> declarations from the private xen/arch/arm/vpci.h into the public
> xen/arch/arm/include/asm/vpci.h, and remove the now redundant
> private header.

Can you provide a brief explanation why we don't couldn't include 
"vpci.h" from "arch/arm/vpci.c"? Such approach would ...

> 
> Update domain.c to include <asm/vpci.h> instead of the removed private
> header.
> 
> This ensures the declarations are visible where the functions are
> defined, resolving a MISRA C Rule 8.4 violation.
> 
> Signed-off-by: Michal Orzel <michal.orzel@amd.com>
> ---
> I'm moving a file with GPL2+ license to a file with GPL2-only. I consider this
> ok in this case becase the copyright on a file with just prototypes does not
> make any sense and a license text was most likely blindly copy-pasted like for
> most of the files in that era.

... avoid the licensing discussion. I am in the opinion that it is ok to 
move from GPLv2+ to GPLv2 because the license says "either version 2 of 
the License, or (at your option) any later version". But I remember not 
everyone agrees on this interpretation and we never solved the 
discussion on whether we need to request permission from the original 
copyright holder.

Alternatively, I see this file was only modified by two companies (EPAM 
and Arm). I see one employee of each company are already CCed. So you 
could confirm with them if the change is fine.

Cheers,

-- 
Julien Grall

Re: [PATCH 3/3] xen/arm: vpci: Move content of xen/arch/arm/vpci.h to arch header

[Orzel, Michal]

+Rahul

On 02/04/2026 04:44, Julien Grall wrote:
> Hi Michal,
> 
> On 01/04/2026 15:58, Michal Orzel wrote:
>> Move domain_vpci_init() and domain_vpci_get_num_mmio_handlers()
>> declarations from the private xen/arch/arm/vpci.h into the public
>> xen/arch/arm/include/asm/vpci.h, and remove the now redundant
>> private header.
> 
> Can you provide a brief explanation why we don't couldn't include 
> "vpci.h" from "arch/arm/vpci.c"? Such approach would ...
Yes, we could but I think it's better not to use local headers if the main ones
under include already exists. This matches the x86.

> 
>>
>> Update domain.c to include <asm/vpci.h> instead of the removed private
>> header.
>>
>> This ensures the declarations are visible where the functions are
>> defined, resolving a MISRA C Rule 8.4 violation.
>>
>> Signed-off-by: Michal Orzel <michal.orzel@amd.com>
>> ---
>> I'm moving a file with GPL2+ license to a file with GPL2-only. I consider this
>> ok in this case becase the copyright on a file with just prototypes does not
>> make any sense and a license text was most likely blindly copy-pasted like for
>> most of the files in that era.
> 
> ... avoid the licensing discussion. I am in the opinion that it is ok to 
> move from GPLv2+ to GPLv2 because the license says "either version 2 of 
> the License, or (at your option) any later version". But I remember not 
> everyone agrees on this interpretation and we never solved the 
> discussion on whether we need to request permission from the original 
> copyright holder.
> 
> Alternatively, I see this file was only modified by two companies (EPAM 
> and Arm). I see one employee of each company are already CCed. So you 
> could confirm with them if the change is fine.
The header was introduced by Rahul Singh from Arm and Oleksandr Andruschenko
from EPAM. @Rahul, @Bertrand, @Volodymyr - are you ok to move this file to
GPL2-only?

~Michal

Re: [PATCH 3/3] xen/arm: vpci: Move content of xen/arch/arm/vpci.h to arch header

[Volodymyr Babchuk]

Hi Michal,

"Orzel, Michal" <michal.orzel@amd.com> writes:

> +Rahul
>
> On 02/04/2026 04:44, Julien Grall wrote:
>> Hi Michal,
>> 
>> On 01/04/2026 15:58, Michal Orzel wrote:
>>> Move domain_vpci_init() and domain_vpci_get_num_mmio_handlers()
>>> declarations from the private xen/arch/arm/vpci.h into the public
>>> xen/arch/arm/include/asm/vpci.h, and remove the now redundant
>>> private header.
>> 
>> Can you provide a brief explanation why we don't couldn't include 
>> "vpci.h" from "arch/arm/vpci.c"? Such approach would ...
> Yes, we could but I think it's better not to use local headers if the main ones
> under include already exists. This matches the x86.
>
>> 
>>>
>>> Update domain.c to include <asm/vpci.h> instead of the removed private
>>> header.
>>>
>>> This ensures the declarations are visible where the functions are
>>> defined, resolving a MISRA C Rule 8.4 violation.
>>>
>>> Signed-off-by: Michal Orzel <michal.orzel@amd.com>
>>> ---
>>> I'm moving a file with GPL2+ license to a file with GPL2-only. I consider this
>>> ok in this case becase the copyright on a file with just prototypes does not
>>> make any sense and a license text was most likely blindly copy-pasted like for
>>> most of the files in that era.
>> 
>> ... avoid the licensing discussion. I am in the opinion that it is ok to 
>> move from GPLv2+ to GPLv2 because the license says "either version 2 of 
>> the License, or (at your option) any later version". But I remember not 
>> everyone agrees on this interpretation and we never solved the 
>> discussion on whether we need to request permission from the original 
>> copyright holder.
>> 
>> Alternatively, I see this file was only modified by two companies (EPAM 
>> and Arm). I see one employee of each company are already CCed. So you 
>> could confirm with them if the change is fine.
> The header was introduced by Rahul Singh from Arm and Oleksandr Andruschenko
> from EPAM. @Rahul, @Bertrand, @Volodymyr - are you ok to move this file to
> GPL2-only?

Yes, I'm okay with that:

Acked-by: Volodymyr Babchuk <volodymyr_babchuk@epam.com>

-- 
WBR, Volodymyr

Re: [PATCH 3/3] xen/arm: vpci: Move content of xen/arch/arm/vpci.h to arch header

[Luca Fancellu]

Hi Michal,

> On 1 Apr 2026, at 15:58, Michal Orzel <michal.orzel@amd.com> wrote:
> 
> Move domain_vpci_init() and domain_vpci_get_num_mmio_handlers()
> declarations from the private xen/arch/arm/vpci.h into the public
> xen/arch/arm/include/asm/vpci.h, and remove the now redundant
> private header.
> 
> Update domain.c to include <asm/vpci.h> instead of the removed private
> header.
> 
> This ensures the declarations are visible where the functions are
> defined, resolving a MISRA C Rule 8.4 violation.
> 
> Signed-off-by: Michal Orzel <michal.orzel@amd.com>
> ---
> I'm moving a file with GPL2+ license to a file with GPL2-only. I consider this
> ok in this case becase the copyright on a file with just prototypes does not
> make any sense and a license text was most likely blindly copy-pasted like for
> most of the files in that era.
> ---
> xen/arch/arm/domain.c           |  2 +-
> xen/arch/arm/include/asm/vpci.h | 18 ++++++++++++++
> xen/arch/arm/vpci.h             | 42 ---------------------------------
> 3 files changed, 19 insertions(+), 43 deletions(-)
> delete mode 100644 xen/arch/arm/vpci.h

I’m ok for the move, you need to chase EPAM approval

Reviewed-by: Luca Fancellu <luca.fancellu@arm.com>