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: 9695151 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 82C3B601E9 for ; Sun, 23 Apr 2017 17:31:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7DB4D203B9 for ; Sun, 23 Apr 2017 17:31:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 71A07262F2; Sun, 23 Apr 2017 17:31:34 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 18A12203B9 for ; Sun, 23 Apr 2017 17:31:34 +0000 (UTC) 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=3BnKHh5z1xup7G0MtDT8TKvu8qk0b5/mxjVyMfqXWOQ=; b=anE+cOyfc34vRMOEVcYqOZqp8p IKVPyguh5FW8c7v2nbJjuE6zOs1r/V0unSpvUbK3PTg2V87D75WKObKdOMgVhVsUDmD2YT+jAOJ9R zL7q0WWZ8LqgI3WKe59hGpBcXnjedJ0yoq4EovJgRRLUq6OkL88gpOrBjiivcp3f9s+n120mWJ+yN KypXi3ZLtrbWnjBVg1NjN/ABtEPoZ/D44FR1xykctoBwc3+LqhASz0jqu0WBURFWC5qAH6P4UFOMJ h09bxmQ/1sgk4tXvgQWUuYX5WpkVtDca8BU7obG6MrrFkMWwXLqdwjnut8buHsZUIlkBRpqW6NyVq qoVE8rBw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1d2LM6-0003F3-F9; Sun, 23 Apr 2017 17:31:26 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1d2LLb-0002ZO-Lm for linux-arm-kernel@bombadil.infradead.org; Sun, 23 Apr 2017 17:30:55 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=NGTUvBrYBFtNiK5/TGoZL+c9bjrPzVzZqMEsUpxiEqM=; b=S9tN/XIySOEQgBq48s+d6fW5u MQxw/GJH1eNaSNTCJoCaOy8V3nvFP2RVvK2tt4YjYOfROdA151FFd6d6cm6SwznSVR4hIcU7X56P0 00PJpLev2x9XTHf30jpO/R4ZXsomFw1WPKiqlU2towz/LC7+uPy/++7iVECimGVSf7Js1uA+E/ZpB NtNCoh/XLq391MU+cIl/cd8GSa4RmEwwbHkN8HyYMKdB5eiKLQQUtO+C0+8u2OpLZnZrZbg1n2jZN NIHGteKRDnbQ+bcAnDn5/7p7zsXY2snMdqL07tD4xvnrO+WjUofCkr4RfgJNDRiD+lz0kcyIKE1+e EPtUV1Sgg==; Received: from mail-wm0-x22e.google.com ([2a00:1450:400c:c09::22e]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1d2L9C-0005le-K9 for linux-arm-kernel@lists.infradead.org; Sun, 23 Apr 2017 17:18:08 +0000 Received: by mail-wm0-x22e.google.com with SMTP id u65so7573055wmu.1 for ; Sun, 23 Apr 2017 10:17:46 -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=N455t6wUUwuEtPga0u46S0TfmoK8O32kpsqXb2SlFF8KTn5gJP7I5NPcUAbeT6NPeK L/5gsaae6b9+GuxherDo1vKHwr6k9PcDwgtajadJ43MN2qgsGyGwrVQBAHZeOJKBlncJ gB+lZvE7offZ6ga12H3wii8xO8fhEj0euRvIXMqDaQjCf9ObyaCVBbmtC09UixDpT7jm mKno1y1l0S3HT6uXZOr13xgDULYXZtITtXrUCaXbxE+yTuuxtFwC17zvSwssrbvX3YhZ s9tbIXagKzugawqQGIU4FmupuBUnjW5EBW6kYQsnwLOlqJEWJwTElFJVQ/JuXDfvtPX4 fB5Q== X-Gm-Message-State: AN3rC/7Z/x4vm15mkVzkCH/UDDyqA7wmfPHnt2H3mfcASRn5URt0VCvr Vk9gNKjH5i5dB6wv 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?= 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170423_131806_816626_32F2C531 X-CRM114-Status: GOOD ( 10.01 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marc Zyngier , Christoffer Dall , kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.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)