From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Return-Path: Date: Mon, 9 Mar 2020 13:56:53 -0600 From: Mathieu Poirier Subject: Re: [PATCH v5 4/8] remoteproc: Add elf helpers to access elf64 and elf32 fields Message-ID: <20200309195653.GD1399@xps15> References: <20200210162209.23149-1-cleger@kalray.eu> <20200302093902.27849-1-cleger@kalray.eu> <20200302093902.27849-5-cleger@kalray.eu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200302093902.27849-5-cleger@kalray.eu> To: Clement Leger Cc: Ohad Ben-Cohen , Bjorn Andersson , Jonathan Corbet , Shawn Guo , Sascha Hauer , linux-remoteproc@vger.kernel.org, Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , Andy Gross , Patrice Chotard , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, Arnaud Pouliquen , Loic PALLARDY , s-anna List-ID: On Mon, Mar 02, 2020 at 10:38:58AM +0100, Clement Leger wrote: > 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 accommodate both elf types sizes, the maximum size for a > elf header member is chosen using the maximum value of the field for > both elf class. > > Signed-off-by: Clement Leger Reviewed-by: Mathieu Poirier > --- > drivers/remoteproc/remoteproc_elf_helpers.h | 96 +++++++++++++++++++++++++++++ > 1 file changed, 96 insertions(+) > create mode 100644 drivers/remoteproc/remoteproc_elf_helpers.h > > diff --git a/drivers/remoteproc/remoteproc_elf_helpers.h b/drivers/remoteproc/remoteproc_elf_helpers.h > new file mode 100644 > index 000000000000..4b6be7b6bf4d > --- /dev/null > +++ b/drivers/remoteproc/remoteproc_elf_helpers.h > @@ -0,0 +1,96 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +/* > + * Remote processor elf helpers defines > + * > + * Copyright (C) 2020 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 of 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) > +{ > + struct elf32_hdr *ehdr = (struct elf32_hdr *)fw->data; > + > + return ehdr->e_ident[EI_CLASS]; > +} > + > +static inline void elf_hdr_init_ident(struct elf32_hdr *hdr, u8 class) > +{ > + memcpy(hdr->e_ident, ELFMAG, SELFMAG); > + hdr->e_ident[EI_CLASS] = class; > + hdr->e_ident[EI_DATA] = ELFDATA2LSB; > + hdr->e_ident[EI_VERSION] = EV_CURRENT; > + hdr->e_ident[EI_OSABI] = ELFOSABI_NONE; > +} > + > +/* Generate getter and setter for a specific elf struct/field */ > +#define ELF_GEN_FIELD_GET_SET(__s, __field, __type) \ > +static inline __type elf_##__s##_get_##__field(u8 class, const void *arg) \ > +{ \ > + if (class == ELFCLASS32) \ > + return (__type) ((const struct elf32_##__s *) arg)->__field; \ > + else \ > + return (__type) ((const struct elf64_##__s *) arg)->__field; \ > +} \ > +static inline void elf_##__s##_set_##__field(u8 class, void *arg, \ > + __type value) \ > +{ \ > + if (class == ELFCLASS32) \ > + ((struct elf32_##__s *) arg)->__field = (__type) value; \ > + else \ > + ((struct elf64_##__s *) arg)->__field = (__type) value; \ > +} > + > +ELF_GEN_FIELD_GET_SET(hdr, e_entry, u64) > +ELF_GEN_FIELD_GET_SET(hdr, e_phnum, u16) > +ELF_GEN_FIELD_GET_SET(hdr, e_shnum, u16) > +ELF_GEN_FIELD_GET_SET(hdr, e_phoff, u64) > +ELF_GEN_FIELD_GET_SET(hdr, e_shoff, u64) > +ELF_GEN_FIELD_GET_SET(hdr, e_shstrndx, u16) > +ELF_GEN_FIELD_GET_SET(hdr, e_machine, u16) > +ELF_GEN_FIELD_GET_SET(hdr, e_type, u16) > +ELF_GEN_FIELD_GET_SET(hdr, e_version, u32) > +ELF_GEN_FIELD_GET_SET(hdr, e_ehsize, u32) > +ELF_GEN_FIELD_GET_SET(hdr, e_phentsize, u16) > + > +ELF_GEN_FIELD_GET_SET(phdr, p_paddr, u64) > +ELF_GEN_FIELD_GET_SET(phdr, p_vaddr, u64) > +ELF_GEN_FIELD_GET_SET(phdr, p_filesz, u64) > +ELF_GEN_FIELD_GET_SET(phdr, p_memsz, u64) > +ELF_GEN_FIELD_GET_SET(phdr, p_type, u32) > +ELF_GEN_FIELD_GET_SET(phdr, p_offset, u64) > +ELF_GEN_FIELD_GET_SET(phdr, p_flags, u32) > +ELF_GEN_FIELD_GET_SET(phdr, p_align, u64) > + > +ELF_GEN_FIELD_GET_SET(shdr, sh_size, u64) > +ELF_GEN_FIELD_GET_SET(shdr, sh_offset, u64) > +ELF_GEN_FIELD_GET_SET(shdr, sh_name, u32) > +ELF_GEN_FIELD_GET_SET(shdr, sh_addr, u64) > + > +#define ELF_STRUCT_SIZE(__s) \ > +static inline unsigned long elf_size_of_##__s(u8 class) \ > +{ \ > + if (class == ELFCLASS32)\ > + return sizeof(struct elf32_##__s); \ > + else \ > + return sizeof(struct elf64_##__s); \ > +} > + > +ELF_STRUCT_SIZE(shdr) > +ELF_STRUCT_SIZE(phdr) > +ELF_STRUCT_SIZE(hdr) > + > +#endif /* REMOTEPROC_ELF_LOADER_H */ > -- > 2.15.0.276.g89ea799 > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D126CC10F27 for ; Mon, 9 Mar 2020 19:57:03 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A8F8F2467C for ; Mon, 9 Mar 2020 19:57:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="nMLKEqac"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="UBurujxd" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A8F8F2467C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=SwAfLAbntZp2X3ZWscSZTxmG3sIm3Y5RxgW5E0EPxVs=; b=nMLKEqacijiRfM z2gwp25RufvnSotE05Wwb0+LLg/klJlR7kiIPyjRqZ3VI8yzHpkXzNagAiJbLzUcGBrP5Nb3J/UKk gGD+kqJRCcCK13y8cfPa3X7+hwb+Cxs6XK4GYsCWlxHqoDTfTjSQ+fSpqKh+ZmBvuNVDUhbzQmCUS Ed225caOx9gKVIz2pDMQQz4SBZzNcMhbE4TDN6fARE1tZqMQgsNsbuKLGKfb/cS7VV23612pTdXDm 79POyxPIuitn776qzYGLAUHMq9IXHcqvH6MgsFvGIBJmK2SXufDhxTSpLzQNt7Q/I+ToZ7Z6UWCMn YOpl9c2ymTPjfWWdDQmA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jBOWJ-0002IW-QP; Mon, 09 Mar 2020 19:56:59 +0000 Received: from mail-pj1-x1042.google.com ([2607:f8b0:4864:20::1042]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jBOWG-0002ID-Ih for linux-arm-kernel@lists.infradead.org; Mon, 09 Mar 2020 19:56:58 +0000 Received: by mail-pj1-x1042.google.com with SMTP id f15so348503pjq.2 for ; Mon, 09 Mar 2020 12:56:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=+SZtf0M28Nv1QFHflR2s3hX23poufSUdY44oODK2BAY=; b=UBurujxd1n8tmu1N5xcKWOKFdorVALZ/c8MK0DTzPfMHbrhfVl4E4YT2CXj9hbBurs FVH34y5aIp7VS1UdCMP98Ok/V9bItureBV+jO+cgQ1JWcL/3AaXp/CFrfbIVkNFMRbxJ 0jGpxW12IoGYsaGH9bhcuad7QMZlJ1HzaThVqXdLeLSgJhyX9Wth5doveQr++PnwQXOG 5zwqUWf5gpUCgBnP/2QGeAnuKYkCrw4Cpr+0b3GQBK4kDyG4S8tXJt9Bvc8pJRXBDa0j IaG9f0vQ2LDYiKUKJ9dxv3uBtDuLsmz8ba5nkESeuu4rknvxX6RfJTnFW3ALIXW2sQB1 +2FQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=+SZtf0M28Nv1QFHflR2s3hX23poufSUdY44oODK2BAY=; b=UQ9a0kWeRGy75Guzx8tAUNBWzmf5XMRHWocNlaGEvY8J4VIB2RxhwYUt+TFA/f4OjY chgDu76WkbEEdEQEcF2eXDxRMh+3eTLIJ6jpwBLRX2djf0/1Y36KbCN4WdKbV+/1gk+e fxi2JjOGXxX61DRhboiqws5h1yX+7ZwzbIzNqKgxfRwCJ3jWQO8oqNBrBpzyO0NXjvtF XJcvZtHJU5+BI/eL1Gh+2AgBpqHdn48777Lekl2+HLck3mUtnY1vM+7CZai74qFYH15C SnqtsH9r41XqpRiAxrQcRzAJYrQPU5gunpKsHD3LUGgXByaOWC9vXkqpa3UeED64Kd1o cytw== X-Gm-Message-State: ANhLgQ20tR3i28jfiojI6aMM2paWy232yVSN8yrYBbfC/KuiiN/Cvead 0cjzwDoCEwT5n1iufT8KTi2ZiQ== X-Google-Smtp-Source: ADFU+vvR9cBt7tA3gwJF7m+Q3TQX3HEJMkR3tbnhc3eRv3NjmUZ9OXX8E469moyjW1ToKHn9huhxHw== X-Received: by 2002:a17:902:8b88:: with SMTP id ay8mr16941773plb.202.1583783815957; Mon, 09 Mar 2020 12:56:55 -0700 (PDT) Received: from xps15 (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id x70sm36208373pgd.37.2020.03.09.12.56.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2020 12:56:55 -0700 (PDT) Date: Mon, 9 Mar 2020 13:56:53 -0600 From: Mathieu Poirier To: Clement Leger Subject: Re: [PATCH v5 4/8] remoteproc: Add elf helpers to access elf64 and elf32 fields Message-ID: <20200309195653.GD1399@xps15> References: <20200210162209.23149-1-cleger@kalray.eu> <20200302093902.27849-1-cleger@kalray.eu> <20200302093902.27849-5-cleger@kalray.eu> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200302093902.27849-5-cleger@kalray.eu> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200309_125656_654183_74B2A89D X-CRM114-Status: GOOD ( 19.23 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ohad Ben-Cohen , Loic PALLARDY , Arnaud Pouliquen , Jonathan Corbet , Fabio Estevam , Sascha Hauer , linux-doc@vger.kernel.org, linux-remoteproc@vger.kernel.org, Patrice Chotard , Bjorn Andersson , Andy Gross , NXP Linux Team , Pengutronix Kernel Team , linux-arm-msm@vger.kernel.org, s-anna , Shawn Guo , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Mar 02, 2020 at 10:38:58AM +0100, Clement Leger wrote: > 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 accommodate both elf types sizes, the maximum size for a > elf header member is chosen using the maximum value of the field for > both elf class. > > Signed-off-by: Clement Leger Reviewed-by: Mathieu Poirier > --- > drivers/remoteproc/remoteproc_elf_helpers.h | 96 +++++++++++++++++++++++++++++ > 1 file changed, 96 insertions(+) > create mode 100644 drivers/remoteproc/remoteproc_elf_helpers.h > > diff --git a/drivers/remoteproc/remoteproc_elf_helpers.h b/drivers/remoteproc/remoteproc_elf_helpers.h > new file mode 100644 > index 000000000000..4b6be7b6bf4d > --- /dev/null > +++ b/drivers/remoteproc/remoteproc_elf_helpers.h > @@ -0,0 +1,96 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +/* > + * Remote processor elf helpers defines > + * > + * Copyright (C) 2020 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 of 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) > +{ > + struct elf32_hdr *ehdr = (struct elf32_hdr *)fw->data; > + > + return ehdr->e_ident[EI_CLASS]; > +} > + > +static inline void elf_hdr_init_ident(struct elf32_hdr *hdr, u8 class) > +{ > + memcpy(hdr->e_ident, ELFMAG, SELFMAG); > + hdr->e_ident[EI_CLASS] = class; > + hdr->e_ident[EI_DATA] = ELFDATA2LSB; > + hdr->e_ident[EI_VERSION] = EV_CURRENT; > + hdr->e_ident[EI_OSABI] = ELFOSABI_NONE; > +} > + > +/* Generate getter and setter for a specific elf struct/field */ > +#define ELF_GEN_FIELD_GET_SET(__s, __field, __type) \ > +static inline __type elf_##__s##_get_##__field(u8 class, const void *arg) \ > +{ \ > + if (class == ELFCLASS32) \ > + return (__type) ((const struct elf32_##__s *) arg)->__field; \ > + else \ > + return (__type) ((const struct elf64_##__s *) arg)->__field; \ > +} \ > +static inline void elf_##__s##_set_##__field(u8 class, void *arg, \ > + __type value) \ > +{ \ > + if (class == ELFCLASS32) \ > + ((struct elf32_##__s *) arg)->__field = (__type) value; \ > + else \ > + ((struct elf64_##__s *) arg)->__field = (__type) value; \ > +} > + > +ELF_GEN_FIELD_GET_SET(hdr, e_entry, u64) > +ELF_GEN_FIELD_GET_SET(hdr, e_phnum, u16) > +ELF_GEN_FIELD_GET_SET(hdr, e_shnum, u16) > +ELF_GEN_FIELD_GET_SET(hdr, e_phoff, u64) > +ELF_GEN_FIELD_GET_SET(hdr, e_shoff, u64) > +ELF_GEN_FIELD_GET_SET(hdr, e_shstrndx, u16) > +ELF_GEN_FIELD_GET_SET(hdr, e_machine, u16) > +ELF_GEN_FIELD_GET_SET(hdr, e_type, u16) > +ELF_GEN_FIELD_GET_SET(hdr, e_version, u32) > +ELF_GEN_FIELD_GET_SET(hdr, e_ehsize, u32) > +ELF_GEN_FIELD_GET_SET(hdr, e_phentsize, u16) > + > +ELF_GEN_FIELD_GET_SET(phdr, p_paddr, u64) > +ELF_GEN_FIELD_GET_SET(phdr, p_vaddr, u64) > +ELF_GEN_FIELD_GET_SET(phdr, p_filesz, u64) > +ELF_GEN_FIELD_GET_SET(phdr, p_memsz, u64) > +ELF_GEN_FIELD_GET_SET(phdr, p_type, u32) > +ELF_GEN_FIELD_GET_SET(phdr, p_offset, u64) > +ELF_GEN_FIELD_GET_SET(phdr, p_flags, u32) > +ELF_GEN_FIELD_GET_SET(phdr, p_align, u64) > + > +ELF_GEN_FIELD_GET_SET(shdr, sh_size, u64) > +ELF_GEN_FIELD_GET_SET(shdr, sh_offset, u64) > +ELF_GEN_FIELD_GET_SET(shdr, sh_name, u32) > +ELF_GEN_FIELD_GET_SET(shdr, sh_addr, u64) > + > +#define ELF_STRUCT_SIZE(__s) \ > +static inline unsigned long elf_size_of_##__s(u8 class) \ > +{ \ > + if (class == ELFCLASS32)\ > + return sizeof(struct elf32_##__s); \ > + else \ > + return sizeof(struct elf64_##__s); \ > +} > + > +ELF_STRUCT_SIZE(shdr) > +ELF_STRUCT_SIZE(phdr) > +ELF_STRUCT_SIZE(hdr) > + > +#endif /* REMOTEPROC_ELF_LOADER_H */ > -- > 2.15.0.276.g89ea799 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel