random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-14 04:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

cpu-uclass: relocate ops pointers for CONFIG_NEEDS_MANUAL_RELOC

Browse Source 
Relocate cpu_ops pointers when CONFIG_NEEDS_MANUAL_RELOC is enabled.

The (gd->flags & GD_FLG_RELOC) check was added to make sure the reloc_done
logic works for drivers that use DM_FLAG_PRE_RELOC.

Signed-off-by: Ovidiu Panait <ovpanait@gmail.com>
Link: https://lore.kernel.org/r/20220531181435.3473549-2-ovpanait@gmail.com
Signed-off-by: Michal Simek <michal.simek@amd.com>
This commit is contained in:
Ovidiu Panait 2022-05-31 21:14:23 +03:00 committed by Michal Simek
parent 15c924a743
commit b391b915bb
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/cpu/cpu-uclass.c
View File

@ -14,6 +14,9 @@
#include <dm/lists.h> #include <dm/lists.h>
#include <dm/root.h> #include <dm/root.h>
#include <linux/err.h> #include <linux/err.h>
#include <relocate.h>
DECLARE_GLOBAL_DATA_PTR;
int cpu_probe_all(void) int cpu_probe_all(void)
{ {
@ -136,9 +139,36 @@ static int uclass_cpu_init(struct uclass *uc)
return ret; return ret;
} }
static int uclass_cpu_post_bind(struct udevice *dev)
{
if (IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC) &&
(gd->flags & GD_FLG_RELOC)) {
struct cpu_ops *ops = cpu_get_ops(dev);
static int reloc_done;
if (!reloc_done) {
if (ops->get_desc)
MANUAL_RELOC(ops->get_desc);
if (ops->get_info)
MANUAL_RELOC(ops->get_info);
if (ops->get_count)
MANUAL_RELOC(ops->get_count);
if (ops->get_vendor)
MANUAL_RELOC(ops->get_vendor);
if (ops->is_current)
MANUAL_RELOC(ops->is_current);
reloc_done++;
}
}
return 0;
}
UCLASS_DRIVER(cpu) = { UCLASS_DRIVER(cpu) = {
.id = UCLASS_CPU, .id = UCLASS_CPU,
.name = "cpu", .name = "cpu",
.flags = DM_UC_FLAG_SEQ_ALIAS, .flags = DM_UC_FLAG_SEQ_ALIAS,
.init = uclass_cpu_init, .init = uclass_cpu_init,
.post_bind = uclass_cpu_post_bind,
}; };