From patchwork Sun Apr 23 17:09:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 9695033 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 9CC206037F for ; Sun, 23 Apr 2017 17:13:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8775926530 for ; Sun, 23 Apr 2017 17:13:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7112126538; Sun, 23 Apr 2017 17:13:11 +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 F02F726538 for ; Sun, 23 Apr 2017 17:13:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1163381AbdDWRNI (ORCPT ); Sun, 23 Apr 2017 13:13:08 -0400 Received: from mail-wm0-f47.google.com ([74.125.82.47]:35238 "EHLO mail-wm0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1163047AbdDWRK4 (ORCPT ); Sun, 23 Apr 2017 13:10:56 -0400 Received: by mail-wm0-f47.google.com with SMTP id w64so46382646wma.0 for ; Sun, 23 Apr 2017 10:10:56 -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=hKqd28g1FGTz67VMIH4UDIHi9A8iUCWfRVytAx0T3kU=; b=TqiVnAkkQt+NVe6TkMyetGSyMSWoe7vZzhD9cOK9H2y2TzsTXYmDXANp952dJEdmrQ 1SEIjf2kfmO8Wj45UgVM1SHbMSrE1biyQtEFuYUR9P0pPL5rkmwgAPckIFtvM4+gISDK l/ejosjrS7UAwZ9FOP35Ij0pnlrjcFACbKe2Y= 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=hKqd28g1FGTz67VMIH4UDIHi9A8iUCWfRVytAx0T3kU=; b=X0XgKES4hDAZUzDRpSV9ed9JrhZpL6Xln+RE8wo1TfytmVjSO9brEnVeSsOiFezX3v G6J1HBtDPjNm6GaOKqbfdGM05yCJBp0M6+VBqFXLWSCjgu+rK5EB+8b32EJohzfdQPUf rEYScX+3hPOHjWPmN0w6MJWFx1Tk248SYJyj01KfJ/JzQPRhYSR+RNwShjKcUK/oKISg c1QOpLdmOPvML0pqI55E/i3gp5ih+o63xu16yxSyfmTV7nAtFz5vCpuLt2MbvLKoEG1P N/qLVMKB9NCkYbtqahuiw9U829CeRzCb9qgRxzSrs80XTRS+wMrNKCKg26jhgegUPZab ZhUw== X-Gm-Message-State: AN3rC/4l1LgAdtVDPJfC55MPbU0D35JUeDTEC+dkZyZi8atuPJjgNl/n nReqH+JpJdvhilfx X-Received: by 10.80.163.146 with SMTP id s18mr137684edb.107.1492967455403; Sun, 23 Apr 2017 10:10:55 -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.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 23 Apr 2017 10:10:54 -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 78/79] ARM: hyp-stub: Fix Thumb-2 compilation Date: Sun, 23 Apr 2017 19:09:28 +0200 Message-Id: <20170423170929.27334-79-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 assembler defaults to emiting the short form of ADR, leading to an out-of-range immediate. Using the wide version solves this issue. Fixes: bc845e4fbbbb ("ARM: KVM: Implement HVC_RESET_VECTORS stub hypercall in the init code") Reported-by: Arnd Bergmann Signed-off-by: Marc Zyngier Signed-off-by: Christoffer Dall --- arch/arm/kernel/hyp-stub.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/kernel/hyp-stub.S b/arch/arm/kernel/hyp-stub.S index d8523cc..ec7e737 100644 --- a/arch/arm/kernel/hyp-stub.S +++ b/arch/arm/kernel/hyp-stub.S @@ -125,7 +125,7 @@ ENTRY(__hyp_stub_install_secondary) * (see safe_svcmode_maskall). */ @ Now install the hypervisor stub: - adr r7, __hyp_stub_vectors + W(adr) r7, __hyp_stub_vectors mcr p15, 4, r7, c12, c0, 0 @ set hypervisor vector base (HVBAR) @ Disable all traps, so we don't get any nasty surprise