From patchwork Thu Oct 17 08:14:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Daniel Kachhap X-Patchwork-Id: 11195091 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6706313BD for ; Thu, 17 Oct 2019 08:16:34 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 43CD620820 for ; Thu, 17 Oct 2019 08:16:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="pIvTpfDJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 43CD620820 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=Zg8Ir9hPsHAHYKKvvyOuISYtbSRgE3T1FtrwOfCMhXA=; b=pIvTpfDJK5TkTVSYv8sDeWib8T WDCf3ahKDqAcPpRhMpNK15DNKvKia+7pAQTNByXrAyYfsJsVccJZ2UfbXMsWhUTqITDYuK+cKPqKB +idI0ZB0Zd2zigLs0woP818u6jKvHwCfMR3NuGwKWHSIxe5S0rBag+vsoBwRDn/g2x3sYIAJGB/rY Ip7/GNWUuWvYhxJ/qKyJTlVBJP2XPZ6j/iLiPCZSNUQGLApZc7hRNxl7gzOVIHopAYEV55xVN5DAD bp7Fit9IyRKQFNKcZuoGZpyotz9fK2fhTO+0QTdcVJgEaJJvHwrEl35IuOM37ExRPfc5UO7uelA9N RZyTeusQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iL0xU-0003U4-Ug; Thu, 17 Oct 2019 08:16:32 +0000 Received: from [217.140.110.172] (helo=foss.arm.com) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iL0w3-000176-Hg for linux-arm-kernel@lists.infradead.org; Thu, 17 Oct 2019 08:15:05 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id DB35228; Thu, 17 Oct 2019 01:14:56 -0700 (PDT) Received: from a075553-lin.blr.arm.com (a075553-lin.blr.arm.com [10.162.0.144]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 3FB093F6C4; Thu, 17 Oct 2019 01:14:53 -0700 (PDT) From: Amit Daniel Kachhap To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 04/11] arm64: create macro to park cpu in an infinite loop Date: Thu, 17 Oct 2019 13:44:18 +0530 Message-Id: <1571300065-10236-5-git-send-email-amit.kachhap@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1571300065-10236-1-git-send-email-amit.kachhap@arm.com> References: <1571300065-10236-1-git-send-email-amit.kachhap@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191017_011504_083007_0B6A6E05 X-CRM114-Status: GOOD ( 10.74 ) X-Spam-Score: 1.3 (+) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (1.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 1.3 RDNS_NONE Delivered to internal network by a host with no rDNS X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Kees Cook , Suzuki K Poulose , Catalin Marinas , Ard Biesheuvel , Will Deacon , Kristina Martsenko , James Morse , Ramana Radhakrishnan , Amit Daniel Kachhap , Vincenzo Frascino , Dave Martin MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org A macro early_park_cpu is added to park the faulted cpu in an infinite loop. Currently, this macro is substituted in two instances and is reused in the subsequent pointer authentication patch. Signed-off-by: Amit Daniel Kachhap --- Changes since RFC v2: - New patch in this version for code reuse. arch/arm64/kernel/head.S | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index 989b194..e58e5975 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -761,6 +761,16 @@ ENDPROC(__secondary_too_slow) .endm /* + * Macro to park the cpu in an infinite loop. + */ + .macro early_park_cpu +.Lepc_\@: + wfe + wfi + b .Lepc_\@ + .endm + +/* * Enable the MMU. * * x0 = SCTLR_EL1 value for turning on the MMU. @@ -810,10 +820,7 @@ ENTRY(__cpu_secondary_check52bitva) update_early_cpu_boot_status \ CPU_STUCK_IN_KERNEL | CPU_STUCK_REASON_52_BIT_VA, x0, x1 -1: wfe - wfi - b 1b - + early_park_cpu #endif 2: ret ENDPROC(__cpu_secondary_check52bitva) @@ -822,10 +829,7 @@ __no_granule_support: /* Indicate that this CPU can't boot and is stuck in the kernel */ update_early_cpu_boot_status \ CPU_STUCK_IN_KERNEL | CPU_STUCK_REASON_NO_GRAN, x1, x2 -1: - wfe - wfi - b 1b + early_park_cpu ENDPROC(__no_granule_support) #ifdef CONFIG_RELOCATABLE