From 274f82247dbb06dde3095d1476c0ce70fefb7913 Mon Sep 17 00:00:00 2001 From: Gowtham Suresh Kumar Date: Tue, 4 Jan 2022 17:06:51 +0000 Subject: [PATCH] arm-bsp/u-boot: corstone1000: Disable mm_communicate failure log When a getVariable() call is made with data size set to 0, mm_communicate should return EFI_BUFFER_TOO_SMALL. This is an expected behavior. There should not be any failure logs in this case. So the error log is commented here. Change-Id: Id5b36928b1450ef9f83d34a3ab7feb4839ff9734 Signed-off-by: Gowtham Suresh Kumar Signed-off-by: Jon Mason --- ...0-Comment-mm_communicate-failure-log.patch | 35 +++++++++++++++++++ .../recipes-bsp/u-boot/u-boot_%.bbappend | 1 + 2 files changed, 36 insertions(+) create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0050-Comment-mm_communicate-failure-log.patch diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0050-Comment-mm_communicate-failure-log.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0050-Comment-mm_communicate-failure-log.patch new file mode 100644 index 00000000..9f4b00c7 --- /dev/null +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0050-Comment-mm_communicate-failure-log.patch @@ -0,0 +1,35 @@ +Upstream-Status: Pending [Not submitted to upstream yet] +Signed-off-by: Gowtham Suresh Kumar + +From 152ff06c983b7b1a685d82bc229efdd6260d9a12 Mon Sep 17 00:00:00 2001 +From: Gowtham Suresh Kumar +Date: Fri, 24 Dec 2021 14:22:52 +0000 +Subject: [PATCH] Comment mm_communicate failure log + +When a getVariable() call is made with data size set to 0, +mm_communicate should return EFI_BUFFER_TOO_SMALL. This is +an expected behavior. There should not be any failure logs +in this case. So the error log is commented here. +--- + lib/efi_loader/efi_variable_tee.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/lib/efi_loader/efi_variable_tee.c b/lib/efi_loader/efi_variable_tee.c +index b466702983..fc4d684669 100644 +--- a/lib/efi_loader/efi_variable_tee.c ++++ b/lib/efi_loader/efi_variable_tee.c +@@ -407,7 +407,10 @@ static efi_status_t __efi_runtime mm_communicate(u8 *comm_buf, efi_uintn_t dsize + ret = ffa_mm_communicate(comm_buf, dsize); + #endif + if (ret != EFI_SUCCESS) { +- log_err("%s failed!\n", __func__); ++ /* mm_communicate failure is logged even when getVariable() is called ++ * with data size set to 0. This is not expected so logging is commented. ++ */ ++ //log_err("%s failed!\n", __func__); + return ret; + } + +-- +2.17.1 + diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend index 51973dda..7762cb6d 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend @@ -59,6 +59,7 @@ SRC_URI:append:corstone1000 = " \ file://0047-efi_firmware-add-get_image_info-for-corstone1000.patch \ file://0048-corstone1000-enable-ethernet-device.patch \ file://0049-efi_loader-Fix-loaded-image-alignment.patch \ + file://0050-Comment-mm_communicate-failure-log.patch \ " #