Message ID | 20200511094837.8572-2-peng.fan@nxp.com |
---|---|
State | Accepted |
Commit | dc575201c849b3cc6782e6933417f7b2ccc3599a |
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=85.214.62.61; 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=h77V1eoG; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 49LFt03Hmrz9sRf for <incoming@patchwork.ozlabs.org>; Mon, 11 May 2020 19:26:00 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 43D3980681; Mon, 11 May 2020 11:25:45 +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="h77V1eoG"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0DA2680675; Mon, 11 May 2020 11:25:42 +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-he1eur04on0607.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::607]) (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 647E98066F for <u-boot@lists.denx.de>; Mon, 11 May 2020 11:25:39 +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=GprjEV34XIb7pZa/EYqT05SpBCt05lvzKUC6E81x8FkVLod5HytUJSTg37ffGZSlJ9m0Mnt1VAIvICdIAgnIgN+Ar8mgSCpEGHIEQp56Ni0kN6xKJVOmTju1PgMygA27DeJLflmWyMxCigbD8mkvuFLvn89+7M3Jfi8W3hBnhc32TCLsRqEnjRhYJnLxsc7rcNImqTdTzS3VJashDpBcBLduHJxCDPmatbuyNW3J1YlpVXvr6YF6gpUTdeoTHleHuyIr8RClydD3B/Ze59x+CT5dLW+8Joz4SYH/M6CVmn/u1yVd3xvPIpx3XWnYXWkrQtRZre/fSuaJW3e4miHKvA== 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=H2H/YG5eSES8VzYIHZfq4v+sQj0QHWDhBJ6vqLsaETI=; b=Td3EZERrF+GWAelFjkzm2feZpoSwvqI4WRz1Xr4mME/c7ckbt7M9y/naaBv6KQ8Llo4BtGm+10zsgC9eA2iq8vfLaeBr8tEFXyLgcM0CwyNPBRF3BY3/RTp2rFgR+u4MKqv7eMQSghIZX+FWK/xYebH+ElSLjoLsVeYpQpXIabfd0XH2AoUKnw1vXtucZsgpxYKmozG7SZhi1K3daDpRw018V9MeKZtB5f7lVWsf8WUEr4x9RKwwsagpn0qjqWaPpppQOtqPudbJNc9rOuY675XpNfoUsKwiTwYPCygUDAQF25pFgzbkcH0KHt4gHVPgG2EKSUQtbj32NeO3F9DsRw== 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=H2H/YG5eSES8VzYIHZfq4v+sQj0QHWDhBJ6vqLsaETI=; b=h77V1eoGF9Aj4Ydq8UHzceeKZESUvrHq6zpUxcW0+9ptdnse1FxZuYt7m+avttKyUnAIlrjEbmrvV1QBXkD/ZCcDWtHhF8iOPq9IVS08c/xLKZ6KLxvVuWPbiq5RjCUoCOyYkR+iLRIRl0tx9l/DrKt7XvbjjywKqTZIFSbmHig= 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:38 +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:38 +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 1/6] imx8: misc: use arm_smccc_smc Date: Mon, 11 May 2020 17:48:32 +0800 Message-Id: <20200511094837.8572-2-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:35 +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: 0698e9a3-507f-4582-de1c-08d7f58d43f0 X-MS-TrafficTypeDiagnostic: DB6PR0402MB2853:|DB6PR0402MB2853: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: <DB6PR0402MB285337EAAA8265A2A3740B2788A10@DB6PR0402MB2853.eurprd04.prod.outlook.com> X-MS-Oob-TLC-OOBClassifiers: OLM:24; X-Forefront-PRVS: 04004D94E2 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6LcB+cVWwydKIlelrhi3vY3H6GY2K897Hsj5C5g3Y1TPpFccqcGg1rkTQDM9yovUjuNhO/FXG45nMzznvdUb5bBxYmUaSOPFKI833xlWRq8hBG3qhwEWNaK5u0aEqVy1XJyGt8y/O0tHBxpnMvaUInPdwnn7OSqGuEyw+qPHts85UXHBa/22uCUwqeIzLr8aeh60NG4gThkVu6g1nemPvai/0FAMuID7wgWItKdSllcnDmg6G1rbIr0+0r+ceNiLybzZABAkkCq4ZqIjW+f4btwYpqPp2GUvmjkbx/KtDSRsiZFIZZnDBlz2MbxjFfUF+6v9pQshOkLAmhlM/mJzyLnmBTPUfQ+19bXSpnbscRPZwvPuwSdIhKaDaQJoMYGP/ORnqE3sSz0o3kzx0rRhunsln+1fDGso9uEY1rKXscYYzW/iyVgI2SjS3rADdj9AZkAkTjeOTrNKAfY4vf8JwJCCKya16GC5Xyoq7/oVo2UQyOyeX9KCXbsa+h6kxTV4yUBwsbuDm70KEINH27FEwA== 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: vYAvW39QieWuT43TaxeWvEIuqMrjEOB/LFjXJkRgZxfSCoRN+FVCp1DhZagxw1idd6ZmaYzyrhAh0eU2i/wOEzSv4L8FFdjNHAlzMAhMwrDyuFWjUiC40HJ61GJ+zCv/kQ8sUC08gnBRVYx1LCH0QybtT5yPtKHccMKqbZLTmF7dms6aXjcCc2T8vA1g0vvwsffAY+MSKTwGF0p++3ccgZSd5l1M09Mf1LBxWrKH0GwIuEs+pa3muujlBGNyDivma7WHtCsqs3iAP+bgarB2+UzDBBuDYIU5KSwUS2gJIvG/kS2fCgYNU6Gbon3shoP7fxZMDkpfbxSqldaIkimkOR941gEDkIV9srrjpWc+pRuvMA/77n6YfcLphkADyLtld8Kt8qSJ0HQ68yU5iX/qmESCfLF/MKT5G+R6w/bFi9H7a9XmHG/5ZqrAELaNsgMucD2yQSt319GWMtG+JM9S77qHXc8OlcvjrjgDtXItz7sWcCKqOalZhaQwsL/Ssu1d X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0698e9a3-507f-4582-de1c-08d7f58d43f0 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2020 09:25:37.8965 (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: mh3eZKfM+CAwRbo/W/tpF1Bz5Oh3v3+Ul98S1fGZ6/IOF6sfKZj8S1r3pLwlNmm6wgzxV347tK9buVlyQuusOw== 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/imx8/misc.c b/arch/arm/mach-imx/imx8/misc.c index 76d6571d8b..f3fdd22d28 100644 --- a/arch/arm/mach-imx/imx8/misc.c +++ b/arch/arm/mach-imx/imx8/misc.c @@ -3,6 +3,7 @@ #include <asm/arch/sci/sci.h> #include <asm/mach-imx/sys_proto.h> #include <imx_sip.h> +#include <linux/arm-smccc.h> int sc_pm_setup_uart(sc_rsrc_t uart_rsrc, sc_pm_clock_rate_t clk_rate) { @@ -29,6 +30,7 @@ int sc_pm_setup_uart(sc_rsrc_t uart_rsrc, sc_pm_clock_rate_t clk_rate) void build_info(void) { + struct arm_smccc_res res; u32 seco_build = 0, seco_commit = 0; u32 sc_build = 0, sc_commit = 0; ulong atf_commit = 0; @@ -49,8 +51,9 @@ void build_info(void) } /* Get ARM Trusted Firmware commit id */ - atf_commit = call_imx_sip(IMX_SIP_BUILDINFO, - IMX_SIP_BUILDINFO_GET_COMMITHASH, 0, 0, 0); + arm_smccc_smc(IMX_SIP_BUILDINFO, IMX_SIP_BUILDINFO_GET_COMMITHASH, + 0, 0, 0, 0, 0, 0, &res); + atf_commit = res.a0; if (atf_commit == 0xffffffff) { debug("ATF does not support build info\n"); atf_commit = 0x30; /* Display 0 */
Use arm_smccc_smc to replace call_imx_sip Signed-off-by: Peng Fan <peng.fan@nxp.com> --- arch/arm/mach-imx/imx8/misc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)