Skip to content

Commit

Permalink
firmware: arm_ffa: Allow FF-A initialisation even when notification f…
Browse files Browse the repository at this point in the history
…ails

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/[email protected]
Tested-by: Jens Wiklander <[email protected]>
Signed-off-by: Sudeep Holla <[email protected]>
  • Loading branch information
sudeep-holla committed Nov 13, 2023
1 parent 3fad96e commit 95520fc
Showing 1 changed file with 8 additions and 12 deletions.
20 changes: 8 additions & 12 deletions drivers/firmware/arm_ffa/driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

ret = ffa_features(FFA_NOTIFICATION_BITMAP_CREATE, 0, NULL, NULL);
if (ret) {
pr_err("Notifications not supported, continuing with it ..\n");
return 0;
pr_info("Notifications not supported, continuing with it ..\n");
return;
}

ret = ffa_notification_bitmap_create();
if (ret) {
pr_err("notification_bitmap_create error %d\n", ret);
return ret;
pr_info("Notification bitmap create error %d\n", ret);
return;
}
drv_info->bitmap_created = true;

Expand All @@ -1426,10 +1426,10 @@ static int ffa_notifications_setup(void)
ret = ffa_sched_recv_cb_update(drv_info->vm_id, ffa_self_notif_handle,
drv_info, true);
if (!ret)
return ret;
return;
cleanup:
pr_info("Notification setup failed %d, not enabled\n", ret);
ffa_notifications_cleanup();
return ret;
}

static int __init ffa_init(void)
Expand Down Expand Up @@ -1487,13 +1487,9 @@ static int __init ffa_init(void)

ffa_set_up_mem_ops_native_flag();

ret = ffa_notifications_setup();
if (ret)
goto partitions_cleanup;
ffa_notifications_setup();

return 0;
partitions_cleanup:
ffa_partitions_cleanup();
free_pages:
if (drv_info->tx_buffer)
free_pages_exact(drv_info->tx_buffer, RXTX_BUFFER_SIZE);
Expand Down

0 comments on commit 95520fc

Please sign in to comment.