From patchwork Sun Apr 23 17:09:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 9695005 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 89F9660245 for ; Sun, 23 Apr 2017 17:12:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 73A4620564 for ; Sun, 23 Apr 2017 17:12:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 688AD212BE; Sun, 23 Apr 2017 17:12:24 +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=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM 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 108E820564 for ; Sun, 23 Apr 2017 17:12:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1162910AbdDWRMV (ORCPT ); Sun, 23 Apr 2017 13:12:21 -0400 Received: from mail-wm0-f49.google.com ([74.125.82.49]:35152 "EHLO mail-wm0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1162777AbdDWRK1 (ORCPT ); Sun, 23 Apr 2017 13:10:27 -0400 Received: by mail-wm0-f49.google.com with SMTP id w64so46378268wma.0 for ; Sun, 23 Apr 2017 10:10:26 -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=NGTUvBrYBFtNiK5/TGoZL+c9bjrPzVzZqMEsUpxiEqM=; b=fWoww0G/GYJDnraPkTIqDdX6dBjfSYl2IvnlQ/Sj6suNjbrjvBrUXadGIMV2Auo05q ZDUQcsOe54H4qUNShIdXFyLOC/XBChvSxT11vRO2IHzxDkrR5FUjDQylgohg1Aj1e1cE 3u8SMJb1bVi7MMFjj/VZdSAnnNqS5YNT0bCmU= 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=NGTUvBrYBFtNiK5/TGoZL+c9bjrPzVzZqMEsUpxiEqM=; b=mVMdQKVZdlSxsDscbf/gZFiOHw1Al2GRSPIa6YQjA4pnZibgz3S6YTBkpYs4v4doFO gIOm+gzrvkOsvBer7iOwUZv0VP6G45yLrii/tZ691DyF7P+eI6IsOxs/fe4f+AphZC6L 2Lm/PV8wHGWCE42Mh29l5ZKLpamNUouJQhVD+NOnkMcqZykcusJYc6UN9giMEZhMSqid 7XckARTcmlI64T84IkKwXJptlIl5hlGYAMq5XEhvAueq52LG0tgm6n3LTgKIn5tl8foQ Wq/ieZOaWMaisLI8Gp8bNkKeFv/lm0TVJZnJY2mIW81Tfy7xw2xNLAyUAXBt5+Rx+kwP KQ2Q== X-Gm-Message-State: AN3rC/4bI1ow8pi/fZ6iR3x0HlaqWJ6s+OEqUi050Sdn3PubN0yARhmh cjg0IRi/4Y0f4wwc X-Received: by 10.28.158.216 with SMTP id h207mr5533790wme.0.1492967425465; Sun, 23 Apr 2017 10:10:25 -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.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 23 Apr 2017 10:10:24 -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 51/79] ARM: hyp-stub: Use r1 for the soft-restart address Date: Sun, 23 Apr 2017 19:09:01 +0200 Message-Id: <20170423170929.27334-52-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 It is not really obvious why the restart address should be in r3 when communicated to the hyp-stub. r1 should be perfectly adequate, and consistent with the rest of the code. Tested-by: Keerthy Acked-by: Russell King Acked-by: Catalin Marinas Signed-off-by: Marc Zyngier Signed-off-by: Christoffer Dall --- arch/arm/kernel/hyp-stub.S | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/arm/kernel/hyp-stub.S b/arch/arm/kernel/hyp-stub.S index 8301db9..15eaa14 100644 --- a/arch/arm/kernel/hyp-stub.S +++ b/arch/arm/kernel/hyp-stub.S @@ -214,7 +214,7 @@ __hyp_stub_do_trap: 1: teq r0, #HVC_SOFT_RESTART bne 1f - bx r3 + bx r1 1: mov r0, #-1 @@ -258,10 +258,9 @@ ENTRY(__hyp_set_vectors) ENDPROC(__hyp_set_vectors) ENTRY(__hyp_soft_restart) - mov r3, r0 + mov r1, r0 mov r0, #HVC_SOFT_RESTART __HVC(0) - mov r0, r3 ret lr ENDPROC(__hyp_soft_restart)