[U-Boot] common: command: Fix manual relocation for repeatable command
diff mbox series

Message ID 846f155a185eded109959316b8e4c0e43a710b41.1571667905.git.michal.simek@xilinx.com
State Accepted
Commit 6f94daf9151e76f68a2a46d15862e232436a14e3
Delegated to: Tom Rini
Headers show
Series
  • [U-Boot] common: command: Fix manual relocation for repeatable command
Related show

Commit Message

Michal Simek Oct. 21, 2019, 2:25 p.m. UTC
All platforms which are using MANUAL_RELOC are jumping back to origin
location when repeatable command is called. The reason is that cmd_rep link
is not updated properly. Issue can be reproduced by rewriting origin
U-Boot location through (for example) file download by tftp command.

Fixes: 80a48dd47e3b ("common: command: Rework the 'cmd is repeatable' logic")
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

 common/command.c | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Michal Simek Oct. 24, 2019, 11:35 a.m. UTC | #1
po 21. 10. 2019 v 16:25 odesílatel Michal Simek
<michal.simek@xilinx.com> napsal:
>
> All platforms which are using MANUAL_RELOC are jumping back to origin
> location when repeatable command is called. The reason is that cmd_rep link
> is not updated properly. Issue can be reproduced by rewriting origin
> U-Boot location through (for example) file download by tftp command.
>
> Fixes: 80a48dd47e3b ("common: command: Rework the 'cmd is repeatable' logic")
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> ---
>
>  common/command.c | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/common/command.c b/common/command.c
> index 4b887a267fb6..ceca99251076 100644
> --- a/common/command.c
> +++ b/common/command.c
> @@ -496,6 +496,11 @@ void fixup_cmdtable(cmd_tbl_t *cmdtp, int size)
>         for (i = 0; i < size; i++) {
>                 ulong addr;
>
> +               addr = (ulong)(cmdtp->cmd_rep) + gd->reloc_off;
> +               cmdtp->cmd_rep =
> +                       (int (*)(struct cmd_tbl_s *, int, int,
> +                                char * const [], int *))addr;
> +
>                 addr = (ulong)(cmdtp->cmd) + gd->reloc_off;
>  #ifdef DEBUG_COMMANDS
>                 printf("Command \"%s\": 0x%08lx => 0x%08lx\n",
> --
> 2.17.1
>

Queue for rc1 because this is big issue which should be fixed ASAP and
only MB and m68k are affected by this patch.

Thanks,
Michal

Patch
diff mbox series

diff --git a/common/command.c b/common/command.c
index 4b887a267fb6..ceca99251076 100644
--- a/common/command.c
+++ b/common/command.c
@@ -496,6 +496,11 @@  void fixup_cmdtable(cmd_tbl_t *cmdtp, int size)
 	for (i = 0; i < size; i++) {
 		ulong addr;
 
+		addr = (ulong)(cmdtp->cmd_rep) + gd->reloc_off;
+		cmdtp->cmd_rep =
+			(int (*)(struct cmd_tbl_s *, int, int,
+				 char * const [], int *))addr;
+
 		addr = (ulong)(cmdtp->cmd) + gd->reloc_off;
 #ifdef DEBUG_COMMANDS
 		printf("Command \"%s\": 0x%08lx => 0x%08lx\n",