mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-10 23:24:38 +00:00
cpu-uclass: relocate ops pointers for CONFIG_NEEDS_MANUAL_RELOC
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:
parent
15c924a743
commit
b391b915bb
1 changed files with 30 additions and 0 deletions
|
@ -14,6 +14,9 @@
|
|||
#include <dm/lists.h>
|
||||
#include <dm/root.h>
|
||||
#include <linux/err.h>
|
||||
#include <relocate.h>
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
int cpu_probe_all(void)
|
||||
{
|
||||
|
@ -136,9 +139,36 @@ static int uclass_cpu_init(struct uclass *uc)
|
|||
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) = {
|
||||
.id = UCLASS_CPU,
|
||||
.name = "cpu",
|
||||
.flags = DM_UC_FLAG_SEQ_ALIAS,
|
||||
.init = uclass_cpu_init,
|
||||
.post_bind = uclass_cpu_post_bind,
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue