firmware: arm_ffa: Handle the presence of host partition in the partition info

[ Upstream commit 2f622a8b0722d332a2a149794a3add47bc9bdcf3 ]

Currently it is assumed that the firmware doesn't present the host
partition in the list of partitions presented as part of the response
to PARTITION_INFO_GET from the firmware. However, there are few
platforms that prefer to present the same in the list of partitions.
It is not manadatory but not restricted as well.

So handle the same by making sure to check the presence of the host
VM ID in the XArray partition information maintained/managed in the
driver before attempting to add it.

Tested-by: Viresh Kumar <viresh.kumar@linaro.org>
Message-Id: <20250217-ffa_updates-v3-7-bd1d9de615e7@arm.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/firmware/arm_ffa/driver.c b/drivers/firmware/arm_ffa/driver.c
index ca9a27fceb1fd5528eba96bb5d3b490aa8322717..d545d2513205177a545891a0795a3663e13462e0 100644 (file)
--- a/drivers/firmware/arm_ffa/driver.c
+++ b/drivers/firmware/arm_ffa/driver.c
@@ -1458,6 +1458,10 @@ static int ffa_setup_partitions(void)
 
        kfree(pbuf);
 
+       /* Check if the host is already added as part of partition info */
+       if (xa_load(&drv_info->partition_info, drv_info->vm_id))
+               return 0;
+
        /* Allocate for the host */
        ret = ffa_xa_add_partition_info(drv_info->vm_id);
        if (ret)