Patrick Williams | 864cc43 | 2023-02-09 14:54:44 -0600 | [diff] [blame^] | 1 | From 61f17cf403e2c1108b76556c879aa21945b31dcb Mon Sep 17 00:00:00 2001 |
Andrew Geissler | ea144b03 | 2023-01-27 16:03:57 -0600 | [diff] [blame] | 2 | From: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com> |
| 3 | Date: Wed, 30 Nov 2022 19:14:52 +0000 |
Patrick Williams | 864cc43 | 2023-02-09 14:54:44 -0600 | [diff] [blame^] | 4 | Subject: [PATCH 25/27] efi_setup: discover FF-A bus before raising EFI started |
Andrew Geissler | ea144b03 | 2023-01-27 16:03:57 -0600 | [diff] [blame] | 5 | event |
| 6 | |
| 7 | add FF-A discovery to efi_corstone1000_uboot_efi_started_event() |
| 8 | |
| 9 | Signed-off-by: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com> |
| 10 | Upstream-Status: Pending [Not submitted to upstream yet] |
Patrick Williams | 864cc43 | 2023-02-09 14:54:44 -0600 | [diff] [blame^] | 11 | Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org> |
Andrew Geissler | ea144b03 | 2023-01-27 16:03:57 -0600 | [diff] [blame] | 12 | --- |
| 13 | lib/efi_loader/efi_setup.c | 11 +++++++++-- |
| 14 | 1 file changed, 9 insertions(+), 2 deletions(-) |
| 15 | |
| 16 | diff --git a/lib/efi_loader/efi_setup.c b/lib/efi_loader/efi_setup.c |
Patrick Williams | 864cc43 | 2023-02-09 14:54:44 -0600 | [diff] [blame^] | 17 | index 08c742edbd12..65bd626e49b4 100644 |
Andrew Geissler | ea144b03 | 2023-01-27 16:03:57 -0600 | [diff] [blame] | 18 | --- a/lib/efi_loader/efi_setup.c |
| 19 | +++ b/lib/efi_loader/efi_setup.c |
| 20 | @@ -142,9 +142,16 @@ static efi_status_t efi_init_secure_boot(void) |
| 21 | static int efi_corstone1000_uboot_efi_started_event(void) |
| 22 | { |
| 23 | struct ffa_send_direct_data msg = {0}; |
| 24 | + int ret; |
| 25 | |
| 26 | log_debug("[%s]\n", __func__); |
| 27 | |
| 28 | + ret = ffa_bus_discover(NULL); |
| 29 | + if (ret != 0) { |
| 30 | + log_err("failure to discover FF-A bus\n"); |
| 31 | + return ret; |
| 32 | + } |
| 33 | + |
| 34 | /* |
| 35 | * setting the kernel started event arguments: |
| 36 | * setting capsule update interface ID(31:16) |
Patrick Williams | 864cc43 | 2023-02-09 14:54:44 -0600 | [diff] [blame^] | 37 | @@ -284,9 +291,9 @@ efi_status_t efi_init_obj_list(void) |
Andrew Geissler | ea144b03 | 2023-01-27 16:03:57 -0600 | [diff] [blame] | 38 | int ffa_ret; |
| 39 | ffa_ret = efi_corstone1000_uboot_efi_started_event(); |
| 40 | if (ffa_ret) |
| 41 | - debug("[efi_boottime][ERROR]: Failure to notify SE Proxy FW update service\n"); |
| 42 | + log_err("Failure to notify SE Proxy FW update service\n"); |
| 43 | else |
| 44 | - debug("[efi_boottime][INFO]: SE Proxy FW update service notified\n"); |
| 45 | + debug("SE Proxy FW update service notified\n"); |
| 46 | #endif |
| 47 | |
| 48 | /* Initialize variable services */ |
| 49 | -- |
Patrick Williams | 864cc43 | 2023-02-09 14:54:44 -0600 | [diff] [blame^] | 50 | 2.39.1 |
Andrew Geissler | ea144b03 | 2023-01-27 16:03:57 -0600 | [diff] [blame] | 51 | |