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: 9695137 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 0C4D3601E9 for ; Sun, 23 Apr 2017 17:24:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 025E4203B9 for ; Sun, 23 Apr 2017 17:24:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E9F0A262F2; Sun, 23 Apr 2017 17:24:54 +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 7502A203B9 for ; Sun, 23 Apr 2017 17:24:54 +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=JF4Wjw87Ckqx9YAfstVMx+a8DFjQ+BtzmeUzrbA+ZBE=; b=DMpkKKNPcfNn4bM9YN7Lw44gfM OakQTTqCFRh73+YFKFThEqaxVWthKXRnwWHsxE7a1DfdLd+0+V7voalBY0tr9lytwMstmBHQQc/5J lBdDw5Y71etGpfXyIL2n4QhQjDjgoClYvdoxGk+830jvyhTk9NkwLzI43fvJW2MAIwx6w6LAdmBH8 bBI5ktfrn1g6yvZFAHJEmXlab6sHw0WRhLo0I3FUVHdPSEhbYcM2F00oHA2uH2wFr4o12Tfe5nKue jSuPVzu43m5mCjmAK4VA5VJz4lZgpS6C6eyaV4MEpw2cEdxSM4EbWRL+WxoTKreQql1gkfPyDCEul AYyJAGog==; 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 1d2LFl-0006tz-P8; Sun, 23 Apr 2017 17:24:53 +0000 Received: from mail-wm0-x22b.google.com ([2a00:1450:400c:c09::22b]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1d2L2X-00070U-Iu for linux-arm-kernel@lists.infradead.org; Sun, 23 Apr 2017 17:11:21 +0000 Received: by mail-wm0-x22b.google.com with SMTP id u65so7510775wmu.1 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=Yq+GBEdGM05YAm/MMSo5qT1OwwIJlRn3mqK/53SCgit30zuYcV8Pu4glKIog6g9mU6 0z2tHffI/HtJSRsIHgE7N8GDFZmpSWAT25637lQoKx97Q6883n6EyHRBAqe3ZNYL3a/d aRDIssEalm9/Y+x96/dRB2lX/I48Hk8Q2Mn7KsQJ09J/+bd9d6b1aZloHnZh8swR1iJQ cUUQZmEZmvmJtfzTofIpV1Lxv8AsQQnlnEJbRTb/V4SBZd54tr3HLH9+T82VTfd+7I7e NxHElAIwycTdI6pxbysshaFaECg8S+luB0Fb53nbs4j69+J6LhH0FAvRajQeBfBraPij i6oQ== X-Gm-Message-State: AN3rC/525ci6Uk/m7q/KBKviagT2WhAJv1dM40cu0/RyHoMKPeCLMnl5 LxlPo9aKJR+R8DZS 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?= 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170423_101114_063601_9FDAC439 X-CRM114-Status: UNSURE ( 9.66 ) X-CRM114-Notice: Please train this message. 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 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