Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp587506ybp; Fri, 4 Oct 2019 01:33:22 -0700 (PDT) X-Google-Smtp-Source: APXvYqz3pqKKrfisOu0iQg/dQ3hO2DlpXOjMcFwftX49+d/KmDb5epkefA9CcZUOu+WWVTO0vXuj X-Received: by 2002:a17:906:80c3:: with SMTP id a3mr11183199ejx.271.1570178002785; Fri, 04 Oct 2019 01:33:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570178002; cv=none; d=google.com; s=arc-20160816; b=AAW/gAQcK/+FFQpjYecFn3XFTkJIguEkGKttAkic5AxeiL+6RYQEpNJ660LAXlbbeD 6ML36to2nHtDfIQbmFyKma0S0CIT62edwkZpf9LHAftdYF3wtWxDtGTYD2WFY1Gp2opi nvFXG7/wS3wMO+7fWmrV44KjcysEkxvFUsQDbyv0a5NcKxxxOkSuIHCJC3piGa9iJKuJ RQ4pFHtOZu5ik4O7hUwIq/gIit/aPnX3meLN6ueIEpzClLfVZTy3P5plLyHX8ZP3qb3J oaa4xAFiYkwv7ec0SKOkZNZvlrtK68xC4HdV9bBZnXEEUfs66H34PEtCBAi2St7ZOX50 lQoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:thread-index:thread-topic :content-transfer-encoding:mime-version:subject:references :in-reply-to:message-id:cc:to:from:date:dkim-signature:dkim-filter; bh=V5c5q7AnrElqyRA95/ufDnoEalYyEwF4WtFB5+mVTVQ=; b=pMCEEj7rKw9RJ7m68fJRPdy44qyFRY5JK2ExU1Dtqf+YuAbzP5MIOW/NGUoKVt7Foq I/wDc4B9hlP+nIK0PyeEpizmGsbiX6CeHjtpdaLbXNAqhdn/xjvAiiukvPm3QeCtwdg9 lYm2Ohk6vuCCkTga/Y5VCy1vw55EUDc30cQhPZwk6hlQmyI17YEcJNcXziTlhRbJ4bsc WEBNF5OzcL4V9pLL8wxg2oEphQ7jzU125fYC/tBepjJxzlVw0MsH8S9BrcM+Sx3CHsCS Ix0sP3EFiSIRa6HBdLXRDcGcN0azWjeRq79t7tL2w0mgZm85TN4LAeJDKDLmBohif5i6 c2KA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kalray.eu header.s=32AE1B44-9502-11E5-BA35-3734643DEF29 header.b=cvnXTTQn; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=kalray.eu Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r2si2480184ejj.90.2019.10.04.01.32.58; Fri, 04 Oct 2019 01:33:22 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kalray.eu header.s=32AE1B44-9502-11E5-BA35-3734643DEF29 header.b=cvnXTTQn; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=kalray.eu Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729133AbfJDI1c (ORCPT + 99 others); Fri, 4 Oct 2019 04:27:32 -0400 Received: from zimbra2.kalray.eu ([92.103.151.219]:49720 "EHLO zimbra2.kalray.eu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728962AbfJDI1c (ORCPT ); Fri, 4 Oct 2019 04:27:32 -0400 Received: from localhost (localhost [127.0.0.1]) by zimbra2.kalray.eu (Postfix) with ESMTP id 0DDAE27E0415; Fri, 4 Oct 2019 10:27:30 +0200 (CEST) Received: from zimbra2.kalray.eu ([127.0.0.1]) by localhost (zimbra2.kalray.eu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id 0VNm-V2HtI5B; Fri, 4 Oct 2019 10:27:29 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by zimbra2.kalray.eu (Postfix) with ESMTP id 2344327E0DD2; Fri, 4 Oct 2019 10:27:29 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.10.3 zimbra2.kalray.eu 2344327E0DD2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kalray.eu; s=32AE1B44-9502-11E5-BA35-3734643DEF29; t=1570177649; bh=V5c5q7AnrElqyRA95/ufDnoEalYyEwF4WtFB5+mVTVQ=; h=Date:From:To:Message-ID:MIME-Version; b=cvnXTTQnbbQMskwSIffoEx9O5pu81BjLkFPX4ZiCFBPyXfKDpVAmflf1AM2Gky4lo iMCUqj6bjdw3hcNl94FSqSyfGhN397gG/UmSvQ7EkXuUAFCJEWBVxYiJcTZbbJHa8z PBOd3IdiUZAZK65tkLsvFXthT86YjvU+dMbU1SdY= X-Virus-Scanned: amavisd-new at zimbra2.kalray.eu Received: from zimbra2.kalray.eu ([127.0.0.1]) by localhost (zimbra2.kalray.eu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id v_3i41XLbXRG; Fri, 4 Oct 2019 10:27:29 +0200 (CEST) Received: from zimbra2.kalray.eu (localhost [127.0.0.1]) by zimbra2.kalray.eu (Postfix) with ESMTP id 0A9AF27E0415; Fri, 4 Oct 2019 10:27:29 +0200 (CEST) Date: Fri, 4 Oct 2019 10:27:28 +0200 (CEST) From: =?utf-8?Q?Cl=C3=A9ment?= Leger To: Ohad Ben-Cohen , Bjorn Andersson , linux-remoteproc , linux-kernel Cc: Loic PALLARDY , Arnaud Pouliquen Message-ID: <680522669.83582975.1570177648885.JavaMail.zimbra@kalray.eu> In-Reply-To: <888841229.65143809.1568372299278.JavaMail.zimbra@kalray.eu> References: <04be3345-698d-29b0-7b4b-7eed088e490d@st.com> <20190819114516.28665-1-cleger@kalray.eu> <888841229.65143809.1568372299278.JavaMail.zimbra@kalray.eu> Subject: Re: [PATCH] rproc: Add elf64 support in elf loader MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [192.168.40.202] X-Mailer: Zimbra 8.8.12_GA_3794 (ZimbraWebClient - GC75 (Linux)/8.8.12_GA_3794) Thread-Topic: rproc: Add elf64 support in elf loader Thread-Index: qYnAXEk8s9A0edtfgVQpSjpD3wixNMUNe6Oc Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Ping ? ----- On 13 Sep, 2019, at 12:58, Cl=C3=A9ment Leger cleger@kalray.eu wrote: > Ping ? >=20 > ----- On 19 Aug, 2019, at 13:45, Cl=C3=A9ment Leger cleger@kalray.eu wrot= e: >=20 >> From: Cl=C3=A9ment Leger >>=20 >> elf32 and elf64 mainly differ by their types. In order to avoid >> copy/pasting the whole loader code, generate static inline functions >> which will access values according to the elf class. It allows to keep a >> common loader basis. >> In order to accomodate both elf types sizes, the maximum size for a >> elf header member is chosen using the maximum value of both elf class. >>=20 >> Signed-off-by: Clement Leger >> Tested-by: Arnaud POULIQUEN >> --- >> drivers/remoteproc/remoteproc_elf_loader.c | 135 ++++++++++++++++++-----= ------ >> drivers/remoteproc/remoteproc_elf_loader.h | 69 +++++++++++++++ >> drivers/remoteproc/remoteproc_internal.h | 2 +- >> drivers/remoteproc/st_remoteproc.c | 2 +- >> include/linux/remoteproc.h | 4 +- >> 5 files changed, 156 insertions(+), 56 deletions(-) >> create mode 100644 drivers/remoteproc/remoteproc_elf_loader.h >>=20 >> diff --git a/drivers/remoteproc/remoteproc_elf_loader.c >> b/drivers/remoteproc/remoteproc_elf_loader.c >> index b17d72ec8603..6a2d31d6092c 100644 >> --- a/drivers/remoteproc/remoteproc_elf_loader.c >> +++ b/drivers/remoteproc/remoteproc_elf_loader.c >> @@ -31,6 +31,7 @@ >> #include >>=20 >> #include "remoteproc_internal.h" >> +#include "remoteproc_elf_loader.h" >>=20 >> /** >> * rproc_elf_sanity_check() - Sanity Check ELF firmware image >> @@ -43,8 +44,16 @@ int rproc_elf_sanity_check(struct rproc *rproc, const= struct >> firmware *fw) >> { >> =09const char *name =3D rproc->firmware; >> =09struct device *dev =3D &rproc->dev; >> +=09/* >> +=09 * Elf files are beginning with the same structure. Thus, to simplif= y >> +=09 * header parsing, we can use the elf32_hdr one for both elf64 and >> +=09 * elf32. >> +=09 */ >> =09struct elf32_hdr *ehdr; >> +=09u32 elf_shdr_size; >> +=09u64 phoff, shoff; >> =09char class; >> +=09u16 phnum; >>=20 >> =09if (!fw) { >> =09=09dev_err(dev, "failed to load %s\n", name); >> @@ -58,9 +67,13 @@ int rproc_elf_sanity_check(struct rproc *rproc, const= struct >> firmware *fw) >>=20 >> =09ehdr =3D (struct elf32_hdr *)fw->data; >>=20 >> -=09/* We only support ELF32 at this point */ >> +=09if (memcmp(ehdr->e_ident, ELFMAG, SELFMAG)) { >> +=09=09dev_err(dev, "Image is corrupted (bad magic)\n"); >> +=09=09return -EINVAL; >> +=09} >> + >> =09class =3D ehdr->e_ident[EI_CLASS]; >> -=09if (class !=3D ELFCLASS32) { >> +=09if (class !=3D ELFCLASS32 && class !=3D ELFCLASS64) { >> =09=09dev_err(dev, "Unsupported class: %d\n", class); >> =09=09return -EINVAL; >> =09} >> @@ -75,26 +88,29 @@ int rproc_elf_sanity_check(struct rproc *rproc, cons= t struct >> firmware *fw) >> =09=09return -EINVAL; >> =09} >>=20 >> -=09if (fw->size < ehdr->e_shoff + sizeof(struct elf32_shdr)) { >> -=09=09dev_err(dev, "Image is too small\n"); >> -=09=09return -EINVAL; >> -=09} >> +=09phoff =3D elf_hdr_e_phoff(class, fw->data); >> +=09shoff =3D elf_hdr_e_shoff(class, fw->data); >> +=09phnum =3D elf_hdr_e_phnum(class, fw->data); >> +=09elf_shdr_size =3D elf_size_of_shdr(class); >>=20 >> -=09if (memcmp(ehdr->e_ident, ELFMAG, SELFMAG)) { >> -=09=09dev_err(dev, "Image is corrupted (bad magic)\n"); >> +=09if (fw->size < shoff + elf_shdr_size) { >> +=09=09dev_err(dev, "Image is too small\n"); >> =09=09return -EINVAL; >> =09} >>=20 >> -=09if (ehdr->e_phnum =3D=3D 0) { >> +=09if (phnum =3D=3D 0) { >> =09=09dev_err(dev, "No loadable segments\n"); >> =09=09return -EINVAL; >> =09} >>=20 >> -=09if (ehdr->e_phoff > fw->size) { >> +=09if (phoff > fw->size) { >> =09=09dev_err(dev, "Firmware size is too small\n"); >> =09=09return -EINVAL; >> =09} >>=20 >> +=09dev_dbg(dev, "Firmware is an elf%d file\n", >> +=09=09class =3D=3D ELFCLASS32 ? 32 : 64); >> + >> =09return 0; >> } >> EXPORT_SYMBOL(rproc_elf_sanity_check); >> @@ -110,11 +126,9 @@ EXPORT_SYMBOL(rproc_elf_sanity_check); >> * Note that the boot address is not a configurable property of all remo= te >> * processors. Some will always boot at a specific hard-coded address. >> */ >> -u32 rproc_elf_get_boot_addr(struct rproc *rproc, const struct firmware = *fw) >> +u64 rproc_elf_get_boot_addr(struct rproc *rproc, const struct firmware = *fw) >> { >> -=09struct elf32_hdr *ehdr =3D (struct elf32_hdr *)fw->data; >> - >> -=09return ehdr->e_entry; >> +=09return elf_hdr_e_entry(fw_elf_get_class(fw), fw->data); >> } >> EXPORT_SYMBOL(rproc_elf_get_boot_addr); >>=20 >> @@ -145,37 +159,41 @@ EXPORT_SYMBOL(rproc_elf_get_boot_addr); >> int rproc_elf_load_segments(struct rproc *rproc, const struct firmware *= fw) >> { >> =09struct device *dev =3D &rproc->dev; >> -=09struct elf32_hdr *ehdr; >> -=09struct elf32_phdr *phdr; >> +=09const void *ehdr, *phdr; >> =09int i, ret =3D 0; >> +=09u16 phnum; >> =09const u8 *elf_data =3D fw->data; >> +=09u8 class =3D fw_elf_get_class(fw); >> +=09u32 elf_phdr_size =3D elf_size_of_phdr(class); >>=20 >> -=09ehdr =3D (struct elf32_hdr *)elf_data; >> -=09phdr =3D (struct elf32_phdr *)(elf_data + ehdr->e_phoff); >> +=09ehdr =3D elf_data; >> +=09phnum =3D elf_hdr_e_phnum(class, ehdr); >> +=09phdr =3D elf_data + elf_hdr_e_phoff(class, ehdr); >>=20 >> =09/* go through the available ELF segments */ >> -=09for (i =3D 0; i < ehdr->e_phnum; i++, phdr++) { >> -=09=09u32 da =3D phdr->p_paddr; >> -=09=09u32 memsz =3D phdr->p_memsz; >> -=09=09u32 filesz =3D phdr->p_filesz; >> -=09=09u32 offset =3D phdr->p_offset; >> +=09for (i =3D 0; i < phnum; i++, phdr +=3D elf_phdr_size) { >> +=09=09u64 da =3D elf_phdr_p_paddr(class, phdr); >> +=09=09u64 memsz =3D elf_phdr_p_memsz(class, phdr); >> +=09=09u64 filesz =3D elf_phdr_p_filesz(class, phdr); >> +=09=09u64 offset =3D elf_phdr_p_offset(class, phdr); >> +=09=09u32 type =3D elf_phdr_p_type(class, phdr); >> =09=09void *ptr; >>=20 >> -=09=09if (phdr->p_type !=3D PT_LOAD) >> +=09=09if (type !=3D PT_LOAD) >> =09=09=09continue; >>=20 >> -=09=09dev_dbg(dev, "phdr: type %d da 0x%x memsz 0x%x filesz 0x%x\n", >> -=09=09=09phdr->p_type, da, memsz, filesz); >> +=09=09dev_dbg(dev, "phdr: type %d da 0x%llx memsz 0x%llx filesz 0x%llx\= n", >> +=09=09=09type, da, memsz, filesz); >>=20 >> =09=09if (filesz > memsz) { >> -=09=09=09dev_err(dev, "bad phdr filesz 0x%x memsz 0x%x\n", >> +=09=09=09dev_err(dev, "bad phdr filesz 0x%llx memsz 0x%llx\n", >> =09=09=09=09filesz, memsz); >> =09=09=09ret =3D -EINVAL; >> =09=09=09break; >> =09=09} >>=20 >> =09=09if (offset + filesz > fw->size) { >> -=09=09=09dev_err(dev, "truncated fw: need 0x%x avail 0x%zx\n", >> +=09=09=09dev_err(dev, "truncated fw: need 0x%llx avail 0x%zx\n", >> =09=09=09=09offset + filesz, fw->size); >> =09=09=09ret =3D -EINVAL; >> =09=09=09break; >> @@ -184,14 +202,15 @@ int rproc_elf_load_segments(struct rproc *rproc, c= onst >> struct firmware *fw) >> =09=09/* grab the kernel address for this device address */ >> =09=09ptr =3D rproc_da_to_va(rproc, da, memsz); >> =09=09if (!ptr) { >> -=09=09=09dev_err(dev, "bad phdr da 0x%x mem 0x%x\n", da, memsz); >> +=09=09=09dev_err(dev, "bad phdr da 0x%llx mem 0x%llx\n", da, >> +=09=09=09=09memsz); >> =09=09=09ret =3D -EINVAL; >> =09=09=09break; >> =09=09} >>=20 >> =09=09/* put the segment where the remote processor expects it */ >> -=09=09if (phdr->p_filesz) >> -=09=09=09memcpy(ptr, elf_data + phdr->p_offset, filesz); >> +=09=09if (filesz) >> +=09=09=09memcpy(ptr, elf_data + offset, filesz); >>=20 >> =09=09/* >> =09=09 * Zero out remaining memory for this segment. >> @@ -208,24 +227,32 @@ int rproc_elf_load_segments(struct rproc *rproc, c= onst >> struct firmware *fw) >> } >> EXPORT_SYMBOL(rproc_elf_load_segments); >>=20 >> -static struct elf32_shdr * >> -find_table(struct device *dev, struct elf32_hdr *ehdr, size_t fw_size) >> +static const void * >> +find_table(struct device *dev, const struct firmware *fw) >> { >> -=09struct elf32_shdr *shdr; >> +=09const void *shdr, *name_table_shdr; >> =09int i; >> =09const char *name_table; >> =09struct resource_table *table =3D NULL; >> -=09const u8 *elf_data =3D (void *)ehdr; >> +=09const u8 *elf_data =3D (void *)fw->data; >> +=09u8 class =3D fw_elf_get_class(fw); >> +=09size_t fw_size =3D fw->size; >> +=09const void *ehdr =3D elf_data; >> +=09u16 shnum =3D elf_hdr_e_shnum(class, ehdr); >> +=09u32 elf_shdr_size =3D elf_size_of_shdr(class); >> +=09u16 shstrndx =3D elf_hdr_e_shstrndx(class, ehdr); >>=20 >> =09/* look for the resource table and handle it */ >> -=09shdr =3D (struct elf32_shdr *)(elf_data + ehdr->e_shoff); >> -=09name_table =3D elf_data + shdr[ehdr->e_shstrndx].sh_offset; >> +=09shdr =3D elf_data + elf_hdr_e_shoff(class, ehdr); >> +=09name_table_shdr =3D shdr + (shstrndx * elf_shdr_size); >> +=09name_table =3D elf_data + elf_shdr_sh_offset(class, name_table_shdr)= ; >>=20 >> -=09for (i =3D 0; i < ehdr->e_shnum; i++, shdr++) { >> -=09=09u32 size =3D shdr->sh_size; >> -=09=09u32 offset =3D shdr->sh_offset; >> +=09for (i =3D 0; i < shnum; i++, shdr +=3D elf_shdr_size) { >> +=09=09u64 size =3D elf_shdr_sh_size(class, shdr); >> +=09=09u64 offset =3D elf_shdr_sh_offset(class, shdr); >> +=09=09u32 name =3D elf_shdr_sh_name(class, shdr); >>=20 >> -=09=09if (strcmp(name_table + shdr->sh_name, ".resource_table")) >> +=09=09if (strcmp(name_table + name, ".resource_table")) >> =09=09=09continue; >>=20 >> =09=09table =3D (struct resource_table *)(elf_data + offset); >> @@ -279,21 +306,21 @@ find_table(struct device *dev, struct elf32_hdr *e= hdr, >> size_t fw_size) >> */ >> int rproc_elf_load_rsc_table(struct rproc *rproc, const struct firmware = *fw) >> { >> -=09struct elf32_hdr *ehdr; >> -=09struct elf32_shdr *shdr; >> +=09const void *shdr; >> =09struct device *dev =3D &rproc->dev; >> =09struct resource_table *table =3D NULL; >> =09const u8 *elf_data =3D fw->data; >> =09size_t tablesz; >> +=09u8 class =3D fw_elf_get_class(fw); >> +=09u64 sh_offset; >>=20 >> -=09ehdr =3D (struct elf32_hdr *)elf_data; >> - >> -=09shdr =3D find_table(dev, ehdr, fw->size); >> +=09shdr =3D find_table(dev, fw); >> =09if (!shdr) >> =09=09return -EINVAL; >>=20 >> -=09table =3D (struct resource_table *)(elf_data + shdr->sh_offset); >> -=09tablesz =3D shdr->sh_size; >> +=09sh_offset =3D elf_shdr_sh_offset(class, shdr); >> +=09table =3D (struct resource_table *)(elf_data + sh_offset); >> +=09tablesz =3D elf_shdr_sh_size(class, shdr); >>=20 >> =09/* >> =09 * Create a copy of the resource table. When a virtio device starts >> @@ -326,13 +353,17 @@ EXPORT_SYMBOL(rproc_elf_load_rsc_table); >> struct resource_table *rproc_elf_find_loaded_rsc_table(struct rproc *rpr= oc, >> =09=09=09=09=09=09 const struct firmware *fw) >> { >> -=09struct elf32_hdr *ehdr =3D (struct elf32_hdr *)fw->data; >> -=09struct elf32_shdr *shdr; >> +=09const void *shdr; >> +=09u64 sh_addr, sh_size; >> +=09u8 class =3D fw_elf_get_class(fw); >>=20 >> -=09shdr =3D find_table(&rproc->dev, ehdr, fw->size); >> +=09shdr =3D find_table(&rproc->dev, fw); >> =09if (!shdr) >> =09=09return NULL; >>=20 >> -=09return rproc_da_to_va(rproc, shdr->sh_addr, shdr->sh_size); >> +=09sh_addr =3D elf_shdr_sh_addr(class, shdr); >> +=09sh_size =3D elf_shdr_sh_size(class, shdr); >> + >> +=09return rproc_da_to_va(rproc, sh_addr, sh_size); >> } >> EXPORT_SYMBOL(rproc_elf_find_loaded_rsc_table); >> diff --git a/drivers/remoteproc/remoteproc_elf_loader.h >> b/drivers/remoteproc/remoteproc_elf_loader.h >> new file mode 100644 >> index 000000000000..fac3565734f9 >> --- /dev/null >> +++ b/drivers/remoteproc/remoteproc_elf_loader.h >> @@ -0,0 +1,69 @@ >> +/* SPDX-License-Identifier: GPL-2.0 */ >> +/* >> + * Remote processor elf loader defines >> + * >> + * Copyright (C) 2019 Kalray, Inc. >> + */ >> + >> +#ifndef REMOTEPROC_ELF_LOADER_H >> +#define REMOTEPROC_ELF_LOADER_H >> + >> +#include >> +#include >> + >> +/** >> + * fw_elf_get_class - Get elf class >> + * @fw: the ELF firmware image >> + * >> + * Note that we use and elf32_hdr to access the class since the start o= f the >> + * struct is the same for both elf class >> + * >> + * Return: elf class of the firmware >> + */ >> +static inline u8 fw_elf_get_class(const struct firmware *fw) >> +{ >> +=09struct elf32_hdr *ehdr =3D (struct elf32_hdr *)fw->data; >> + >> +=09return ehdr->e_ident[EI_CLASS]; >> +} >> + >> +#define ELF_GET_FIELD(__s, __field, __type) \ >> +static inline __type elf_##__s##_##__field(u8 class, const void *arg) \ >> +{ \ >> +=09if (class =3D=3D ELFCLASS32) \ >> +=09=09return (__type) ((const struct elf32_##__s *) arg)->__field; \ >> +=09else \ >> +=09=09return (__type) ((const struct elf64_##__s *) arg)->__field; \ >> +} >> + >> +ELF_GET_FIELD(hdr, e_entry, u64) >> +ELF_GET_FIELD(hdr, e_phnum, u16) >> +ELF_GET_FIELD(hdr, e_shnum, u16) >> +ELF_GET_FIELD(hdr, e_phoff, u64) >> +ELF_GET_FIELD(hdr, e_shoff, u64) >> +ELF_GET_FIELD(hdr, e_shstrndx, u16) >> + >> +ELF_GET_FIELD(phdr, p_paddr, u64) >> +ELF_GET_FIELD(phdr, p_filesz, u64) >> +ELF_GET_FIELD(phdr, p_memsz, u64) >> +ELF_GET_FIELD(phdr, p_type, u32) >> +ELF_GET_FIELD(phdr, p_offset, u64) >> + >> +ELF_GET_FIELD(shdr, sh_size, u64) >> +ELF_GET_FIELD(shdr, sh_offset, u64) >> +ELF_GET_FIELD(shdr, sh_name, u32) >> +ELF_GET_FIELD(shdr, sh_addr, u64) >> + >> +#define ELF_STRUCT_SIZE(__s) \ >> +static inline unsigned long elf_size_of_##__s(u8 class) \ >> +{ \ >> +=09if (class =3D=3D ELFCLASS32)\ >> +=09=09return sizeof(struct elf32_##__s); \ >> +=09else \ >> +=09=09return sizeof(struct elf64_##__s); \ >> +} >> + >> +ELF_STRUCT_SIZE(shdr) >> +ELF_STRUCT_SIZE(phdr) >> + >> +#endif /* REMOTEPROC_ELF_LOADER_H */ >> diff --git a/drivers/remoteproc/remoteproc_internal.h >> b/drivers/remoteproc/remoteproc_internal.h >> index 45ff76a06c72..4ef745e3a1bc 100644 >> --- a/drivers/remoteproc/remoteproc_internal.h >> +++ b/drivers/remoteproc/remoteproc_internal.h >> @@ -63,7 +63,7 @@ phys_addr_t rproc_va_to_pa(void *cpu_addr); >> int rproc_trigger_recovery(struct rproc *rproc); >>=20 >> int rproc_elf_sanity_check(struct rproc *rproc, const struct firmware *f= w); >> -u32 rproc_elf_get_boot_addr(struct rproc *rproc, const struct firmware = *fw); >> +u64 rproc_elf_get_boot_addr(struct rproc *rproc, const struct firmware = *fw); >> int rproc_elf_load_segments(struct rproc *rproc, const struct firmware *= fw); >> int rproc_elf_load_rsc_table(struct rproc *rproc, const struct firmware = *fw); >> struct resource_table *rproc_elf_find_loaded_rsc_table(struct rproc *rpr= oc, >> diff --git a/drivers/remoteproc/st_remoteproc.c >> b/drivers/remoteproc/st_remoteproc.c >> index 51049d17b1e5..e23abd8a96b0 100644 >> --- a/drivers/remoteproc/st_remoteproc.c >> +++ b/drivers/remoteproc/st_remoteproc.c >> @@ -193,7 +193,7 @@ static int st_rproc_start(struct rproc *rproc) >> =09=09} >> =09} >>=20 >> -=09dev_info(&rproc->dev, "Started from 0x%x\n", rproc->bootaddr); >> +=09dev_info(&rproc->dev, "Started from 0x%llx\n", rproc->bootaddr); >>=20 >> =09return 0; >>=20 >> diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h >> index 04d04709f2bd..512de9a2590c 100644 >> --- a/include/linux/remoteproc.h >> +++ b/include/linux/remoteproc.h >> @@ -362,7 +362,7 @@ struct rproc_ops { >> =09=09=09=09struct rproc *rproc, const struct firmware *fw); >> =09int (*load)(struct rproc *rproc, const struct firmware *fw); >> =09int (*sanity_check)(struct rproc *rproc, const struct firmware *fw); >> -=09u32 (*get_boot_addr)(struct rproc *rproc, const struct firmware *fw)= ; >> +=09u64 (*get_boot_addr)(struct rproc *rproc, const struct firmware *fw)= ; >> }; >>=20 >> /** >> @@ -478,7 +478,7 @@ struct rproc { >> =09int num_traces; >> =09struct list_head carveouts; >> =09struct list_head mappings; >> -=09u32 bootaddr; >> +=09u64 bootaddr; >> =09struct list_head rvdevs; >> =09struct list_head subdevs; >> =09struct idr notifyids; >> -- > > 2.15.0.276.g89ea799