Received: by 2002:ac0:aa62:0:0:0:0:0 with SMTP id w31-v6csp1956333ima; Thu, 25 Oct 2018 07:32:58 -0700 (PDT) X-Google-Smtp-Source: AJdET5cDwug++h1XDKMtirxADlqvpNioHu9uTXkc7cmWMEyClqvOwToqPrVx2YdBm+0IMD2v+R2Y X-Received: by 2002:a17:902:788b:: with SMTP id q11-v6mr1802811pll.54.1540477978696; Thu, 25 Oct 2018 07:32:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540477978; cv=none; d=google.com; s=arc-20160816; b=UHeMu1/ZDGJkXPCWiSbCaQZcC61ydgnydtLpSf+Q6FijzLPvYIq10cNnoviR/giNwm U4eBHCwy8TIuUrsgY3melzgUNSXraPl7QojjiSGM4zQnCsQhpbaLtFMpIPEd+ln2usFD /WONQMRMLLWWedIU4K8Tt5xDCEWMC8toyYcqTi1tHe7QxUC7zu1d4SeiXs6B8T64jDFz yVTMuOfCniCmyCI9L12R2l4uHPqHBVOWYZ9XDJ+OcsN0H4XhjFsNsYU+w8PR9cADBDoi I5lBnJdcUSzsD8Jylg52nKmOu2sFKpJ0f4cSBlSaVGy++3qJVH6kcDGevI8IRw50OPFL WlzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=TX7z8fKrVQCbMb52c6jeW87Yc+q+HpUq9sucyQVgJDs=; b=UJX7SG3clK/NrMAX20CxhF1cFdrgQkuQElMDIifrQW8lldk1C6o9s781hQXU3aU38/ SQwfSrAgVFd3W3Encl0UJS+WihC+FUotURkk1Lmomqmyo25iA9NdAA2PAM615yv7Edvs 3P++fhPpXttHGllHtr59nSYB0SlXtQey9vIfVRM5pJ0pdHhZAcl0WhdPy1Tg/vPzAYyk xFO0LrPIpCDJpzJCa5w1v8oMQaKVX/NeMpbn2bKlyDyR01cGHwE3EIOk0CffcHKxM7hs deLR/Mz12tYdB6ZFDZFByzIGHo42+CQzW4DEUkoK4IQYvwXhHdPvTwYlMJ/KJm+6+AG7 vHrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=AQx4WmVW; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l14-v6si8222696pgi.34.2018.10.25.07.32.24; Thu, 25 Oct 2018 07:32:58 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=AQx4WmVW; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730373AbeJYWwI (ORCPT + 99 others); Thu, 25 Oct 2018 18:52:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:34012 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727992AbeJYWwH (ORCPT ); Thu, 25 Oct 2018 18:52:07 -0400 Received: from sasha-vm.mshome.net (unknown [167.98.65.38]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 168A820848; Thu, 25 Oct 2018 14:19:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1540477150; bh=x3Sq3kVWrOZd6+qgj8SB7cRu3yavIH7tGfm3q/KK8iw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AQx4WmVW+wp2IitZz5MGHZ0CT94aJr7I+ts2QqU3CZSfczoNfppEIFpFtdf9g59f1 OQL/YFf0l3E1temw+5jHxPSbn7xUqTvgG5//23YymBQ1nmoSviDsk5Ojcz8GppjgxT v/WDuUgzJAM/Kn57l0Jt6WB/Xg638+T/GMnfra9k= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Matthijs van Duin , Tony Lindgren , Sasha Levin Subject: [PATCH AUTOSEL 3.18 08/98] ARM: OMAP5 / DRA7: Fix HYP mode boot for thumb2 build Date: Thu, 25 Oct 2018 10:17:23 -0400 Message-Id: <20181025141853.214051-8-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181025141853.214051-1-sashal@kernel.org> References: <20181025141853.214051-1-sashal@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Matthijs van Duin [ Upstream commit 448c077eeb02240c430db2a2c3bf5285a4c65d66 ] 'adr' yields a data-pointer, not a function-pointer. Fixes: 999f934de195 ("ARM: omap5/dra7xx: Enable booting secondary CPU in HYP mode") Signed-off-by: Matthijs van Duin Signed-off-by: Tony Lindgren Signed-off-by: Sasha Levin --- arch/arm/mach-omap2/omap-headsmp.S | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-omap2/omap-headsmp.S b/arch/arm/mach-omap2/omap-headsmp.S index 6d1dffca6c7b..748dde9fa4a5 100644 --- a/arch/arm/mach-omap2/omap-headsmp.S +++ b/arch/arm/mach-omap2/omap-headsmp.S @@ -17,6 +17,7 @@ #include #include +#include #include "omap44xx.h" @@ -56,7 +57,7 @@ wait_2: ldr r2, =AUX_CORE_BOOT0_PA @ read from AuxCoreBoot0 cmp r0, r4 bne wait_2 ldr r12, =API_HYP_ENTRY - adr r0, hyp_boot + badr r0, hyp_boot smc #0 hyp_boot: b secondary_startup -- 2.17.1