From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2912CC433EF for ; Wed, 13 Apr 2022 09:07:48 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 26D66831E0; Wed, 13 Apr 2022 11:07:46 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.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=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="MLtp0jP4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6910381DD3; Wed, 13 Apr 2022 11:07:44 +0200 (CEST) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03on0623.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe08::623]) (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 E245083A41 for ; Wed, 13 Apr 2022 11:07:41 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cZVTa+15GxIXSAxLDRmzuNPGLa22P63brJ/WQMHSoiPZ3lt0HdJ7TOiyhdd/cCwAkFKSnTvzk/YcS2maTazwypeVfSIm4fDT+VE/POFWEFe2C51weDrMA1sZnFCBlCAoQ5T/wHwKSVcTcQ/i8FBA7XQ7S84R7sF4aEmqVgJ0w7tCbDTth5HUkWmIDECyNRWvtd12MCclfZjO0PKcdgGVIeMl8p8AWEnHra0iI6Q6MDhnmqEYoNS18+cPoSJsiVNyLWo8Xo2JZULpJEBJpmXrSkg4X2SsxQ8CzPKaUXJhnCCl582VE2hOqsDUtfMCQPKnl+6o8eN1G2Q2dGBQBI3h0w== 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=2HQ/c6H/Nv3RBB4bVJSZwirULm9WrYGFgXrSqxLDQrQ=; b=eL42KX+ZPlEJS3JCdT+DRV5T3nnNXvkNmATYjLfZlm6S0jZPmTd5Ru7qUGrr6ED9iqB0+T4xdZLrhRgPGwAtXvXoG3liuRy7SbQWBMDwWIl4cyaBFXRHe03zdS2pE2z4/huUvTt1E/9fz2CGvy5OYrEQr4C1hR9X64ZVTvWk901NPsIlYpysqDtNZtZC/OPiNfGv9nr62TXl8prurW1RxW2XSOV6LaNCO0HgQ9y1DIjfhXOQgOqhJfPC6MfL8T20u5SGR6gk4A4BZkBl4XnredTKpJL+XU81jhQPvCvOCja6slDjv3KAWId452sFmxD//lbmjPSeoCDRvU05y/7FYw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2HQ/c6H/Nv3RBB4bVJSZwirULm9WrYGFgXrSqxLDQrQ=; b=MLtp0jP4ejxbWYrydh1C/g9QdW0x0Qx6evybD3C+AV51cA6PmUS/984szSsEcAFlVsCedhbTfg3/YQ6NjYuUCUuqK8GNMCcVCTUeRzihQ/85SjLUWW4oT9vgljvyKNJHfBv8qi5diuyxjVZ+l4i3AA0QAkuSiXLFCa+G//jYuNY= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by DU2PR04MB8661.eurprd04.prod.outlook.com (2603:10a6:10:2dc::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.30; Wed, 13 Apr 2022 09:07:40 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::389f:e6eb:a7a2:61b6]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::389f:e6eb:a7a2:61b6%8]) with mapi id 15.20.5144.029; Wed, 13 Apr 2022 09:07:40 +0000 From: "Peng Fan (OSS)" To: trini@konsulko.com, Jagan Teki , Andre Przywara , Simon Glass , Philipp Tomsich , Kever Yang , Hans de Goede Cc: u-boot@lists.denx.de, Peng Fan Subject: [PATCH V4 6/6] arm: set cntfrq_el0 if CONFIG_COUNTER_FREQUENCY is valid Date: Wed, 13 Apr 2022 17:47:22 +0800 Message-Id: <20220413094726.32199-7-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220413094726.32199-1-peng.fan@oss.nxp.com> References: <20220413094726.32199-1-peng.fan@oss.nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SG2PR06CA0182.apcprd06.prod.outlook.com (2603:1096:4:1::14) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 229b478a-68d3-456d-cadd-08da1d2d0fac X-MS-TrafficTypeDiagnostic: DU2PR04MB8661:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mbZ/Z5qESygiW6/0R32E8sQe7u29UKbeJU0CdT7Mon3Etb547XU6uZxSc/U48uf2hKjXPeRRigpd+yPC77mGQ947TglaSs+pOpaH8SsVmOVJhqCOTaLLP2Cp57j4+69ioalVbN8tT9Nrjwo6b5MjyeKyPzs9Fd4CCols3F2QewJTUV+43oJC6fYohwBrYqhrgyLeMcH4wtST67UuKU9hqRLKRtwJlv8DkxQBV+/ywb7iPX7ZLCmcdBrLKAfXSgUsIothVYegWlkxWiFD3AJ9r6m0UKo3DtOPM/mDthImSqmbf4eRcMPCLqSWT1mXp/+6j/VUo/ZBxmOXQbl+SlTRnsC6W9RYwR0kj4wvxjgf9PUN1uoJnmvh4kOQ0HlFWynykRFK/E3IzKTKZxaHbnUONJwe7+kSG3I/CTJ2X3Of6Fx6sQkN+20u7f//zMTurKu0GfXUGYo3CidrkUs/tFKwTqbXXd7HpbwkN3A9qbMIZqT2YaysV3Ke1cyFa7lbFHXHHUYNbS6vVHLt6/AvTSwftbaiCr9bI5RTzSpEvuaQfT7vZ7wyK4DaCXX6oqoKLrXWj1etSU6uwB545cEEoA5VCyGpJ7QLZTKPDgxJDu+I4kHj03ucb+y66eLVmI7XVmZ2ABKHh8Q5p5dQmOX+apFv+yd04GVJTM8RzbFwEbC5LUHUdjXqr83xkQn4rEEMvfQ8Dg1F3D7BgbG8OC51GS00lA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9417.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(6512007)(6506007)(66476007)(4326008)(8676002)(66556008)(5660300002)(86362001)(83380400001)(66946007)(508600001)(8936002)(6486002)(316002)(2616005)(2906002)(26005)(186003)(52116002)(38350700002)(1076003)(110136005)(38100700002)(6666004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ZFAgPZWnJE15rNBM6QJrIH9Ik66b+QQqLOFLVQTSnhF7jtcDnhnDze0+hxOD?= =?us-ascii?Q?abYvWcUw/cfA6ITMGmJS7W0yx8qbnoIOAJAXAX6HzW+lWnqQpE7mUDZKZVin?= =?us-ascii?Q?7xStITY/sGLSDQDoF9Tan6fpxTF6iShuvfmQrwQAbBk9HnRQUh+7cerNlV+b?= =?us-ascii?Q?NxyZVus89t7Xq20tqME/vcbNSw1ys5G0pEEXCmSGJ8Gpk3tvGiHYne6j3gXN?= =?us-ascii?Q?WxY5kHk31DRuNYf8N+wRIn8sYhcTxXG9vy2Ka0esK8GvGHW9uXsKmPwGO8br?= =?us-ascii?Q?Fn/RYr4KKOaJSXlFyx+L49sHdhyZmDu6U94IVJXGvHbVwK2Q0Fie1QFONEXC?= =?us-ascii?Q?Lo8QSbmN+6jFwV43EYVgWfasGUyGLikrnp4nTXkG+q8KFPQoVeSqAT38rQZw?= =?us-ascii?Q?LjBM150+YUvcJ+eR51t8O+8mI1O+aezrnFzMhk7Vsfg6Ll88So58c7TkqA+n?= =?us-ascii?Q?qbtV6YWwISIgt1R+iW3dELykZpTmcwMOk1XfA3+aezUk3u6R/Q3ZgzMTbnjM?= =?us-ascii?Q?ZPJFewJz/2h3d1jxh6hGXbb9hZmowN3fJdgzTlPYe+RUOGMhRVUzZOnGw0oz?= =?us-ascii?Q?supZFHqOTDtsKzh51QOARauzb1aQQgPHQ03/RLAi2tYyEvws1BfcnCTHfMLj?= =?us-ascii?Q?dZVDpbVfT87uBKFAFVpeBMy7pA/Cri6eFhmqYpegBpedf9oCVMl/qzDlQs1h?= =?us-ascii?Q?sr87K4t9OeP+UoJsyKe6ejHk5RDlHbLXcGoTiU4L3zoXxBoueIRV4vHUBVev?= =?us-ascii?Q?GeREmrcHslXOQnBlA6bGWYaYJP0ay8B5kTGtQknBzZ+WEmqU7xndtWAyhGk9?= =?us-ascii?Q?KtJ7ZsNpkRzojk9OodJfJvRbd71gcyj4XbxMFdeIliRIVyX3ukuKJSY5NAYi?= =?us-ascii?Q?PzmmC1W89ZXdY4Bp1AWOZef1a8YVD7dVM8Gkap1sJQ/6vjbOCjlobbHIj5j7?= =?us-ascii?Q?ZqFfh9gzpeOrq8kdCxtDqpUYP4GVQzCz48kawzb1IlUTW6ZX+WZ393gaM+XH?= =?us-ascii?Q?oIPZW+y7JPGkkJao4wVI6j4ljjPU2k2yvItZ6tMdJcI4EkZxYtbEWXQ0ZstQ?= =?us-ascii?Q?eMirjVr5qiqtkleAAyMhssG5jgr8PIxFfGVwG8O1fQkO7h3xxAcoYcKtxESj?= =?us-ascii?Q?7Iu8/UT8/dmOwc+tla0K1tETySZO2Si9XBR3Zsj9+RDM3cMp+q4ZJ/X25GzM?= =?us-ascii?Q?6yoWq4qrZCEHrlhE82xOWPFNViYOJXgVFcTpVgKoV4s1D8djE70Bj0V71OH4?= =?us-ascii?Q?QO174rxN3UfRLhCsw6ImLNxrOAA5l0ADODcFiEg4o084JfbXqEtHQDPxSYhB?= =?us-ascii?Q?g6MIz5DCPVV5dZKo+rEEfyji88zie7jzeZTBz2LFr+YRCJ9W4UbSGb1UpUZT?= =?us-ascii?Q?pvHe4apKmF4s78wVV+fshhmGUMBeyNkFoXdDssg5b1XyWTRBEubhwnLD12hS?= =?us-ascii?Q?7rrKaxgC5SFDNP1/LLqq8qtu178QB8FY5Va8pCpgq/2qxTwQIhfW0qPM9FER?= =?us-ascii?Q?P/fX7nUzXH9HMdjFIDsAmG4cDdfn0LzBiaemecsQtUuuPVsolfhoTj2RbyTz?= =?us-ascii?Q?Rz8n5eEUp7Vhb6BsoQ6O360v0Be1wIcqInRlvjbkTMxyzW4pZvfozcX6ZR4x?= =?us-ascii?Q?0AQUEvuvVb3EhU7FZiRX1infxxVQ9ZPcAFC7qsEu3mNMuuLaennk3NhCGmK1?= =?us-ascii?Q?fyj7wrxcln/Q3Oda+AwPB6fAsSEtYwKaQkdHNYc4N5sJYYxcDMLg/RpPcJjR?= =?us-ascii?Q?JyuAAFHGVw=3D=3D?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 229b478a-68d3-456d-cadd-08da1d2d0fac X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2022 09:07:40.1781 (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: 0rJlqVAKQTRiFWoWpZuK1ZQ3NQYLDeFCV+v13mHUwTHS6QPNGsRUZbxpB9I1UXqNVy28pVw7M4s7QT4vqJ/rUQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8661 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.5 at phobos.denx.de X-Virus-Status: Clean From: Peng Fan Since COUNTER_FREQUENCY is obselete, so set cntfrq_el0 if CONFIG_COUNTER_FREQUENCY is valid Signed-off-by: Peng Fan --- arch/arm/cpu/armv7/ls102xa/psci.S | 2 +- arch/arm/cpu/armv7/ls102xa/timer.c | 2 +- arch/arm/cpu/armv7/nonsec_virt.S | 4 ++-- arch/arm/cpu/armv7/sunxi/psci.c | 2 +- arch/arm/cpu/armv8/start.S | 4 ++-- arch/arm/mach-rockchip/rk3036-board-spl.c | 2 +- arch/arm/mach-rockchip/spl.c | 2 +- arch/arm/mach-rockchip/tpl.c | 2 +- board/sunxi/board.c | 6 +++--- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/arch/arm/cpu/armv7/ls102xa/psci.S b/arch/arm/cpu/armv7/ls102xa/psci.S index 531cfb033bc..3956178369f 100644 --- a/arch/arm/cpu/armv7/ls102xa/psci.S +++ b/arch/arm/cpu/armv7/ls102xa/psci.S @@ -36,7 +36,7 @@ .align 5 -#define ONE_MS (COUNTER_FREQUENCY / 1000) +#define ONE_MS (CONFIG_COUNTER_FREQUENCY / 1000) #define RESET_WAIT (30 * ONE_MS) .globl psci_version diff --git a/arch/arm/cpu/armv7/ls102xa/timer.c b/arch/arm/cpu/armv7/ls102xa/timer.c index d79bf105f13..c6126b10c35 100644 --- a/arch/arm/cpu/armv7/ls102xa/timer.c +++ b/arch/arm/cpu/armv7/ls102xa/timer.c @@ -65,7 +65,7 @@ int timer_init(void) /* Enable System Counter */ writel(SYS_COUNTER_CTRL_ENABLE, &sctr->cntcr); - freq = COUNTER_FREQUENCY; + freq = CONFIG_COUNTER_FREQUENCY; asm("mcr p15, 0, %0, c14, c0, 0" : : "r" (freq)); /* Set PL1 Physical Timer Ctrl */ diff --git a/arch/arm/cpu/armv7/nonsec_virt.S b/arch/arm/cpu/armv7/nonsec_virt.S index 1773fae205c..39aeeb423f0 100644 --- a/arch/arm/cpu/armv7/nonsec_virt.S +++ b/arch/arm/cpu/armv7/nonsec_virt.S @@ -189,11 +189,11 @@ ENTRY(_nonsec_init) * we do this here instead. * But first check if we have the generic timer. */ -#ifdef COUNTER_FREQUENCY +#if CONFIG_COUNTER_FREQUENCY mrc p15, 0, r0, c0, c1, 1 @ read ID_PFR1 and r0, r0, #CPUID_ARM_GENTIMER_MASK @ mask arch timer bits cmp r0, #(1 << CPUID_ARM_GENTIMER_SHIFT) - ldreq r1, =COUNTER_FREQUENCY + ldreq r1, =CONFIG_COUNTER_FREQUENCY mcreq p15, 0, r1, c14, c0, 0 @ write CNTFRQ #endif diff --git a/arch/arm/cpu/armv7/sunxi/psci.c b/arch/arm/cpu/armv7/sunxi/psci.c index 1ac50f558a4..d1bd6b9be41 100644 --- a/arch/arm/cpu/armv7/sunxi/psci.c +++ b/arch/arm/cpu/armv7/sunxi/psci.c @@ -57,7 +57,7 @@ static u32 __secure cp15_read_cntp_ctl(void) return val; } -#define ONE_MS (COUNTER_FREQUENCY / 1000) +#define ONE_MS (CONFIG_COUNTER_FREQUENCY / 1000) static void __secure __mdelay(u32 ms) { diff --git a/arch/arm/cpu/armv8/start.S b/arch/arm/cpu/armv8/start.S index 6a6a4f86502..d328e8c08a1 100644 --- a/arch/arm/cpu/armv8/start.S +++ b/arch/arm/cpu/armv8/start.S @@ -138,9 +138,9 @@ pie_fixup_done: 0: msr daifclr, #0x4 /* Unmask SError interrupts */ -#ifdef COUNTER_FREQUENCY +#if CONFIG_COUNTER_FREQUENCY branch_if_not_highest_el x0, 4f - ldr x0, =COUNTER_FREQUENCY + ldr x0, =CONFIG_COUNTER_FREQUENCY msr cntfrq_el0, x0 /* Initialize CNTFRQ */ #endif diff --git a/arch/arm/mach-rockchip/rk3036-board-spl.c b/arch/arm/mach-rockchip/rk3036-board-spl.c index 6eb89e15b81..73f6d241a1c 100644 --- a/arch/arm/mach-rockchip/rk3036-board-spl.c +++ b/arch/arm/mach-rockchip/rk3036-board-spl.c @@ -20,7 +20,7 @@ void rockchip_stimer_init(void) { asm volatile("mcr p15, 0, %0, c14, c0, 0" - : : "r"(COUNTER_FREQUENCY)); + : : "r"(CONFIG_COUNTER_FREQUENCY)); writel(0, CONFIG_ROCKCHIP_STIMER_BASE + TIMER_CONTROL_REG); writel(0xffffffff, CONFIG_ROCKCHIP_STIMER_BASE); diff --git a/arch/arm/mach-rockchip/spl.c b/arch/arm/mach-rockchip/spl.c index d51a0727b47..3c491f2c9ef 100644 --- a/arch/arm/mach-rockchip/spl.c +++ b/arch/arm/mach-rockchip/spl.c @@ -88,7 +88,7 @@ __weak void rockchip_stimer_init(void) return; #ifndef CONFIG_ARM64 asm volatile("mcr p15, 0, %0, c14, c0, 0" - : : "r"(COUNTER_FREQUENCY)); + : : "r"(CONFIG_COUNTER_FREQUENCY)); #endif writel(0, CONFIG_ROCKCHIP_STIMER_BASE + TIMER_CONTROL_REG); writel(0xffffffff, CONFIG_ROCKCHIP_STIMER_BASE); diff --git a/arch/arm/mach-rockchip/tpl.c b/arch/arm/mach-rockchip/tpl.c index 3c007bb4508..a0f124864b1 100644 --- a/arch/arm/mach-rockchip/tpl.c +++ b/arch/arm/mach-rockchip/tpl.c @@ -37,7 +37,7 @@ __weak void rockchip_stimer_init(void) #ifndef CONFIG_ARM64 asm volatile("mcr p15, 0, %0, c14, c0, 0" - : : "r"(COUNTER_FREQUENCY)); + : : "r"(CONFIG_COUNTER_FREQUENCY)); #endif writel(0, CONFIG_ROCKCHIP_STIMER_BASE + TIMER_CONTROL_REG); diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 89324159d55..371ed9eebaf 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -202,14 +202,14 @@ int board_init(void) * we avoid the risk of writing to it. */ asm volatile("mrc p15, 0, %0, c14, c0, 0" : "=r"(freq)); - if (freq != COUNTER_FREQUENCY) { + if (freq != CONFIG_COUNTER_FREQUENCY) { debug("arch timer frequency is %d Hz, should be %d, fixing ...\n", - freq, COUNTER_FREQUENCY); + freq, CONFIG_COUNTER_FREQUENCY); #ifdef CONFIG_NON_SECURE printf("arch timer frequency is wrong, but cannot adjust it\n"); #else asm volatile("mcr p15, 0, %0, c14, c0, 0" - : : "r"(COUNTER_FREQUENCY)); + : : "r"(CONFIG_COUNTER_FREQUENCY)); #endif } } -- 2.35.1