From patchwork Sun Apr 23 17:08:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 9694979 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EB80560245 for ; Sun, 23 Apr 2017 17:11:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D413226530 for ; Sun, 23 Apr 2017 17:11:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C85D9265B9; Sun, 23 Apr 2017 17:11:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 814C826530 for ; Sun, 23 Apr 2017 17:11:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1163242AbdDWRLu (ORCPT ); Sun, 23 Apr 2017 13:11:50 -0400 Received: from mail-wm0-f46.google.com ([74.125.82.46]:35116 "EHLO mail-wm0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1162698AbdDWRKS (ORCPT ); Sun, 23 Apr 2017 13:10:18 -0400 Received: by mail-wm0-f46.google.com with SMTP id w64so46376416wma.0 for ; Sun, 23 Apr 2017 10:10:16 -0700 (PDT) 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=8vN18SVHYIbSgtY+hcmexrXaQsWersNadlGd755LbC8=; b=ATpe9BUx3IhGmrj4vI4FEfcpn2ZNCvOw5SFPNm3oC3jjS0KFIHOdy2drtRcUV05Hpi 7YIxvukeXe+C+mIXg27FlHhJSl8exhH5T/aj76895pBLPlOGeQDJ7GFturUu0xopZvi5 md7g9RzMwIZLSH4Vl0mxn6+wuIB/KGZAXzAzI= 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=8vN18SVHYIbSgtY+hcmexrXaQsWersNadlGd755LbC8=; b=bDoT7maImReO8+lxECZzhNEqjUrmlAPeHUUU7+Kde/OWI/AtM70g0AhDrhpePtX7RN 3hCMd6K2QmOIv+4KW5HObRWJ4YVhktyTRYp9vJKshHOTW4d+OtZlIklQxKDocD84Bj2l mNhfB37yNjN3u5wNXrlapcPGfiHswQjtRFrRwaiJqfuCQjk/1qRUhEJQ699kmeXMzs1R fxKYM28YoiX9SHPb7FkbTUZop1Ao2cCMptMIpRExg+N5D6734C7d24v1WD5wFPjJSfM8 nPr8tYZ00RTIv/Mcc4EkvBsBlc5k0YA7ArcDDcv+yq2NcVL39PBi1Ldx/1grcGIdqTNB elqw== X-Gm-Message-State: AN3rC/5Rzk0f7PxYal5gt2csCe7gfL+zvciQ2zDnQSrBqB7ngullVc1M cLHbHFo48NlGGPlU X-Received: by 10.80.196.76 with SMTP id w12mr141074edf.155.1492967411169; Sun, 23 Apr 2017 10:10:11 -0700 (PDT) Received: from localhost.localdomain (xd93ddc2d.cust.hiper.dk. [217.61.220.45]) by smtp.gmail.com with ESMTPSA id 58sm2803521edz.2.2017.04.23.10.10.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 23 Apr 2017 10:10:10 -0700 (PDT) From: Christoffer Dall To: Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Cc: Marc Zyngier , kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Christoffer Dall Subject: [PULL 38/79] arm64: hyp-stub: Don't save lr in the EL1 code Date: Sun, 23 Apr 2017 19:08:48 +0200 Message-Id: <20170423170929.27334-39-cdall@linaro.org> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170423170929.27334-1-cdall@linaro.org> References: <20170423170929.27334-1-cdall@linaro.org> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Marc Zyngier The EL2 code is not corrupting lr anymore, so don't bother preserving it in the EL1 trampoline code. Acked-by: Catalin Marinas Signed-off-by: Marc Zyngier Signed-off-by: Christoffer Dall --- arch/arm64/kernel/hyp-stub.S | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/arm64/kernel/hyp-stub.S b/arch/arm64/kernel/hyp-stub.S index e4215ad..193dfb2 100644 --- a/arch/arm64/kernel/hyp-stub.S +++ b/arch/arm64/kernel/hyp-stub.S @@ -116,18 +116,14 @@ ENDPROC(\label) */ ENTRY(__hyp_get_vectors) - str lr, [sp, #-16]! mov x0, #HVC_GET_VECTORS hvc #0 - ldr lr, [sp], #16 ret ENDPROC(__hyp_get_vectors) ENTRY(__hyp_set_vectors) - str lr, [sp, #-16]! mov x1, x0 mov x0, #HVC_SET_VECTORS hvc #0 - ldr lr, [sp], #16 ret ENDPROC(__hyp_set_vectors)