From patchwork Mon May 11 09:48:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 1287564 X-Patchwork-Delegate: sbabic@denx.de Return-Path: 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=) 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=dQwWbVYR; 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 49LFvF48TFz9sRY for ; Mon, 11 May 2020 19:27:05 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 52F78813B7; Mon, 11 May 2020 11:25:58 +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="dQwWbVYR"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DA2BE812FC; Mon, 11 May 2020 11:25:53 +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-he1eur04on062f.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::62f]) (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 02EBD8120B for ; Mon, 11 May 2020 11:25:51 +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=RtXZQLOoNCoxKiawWg6wGGGxdHmgspNEpOTf+BThFv3a33T03Oqzdlq2jIWKSVVQQObIO6ZGUuZtmHj2L2ixrkwQWkY4aXM7du4xIwj0IkoJnjRM9dxXH1aSe0oim+2261N9XWQKFOLI7RZl7n8aobId2p739EaE3Nx6JaWInz2ajBRFWx6lu3YmuuWuYsV2iaKRsIpx1/l13ZY5fXJa759YD7PN9aEN/DJWhRBM8ukygriwyUR/hfXgzQBFphvvi6EdskfNdnioj3XIOLn7tGpdTSk5ogd30o2/LidflnobvtK0jQ9eMEP4qPX7dUedJB2mxqDSQTVIlLaVGaWgMg== 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=qacCAD4k7rIoTUmXRy9HYP5bhhEiBV7OyvVyz7WGw7k=; b=DmLRralvAtuLww5TFPgAQEvMy8ds1ttaXCOt1gPiAeYIP7gQo/xRvQEWNVzHjXdEBWh3TqI8M+lGA96YCQ17BqH0wwlfvumN6ZsV9JEClaqwXwIMpOQS0vQUnd+nLm647ifn5dhuWf1b4Mz2j9DE0aXJnn6TSFS6sdzaMP+k5qhuOEsJKatn8SJL9SjBUfE3MFIBBxoH8Df9TB3X9ivjizcnGIq59vGVFTSO5pbFIls7GLUo0D6AACMFhgYtI0y8ngAwqtr489WCFAa6rXHyL+MW2p6kPMlG+AkKb0nRmZ1CDxkZoLdu4IjSDMM/Q/zoLTZ93I0GEGuwZ8JjwbIleg== 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=qacCAD4k7rIoTUmXRy9HYP5bhhEiBV7OyvVyz7WGw7k=; b=dQwWbVYROtKJRpDZUv8qWU4DdptH5r49cjswkMXJkkEqgxVIaEs8VAoUfMz7sNzvjMjUiSQ89SmctRtuNQVvHt6IcR743SRC1+CjEzs6w9lC1SG0EuhdAEtBu7VwonjLSokTWT4nNgSIJQSVd8g9jTBP81Wev6oUfToLc0NXmXM= 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:50 +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:50 +0000 From: Peng Fan To: sbabic@denx.de, festevam@gmail.com Cc: uboot-imx@nxp.com, u-boot@lists.denx.de, Peng Fan Subject: [PATCH 6/6] imx: remove imx sip file Date: Mon, 11 May 2020 17:48:37 +0800 Message-Id: <20200511094837.8572-7-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> 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:48 +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: 0bc1ccd8-46ad-44c0-8cc7-08d7f58d4b3b X-MS-TrafficTypeDiagnostic: DB6PR0402MB2853:|DB6PR0402MB2853: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:157; X-Forefront-PRVS: 04004D94E2 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IVKm8vnqcI9kj/ea7077yG4pJE54vdjl/n5k2TMzD7o1TGpX7YBxkA3k+UAokBrMGieJta/uWN62++06rruz3L3+esO3QKB6SObZGh6JWkBAntkKx87N599WcGbowkxfpkCEP2npKDHNG0gtWx2c0z/WNtrirypzuokYYVAVZ+Ul1HNoD9xRC7YplkLoGk29dbX4QftLX7xTRUx95akPU9Erk4qrrAVinwfFMQrJQkm1lqSBjSwecRzYYFX74TGeCOlbvv/ZUM4tGalI7xY8nuhNIAIRmjSG6BqYk/ADuw4NVi7fSCRhUmMqDox56OY7ilrliN/R9111najRQa2N+2sdW3LjrApJRUnfhdCFAAbofsbwlYNrNbUY+zePAtynWiL4sgAg7EkWj2xqEKBsHhYlcE6clXygszyzBVFXR4UwnECa0+zPbZoZmD0/8oK4usRuYEYpCcFRoApvbbnRQTQRuNiXjLforp5XIhUtnT+/RDp/guFAAsp/beWQQWxFeAZ5IS6EIeOenB3RcINplA== 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: /jLnXZLtzIZ7DrKpmlatKccuw/YvgbDsMnTqGJiRoK2pAGLNgdqjN34TNcGZJjd7DiYVIrD7YChAXttsikiY8YvMqG/OCKVHWHrn/RZGiUSgaZqqYPZayjBW+GPHUCey6w3UsHSe42/+96MN+atq5wGQhHvSTTrimrtOOYgesJbJvKY1S3o/sFftY4sLfAOlWg2S/JPprAfzTlzBTpIFHrISaPb8g3ulsiQkRllfhqRw6v9nlP7iu0i0vyb5IpqYy9kvA5rg6Sr/dSToGOoPReKsBuUgnOrMgYDxliRsArBvztvYYe2vTL0wXovsDlugauj5ZSCWibK38aoQXL9sRKGEI+R5wB0K5C6h6H+GLtV7rfSV13YODpvBilk4th568oRCcBm9KNl8OEHkkpzDOVzTcwI+InWydIUKd1hAP0MmpcWkF3AgW0IYce9Z4K74d0rq/Iwo3+EvPSzZ/5bnYgxB+M1igxpe6ROAJ+1mfg8rgrAS/Xlvs2DrRRhpakzG X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0bc1ccd8-46ad-44c0-8cc7-08d7f58d4b3b X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2020 09:25:50.0021 (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: 5Mg8HnJ+g+NQW7t/iliZDHyTarxiJo+9PvFoAzfqEttsmOc1nI0mxscmLPNbIPNPNIZfC+Jujj5BSZ9SrZuEVg== 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 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.102.2 at phobos.denx.de X-Virus-Status: Clean We have switch to use arm_smccc_smc, no need to keep i.MX specific sip wrapper. Signed-off-by: Peng Fan --- arch/arm/mach-imx/Makefile | 2 +- arch/arm/mach-imx/sip.c | 46 ---------------------------------------------- 2 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 arch/arm/mach-imx/sip.c diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index a70d51b5cf..1aa26a50ad 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -218,7 +218,7 @@ endif targets += $(addprefix ../../../,SPL spl/u-boot-spl.cfgout u-boot-dtb.cfgout u-boot.cfgout u-boot.uim spl/u-boot-nand-spl.imx) -obj-$(CONFIG_ARM64) += lowlevel.o sip.o +obj-$(CONFIG_ARM64) += lowlevel.o obj-$(CONFIG_MX5) += mx5/ obj-$(CONFIG_MX6) += mx6/ diff --git a/arch/arm/mach-imx/sip.c b/arch/arm/mach-imx/sip.c deleted file mode 100644 index fca520c671..0000000000 --- a/arch/arm/mach-imx/sip.c +++ /dev/null @@ -1,46 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright 2017 NXP - */ - -#include -#include - -unsigned long call_imx_sip(unsigned long id, unsigned long reg0, - unsigned long reg1, unsigned long reg2, - unsigned long reg3) -{ - struct pt_regs regs; - - regs.regs[0] = id; - regs.regs[1] = reg0; - regs.regs[2] = reg1; - regs.regs[3] = reg2; - regs.regs[4] = reg3; - - smc_call(®s); - - return regs.regs[0]; -} - -/* - * Do an SMC call to return 2 registers by having reg1 passed in by reference - */ -unsigned long call_imx_sip_ret2(unsigned long id, unsigned long reg0, - unsigned long *reg1, unsigned long reg2, - unsigned long reg3) -{ - struct pt_regs regs; - - regs.regs[0] = id; - regs.regs[1] = reg0; - regs.regs[2] = *reg1; - regs.regs[3] = reg2; - regs.regs[4] = reg3; - - smc_call(®s); - - *reg1 = regs.regs[1]; - - return regs.regs[0]; -}