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=-7.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS autolearn=ham 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 30D6FC282C4 for ; Mon, 4 Feb 2019 15:20:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E6BA520823 for ; Mon, 4 Feb 2019 15:20:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="XAlqPR3X" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731294AbfBDPUZ (ORCPT ); Mon, 4 Feb 2019 10:20:25 -0500 Received: from fllv0016.ext.ti.com ([198.47.19.142]:52552 "EHLO fllv0016.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728273AbfBDPUZ (ORCPT ); Mon, 4 Feb 2019 10:20:25 -0500 Received: from fllv0035.itg.ti.com ([10.64.41.0]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id x14FJWsC039411; Mon, 4 Feb 2019 09:19:32 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1549293572; bh=Q4CXRFgn3HqFKCjDyjZt7FaFbKK070qoc53KmayrPoA=; h=Subject:To:CC:References:From:Date:In-Reply-To; b=XAlqPR3XgnbZPZFnGg271brBJTXoEfBrE99aedux30azLp52PTL+mqQCcVXtrAUxC qJ7gx8/w0CqW2+3AKf31uS5xzhIu/OCrXPzIXPovVnNUZfJq6r2899ZTew5a0Th1hr hdvE3EAj2XuSFFqpPhpOXDGAxOrwaLhNqqzZzWV4= Received: from DFLE103.ent.ti.com (dfle103.ent.ti.com [10.64.6.24]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x14FJV8l050419 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 4 Feb 2019 09:19:32 -0600 Received: from DFLE111.ent.ti.com (10.64.6.32) by DFLE103.ent.ti.com (10.64.6.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1591.10; Mon, 4 Feb 2019 09:19:31 -0600 Received: from dflp33.itg.ti.com (10.64.6.16) by DFLE111.ent.ti.com (10.64.6.32) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1591.10 via Frontend Transport; Mon, 4 Feb 2019 09:19:31 -0600 Received: from [172.22.77.137] (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id x14FJUFN001862; Mon, 4 Feb 2019 09:19:30 -0600 Subject: Re: [PATCH v2 06/14] remoteproc: add page lookup for TI PRU to ELF loader To: Roger Quadros , , , CC: , , , , , , , , , , , References: <1549290167-876-1-git-send-email-rogerq@ti.com> <1549290167-876-7-git-send-email-rogerq@ti.com> From: "Andrew F. Davis" Message-ID: <2b70cee5-70fe-9b10-5111-4dc23538b20c@ti.com> Date: Mon, 4 Feb 2019 09:19:30 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.2.1 MIME-Version: 1.0 In-Reply-To: <1549290167-876-7-git-send-email-rogerq@ti.com> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2/4/19 8:22 AM, Roger Quadros wrote: > From: David Lechner > > This adds a special handler to the default remoteproc ELF firmware > loader that looks up the memory map on TI PRU firmware files. > > These processors have multiple memory maps that share the same address > space, so we need to know the page in addition to the physical address > in order to translate the address to a local CPU address. > > Signed-off-by: David Lechner > Signed-off-by: Roger Quadros > --- > drivers/remoteproc/remoteproc_elf_loader.c | 117 +++++++++++++++++++++++++++-- > include/uapi/linux/elf-em.h | 1 + > 2 files changed, 112 insertions(+), 6 deletions(-) > > diff --git a/drivers/remoteproc/remoteproc_elf_loader.c b/drivers/remoteproc/remoteproc_elf_loader.c > index 8888d39..79c9d39 100644 > --- a/drivers/remoteproc/remoteproc_elf_loader.c > +++ b/drivers/remoteproc/remoteproc_elf_loader.c > @@ -32,6 +32,103 @@ > > #include "remoteproc_internal.h" > > +#define SHT_TI_PHATTRS 0x7F000004 > +#define SHT_TI_SH_PAGE 0x7F000007 > + > +struct elf32_ti_phattrs { > + Elf32_Half pha_seg_id; /* Segment id */ > + Elf32_Half pha_tag_id; /* Attribute kind id */ > + union { > + Elf32_Off pha_offset; /* byte offset within the section */ > + Elf32_Word pha_value; /* Constant tag value */ > + } pha_un; > +}; > + > +/* this struct is reverse engineered, so not sure what most of the values are */ Do we really not know? Someone should go check this, if they are not used then for now label them "unused", not "unknown". Andrew > +struct ti_section_page { > + u32 unk0; > + u32 unk1; > + u32 unk2; > + u32 unk3; > + u32 unk4; > + u16 size; > + u16 unk5; > + u16 unk6; > + u8 data[0]; /* array of size */ > +}; > + > +/** > + * rproc_elf_segment_to_map() - Gets memory map for segment > + * @id: segment id > + * @elf_data: pointer to ELF file data > + * > + * Returns the memory map for the segment. > + */ > +static int rproc_elf_segment_to_map(u32 id, const u8 *elf_data) > +{ > + struct elf32_hdr *ehdr; > + struct elf32_shdr *shdr; > + struct elf32_ti_phattrs *ti_attrs = NULL; > + int i; > + > + ehdr = (struct elf32_hdr *)elf_data; > + shdr = (struct elf32_shdr *)(elf_data + ehdr->e_shoff); > + > + if (ehdr->e_machine != EM_TI_PRU) > + return 0; > + > + for (i = 0; i < ehdr->e_shnum; i++, shdr++) { > + if (shdr->sh_type == SHT_TI_PHATTRS) { > + ti_attrs = (struct elf32_ti_phattrs *)(elf_data + shdr->sh_offset); > + break; > + } > + } > + > + if (!ti_attrs) > + return 0; > + > + /* list is terminated by tag id == 0 (PHA_NULL) */ > + for (; ti_attrs->pha_tag_id; ti_attrs++) { > + if (ti_attrs->pha_tag_id == 3 && ti_attrs->pha_seg_id == id) > + return ti_attrs->pha_un.pha_value; > + } > + > + return 0; > +} > + > +/** > + * rproc_elf_section_to_map() - Gets memory map for section > + * @id: segment id > + * @elf_data: pointer to ELF file data > + * > + * Returns the memory map for the section. > + */ > +static int rproc_elf_section_to_map(u32 id, const u8 *elf_data) > +{ > + struct elf32_hdr *ehdr; > + struct elf32_shdr *shdr; > + struct ti_section_page *map = NULL; > + int i; > + > + ehdr = (struct elf32_hdr *)elf_data; > + shdr = (struct elf32_shdr *)(elf_data + ehdr->e_shoff); > + > + if (ehdr->e_machine != EM_TI_PRU) > + return 0; > + > + for (i = 0; i < ehdr->e_shnum; i++, shdr++) { > + if (shdr->sh_type == SHT_TI_SH_PAGE) { > + map = (struct ti_section_page *)(elf_data + shdr->sh_offset); > + break; > + } > + } > + > + if (!map || id >= map->size) > + return 0; > + > + return map->data[id]; > +} > + > /** > * rproc_elf_sanity_check() - Sanity Check ELF firmware image > * @rproc: the remote processor handle > @@ -147,7 +244,7 @@ int rproc_elf_load_segments(struct rproc *rproc, const struct firmware *fw) > struct device *dev = &rproc->dev; > struct elf32_hdr *ehdr; > struct elf32_phdr *phdr; > - int i, ret = 0; > + int i, map, ret = 0; > const u8 *elf_data = fw->data; > > ehdr = (struct elf32_hdr *)elf_data; > @@ -181,8 +278,10 @@ int rproc_elf_load_segments(struct rproc *rproc, const struct firmware *fw) > break; > } > > + map = rproc_elf_segment_to_map(i, elf_data); > + > /* grab the kernel address for this device address */ > - ptr = rproc_da_to_va(rproc, da, memsz, 0); > + ptr = rproc_da_to_va(rproc, da, memsz, map); > if (!ptr) { > dev_err(dev, "bad phdr da 0x%x mem 0x%x\n", da, memsz); > ret = -EINVAL; > @@ -209,7 +308,7 @@ int rproc_elf_load_segments(struct rproc *rproc, const struct firmware *fw) > EXPORT_SYMBOL(rproc_elf_load_segments); > > static struct elf32_shdr * > -find_table(struct device *dev, struct elf32_hdr *ehdr, size_t fw_size) > +find_table(struct device *dev, struct elf32_hdr *ehdr, size_t fw_size, int *id) > { > struct elf32_shdr *shdr; > int i; > @@ -261,6 +360,9 @@ find_table(struct device *dev, struct elf32_hdr *ehdr, size_t fw_size) > return NULL; > } > > + if (id) > + *id = i; > + > return shdr; > } > > @@ -288,7 +390,7 @@ int rproc_elf_load_rsc_table(struct rproc *rproc, const struct firmware *fw) > > ehdr = (struct elf32_hdr *)elf_data; > > - shdr = find_table(dev, ehdr, fw->size); > + shdr = find_table(dev, ehdr, fw->size, NULL); > if (!shdr) > return -EINVAL; > > @@ -328,11 +430,14 @@ struct resource_table *rproc_elf_find_loaded_rsc_table(struct rproc *rproc, > { > struct elf32_hdr *ehdr = (struct elf32_hdr *)fw->data; > struct elf32_shdr *shdr; > + int id, map; > > - shdr = find_table(&rproc->dev, ehdr, fw->size); > + shdr = find_table(&rproc->dev, ehdr, fw->size, &id); > if (!shdr) > return NULL; > > - return rproc_da_to_va(rproc, shdr->sh_addr, shdr->sh_size, 0); > + map = rproc_elf_section_to_map(id, fw->data); > + > + return rproc_da_to_va(rproc, shdr->sh_addr, shdr->sh_size, map); > } > EXPORT_SYMBOL(rproc_elf_find_loaded_rsc_table); > diff --git a/include/uapi/linux/elf-em.h b/include/uapi/linux/elf-em.h > index 0c3000fa..70b487a 100644 > --- a/include/uapi/linux/elf-em.h > +++ b/include/uapi/linux/elf-em.h > @@ -38,6 +38,7 @@ > #define EM_BLACKFIN 106 /* ADI Blackfin Processor */ > #define EM_ALTERA_NIOS2 113 /* Altera Nios II soft-core processor */ > #define EM_TI_C6000 140 /* TI C6X DSPs */ > +#define EM_TI_PRU 144 /* TI Programmable Realtime Unit */ > #define EM_AARCH64 183 /* ARM 64 bit */ > #define EM_TILEPRO 188 /* Tilera TILEPro */ > #define EM_MICROBLAZE 189 /* Xilinx MicroBlaze */ >