| Message ID | 20190819095817.22107-19-peng.fan@nxp.com |
|---|---|
| State | Superseded |
| 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=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="W0zF+mAX"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46Bq3q454Xz9sMr for <incoming@patchwork.ozlabs.org>; Mon, 19 Aug 2019 19:52:55 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 4C3E4C21F7F; Mon, 19 Aug 2019 09:47:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=SPF_HELO_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 4D490C21F03; Mon, 19 Aug 2019 09:45:43 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id CE255C21DFD; Mon, 19 Aug 2019 09:43:26 +0000 (UTC) Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-eopbgr10088.outbound.protection.outlook.com [40.107.1.88]) by lists.denx.de (Postfix) with ESMTPS id 8CA7DC21EC5 for <u-boot@lists.denx.de>; Mon, 19 Aug 2019 09:43:24 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MNkTtN+JLsmNeuwcBKnroTlqM6LKgH1rFMMOrnYwHzn6TeE0MxPjRrJY6Pc66PwlyR1ivtzzw7HNACOr6H/KBuaQLo90sruxhSO43X8hN1mRhsuFeRxKb9cUOjz5qBZ7dDLUheLFrQ4NXpGCOjHnlzmNh6h+40vEt8ZE7qIUWy1anhcwR8ZekKhuL9nBw2AaCIy+S1a6V+avCX1CU4WRQW0QLeB7zci6j1vYPK7OZQzVWoaApaAZiroEUge60iWIKhPfhqTC7IXy73KP+bttrtCBgIzVsFEir/g+tqcz4p2Je/fifehxjPaSnnky0q1V5u/ZJCmwL5P+J+SuevvlUg== 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=qi/+bIZhvaq8EolO1+TO9TZEYofpdS4YReH/qHgyaYg=; b=QNss5Wm6sjr8Rq+A3i8TgUe5jH6F2WWhFAUoXSx9cLAnNRTSJuMGJ8+TX6HJYzRb+jWSRyTU++s1EEsb3kM+cGLprlcQl6F73Y0/8+woPZAVOUyjCeAs2y9pT5pkbOfo1sQ8xcgaV9gtsNz8sOCgZN3zLAs3Y4FSpI/ErPThYF/TALbGCGSrrlBVJ0iTG1RbVdEqTwGXemLE5Au0EzTY6UoTYXPc8H0MLfRp6nvtYwhjjL/xkrpX2FdT9HMKRvCC77ym+4VUuKwKAWQJPbeAyZ9ZmEekc97bq2zBOKU02n2EaBwJOWeWk9ZApp8dotQGmhRzrHfsWmzNfdh6dLqcZg== 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=qi/+bIZhvaq8EolO1+TO9TZEYofpdS4YReH/qHgyaYg=; b=W0zF+mAXBV4ohUXyrojpkCxR0DX+ZuzNss3QczA+XbpB27i0VAbzElfr38J8lp9hb4eFdoN+T0A3Q2ebQo5EojHFRt/iRQyv+U/uVf/f+hBAs1OnIcNqM8pjhwBRxX2cq0MqmGC1pUf6dTYsB1bTr9A3F5MdRu13lgTqD+dN21k= Received: from AM0PR04MB4481.eurprd04.prod.outlook.com (52.135.147.15) by AM0PR04MB4354.eurprd04.prod.outlook.com (52.134.90.160) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2178.18; Mon, 19 Aug 2019 09:43:23 +0000 Received: from AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::5d98:e1f4:aa72:16b4]) by AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::5d98:e1f4:aa72:16b4%4]) with mapi id 15.20.2178.018; Mon, 19 Aug 2019 09:43:23 +0000 From: Peng Fan <peng.fan@nxp.com> To: "sbabic@denx.de" <sbabic@denx.de>, "festevam@gmail.com" <festevam@gmail.com>, "lukma@denx.de" <lukma@denx.de> Thread-Topic: [PATCH v2 18/26] imx8m: restrict reset_cpu Thread-Index: AQHVVnKLlJpb54SPJEuwAz3UnQlrTQ== Date: Mon, 19 Aug 2019 09:43:23 +0000 Message-ID: <20190819095817.22107-19-peng.fan@nxp.com> References: <20190819095817.22107-1-peng.fan@nxp.com> In-Reply-To: <20190819095817.22107-1-peng.fan@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.16.4 x-clientproxiedby: HK2PR02CA0205.apcprd02.prod.outlook.com (2603:1096:201:20::17) To AM0PR04MB4481.eurprd04.prod.outlook.com (2603:10a6:208:70::15) authentication-results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.71] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 8f6a8f1c-ebc8-4311-ae55-08d72489ad57 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020); SRVR:AM0PR04MB4354; x-ms-traffictypediagnostic: AM0PR04MB4354: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: <AM0PR04MB4354392677C3AF9F9A66948388A80@AM0PR04MB4354.eurprd04.prod.outlook.com> x-ms-oob-tlc-oobclassifiers: OLM:4303; x-forefront-prvs: 0134AD334F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(396003)(39860400002)(376002)(346002)(366004)(136003)(189003)(199004)(50226002)(2201001)(81156014)(8936002)(102836004)(86362001)(6506007)(14454004)(66556008)(64756008)(66946007)(316002)(66446008)(81166006)(5660300002)(66066001)(36756003)(71200400001)(478600001)(71190400001)(11346002)(446003)(476003)(186003)(52116002)(26005)(44832011)(6116002)(3846002)(76176011)(2616005)(2501003)(486006)(2906002)(386003)(25786009)(4326008)(6436002)(256004)(99286004)(8676002)(6512007)(6486002)(1076003)(7736002)(53936002)(54906003)(110136005)(305945005)(66476007)(32563001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB4354; H:AM0PR04MB4481.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: vUxCOkCANSaxWDGEqx3NWkQBfRIZlH2Fqy7A71yoJ+8hf3kvCgfiT5d2tCB2o2+CATOlux4VBc3Y933vk3sYzxZiHNwzfE8P7tbN8NfWwWawZjgFlBsxbnZ77WkBZc3ZGHYSaQC11p7z8bAntE6ijdrP04UIJO9VG19J4mD93Yuelj+EBuipUBPpAWvuaLmaCTejiDfsIAH6C67awk3U0ouiai0i4KeQUsa7BOHQw5S+UP52fD5nLwO4W1JFMCCklqxzPJOU7ETLY0qhDMB0PxoMPSUl9ztDfy6I8qRQAWAEe84+OKYmAy0uPMSNTiR/q1fEthmZnIFF9zw+qXggX2GnWJlFpPq7yqik42oqIR0dKy5n/OS4FVlP5KI29Ysk/zEUVg2adcsczW/cFlGVMp28J/CCeUDK7e20r+tF05s= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8f6a8f1c-ebc8-4311-ae55-08d72489ad57 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Aug 2019 09:43:23.7466 (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: rnZOfW5+ft+/pFm7fqLm25jCbIAj147qNo6Qg4T/6nxsvvZ71U9EMPvlj6BppAkG4Arjd+gixaoJ/Y6+9+hSsw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4354 Cc: "u-boot@lists.denx.de" <u-boot@lists.denx.de>, dl-uboot-imx <uboot-imx@nxp.com> Subject: [U-Boot] [PATCH v2 18/26] imx8m: restrict reset_cpu X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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: <http://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> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> |
| Series |
i.MX8MM support
|
expand
|
diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index ac80266010..3a54db4898 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -301,16 +301,21 @@ int ft_system_setup(void *blob, bd_t *bd) } #endif +#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_SYSRESET) void reset_cpu(ulong addr) { - struct watchdog_regs *wdog = (struct watchdog_regs *)WDOG1_BASE_ADDR; + struct watchdog_regs *wdog = (struct watchdog_regs *)addr; - /* Clear WDA to trigger WDOG_B immediately */ - writew((WCR_WDE | WCR_SRS), &wdog->wcr); + if (!addr) + wdog = (struct watchdog_regs *)WDOG1_BASE_ADDR; - while (1) { - /* - * spin for .5 seconds before reset - */ - } + /* Clear WDA to trigger WDOG_B immediately */ + writew((WCR_WDE | WCR_SRS), &wdog->wcr); + + while (1) { + /* + * spin for .5 seconds before reset + */ + } } +#endif
Make reset_cpu only visible when CONFIG_SYSRESET not defined or CONFIG_SPL_BUILD. Signed-off-by: Peng Fan <peng.fan@nxp.com> --- arch/arm/mach-imx/imx8m/soc.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-)