Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-09-23 08:01:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

firmware: zynqmp: Move permission to change config object message

Browse source 
Move the permission to change a config object message from
zynqmp_pmufw_load_config_object function to zynqmp_pmufw_node function
to simplify the code and check the permission only if required.

Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
Link: https://lore.kernel.org/r/20230523124215.30915-4-stefan.herbrechtsmeier-oss@weidmueller.com
Signed-off-by: Michal Simek <michal.simek@amd.com>
This commit is contained in:
Stefan Herbrechtsmeier 2023-05-23 14:42:13 +02:00 committed by Michal Simek
parent d0f1af3ec0
commit ec4739775a
1 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
drivers/firmware/firmware-zynqmp.c
View file

@ -63,29 +63,32 @@ static unsigned int xpm_configobject_close[] = {
int zynqmp_pmufw_config_close(void)
{
zynqmp_pmufw_load_config_object(xpm_configobject_close,
sizeof(xpm_configobject_close));
return 0;
return zynqmp_pmufw_load_config_object(xpm_configobject_close,
sizeof(xpm_configobject_close));
}
int zynqmp_pmufw_node(u32 id)
{
static bool skip_config;
int ret;
static bool check = true;
static bool permission = true;
if (skip_config)
if (check) {
check = false;
if (zynqmp_pmufw_node(NODE_OCM_BANK_0) == -EACCES) {
printf("PMUFW: No permission to change config object\n");
permission = false;
}
}
if (!permission)
return 0;
/* Record power domain id */
xpm_configobject[NODE_ID_LOCATION] = id;
ret = zynqmp_pmufw_load_config_object(xpm_configobject,
sizeof(xpm_configobject));
if (ret == -EACCES && id == NODE_OCM_BANK_0)
skip_config = true;
return 0;
return zynqmp_pmufw_load_config_object(xpm_configobject,
sizeof(xpm_configobject));
}
static int do_pm_probe(void)
@ -250,8 +253,6 @@ int zynqmp_pmufw_load_config_object(const void *cfg_obj, size_t size)
err = xilinx_pm_request(PM_SET_CONFIGURATION, (u32)(u64)cfg_obj, 0, 0,
0, ret_payload);
if (err == XST_PM_NO_ACCESS) {
if (((u32 *)cfg_obj)[NODE_ID_LOCATION] == NODE_OCM_BANK_0)
printf("PMUFW: No permission to change config object\n");
return -EACCES;
}
@ -295,9 +296,6 @@ static int zynqmp_power_probe(struct udevice *dev)
ret >> ZYNQMP_PM_VERSION_MAJOR_SHIFT,
ret & ZYNQMP_PM_VERSION_MINOR_MASK);
if (IS_ENABLED(CONFIG_ARCH_ZYNQMP))
zynqmp_pmufw_node(NODE_OCM_BANK_0);
return 0;
};