Received: by 10.223.185.116 with SMTP id b49csp5727235wrg; Tue, 27 Feb 2018 20:00:34 -0800 (PST) X-Google-Smtp-Source: AG47ELviQYkH2twOr8Egy2xZx+hAgzpMS1PeZpWAihm4YNMz135gMqEst9FpZmGRQpDIMtE5jv2a X-Received: by 2002:a17:902:7598:: with SMTP id j24-v6mr130711pll.1.1519790433928; Tue, 27 Feb 2018 20:00:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519790433; cv=none; d=google.com; s=arc-20160816; b=BwY5hZuIi9T6ef/LXbOBD10ZGhVfpFpw/iwKcTEjMuPnq72Q4EyNNjmSHi1L8n9Hqu bS7Iy50qy3CvO02JcZrh4iQxDN0F1L17VNc3atfKh2/qD/J3ZJMZ2LHwjVReti/CAnWW BfrocbfETY2CjolWsmaSyVyWHJdXZY0PqE3XMhID3P206W/IO2qzNDeUHGt8/mCx+JhV IIcyZuJAvIf2cWLFKE/F7COgt63FZ0jffBE1OENYpxi+h9G6QpWDNpz5zJhG8FbnWWmd i8o/ICcnpC4suyswP+XlAfYUiKZ+xJxHeVGq9jZXoRE8gPaNaPU5UDf81E8t8f8QTifr fj2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=GyALvW8YeD+0MJZ/yzzKdZ537ez2Q1z5R4zg8/QPH8A=; b=hW6Ygz3iQIa6R8VcIp/uXrhI8gkO+OxonLpnrWD4yZ+OL0foQ7fpqJFUuLGIZrvrns X/EyvIjL3DUTLCkYDFsBSOj6aHK8SbElH5B5e4L19BSp7ecys60qIMTWsY1PV2Wf929n VOeqBrHVwxMTmOC/Uy6Jj+siNXc8WfZLizijmG9pAneDJv4xiUb0bmdXO9VrQ7vjYPSa LuJnAAuDichmwTNs13wxZQtpdthQlnhILCMg/pOK+m8i1NoeoSstInudlndS0noniAPt uaxH8SPxDTSfdbV4n96O4kfknGFjLkIbZymQbh8P2K7fabQEt/iB6pBtV61fPIkAec2Q oFkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DdvPmhiC; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r39-v6si574847pld.53.2018.02.27.20.00.19; Tue, 27 Feb 2018 20:00:33 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DdvPmhiC; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752212AbeB1D65 (ORCPT + 99 others); Tue, 27 Feb 2018 22:58:57 -0500 Received: from mail-pl0-f68.google.com ([209.85.160.68]:46210 "EHLO mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752172AbeB1D6z (ORCPT ); Tue, 27 Feb 2018 22:58:55 -0500 Received: by mail-pl0-f68.google.com with SMTP id y8-v6so759570pll.13 for ; Tue, 27 Feb 2018 19:58:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=GyALvW8YeD+0MJZ/yzzKdZ537ez2Q1z5R4zg8/QPH8A=; b=DdvPmhiCUper7kGPYu9IsYe8LnYjqQDwut7q/Pgjt6ABptGQETKOR7hJbEkAj5FyFp p3WXAYuzrrfnJsz8F4Jf6xj4dhiMfxMLBVjcC8rNeNxGnPpXf6HNRIaElqwNHoYjZsPi vqy+lPycvj5WTS1lcUkRIRGSAIrVtm7n5Q0Qg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=GyALvW8YeD+0MJZ/yzzKdZ537ez2Q1z5R4zg8/QPH8A=; b=GBqOEFH4lsukZuvA+AYWJQsbMSxUv681My7DK8ppZGA7jV86YzpM2g7w7yqkD5HMiz XoLdbxd4z8qxPCYPhN+ueDM9BStAPQ9tlVLCdhAIe4P84OtQ9cs54BgN/INDXapimmqd P/tyzjWpAKCa5CfbGooeOz9EVLyGzSFTFqi2s1fkYQHTOSaypMVKdyez+iNqBmQuow+D mF+T1qs0RMlQLokIZ7/87ZxP30YVaqIRIGORrExVOkBycP0YsEIAdcWBae1ibX5CbskP UWfR5GVU45Pnk+5C8F5D6YPwa/wAEF9fTrh3l69nu2wf6VEa6LlXCfvnwk6YCyCkNi9Z bIhw== X-Gm-Message-State: APf1xPAWnvxMSjwuyXXZda361l4o5Oex6D2bPmP7Wl/82jI1gRBNptaD 1ay00WcVO9EbQ1Or+U5BvbnW7w== X-Received: by 2002:a17:902:2006:: with SMTP id n6-v6mr16536609pla.149.1519790334519; Tue, 27 Feb 2018 19:58:54 -0800 (PST) Received: from localhost.localdomain (176.122.172.82.16clouds.com. [176.122.172.82]) by smtp.gmail.com with ESMTPSA id q17sm739911pgt.7.2018.02.27.19.58.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 27 Feb 2018 19:58:54 -0800 (PST) From: Alex Shi To: Marc Zyngier , Will Deacon , Ard Biesheuvel , Catalin Marinas , stable@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Alex Shi Subject: [PATCH 11/29] arm64: entry: Explicitly pass exception level to kernel_ventry macro Date: Wed, 28 Feb 2018 11:56:33 +0800 Message-Id: <1519790211-16582-12-git-send-email-alex.shi@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1519790211-16582-1-git-send-email-alex.shi@linaro.org> References: <1519790211-16582-1-git-send-email-alex.shi@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Will Deacon commit 5b1f7fe41909 upstream. We will need to treat exceptions from EL0 differently in kernel_ventry, so rework the macro to take the exception level as an argument and construct the branch target using that. Reviewed-by: Mark Rutland Tested-by: Laura Abbott Tested-by: Shanker Donthineni Signed-off-by: Will Deacon Signed-off-by: Alex Shi Conflicts: no vmap_stack in arch/arm64/kernel/entry.S --- arch/arm64/kernel/entry.S | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index f0c6b37..7b1be51 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -70,10 +70,10 @@ #define BAD_FIQ 2 #define BAD_ERROR 3 - .macro kernel_ventry label + .macro kernel_ventry, el, label, regsize = 64 .align 7 sub sp, sp, #S_FRAME_SIZE - b \label + b el\()\el\()_\label .endm .macro kernel_entry, el, regsize = 64 @@ -264,31 +264,31 @@ tsk .req x28 // current thread_info .align 11 ENTRY(vectors) - kernel_ventry el1_sync_invalid // Synchronous EL1t - kernel_ventry el1_irq_invalid // IRQ EL1t - kernel_ventry el1_fiq_invalid // FIQ EL1t - kernel_ventry el1_error_invalid // Error EL1t + kernel_ventry 1, sync_invalid // Synchronous EL1t + kernel_ventry 1, irq_invalid // IRQ EL1t + kernel_ventry 1, fiq_invalid // FIQ EL1t + kernel_ventry 1, error_invalid // Error EL1t - kernel_ventry el1_sync // Synchronous EL1h - kernel_ventry el1_irq // IRQ EL1h - kernel_ventry el1_fiq_invalid // FIQ EL1h - kernel_ventry el1_error // Error EL1h + kernel_ventry 1, sync // Synchronous EL1h + kernel_ventry 1, irq // IRQ EL1h + kernel_ventry 1, fiq_invalid // FIQ EL1h + kernel_ventry 1, error // Error EL1h - kernel_ventry el0_sync // Synchronous 64-bit EL0 - kernel_ventry el0_irq // IRQ 64-bit EL0 - kernel_ventry el0_fiq_invalid // FIQ 64-bit EL0 - kernel_ventry el0_error // Error 64-bit EL0 + kernel_ventry 0, sync // Synchronous 64-bit EL0 + kernel_ventry 0, irq // IRQ 64-bit EL0 + kernel_ventry 0, fiq_invalid // FIQ 64-bit EL0 + kernel_ventry 0, error // Error 64-bit EL0 #ifdef CONFIG_COMPAT - kernel_ventry el0_sync_compat // Synchronous 32-bit EL0 - kernel_ventry el0_irq_compat // IRQ 32-bit EL0 - kernel_ventry el0_fiq_invalid_compat // FIQ 32-bit EL0 - kernel_ventry el0_error_compat // Error 32-bit EL0 + kernel_ventry 0, sync_compat, 32 // Synchronous 32-bit EL0 + kernel_ventry 0, irq_compat, 32 // IRQ 32-bit EL0 + kernel_ventry 0, fiq_invalid_compat, 32 // FIQ 32-bit EL0 + kernel_ventry 0, error_compat, 32 // Error 32-bit EL0 #else - kernel_ventry el0_sync_invalid // Synchronous 32-bit EL0 - kernel_ventry el0_irq_invalid // IRQ 32-bit EL0 - kernel_ventry el0_fiq_invalid // FIQ 32-bit EL0 - kernel_ventry el0_error_invalid // Error 32-bit EL0 + kernel_ventry 0, sync_invalid, 32 // Synchronous 32-bit EL0 + kernel_ventry 0, irq_invalid, 32 // IRQ 32-bit EL0 + kernel_ventry 0, fiq_invalid, 32 // FIQ 32-bit EL0 + kernel_ventry 0, error_invalid, 32 // Error 32-bit EL0 #endif END(vectors) -- 2.7.4