Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7F4B9C433EF for ; Fri, 29 Apr 2022 07:22:05 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9402D83EF8; Fri, 29 Apr 2022 09:21:56 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="ZsKl8sjr"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EC42683EFB; Fri, 29 Apr 2022 09:21:45 +0200 (CEST) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0612.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe02::612]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 3514A83EE3 for ; Fri, 29 Apr 2022 09:21:40 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MIAPl5qdWrhY8XqxR/QR8pyo21z6olyx8LwiX1BewMV83zC9n66W/q2TNlKp30Rp3RD0oEHlXEQ4Z1HHugWji3CnFUyKzQWrW5kYzZxh98hj7h4sTWP6UhBhAYVFc0JEQ2Gr6Fg6IKBONsQPEh5wompMuP9PQ+UL51blxJWWh09bZSmHbzkiF0uv4w7zIXnz/8w0n3m251SWaIU/UoEnN4z7EdNHgpX8uF02CyvksCPyHTZ8Cc2DA7zlH5SilnESVH/lh8Xhp9toQ620KBnx8N1PEClQduMoj3aBzNGdIiPV3pDuul8d1h0QqAxnnxAU1Y5gsdnm051R9+jRfbnIgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=YLAy0qs7KZuaXLA1llb8No1qUXgfyBJGB3UPe8wtXVo=; b=CcRdT+FDOw/YZFEcAlt1KEa8TF4hTuctSPFECmL6o2bNrc8WaZwzUt6UZaXdPmiEjUAbyaiSc3Kr+uUMl8bFwgm/+mhJi624fOECB9g9xYAo63ahgpsR5/4cvZi9gI7NxDfIsJwiKOTZPVHpdRagUXmqa7S4TDltsyIpnVbOyYGOXxDuwdQvT43LFL87ICt6lhgg/ziaVp3QZEJhppqkfKqRnhfB/bk8yyy8JseHruAdIOBotYWrWqQ+HQJNWdp/KebWeD3Lw5RMIbcaIvniekRLgDiiAHpix0TVRUzR+PxYn3MUvLUnZVwEMoK6a+Gb/EBTIYvPTscCSBftMT0fxw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YLAy0qs7KZuaXLA1llb8No1qUXgfyBJGB3UPe8wtXVo=; b=ZsKl8sjrXBkf/yhG/odADzE0okYTQ/y0WXCWDV6g/uXStVfnkLZNzRrSLvi6piTUpZqKZ2ubLNz65MSEThaAQ244qB9ACvvGOIKPEaV+tib7AZCbIIcP1yJS9uzkJrZNpgpctLpV1t+/lA77y3IttfZuq+37ArYFHWR4mb29tf4= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by PR3PR04MB7371.eurprd04.prod.outlook.com (2603:10a6:102:87::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.14; Fri, 29 Apr 2022 07:21:37 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::fc66:662f:2a82:1420]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::fc66:662f:2a82:1420%5]) with mapi id 15.20.5206.014; Fri, 29 Apr 2022 07:21:37 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com, "NXP i.MX U-Boot Team" Cc: u-boot@lists.denx.de, Peng Fan Subject: [PATCH 3/4] imx: bootaux: get stack from elf file Date: Fri, 29 Apr 2022 16:03:13 +0800 Message-Id: <20220429080314.29600-3-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220429080314.29600-1-peng.fan@oss.nxp.com> References: <20220429080314.29600-1-peng.fan@oss.nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SI2PR01CA0037.apcprd01.prod.exchangelabs.com (2603:1096:4:193::9) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 65aeec9c-ff8e-41f2-51ad-08da29b0e5c3 X-MS-TrafficTypeDiagnostic: PR3PR04MB7371:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 692MOLQvWVJAhZyoZKGZsmIP5uuuFxn0lnugrk3aXI/KroUDT9iDXnW2/K9P+BtNOmmPbUlA9ONsy5KjBb2mkiRko+ZklYwxNPTqUjDxsYWKXg543YlEPAiM6SujrPIKd/udRcX3LNqI3THzp9qkmbgTjsBoE0ZWCmnqJyStKleWKbUeH0D6YiTxkriJ1u6PMEds54D/qHndgDg/WDhnR7vy2ELhRl/FlWoy9abnkthlGpmJAnm8aRVifJoD3rlajfq1pA1KHG6eAnZdEi4HiGPci0o9LsTnGuG79kqvu/jFNdK9NhOSCLbBLWT8u5Uq2k4OdwJOcBcuDxqmQ2WxD4mWNkjZCCbUZXPOuRo6q65lm4SV5sz/ce0cmTRCPJJnnfCjxSJPycJsxy+Yplm3dEZECFUz6c6m0gnSin4zaIs1eoQVIiMGENXFeSI4rjBKeuKHEeW0E1VOPRLihbkQLR6z/ybyPGsvL7II/yt4DzX1Pg3KpmGqvHFh0tfndzxAIb9YH/TIK/vQKIGr01s4syOgap7jFPWWv4eIlVE8NdARZ+zeNVg6f6LBXs51RIGPXlAtE2E36A5HWTRa5XJZKDjhb6sj4/zF2/X2oWuAqk6EXeHdDpBzesxXoD0qL7x454unWfdcSvsCe0cLJ4iU6h5gMuIPeYil7IEgtdNf7r3bWMM0/M9JiILPzjrIn8rkRsS6T/wDtAe6hyPmG3+MyQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9417.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(508600001)(66946007)(66476007)(66556008)(83380400001)(2906002)(6666004)(4326008)(8676002)(6862004)(8936002)(52116002)(5660300002)(86362001)(6512007)(26005)(6506007)(6486002)(1076003)(186003)(316002)(38100700002)(38350700002)(2616005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?m6p8Vk3Y2i9RBhsfBpu3g77MBCR9O9qAW/5umpIm3gMegl/9lUd34hZ2x9zI?= =?us-ascii?Q?J1C/h4WZPz/xQmqb8FL4mPrBOJ+Z4VcYN2OtWvqyrjgnGXK3DwB07jrYxvxi?= =?us-ascii?Q?WXeRaE9nJHtsWJNr9aOL4i0jLgLD3QJSQIRNQ0GxkdG7pbMFtu6NWvOZhsid?= =?us-ascii?Q?cJQXs/ukrxlhJLFTUOe2tMT2J2Jk4NrLMCq4Ta1iChzAufTCcd6bg3R+UJ8P?= =?us-ascii?Q?YPL/pKEGrod7L2uhd0pXnx2ax/KbaGp/75Ai+OSLRzzvdNVCUdthyLwNRdvy?= =?us-ascii?Q?f4ON3eNqid6VZjZ3J2MQIg1g+ULhBgmBZ5C90ni+t2fYS9YBLaTQewsMB+6d?= =?us-ascii?Q?G820rFWFUutd+VHMENGmh5cwMtwa1Rtd9Ue05QJM7si08alVAOruwSK7BISk?= =?us-ascii?Q?EjQPNniLnHOAilVQ8f7OiIrGJKY2dE8tEc5leiFzowekj/kcPcDJElTZ1QiS?= =?us-ascii?Q?RrNtMpFSdRYkMASZjl5MVnX7vozs3p+2BCv3rgNh5ul4oxLSlCZg1iJeiWN+?= =?us-ascii?Q?OIx+KsDt/I6KH2ze8CSkyKk05a0IVFj5BW/vsj+5aOpvbOXyW3iwioH2QdMB?= =?us-ascii?Q?Y4ZYnKI1xcwz6UhIaE9Gl2sX+1WAeHJrPVkTm7qNyXVVZHkRgoHTx+L2+ZVO?= =?us-ascii?Q?SoSAO7A/78m54jyaOeWO5BiYhSJkyyDO5klUh4ME8SWgrCJMR4YmWZp63u0D?= =?us-ascii?Q?44IveGga3q+SEmjdmzxMFg4602wg7horCDVcq4paEMgWgdDjp5+z/ISjN7OV?= =?us-ascii?Q?aTWq7OnYvRJOYi+32BPpDEUYB+K+JTSrv65fY3DKcnC1oelzAwmm4oB2XIgr?= =?us-ascii?Q?bBlwPgPCweU+3VVy6iK3CnwlMh53CR01bX2tpiAZvZ6JtqSFTD25nVxJatpg?= =?us-ascii?Q?gJcwLzCPEyl++DMq3Mbs1O0pGskCIFNWH5hZp+CWSP0YuIwuWfwNkpnhJVrs?= =?us-ascii?Q?o1eUvkH9P+ZgfwSbEMeB0LjBSLZx5uyTp+e7W30ZIUGAmIQbntRQr/WCFMjg?= =?us-ascii?Q?hDtNFZujGcZbMEZ+MPT/UDrkM2YWllp0wiU89ttZ2MYtxkdAUXzqog0oX/L2?= =?us-ascii?Q?Za54Q/9Xo4Pilv+9jhN2UX0vCD04WJPTDQdN20AU+BqrgPUZ20oioIOUyn0N?= =?us-ascii?Q?pUJ1CK6R1gC8nRr/fK/MCGgydzOH4XTs4AXdm1oeooNPTUJLmct1hCTNSuBY?= =?us-ascii?Q?3EjQcWZZrA8/McxMCiieWiKZsy0TcF8GIgTJvTCNcP2+uvCArMPUEmP2mJ5F?= =?us-ascii?Q?udQGdqW9ULHAc1uaEasCoR5LxdF9Z+NK3A6mF1HWLL5Ym0uucQncWP56wle3?= =?us-ascii?Q?GrJNk4xmkGHif3xkwjHhg2fwfnUIn5+30+q+roM+yv9wD0uwO5iP95sqv6Fh?= =?us-ascii?Q?M5J8rYtc5b1BsYIBcPkbEUoSNtV+3TEk8r+b2/vsGLq76ipTCbIQlpa1Vu2n?= =?us-ascii?Q?mGBzzk9B/jHhvemEuzlG0U8U9dHB0LKDqIcU9MfJ0vJmWZUdWv+PuVxjXxro?= =?us-ascii?Q?7vs6UUlXNIWytZwoMO+NgkS1krPFHMrpjBN8YJdc+VeNeUU6tZAWQwxoZMI9?= =?us-ascii?Q?eulyt3JF8TSL4dLyEswWYyaL1xbILAW2U5jaDUL98XxMoCbz9TX31hhtldwj?= =?us-ascii?Q?iWhE10di69bB+VhbsZ2JMBnhY1ScYRExW417C5dBrD/IIwbGeATu0w+2j7CO?= =?us-ascii?Q?GEptuZuqlE8od/Z5hnMXhRbJ+sUbpYsRB96aBnkHMADTVoSx/jiBtgemFZVU?= =?us-ascii?Q?uqUGeISZCA=3D=3D?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 65aeec9c-ff8e-41f2-51ad-08da29b0e5c3 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2022 07:21:37.6017 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: muUrfOrutJRsxRU91H+Y+72Kbkbnjnl54j9/O2TG2I3Jb4dJsZQ+MlQ+xgQLe2fjQsgWd5Ff9sJEsv39A6zlfg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR04MB7371 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean From: Peng Fan To i.MX8, M core stack is pre-coded in source code, so need to get it before kicking M core. The stack pointer is stored in the first word of the first PT_LOAD section __isr_vector. So use a num to index the section loading. Signed-off-by: Peng Fan --- arch/arm/mach-imx/imx_bootaux.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-imx/imx_bootaux.c b/arch/arm/mach-imx/imx_bootaux.c index 3c6a5c09b7d..8115bf40f1a 100644 --- a/arch/arm/mach-imx/imx_bootaux.c +++ b/arch/arm/mach-imx/imx_bootaux.c @@ -42,10 +42,11 @@ static const struct rproc_att *get_host_mapping(unsigned long auxcore) * is valid, returns the entry point address. * Translates load addresses in the elf file to the U-Boot address space. */ -static unsigned long load_elf_image_m_core_phdr(unsigned long addr) +static unsigned long load_elf_image_m_core_phdr(unsigned long addr, ulong *stack) { Elf32_Ehdr *ehdr; /* ELF header structure pointer */ Elf32_Phdr *phdr; /* Program header structure pointer */ + int num = 0; int i; ehdr = (Elf32_Ehdr *)addr; @@ -71,8 +72,13 @@ static unsigned long load_elf_image_m_core_phdr(unsigned long addr) debug("Loading phdr %i to 0x%p (%i bytes)\n", i, dst, phdr->p_filesz); - if (phdr->p_filesz) + if (phdr->p_filesz) { memcpy(dst, src, phdr->p_filesz); + /* Stack in __isr_vector is the first section/word */ + if (!num) + *stack = *(uint32_t *)src; + num++; + } if (phdr->p_filesz != phdr->p_memsz) memset(dst + phdr->p_filesz, 0x00, phdr->p_memsz - phdr->p_filesz); @@ -96,11 +102,12 @@ int arch_auxiliary_core_up(u32 core_id, ulong addr) * isn't supported yet. */ if (valid_elf_image(addr)) { - stack = 0x0; - pc = load_elf_image_m_core_phdr(addr); + pc = load_elf_image_m_core_phdr(addr, &stack); if (!pc) return CMD_RET_FAILURE; + if (!CONFIG_IS_ENABLED(ARM64)) + stack = 0x0; } else { /* * Assume binary file with vector table at the beginning. -- 2.36.0