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 47206C433F5 for ; Fri, 29 Apr 2022 07:21:43 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 505F683EF5; 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=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="Xbe7bj/N"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8344983EDC; Fri, 29 Apr 2022 09:21:37 +0200 (CEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on0618.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0c::618]) (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 2638F83ED8 for ; Fri, 29 Apr 2022 09:21:34 +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=oPpFU49+zkfEZCYLlESZc5yFgOaZiP+OFfWE4h9ggWGEsUpiwrOU6xdpHnouedtGmOJXRQNEKwRbsIkNkqv9hFQBdAuZaT84ZC7c9AmEA9mNCxJQa7n2Kme7dOcUlTp9u/87y5z4Z8F5S14ewxo+/sXMqKSGLY0vkuC7edcL45lLUCawfv4/9aMQn396zc6FjrtnY1aGkiQpBcXirm6iDOUK8OAyNMg4RCSRORlxzJcHkCk+qYFPmB+7FbxM+5wVMglxICJlTI66dbcmY1j+W0QQZXWoddOlvYJtoXHQfF6ZkU0jZfbruHgtrjyNgIM4Z4hvqTG2WC1otrVlPy04og== 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=472FJ0pWFN5Zap1V9dPhfPoXgT5GEywTHqGErbXPK8k=; b=UXTqGapVmGeqo7BXKA2KXDRQH/5HcRhgmMDHSq5w8Lx+dnzUwYWCE3m6EeJtL19zv0YTqls0TQMdBrV2SC2/LKOOsSfvlZT5r3WRG1UnjKfbro2f3LXceYukVomht5Ebf1huvXEiSA5UcoyH/dSYm2TbRhA1xAfzQs6DAfsHNEw6V6RFc6KDV5wQsZiuuJRZOvQ+VsDkDKGEHxXbjlMgtjJvQFdjMu6ChimA1pF2gxkIhMk/GsxCMnSirjqENU6piYVfMKwxhf2PUls4WLHBZJ9bJv9BLbN3gTfT+R20fTp3Bjm1QJbu80AwdaRXT+d8btD4cIQ9+ya5EJ5jo3s6yQ== 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=472FJ0pWFN5Zap1V9dPhfPoXgT5GEywTHqGErbXPK8k=; b=Xbe7bj/NHxofZ6CsSiUgSqjVrmp8Nyg10XVlyaKftBmFoH5ofbQm27uWjHhjLU2jR5XrsrQvKe1y7O7piGX4clj5JBG9HCKSsHI4cvNxSdw1JGE/qCOKePC7Vygl7+invhkEKy1Yn3K+9yplf5xjYSv8xXrF3qn5YsCCkNhS340= 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:32 +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:32 +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 1/4] imx: bootaux: cleanup code Date: Fri, 29 Apr 2022 16:03:11 +0800 Message-Id: <20220429080314.29600-1-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 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: 6fc779f1-bd6b-4a28-7557-08da29b0e287 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: rzmbIIY7fDAHq5a3Au2nGiQvACwQmANgfd5AguqLRTESWm04EsTxY3/n3vRKazb35kM5CRPCKTvyaSUO3vhKqxeYedWmCcUV6UssnCYlGr6+PhkVqTX+u3uhBKSPnEWPnCO8XxuwQGvZp2DrskLnt0K6Kk8QgltbzkX5oK/vRzrkRKAdqRPTMXdZFrr/YahR8oP26NCtP+ks7f1GPKOWbVLjevxGp4I/joODPxN/J40LTg62nsNxK6liCjfQCEisRvb/p97BnL0+8aQEH8TCUuTkoC7oIWwSJWT3Yg0CfQ8xff7IaPgvGJJXNXgFGBkazMPhOjQtVTBsPPvMeLXBMsqQvuRFsvmGOT0OywbguLLS9PlC25x3jlF4c41tyGTiqrKkboYPPh7vUpeNYT4Djt9sosyew1hxx7Zk0lvZ/+4eEDfw/gP15AteSxN0d3+fn1gh+qE35bTYZ4F8CacHk47zoZqtGx9jfimVo/yD0irAy33X/qazSMLsuj0x9dQib4XXBuMAxw3Z58yP1xnxYEANhNkgkkr8AaK11rAmfKa4U7+e0isOVVr7umzZ2Wq3vXd+DtzfWqfXTLYSigB0GBxvbnP3ik+hniCOy2EockcocTprHO3LqZELJT3BVyBGr7ZGk3HS87GEZyqDNLbmJ6LQtgfT+zQz7sjJ7tTYrBOjn3/notQdyLscPMqCl0qMWX2JMndfioPPP2TLb8wqxQ== 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?DFnEu0seS5ilMvHIsB2rtGUEXxBsjO8tlI1ldBZsyDKkyyP/U0g6snmfA90d?= =?us-ascii?Q?mdjMtIJy65i2fd+LDaqH60yzmTqiJfiAENz5ohGTVbli2NBOF+rkCBdmdUFR?= =?us-ascii?Q?7Jv/IF0d7Ahf2IIcx/Ra9x5ZjJAHobuKtKsoLEBS7L4EODgJP3O4c0XVEnRZ?= =?us-ascii?Q?wk5GyKmpZA2MbISedoCf2dpPBaHONOHDm4D1kwWQmmtgaJmfSxWHUSkDEBs7?= =?us-ascii?Q?AUOshm5aNP4Q0fiH2+7eIkI/KMqlQntfcNk7mpf7rIP7dyRmQbrqaPTyEFGC?= =?us-ascii?Q?b5P7RML2eLuPCJw4G6pLL/UaTwo0ZDlNrjXhbDICfhFt+H38HrXp9LUPPn++?= =?us-ascii?Q?AK1c1nvNDX7AbUCZlCzSLCrVYyNBNw4GQBzaPpBSEqlXQxu3Tiza1FTm1VWE?= =?us-ascii?Q?J8ysOViETXmG3RLif00o/HAeXyz3awDXgen/joErZuAFTTTcznsoIyoJXP6n?= =?us-ascii?Q?a7nTpvAFEqgQLbJvrD1kiZ/CKjM9gt2d1q/8RJ0q4nC1a/j9UHJgotkKQa/P?= =?us-ascii?Q?k02UdZ8lmeUAPsFMsUJsq1VUBDwyp2rEF3tgBtHvWkqPDGrv0NilX1JxDlit?= =?us-ascii?Q?568Kd+eE6Rhs4wDByYPsyvHIzUzkiF2azHMiNqrOpN5lqdWhRUDEfOKsDLKH?= =?us-ascii?Q?V3atcaOUsF7FqFR9TzUwMAfqXjv31IZmH7M7SObbCMLIeEuCQgocdAFp3AnM?= =?us-ascii?Q?vaQLhOiIHUJ8aAqinkUqD/O5lrNC6t+Uwr5AcHHYFcOfgQgZL6OL5Ui6RO/H?= =?us-ascii?Q?FJK6oqsOTL7bn63Ilvj5+duE+s7MSwqanq47sTi9cdohY07epI5MK4MsKQMx?= =?us-ascii?Q?6Jj/DsWW9oWVDvnqznvtRvCo6HxS4XB8Bxv3IX7HMTFgD8EhgT1EvzOXAYvk?= =?us-ascii?Q?kboyJHmZUsFXuTWmwDaAWM9sOJ6Q5vD3yNchTVA+DOGcVV3Dj45gckMF9O6L?= =?us-ascii?Q?ETHP8vzgDtMcfCVYJRJTow3qX7MJbWSZqNcEjzd7mOLDVYKMUbHK119uvIbI?= =?us-ascii?Q?wHJFDvMun8VNNRrJoWhJCDUIB0q+ZsNOeCYjsTuCWwzSQ+rtvesnlncxX9GT?= =?us-ascii?Q?hutLK/+SwC0r79U8dp71hrDz/Pl1WgSFXf1XFDlVrHgxw2/aqTxGIUXqU6d9?= =?us-ascii?Q?8NVh+qL/sPREFOdQej78syMf2+oQ69S8289dTIihcdKyOlTLSA8cKrdU3OHg?= =?us-ascii?Q?DfFhCTbAAvv1Cs0G49WiRjnm4wc8wTRToZO/ACjXcoZadEM1Ts9KPhIBLwZP?= =?us-ascii?Q?hzejmzwx01Siq2nsSP3U91GVTDdYSyGczfRugi9eWkjfNbTFvBCFWbvodPla?= =?us-ascii?Q?QD4Yx3VF2OYsgYTiJnApsVm0sH38FdnuTTQUCXHkIKFENSYB0NMi+131lr3J?= =?us-ascii?Q?P5+w/ByYo8CYqPUiNIh7FlJfK3Ds1wjQssELZC+zySuUYiairYk+HjucJDLK?= =?us-ascii?Q?UAEItEGKu722wEWhEe+f33oCNrzBOI2CH3qVlYYszUDtLWC4NetKZ0DZJbOR?= =?us-ascii?Q?2p4isjMY73nxa4SPXaBOxjyof5IxScFGnbTisiIsa/Y424KR2aUvHYk3x6Uq?= =?us-ascii?Q?njDgTUNipO/s7xJNY78CC616TS9O0hTTFGzA/K/BRdq/TA3F6mueKusQHnRd?= =?us-ascii?Q?wP6oMNZ/MCMEVYNZ9evBvH/XgT0PYwCH3uiQHjwNL7Oi6Lh1Lyexa9Yf/2NB?= =?us-ascii?Q?FnE833ZRK/mS022gIBDsHiUY8G86eTrGyyOSIULWmOj6UDddGv5JWtJU6pCl?= =?us-ascii?Q?X3S3H3YILg=3D=3D?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6fc779f1-bd6b-4a28-7557-08da29b0e287 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:32.0200 (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: RgOxlCEidvly+gt84WB3xkxvMKKyuT8jFn1XfeM4guiHAF/MDivCWf5o6YMRpSRxWpVvQE7lAI5a5lVGW/oQfA== 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 Use if (CONFIG_IS_ENABLED()) to make code cleaner Enable elf support for i.MX8M Signed-off-by: Peng Fan --- arch/arm/mach-imx/imx_bootaux.c | 43 +++++++++++++++------------------ 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/arch/arm/mach-imx/imx_bootaux.c b/arch/arm/mach-imx/imx_bootaux.c index 9ffe5ac6e34..6a075ccc4fb 100644 --- a/arch/arm/mach-imx/imx_bootaux.c +++ b/arch/arm/mach-imx/imx_bootaux.c @@ -14,7 +14,13 @@ #include #include -#ifndef CONFIG_IMX8M +/* Just to avoid build error */ +#if CONFIG_IS_ENABLED(IMX8M) +#define SRC_M4C_NON_SCLR_RST_MASK BIT(0) +#define SRC_M4_ENABLE_MASK BIT(0) +#define SRC_M4_REG_OFFSET 0 +#endif + const __weak struct rproc_att hostmap[] = { }; static const struct rproc_att *get_host_mapping(unsigned long auxcore) @@ -59,7 +65,7 @@ static unsigned long load_elf_image_m_core_phdr(unsigned long addr) return 0; } - dst = (void *)(phdr->p_paddr - mmap->da) + mmap->sa; + dst = (void *)(ulong)(phdr->p_paddr - mmap->da) + mmap->sa; src = (void *)addr + phdr->p_offset; debug("Loading phdr %i to 0x%p (%i bytes)\n", @@ -77,7 +83,6 @@ static unsigned long load_elf_image_m_core_phdr(unsigned long addr) return ehdr->e_entry; } -#endif int arch_auxiliary_core_up(u32 core_id, ulong addr) { @@ -86,10 +91,6 @@ int arch_auxiliary_core_up(u32 core_id, ulong addr) if (!addr) return -EINVAL; -#ifdef CONFIG_IMX8M - stack = *(u32 *)addr; - pc = *(u32 *)(addr + 4); -#else /* * handling ELF64 binaries * isn't supported yet. @@ -109,7 +110,7 @@ int arch_auxiliary_core_up(u32 core_id, ulong addr) stack = *(u32 *)addr; pc = *(u32 *)(addr + 4); } -#endif + printf("## Starting auxiliary core stack = 0x%08lX, pc = 0x%08lX...\n", stack, pc); @@ -120,36 +121,32 @@ int arch_auxiliary_core_up(u32 core_id, ulong addr) flush_dcache_all(); /* Enable M4 */ -#ifdef CONFIG_IMX8M - arm_smccc_smc(IMX_SIP_SRC, IMX_SIP_SRC_M4_START, 0, 0, - 0, 0, 0, 0, NULL); -#else - clrsetbits_le32(SRC_BASE_ADDR + SRC_M4_REG_OFFSET, - SRC_M4C_NON_SCLR_RST_MASK, SRC_M4_ENABLE_MASK); -#endif + if (CONFIG_IS_ENABLED(IMX8M)) { + arm_smccc_smc(IMX_SIP_SRC, IMX_SIP_SRC_M4_START, 0, 0, 0, 0, 0, 0, NULL); + } else { + clrsetbits_le32(SRC_BASE_ADDR + SRC_M4_REG_OFFSET, + SRC_M4C_NON_SCLR_RST_MASK, SRC_M4_ENABLE_MASK); + } return 0; } int arch_auxiliary_core_check_up(u32 core_id) { -#ifdef CONFIG_IMX8M struct arm_smccc_res res; - - arm_smccc_smc(IMX_SIP_SRC, IMX_SIP_SRC_M4_STARTED, 0, 0, - 0, 0, 0, 0, &res); - - return res.a0; -#else unsigned int val; + if (CONFIG_IS_ENABLED(IMX8M)) { + arm_smccc_smc(IMX_SIP_SRC, IMX_SIP_SRC_M4_STARTED, 0, 0, 0, 0, 0, 0, &res); + return res.a0; + } + val = readl(SRC_BASE_ADDR + SRC_M4_REG_OFFSET); if (val & SRC_M4C_NON_SCLR_RST_MASK) return 0; /* assert in reset */ return 1; -#endif } /* -- 2.36.0