]> rtime.felk.cvut.cz Git - vajnamar/linux-xlnx.git/commitdiff
remoteproc: elf loader: revert obsolete change
authorWendy Liang <wendy.liang@xilinx.com>
Thu, 14 Sep 2017 18:22:03 +0000 (11:22 -0700)
committerMichal Simek <michal.simek@xilinx.com>
Fri, 15 Sep 2017 06:26:26 +0000 (08:26 +0200)
This patch is to revert the change to get the loaded
resource table which is no longer required.

The change to remove is part of
commit 106a1dc8416d ("Merge tag 'v3.10' into master-next")

Signed-off-by: Wendy Liang <jliang@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
drivers/remoteproc/remoteproc_elf_loader.c

index d4cbed2c1157edb1cd76ef8b62af082a9f429727..f5080833d09da57bf5e1589284d11f4924d2a20a 100644 (file)
@@ -321,14 +321,12 @@ rproc_elf_find_loaded_rsc_table(struct rproc *rproc, const struct firmware *fw)
 {
        struct elf32_hdr *ehdr = (struct elf32_hdr *)fw->data;
        struct elf32_shdr *shdr;
-       const u8 *elf_data = fw->data;
-       struct elf32_phdr *phdr = (struct elf32_phdr *)(elf_data + ehdr->e_phoff);
 
        shdr = find_table(&rproc->dev, ehdr, fw->size);
        if (!shdr)
                return NULL;
 
-       return rproc_da_to_va(rproc, shdr->sh_addr - phdr->p_vaddr + phdr->p_paddr, shdr->sh_size);
+       return rproc_da_to_va(rproc, shdr->sh_addr, shdr->sh_size);
 }
 
 /**