update fwts patches for IORT updates

- CANWBS flag is added in IORT E.f specification, fwts test updated. Fixes : #216 Signed-off-by: Amrathesh <[email protected]> Change-Id: I1b0d8b1548780495949293749bf08ba737d5e2a9
ARM-software · Nov 12, 2024 · 2fd4e9b · 2fd4e9b
1 parent 68accd2
commit 2fd4e9b
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 4 deletions.
diff --git a/IR/Yocto/build-scripts/get_source.sh b/IR/Yocto/build-scripts/get_source.sh
@@ -134,7 +134,8 @@ copy_recipes()
     # copy any patches to linux src files directory
     cp $COMMON_DIR_PATH/patches/tpm-tis-spi-Add-hardware-wait-polling.patch $TOP_DIR/meta-woden/recipes-kernel/linux/files
     cp $COMMON_DIR_PATH/patches/0001-disable-default-psci-checker-run.patch $TOP_DIR/meta-woden/recipes-kernel/linux/files
-    cp $COMMON_DIR_PATH/patches/fwts_last_attempt_status.patch $TOP_DIR/meta-woden/recipes-acs/fwts/files
+    cp $COMMON_DIR_PATH/patches/0007-fwts-last-attempt-status.patch $TOP_DIR/meta-woden/recipes-acs/fwts/files
+    cp $COMMON_DIR_PATH/patches/0008-acpi-iort-memory-access-flag-update.patch $TOP_DIR/meta-woden/recipes-acs/fwts/files
 }
 
 copy_recipes

diff --git a/IR/Yocto/meta-woden/recipes-acs/fwts/fwts_23.07.00.bb b/IR/Yocto/meta-woden/recipes-acs/fwts/fwts_23.07.00.bb
@@ -11,7 +11,7 @@ SRC_URI = "http://fwts.ubuntu.com/release/fwts-V${PV}.tar.gz;subdir=${BP} \
            file://0005-Undefine-PAGE_SIZE.patch \
            file://0006-use-intptr_t-to-fix-pointer-to-int-cast-issues.patch \
            file://0001-uefi-esrt-Added-esrt_test2-for-EBBR.patch \
-           file://fwts_last_attempt_status.patch \
+           file://0007-fwts-last-attempt-status.patch \
            "
 SRC_URI[sha256sum] = "a15e11c42856e9dfcf7ac23ed370618d2777eb996dd7843accf12d45b21b551c"
 

diff --git a/IR/Yocto/meta-woden/recipes-acs/fwts/fwts_24.03.00.bb b/IR/Yocto/meta-woden/recipes-acs/fwts/fwts_24.03.00.bb
@@ -10,6 +10,7 @@ SRC_URI = "http://fwts.ubuntu.com/release/fwts-V${PV}.tar.gz;subdir=${BP} \
            file://0004-Define-__SWORD_TYPE-if-not-defined-by-libc.patch \
            file://0005-Undefine-PAGE_SIZE.patch \
            file://0001-uefi-esrt-Added-esrt_test2-for-EBBR.patch \
+           file://0008-acpi-iort-memory-access-flag-update.patch \
            "
 SRC_URI[sha256sum] = "d7f2642b1ec3697be798409decd6593d52bb1438f0d2dc697cbc85f52d19b41e"
 
@@ -30,4 +31,4 @@ FILES:${PN} += "${libdir}/fwts/lib*${SOLIBS}"
 FILES:${PN}-dev += "${libdir}/fwts/lib*${SOLIBSDEV} ${libdir}/fwts/lib*.la"
 FILES:${PN}-staticdev += "${libdir}/fwts/lib*a"
 
-RDEPENDS:${PN} += "dtc"
+RDEPENDS:${PN} += "dtc"
diff --git a/...on/patches/fwts_last_attempt_status.patch → ...tches/0007-fwts-last-attempt-status.patch b/...on/patches/fwts_last_attempt_status.patch → ...tches/0007-fwts-last-attempt-status.patch
diff --git a/common/patches/0008-acpi-iort-memory-access-flag-update.patch b/common/patches/0008-acpi-iort-memory-access-flag-update.patch
@@ -0,0 +1,30 @@
+From ec761526eaad78ca12ea888dc58c1ed906b5a5a2 Mon Sep 17 00:00:00 2001
+From: Simon Wang <[email protected]>
+Date: Fri, 1 Nov 2024 04:17:17 -0700
+Subject: acpi: iort: memory access flag update.
+
+BugLink: https://bugs.launchpad.net/fwts/+bug/2086029
+Update the reserved bits of memory access flag with IORT spec E.f.
+
+Signed-off-by: Simon Wang <[email protected]>
+Acked-by: Ivan Hu <[email protected]>
+---
+ src/acpi/iort/iort.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/acpi/iort/iort.c b/src/acpi/iort/iort.c
+index e586e2ca..82933083 100644
+--- a/src/acpi/iort/iort.c
++++ b/src/acpi/iort/iort.c
+@@ -405,7 +405,7 @@ static void iort_memory_access_properties_check(
+ 	fwts_acpi_reserved_zero("IORT", field, properties->reserved, passed);
+
+ 	snprintf(field, sizeof(field), "%s  Memory Access Flags", name);
+-	fwts_acpi_reserved_bits("IORT", field, properties->memory_access_flags, 2, 7, passed);
++	fwts_acpi_reserved_bits("IORT", field, properties->memory_access_flags, 3, 7, passed);
+
+ 	cca = properties->cache_coherent & 1;
+ 	cpm = properties->memory_access_flags & 1;
+-- 
+cgit v1.2.3
+
diff --git a/common/scripts/get_source.sh b/common/scripts/get_source.sh
@@ -230,7 +230,8 @@ get_buildroot_src()
     pushd $TOP_DIR/buildroot/package/fwts
         echo "Applying Buildroot FWTS patch..."
         git apply $TOP_DIR/../../common/patches/build_fwts_version_24.03.00.patch
-        git apply $TOP_DIR/../../common/patches/fwts_last_attempt_status.patch
+	# copy patches to fwts source
+	cp $TOP_DIR/../../common/patches/0008-acpi-iort-memory-access-flag-update.patch .
     popd
 }