| Message ID | 20200511094837.8572-4-peng.fan@nxp.com |
|---|---|
| State | Accepted |
| Commit | bf26b9421eb78c7ff3ecf42a8b5bcde0315343b5 |
| Delegated to: | Stefano Babic |
| Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.a=rsa-sha256 header.s=selector2 header.b=jV3eDiY1; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49LFtc1VZVz9sRf for <incoming@patchwork.ozlabs.org>; Mon, 11 May 2020 19:26:32 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B475F812EE; Mon, 11 May 2020 11:25:52 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=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=nxp.com header.i=@nxp.com header.b="jV3eDiY1"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 524D881015; Mon, 11 May 2020 11:25:47 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0605.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::605]) (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 4DC6080677 for <u-boot@lists.denx.de>; Mon, 11 May 2020 11:25:44 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GUBdwtpSQBPZ8TGf9c9YGqJQFz2eQKnmkgFJGVaWEP1SqKSox38uK/L7U8Z6JhXIIzeR5OwjY3vC7nz10RjJ81mTZP0LIJPlodmWCIqPlbXwTttvm+MxbjrhLxG2o5ut+pYgAdVlTR6l8PHRqctrXiyWpefVKv3x5rZGVfnoqfMrIND5b6N/e7IODvnGJRpvyC4KC3F+/OjT3ngyjhD6ygde5we1+zI/ELxwczai2faf4ECy3np85e7PWLqYwC9UwHq/dok9GXapS9dOrSxDKVr16CS4Rw6f7KVQcHyObUXxNdpQs+i9AhqwZwZpq3ERPF4UqlhNo/TJzQAhdtnx7A== 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-SenderADCheck; bh=eo6IlG3DzsfD9+uOMP5hXde/xQTc8uWlPgT2zfsnenU=; b=iaFj833BSQACXHintIVh+ZnHQ5E6LaFcTyYbeK+oUpwsX4F0EX79r07SifHKK7Pe+cVy5tJO+DeR0EmVBMg0A1ZxTIr33+dehNO9OtQp4QYUO0aGykujlVoOBEeNvun0z6odyncZVbyyzd3wxez3XfrNlrTviXveBtKnTdtDHJ5Q/hL/R++ljYBsG8KIoaWwOpAIM+077+a5V7p5E+Kh/fic7AdeWkutPTo5KA4PTBkd6yuyZ1ZACNv8dWqQepMQJMOQF/kCKMM/Qd/rJDvAwXVTuOke2a7MHn+ZsoUM5TX5ShdvWPTve2JD19KmIFMD1HsujyqLp40MlsDcGNB3hQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=eo6IlG3DzsfD9+uOMP5hXde/xQTc8uWlPgT2zfsnenU=; b=jV3eDiY1f23jM49A+bH5KAwvKbhcaoC5u7tWGV56gTh/eKldsKPd82aUduLPXA58Lj1eAcn/pCUeD5INhqy7SeNf/P8xRC8wvqDfH6q0JR4XRtXpBvY09HLfsEkJEih5MRplQi9sTJPxsYnYyMm37Dqme2AAACQLaigK78ZwFFg= Authentication-Results: denx.de; dkim=none (message not signed) header.d=none;denx.de; dmarc=none action=none header.from=nxp.com; Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) by DB6PR0402MB2853.eurprd04.prod.outlook.com (2603:10a6:4:99::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.26; Mon, 11 May 2020 09:25:43 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::d17b:d767:19c3:b871]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::d17b:d767:19c3:b871%6]) with mapi id 15.20.2979.033; Mon, 11 May 2020 09:25:43 +0000 From: Peng Fan <peng.fan@nxp.com> To: sbabic@denx.de, festevam@gmail.com Cc: uboot-imx@nxp.com, u-boot@lists.denx.de, Peng Fan <peng.fan@nxp.com> Subject: [PATCH 3/6] imx: bootaux: use arm_smccc_smc Date: Mon, 11 May 2020 17:48:34 +0800 Message-Id: <20200511094837.8572-4-peng.fan@nxp.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20200511094837.8572-1-peng.fan@nxp.com> References: <20200511094837.8572-1-peng.fan@nxp.com> Content-Type: text/plain X-ClientProxiedBy: SG2PR01CA0143.apcprd01.prod.exchangelabs.com (2603:1096:4:8f::23) To DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from linux-1xn6.ap.freescale.net (119.31.174.71) by SG2PR01CA0143.apcprd01.prod.exchangelabs.com (2603:1096:4:8f::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.26 via Frontend Transport; Mon, 11 May 2020 09:25:40 +0000 X-Mailer: git-send-email 2.16.4 X-Originating-IP: [119.31.174.71] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: c144e969-08ca-4d58-316f-08d7f58d46e7 X-MS-TrafficTypeDiagnostic: DB6PR0402MB2853:|DB6PR0402MB2853: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: <DB6PR0402MB2853CAAB0272EB0A5FE55C4588A10@DB6PR0402MB2853.eurprd04.prod.outlook.com> X-MS-Oob-TLC-OOBClassifiers: OLM:254; X-Forefront-PRVS: 04004D94E2 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Mxuog+8zs4rki89SZU3Em8TKjPk5l9Q8COBDIpVnYPMYlxOTl+WCRMeGXsZw8xO5xUTgJzgiPwuqt0pP1LuIU2d3WNkZVIQWemrtwZcvetBFLJiGx6WQfqZWoIJANB+hvDorXzUPIFbp0Iu9adJAAe/W65AZ1WR2BYk0HwpiQHOsXvuCM9BQJk7hV93bR10dH95uCeHoW88REAaCpVk/OQD/CIIW+NRoZmJXhBKsr7bydKsL/v1zlkPuM4SeLSIu12ciKGxjVXIfgio9IUMIMTaMbik5UvnJ/pJrgoEfum2n51+o3n1kzzjFeRm+ax65DBkLB/niJsrhvX161QZ54Gh/lC+fu/CNocOXIhnMkXaCByskLieX96RSIXnA40TAaDzHzGu4dSszdjOhEPKlQtNWKvDQkDwUQy05VR0wcw0vONECbSdo4yaLkHufY82ZkHh5mevxcqa6lxWVmJqjnIw0m0AxumsnpQYVZwmjbhNVjv9yjxKBGYa8w/A5Sv4XNICz48lIlt1HEo+Ev9srdg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB6PR0402MB2760.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(136003)(396003)(39860400002)(366004)(346002)(376002)(33430700001)(5660300002)(8936002)(36756003)(956004)(66556008)(66946007)(1076003)(33440700001)(66476007)(26005)(4326008)(6666004)(44832011)(86362001)(16526019)(186003)(2906002)(478600001)(316002)(6512007)(8676002)(6506007)(2616005)(52116002)(6486002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: pKaoj19XkwkUzfMzs9py1DYpkSNVPVIlAMZ2RJgr6/+MtG3BzlUDueEEQMGt3fK8pDGOeqJDyLmageAE0KhnBv1hXNDtmd6CWTkKiPQJaKhBmL2RKRgLyCUnSHpyEqLywl3vCqtBWDVkaiH8tQcB1ON9Tq+ZMykjKzTY0e/KZkp1zU43NHwLc6x05N1qjCMDKHtBsWZeDNdEgA/j52JnzvS9m0ksz0l3X0DbmXRZMJAUz1n5IBhoWdlV1fAX0JlFNVLkr7vlO3L1RskKdKVlm6qrUgL1SwsKJQw0W4iYBE40y04bUyFxY+DV6ZVIYBI0z9NCmwIVMY97EZNcAG46cR0EcFx7E81nmoSq934K/z6BsnGpH+bahJBkwwHe75GkWwuw7U6i1Iq44QvE/wT18FiQKZkohPheBjCYgMf67z9Vp3RpXdr5XvRcM79TbUXOVG50OCu5f93Hzup7p2Xlpk959LXA2+Ftv/6q1y643+viR6m4zN3ZK9kV7VeB7bfS X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c144e969-08ca-4d58-316f-08d7f58d46e7 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2020 09:25:42.9093 (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: rxnFuYNrz/n0UOdONGK6XFo+Tqr+wCznVZrtTCcavVsSYkBHSwWV6GozYbfaflUyEx1mWK0CUcsJZ4rqc391zA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0402MB2853 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean |
| Series | imx: clean up sip file | expand |
diff --git a/arch/arm/mach-imx/imx_bootaux.c b/arch/arm/mach-imx/imx_bootaux.c index ec0da1164f..908125fff7 100644 --- a/arch/arm/mach-imx/imx_bootaux.c +++ b/arch/arm/mach-imx/imx_bootaux.c @@ -9,6 +9,7 @@ #include <command.h> #include <elf.h> #include <imx_sip.h> +#include <linux/arm-smccc.h> #include <linux/compiler.h> #include <cpu_func.h> @@ -54,7 +55,8 @@ int arch_auxiliary_core_up(u32 core_id, ulong addr) /* Enable M4 */ #ifdef CONFIG_IMX8M - call_imx_sip(IMX_SIP_SRC, IMX_SIP_SRC_M4_START, 0, 0, 0); + 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); @@ -66,7 +68,12 @@ int arch_auxiliary_core_up(u32 core_id, ulong addr) int arch_auxiliary_core_check_up(u32 core_id) { #ifdef CONFIG_IMX8M - return call_imx_sip(IMX_SIP_SRC, IMX_SIP_SRC_M4_STARTED, 0, 0, 0); + 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;
Use arm_smccc_smc to replace call_imx_sip Signed-off-by: Peng Fan <peng.fan@nxp.com> --- arch/arm/mach-imx/imx_bootaux.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)