From patchwork Mon Sep 26 16:47:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1682745 X-Patchwork-Delegate: van.freenix@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=seco.com header.i=@seco.com header.a=rsa-sha256 header.s=selector1 header.b=QeORdMSS; 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 ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MbpbV4mnNz1yq3 for ; Tue, 27 Sep 2022 02:48:06 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CB2B78499D; Mon, 26 Sep 2022 18:48:03 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=seco.com header.i=@seco.com header.b="QeORdMSS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3930D8457B; Mon, 26 Sep 2022 18:48:02 +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=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2071.outbound.protection.outlook.com [40.107.22.71]) (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 9D3F984A59 for ; Mon, 26 Sep 2022 18:47:59 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=l1Kcqm6NOl99hjxrceJCrX4qsYwokBODACqIKev1daMXvom3s/sABuNwJiWgust5pH0oFCSHEbTimUuvouZyGf+sp7LJ1OdQ33x9zyYsoLtuE3FpshA6JWhXt1a6E/huoHm+GiXtAJ6w4dZZh5qk0kvOhFR9HkwDzWsspEnuJTxJZV1C44m1r51rJFrfZHUCZyIEQw//YIfkbN8AEQaGh6/4Dw94bAuK1bEOYNLRZZu3ACxopDKTFweuBf7tgLyCuAl0Kn0JnDun2d9vzt0SvDgn1mZVlfbsLdxdMuwTIJsesebfoaqoS9+pe4/hwgVXcJdnYQbDL4TKmMXJFibHLQ== 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=D527DaecB9qPmtaLqUEvep5zvBT/edt8GbjvM4iu4W4=; b=oRA5wyREBR6D9r1PM33op+GNaHrFEbEih6NStzYvwnwTelw8VXFeXph8fcOGtCrdufoi0nAK9S8eDyW2SHYiPAGnyz6rLk9VeDxHJ7qMiPnUA8Wsz/hAl2MoP5+/T5JvnuAyimU3LVFh9atEnF4cexXErT7/5bKlqhpHUIlb84cqIid06FgEstqUkh8E4P0IFaU+9dR8CfavrASCNR18KHQW20jftnNjUryBicv4MkmoChF1n0a6x1wmxBBfB08coLJzdCOieMhSrX7hyAixSde+jW5cGaxFeVTm98hW7oILXYGSSg5CN3LP2It6tcbuoOUHooVx/yAGwBUgX56/Rw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=seco.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=D527DaecB9qPmtaLqUEvep5zvBT/edt8GbjvM4iu4W4=; b=QeORdMSSy5yxGmOnYGfCejNrS8FCfVTyJS0yIbUXirs5ejUxWNj/WnKZAFvjLRNXmvdrvznDey4+FxRsI6CQSNPO9vwDoUDU4Dcj3cO+b8kGQSxeqqRNXDs7MCfVoE3YwevzGYZwmZkYj4Sah2YJ5TmImtsMysylUmDs32KOpC8eZoGnzd+5z601xcGoHtShBddfPpY5GbzHfOtCpOZHvBln5C0n0EbjTPB+DLeAuHJ4QSt/rQ9d7DykDmfMV7uWVU1TD7ekU/HBx8Q4IoaazyZ2vDk9gSfS2AMsUkcTqOhpgZjbuzgaqW6ij7JZ2aHd4kGhvTaH70UaFClm/YalUw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from DB7PR03MB4972.eurprd03.prod.outlook.com (2603:10a6:10:7d::22) by AM9PR03MB6753.eurprd03.prod.outlook.com (2603:10a6:20b:2d4::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.25; Mon, 26 Sep 2022 16:47:58 +0000 Received: from DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::204a:de22:b651:f86d]) by DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::204a:de22:b651:f86d%6]) with mapi id 15.20.5654.014; Mon, 26 Sep 2022 16:47:58 +0000 From: Sean Anderson To: Priyanka Jain , Peng Fan , u-boot@lists.denx.de Cc: Rajesh Bhagat , Mingkai Hu , Pramod Kumar , Ran Wang , Sean Anderson Subject: [PATCH] arm64: layerscape: Support SYSRESET Date: Mon, 26 Sep 2022 12:47:37 -0400 Message-Id: <20220926164737.2801920-1-sean.anderson@seco.com> X-Mailer: git-send-email 2.35.1.1320.gc452695387.dirty X-ClientProxiedBy: MN2PR14CA0016.namprd14.prod.outlook.com (2603:10b6:208:23e::21) To DB7PR03MB4972.eurprd03.prod.outlook.com (2603:10a6:10:7d::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB7PR03MB4972:EE_|AM9PR03MB6753:EE_ X-MS-Office365-Filtering-Correlation-Id: c9ccdf20-7e19-455f-2772-08da9fdedde5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7A6f5AT/PtzlAiaXmxvIVcmrK+nQ7S2A8UFKB0fFUC/QKWt64VMgWhA8i3k0a+3/5r316o/8T9LgUbi6MbQk/0HHZ7dS5Ghbhda+xKHR9SufX76cX1/pxxwv6qSmm9ystSUaBpbd4WKSJ64/3MACuxZWi/iwg95rLEHpkseSyBUY/ZOQVNtQPkVzSfb0DSBsoVx9bzaWFFS7YaqJZ++ZVPxUZK1zpg3D6NdcDXbWWMRwsSUjR6LXJf6MPAJxBkAkDo3lUJZx7wBiu1oADLZfuASvq6NRIUdDtSepAMrG0Uca0/k+0CaS22oPp1NotrA1VwYBoru1/MyLcCs4ZwOmDLngHgppPlJTSbQ0rX0+U0j90XazS4mqy7sZSTbK9uZCY9yDfOuVdlY6UfFX5XcE5yArUjLul/QmjLKVN2HwXLHgSmIUxF7md8bxMYP5bekOYyE8l5CwlTJqChnRWj88/8+SDKG5A1encQApulGUyDTDcG74pbF5A57xlKkkUuD7wn1tGOoPpGxNCxY0Mg49BwS6H3SATBzSck3ldUV7HWmh1AHiHN0ylBtQEpZLM9dc/SGxRNyDrjs2yOo/zZWjgLtuBczsce/eFkepfNFWIdlyW7UhGHgpuyLGBIzZqTke75s36bYruPUcJu4q+6gR5XdvuzGB3Gt+n4j20bjCWTdbCPu+pPKJR3xd9jufqzHpsTeFi6hzslEfsdHEwQtgavbLn1WUQNUxzdKHib+48tyPedGWhBydh/kmHm3fyngVRX37uTHa1hwWX7/ijqeZQg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR03MB4972.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(366004)(136003)(346002)(396003)(376002)(39840400004)(451199015)(54906003)(110136005)(66946007)(66476007)(66556008)(478600001)(8676002)(6486002)(316002)(4326008)(86362001)(38350700002)(6666004)(107886003)(41300700001)(26005)(6512007)(44832011)(5660300002)(4744005)(52116002)(6506007)(8936002)(2906002)(38100700002)(2616005)(186003)(1076003)(36756003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ITuGhaGC8xW60F1ObK+m46fwLwt94MdWGyNNxtQm2QYrbV/UBQ3Gb84gTXMoZihdXn40Qu4BX2Nur/eYom2+6LryEMetihWMyIS0I6UzN5ZphC0FaXledoxDRd+lJQ5a7WjxKh/ewv49feVZBdBcZouVCtejiJCN6ZnTlrclhlspLYpmbTcgJXgxUWjmKOMT8XuOEEukvtaxc+V7uXs18nW7veegh8v8HmRtmwtyl0T8HcIqvBga5eDAOCGrvfVbDavs9uohKEQbLFswovf4wP00SXh88VwJ33f82Nphjq2YlAJcIN6HWC1kvOlsN4817Y+VqmUuD5ztkGi8TBQQXB5oMpDW5RDGh5UnbbQI03lfGXL3JYz0oYk7mF8Oo8USPaAFSFMijIhibklAH+WmS1wXNhYfYKJZ1mIsq5lvybuanG/pcQc3MCZ0JgepaXfLK/qTkGck+erWRMaWWc9uVK5pm1yzZrbKzMZH+Rw2MYAK3Rl18MqyfuKVetSKr7VSTsR4uvH8YdJSu4iCpRbXK2UFutqWkElDzMSYBEdXF6206r5QJ5rsQkFcGQhmatlpoWK0+E2J6fwl5KkCoQhhtdicpeLpcNyjfpjZu9/fGfRyazrU1ySwrNUsM9/qWLL/dIMmh87uJpXM9EE3S7bmaEz4sWy4viqvADb/OeFWZ78T41Dx5x2gFlqAvZbEYaEYn8hHAXifPSAb/uKeH5FOkzdOQi/fLpq/qnqf4wDmqoI12CU0aMhb2P1tzKdBWvaGuz9v3U1DEWz7RrbRLZ7/5u/ARXp6O3OHJA9f22iLh7a68+oKaMPfy5J8+ltMnVb3SAqJGkMWYAvEKGYE9r6/HisYrF0mDTW4RehgP5y/9JLWYQLJP5s//XKmQOoOIOexaO1LnJIZrVxgEHAtfwRnDvyKfcltIAnN1ExMJ7B+Yx4Sd88zPRsclgMxlmDtenIK37+lUA6egNSFPPu+3M+2fZ8we2UijIk2Trc58T7ayC/K4lXm175Pn99UKko0y2CHxLTppeIj0cJ3VNoCePJzgGQ+X+Hd02TOH0B07lzTc34XQ5mOqN961v5gLUB80FL5Oh0wSWTiLkqA9AX9dHs0k0zO/HDOe4Po53PgFqbXLcEat9Hmv7YGyeeVH/pns8649FDnqp2buI6pyD5lH3drq1KtE7Lc8J1CmenCVl4+kfXdnn5YTeTVGNb/OV0Ci75rx+p0BrhJ5H5g/40A4AB9fhCEv1+SRg2at3jSr8xTUEL1BXcL2rqtJYV8utHRoBrafuiPiT5xkpuiEP8ZRXgFwYjJIFv3WcIDgwu7Wc+LzRgqat3ISd+kjGEfHTU/0a/DrD16fjgg1YtV6d0siK9RgU7rM/Tu2aW8Sr2uN1W0fkewd5n6/6TnaYEdA45ahKgMV2hu01Fsc0yDiUax564i6uREetOFS5tW8ohfJ+4iH0zhY4OlBlGZMGsrpAultRkyfzOhzBZ4IpN2aXGQ3JFzcwgKDjXXZnxoFYNISrbYxCNbd8ka5lhK5MobDf7tZ5q0j0ErmRsQOcuvbIxnsf9s8HDPAkZfV6mPrJi7GwMzy3dFaCbyauzBB7lRZ0dlpum+ifMjfLikx/zxFPOWwg/PXw== X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: c9ccdf20-7e19-455f-2772-08da9fdedde5 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2022 16:47:58.3809 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: mscCqgxf9wDRI9FMjoSDyWbt92AWxTvXbQiyVmeYeS74NSidg6jUSqz9MaoAy8+S3w1C1NZmL+wiOH/5HNuVEA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR03MB6753 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.6 at phobos.denx.de X-Virus-Status: Clean CONFIG_SYSRESET provides its own implementation of reset_cpu. Disable our version when it is enabled. Signed-off-by: Sean Anderson --- arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index c989a43cbeb..487c0ed5539 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c @@ -1229,6 +1229,7 @@ int timer_init(void) return 0; } +#if !CONFIG_IS_ENABLED(SYSRESET) __efi_runtime_data u32 __iomem *rstcr = (u32 *)CONFIG_SYS_FSL_RST_ADDR; void __efi_runtime reset_cpu(void) @@ -1248,6 +1249,7 @@ void __efi_runtime reset_cpu(void) scfg_out32(rstcr, val); #endif } +#endif #if defined(CONFIG_EFI_LOADER) && !defined(CONFIG_PSCI_RESET)