Commit 95520fc0 authored by Sudeep Holla's avatar Sudeep Holla

firmware: arm_ffa: Allow FF-A initialisation even when notification fails

FF-A notifications are optional feature in the specification. Currently
we allow to continue if the firmware reports no support for the
notifications. However, we fail to continue and complete the FF-A
driver initialisation if the notification setup fails for any reason.

Let us allow the FF-A driver to complete the initialisation even if the
notification fails to setup. We will just flag the error and continue
to provide other features in the driver.

Link: https://lore.kernel.org/r/20231024-ffa-notification-fixes-v1-1-d552c0ec260d@arm.comTested-by: default avatarJens Wiklander <jens.wiklander@linaro.org>
Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
parent 3fad96e9
...@@ -1390,20 +1390,20 @@ static void ffa_notifications_cleanup(void) ...@@ -1390,20 +1390,20 @@ static void ffa_notifications_cleanup(void)
} }
} }
static int ffa_notifications_setup(void) static void ffa_notifications_setup(void)
{ {
int ret, irq; int ret, irq;
ret = ffa_features(FFA_NOTIFICATION_BITMAP_CREATE, 0, NULL, NULL); ret = ffa_features(FFA_NOTIFICATION_BITMAP_CREATE, 0, NULL, NULL);
if (ret) { if (ret) {
pr_err("Notifications not supported, continuing with it ..\n"); pr_info("Notifications not supported, continuing with it ..\n");
return 0; return;
} }
ret = ffa_notification_bitmap_create(); ret = ffa_notification_bitmap_create();
if (ret) { if (ret) {
pr_err("notification_bitmap_create error %d\n", ret); pr_info("Notification bitmap create error %d\n", ret);
return ret; return;
} }
drv_info->bitmap_created = true; drv_info->bitmap_created = true;
...@@ -1426,10 +1426,10 @@ static int ffa_notifications_setup(void) ...@@ -1426,10 +1426,10 @@ static int ffa_notifications_setup(void)
ret = ffa_sched_recv_cb_update(drv_info->vm_id, ffa_self_notif_handle, ret = ffa_sched_recv_cb_update(drv_info->vm_id, ffa_self_notif_handle,
drv_info, true); drv_info, true);
if (!ret) if (!ret)
return ret; return;
cleanup: cleanup:
pr_info("Notification setup failed %d, not enabled\n", ret);
ffa_notifications_cleanup(); ffa_notifications_cleanup();
return ret;
} }
static int __init ffa_init(void) static int __init ffa_init(void)
...@@ -1487,13 +1487,9 @@ static int __init ffa_init(void) ...@@ -1487,13 +1487,9 @@ static int __init ffa_init(void)
ffa_set_up_mem_ops_native_flag(); ffa_set_up_mem_ops_native_flag();
ret = ffa_notifications_setup(); ffa_notifications_setup();
if (ret)
goto partitions_cleanup;
return 0; return 0;
partitions_cleanup:
ffa_partitions_cleanup();
free_pages: free_pages:
if (drv_info->tx_buffer) if (drv_info->tx_buffer)
free_pages_exact(drv_info->tx_buffer, RXTX_BUFFER_SIZE); free_pages_exact(drv_info->tx_buffer, RXTX_BUFFER_SIZE);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment