From patchwork Thu Feb 16 00:05:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthijs van Duin X-Patchwork-Id: 9575895 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 B7A3360244 for ; Thu, 16 Feb 2017 00:05:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A831D2853F for ; Thu, 16 Feb 2017 00:05:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9A9CD2859F; Thu, 16 Feb 2017 00:05:47 +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.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID 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 75A962853F for ; Thu, 16 Feb 2017 00:05:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752921AbdBPAFn (ORCPT ); Wed, 15 Feb 2017 19:05:43 -0500 Received: from mail-wr0-f194.google.com ([209.85.128.194]:36723 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753101AbdBPAFO (ORCPT ); Wed, 15 Feb 2017 19:05:14 -0500 Received: by mail-wr0-f194.google.com with SMTP id k90so190211wrc.3 for ; Wed, 15 Feb 2017 16:05:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=10ST0oux+mDf5tXWOnFF4b3k4d3S4SwdpqFVj8IHZCY=; b=iFSs3x4gv1md0NJtArpH6DGT1f/oyuMR7VdSeBchRH6Knzs5jhk2lmdgNVrVtBWNVr 9jqWWmtxObAykO6dIbm+hb4QKq1kq9PZIxaP25KRjq5jqaxDMJk0x/SS9DYPEU4C435V ls9aIGu74OhId2GnQ2phF0zy+qHhW8eoWw/BiLEK1EK7eDhxPGt+LNE/bhzh6EfNOJHs 63cUXZKxvnK659dKPgrZUTCd2uKwCOU96MoJQU913CwhQisruZ8DZH9lOvvDOlpd6nlu VrCCVsG1nFF5u2qHffwsAwynWxEwLq6nUCjGdQ815GjCT1zMe1FcAqWwWuNM8M/0cd6k 9ZZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=10ST0oux+mDf5tXWOnFF4b3k4d3S4SwdpqFVj8IHZCY=; b=kgp+eHWKlK2/rTCCeW+dyydGwCCuyjHzNvvz7iDs8dVXjl+xxgF9BD6BKxnQWdZVJo H1fBTdM3kF6bK+zQGjmeFZpugudXlphVysIMduj26LKeXiRq8HYVA0nnpAuEVyUT4jSQ r01Estm7Nwl4bTgtSv4tireSTBoQyh5ozXglnokWEu31Ov86MaCMkVnaLY9KEhq/KMD7 0hkBFS75DKSf8EFnnxD2n4Han0iuJIFvEWeyBI9UsPkmCGsv9pAD+/pjG58I7I88GkoH XggZ+AVzP8oqgA0UmVkhfleIZIWax8r/I3OLRBeFgPYiU+K4+2biUllZSA15TyF0DupP kYig== X-Gm-Message-State: AMke39kJ8gbOQvz/L6NhYm5xwXSdwxY/3XbnVmKNlPbGZQ144flfLcDYEhOZAibtUL5WEw== X-Received: by 10.223.163.201 with SMTP id m9mr34817336wrb.66.1487203507921; Wed, 15 Feb 2017 16:05:07 -0800 (PST) Received: from squirrel.local ([185.34.169.170]) by smtp.gmail.com with ESMTPSA id k44sm6695176wrk.59.2017.02.15.16.05.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Feb 2017 16:05:07 -0800 (PST) Date: Thu, 16 Feb 2017 01:05:04 +0100 From: Matthijs van Duin To: Tony Lindgren Cc: Lennart Sorensen , linux-omap@vger.kernel.org, kernel@pyra-handheld.com Subject: [PATCH] ARM: OMAP5 / DRA7: Fix HYP mode boot for thumb2 build Message-ID: <20170216000504.rkamjmm7dghkfs4h@squirrel.local> MIME-Version: 1.0 Content-Disposition: inline User-Agent: NeoMutt/20170113 (1.7.2) Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP '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 --- 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 fe36ce2734d4..4c6f14cf92a8 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" @@ -66,7 +67,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 omap_secondary_startup