[PATCH] sbsa: Fix build with gcc13

[PATCH] sbsa: Fix build with gcc13

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../uefi/sbsa-acs/enum-int-mismatch.patch     | 32 +++++++++++++++++++
 meta-arm/recipes-bsp/uefi/sbsa-acs_1.0.bb     |  1 +
 2 files changed, 33 insertions(+)
 create mode 100644 meta-arm/recipes-bsp/uefi/sbsa-acs/enum-int-mismatch.patch

diff --git a/meta-arm/recipes-bsp/uefi/sbsa-acs/enum-int-mismatch.patch b/meta-arm/recipes-bsp/uefi/sbsa-acs/enum-int-mismatch.patch
new file mode 100644
index 00000000..29b2e2f3
--- /dev/null
+++ b/meta-arm/recipes-bsp/uefi/sbsa-acs/enum-int-mismatch.patch
@@ -0,0 +1,32 @@
+Fix function protype mismatches
+
+These are flagged by gcc13
+avs_gic.c:241:1: error: conflicting types for 'val_gic_get_info' due to enum/integer mismatch; have 'uint32_t(uint32_t)' {aka 'unsigned int(unsigned int)'} [-Werror=enum-int-mismatch]
+|   241 | val_gic_get_info(uint32_t type)
+|       | ^~~~~~~~~~~~~~~~
+
+Upstream-Status: Submitted [https://github.com/ARM-software/sbsa-acs/pull/291]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+--- a/ShellPkg/Application/sbsa-acs/val/include/val_interface.h
++++ b/ShellPkg/Application/sbsa-acs/val/include/val_interface.h
+@@ -155,7 +155,7 @@ typedef enum {
+ void     val_wd_create_info_table(uint64_t *wd_info_table);
+ void     val_wd_free_info_table(void);
+ uint32_t val_wd_execute_tests(uint32_t level, uint32_t num_pe);
+-uint64_t val_wd_get_info(uint32_t index, uint32_t info_type);
++uint64_t val_wd_get_info(uint32_t index, WD_INFO_TYPE_e info_type);
+ uint32_t val_wd_set_ws0(uint32_t index, uint32_t timeout);
+ 
+ 
+--- a/ShellPkg/Application/sbsa-acs/val/src/avs_gic.c
++++ b/ShellPkg/Application/sbsa-acs/val/src/avs_gic.c
+@@ -238,7 +238,7 @@ val_get_cpuif_base(void)
+   @return  32-bit data
+ **/
+ uint32_t
+-val_gic_get_info(uint32_t type)
++val_gic_get_info(GIC_INFO_e type)
+ {
+   uint32_t rdbase_len;
+ 
diff --git a/meta-arm/recipes-bsp/uefi/sbsa-acs_1.0.bb b/meta-arm/recipes-bsp/uefi/sbsa-acs_1.0.bb
index 95096e61..8c0473a7 100644
--- a/meta-arm/recipes-bsp/uefi/sbsa-acs_1.0.bb
+++ b/meta-arm/recipes-bsp/uefi/sbsa-acs_1.0.bb
@@ -8,6 +8,7 @@ SRC_URI += "git://github.com/ARM-software/sbsa-acs;destsuffix=edk2/ShellPkg/Appl
             git://github.com/tianocore/edk2-libc;destsuffix=edk2/edk2-libc;protocol=https;branch=master;name=libc \
             file://shell.patch \
             file://use_bfd_linker.patch \
+            file://enum-int-mismatch.patch \
             file://0001-Revert-peripheral-test-3-updated-for-multiple-uarts.patch;patchdir=ShellPkg/Application/sbsa-acs \
             "
 
-- 
2.39.1

Re: [PATCH] sbsa: Fix build with gcc13

[Jon Mason]

On Thu, 2 Feb 2023 17:48:59 -0800, Khem Raj wrote:
> 


Applied, thanks!

[1/1] sbsa: Fix build with gcc13
      commit: 70fbe7fe1286b47122fd2b4e715c46cd0b2d1a23

Best regards,
-- 
Jon Mason <jon.mason@arm.com>