From patchwork Thu Sep 27 19:27:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 10618507 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4F6CD913 for ; Thu, 27 Sep 2018 19:28:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3865F2BC74 for ; Thu, 27 Sep 2018 19:28:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2BD5F2BC81; Thu, 27 Sep 2018 19:28:55 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 223482BC74 for ; Thu, 27 Sep 2018 19:28:51 +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=BC0cetyf+CBeqEPLB2xDlh79a51ViAoj4PmdPVsjHoQ=; b=Xg7mSWRo6Zt8r9reA6f22HQNkw /8+O1gE0245e1exw2fSg4bWcDn2gtx0pcIfkl2l4t+UCvvBHbNEGhCgZ5dw00uGMaiQWTmg8r6ugT 95S5wxAbSLsEj8W5ureG+90avkwV97SKgXtsaP+8gpf9INdNuuUzGUucTZUO85gzrDTbzLtbrW+32 ugpm5QyH0I04ZH7eTHEW7UzNKw0q+vPIwsnCRYrL+uiqncqfdQIDlmCp/Ivd+7BRa3hbru/cdtT1M U7lw4cbzGtel4kUqVcpaEeUWf7Mc7hYprOzvRi6hW+FKTs7Xgnnmx4/1wyKHRvTJPGgAj8qnhmdll +ULE1G9Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1g5bxv-0001wG-JA; Thu, 27 Sep 2018 19:28:47 +0000 Received: from mail-pg1-x542.google.com ([2607:f8b0:4864:20::542]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g5bxV-0001sp-TH for linux-arm-kernel@lists.infradead.org; Thu, 27 Sep 2018 19:28:23 +0000 Received: by mail-pg1-x542.google.com with SMTP id 85-v6so2662655pge.6 for ; Thu, 27 Sep 2018 12:27:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=idS9CWU81VVg7Wphz/MpSwKUtfQ6rlPXr/UIS8hVWNw=; b=NyPbJ3Twf18IBYzjZI8Kd/LHWSRv1QcMlXt8kDJJWhUdcXpp8XK0WI4oAunAadQv06 Hd4Wt8qOZJLcg/2Y0R6gG/q6l/en3v087KKMB10uY/DBcYSrSM0kXgW6jy74Y25Zil6c 0UOpmaLsVnaot/UZu2TsafnFCWX5WSCa27HAYrlPuLdS2mI5hek/R0MuqbylvhfipSTE 40kZm4mhscsJdG4GpgVzzoJtcetCHhmdUiqMmHnIofFWYrMBQ6gislhThNFTja3PXt99 FngPdTOQZSqgwaFSxaDtwROT2KOsZLUah+9QtAQ4XRupi+aojhZsI5Kn/oWHuydnffui hmpQ== 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=idS9CWU81VVg7Wphz/MpSwKUtfQ6rlPXr/UIS8hVWNw=; b=BFKMaIN9iyQGe6oC3LKXi9eahAq8sUkh42k49Jo0TDflmp7LUdkJE6GFII18ZJOQfk TzYJPNindtlEl6/VvBDT7SInBNDj+xo6u5ZwjbbX9/OEXdi75qRt2Xgx2MSwxjOHv3Kk BXyNawS6BNo8LPV7QsKDDNr44sjfwYUu02DjgCvGGdLipeqjOeo/pNEb5YNmRLZaf7mt dwbXo1Ufllm2FZe5cc6tR2TXlC+6IUWbDooxKwN4lQ5mQwKJDnup365EM29zqNYAZAxv 5ZGDSAnk6UiKFGfMSNy+mBTL4MtmJDFxmr1pnukYYj+DsA5iYCZWHJnZm+IR704suNBe PkyQ== X-Gm-Message-State: ABuFfohiUYikT0uMDzpKNk35i5f681ftvpTkzuwke+tC/xZiCUi843Mi eQO5jWA6agq5jPzvFYG1/nZTv7mG X-Google-Smtp-Source: ACcGV60y5iSZ28H1BZ9safitCo7nBVyNkd4r06V9q2WyA2BZvSRMQuec+V432jX7UdJWuR7X4Poneg== X-Received: by 2002:a63:a0d:: with SMTP id 13-v6mr11955274pgk.318.1538076473735; Thu, 27 Sep 2018 12:27:53 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id q2-v6sm8531502pfc.17.2018.09.27.12.27.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Sep 2018 12:27:52 -0700 (PDT) From: Florian Fainelli To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/3] firmware/psci: Fix cpu_resume entry points with THUMB2_KERNEL Date: Thu, 27 Sep 2018 12:27:09 -0700 Message-Id: <20180927192711.26455-2-f.fainelli@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180927192711.26455-1-f.fainelli@gmail.com> References: <20180927192711.26455-1-f.fainelli@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180927_122821_989096_BBC04E42 X-CRM114-Status: GOOD ( 14.05 ) 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: Mark Rutland , Rob Herring , Lorenzo Pieralisi , Russell King , open list , Florian Fainelli , "maintainer:BROADCOM BCM7XXX ARM ARCHITECTURE" , Gregory Fong , Doug Berger , Brian Norris 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 When THUMB2_KERNEL is enabled, we would be failing to resume from an idle or system suspend call where the reentry point is set to cpu_resume() because that function is in Thumb2. Utilize cpu_resume_arm() for ARM 32-bit kernels which takes care of the mode switching for us. Fixes: 8b6f2499ac45 ("ARM: 8511/1: ARM64: kernel: PSCI: move PSCI idle management code to drivers/firmware") Fixes: faf7ec4a92c0 ("drivers: firmware: psci: add system suspend support") Signed-off-by: Florian Fainelli --- drivers/firmware/psci.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c index c80ec1d03274..f8b154384483 100644 --- a/drivers/firmware/psci.c +++ b/drivers/firmware/psci.c @@ -400,9 +400,14 @@ int psci_cpu_init_idle(unsigned int cpu) static int psci_suspend_finisher(unsigned long index) { u32 *state = __this_cpu_read(psci_power_state); + unsigned long reentry; - return psci_ops.cpu_suspend(state[index - 1], - __pa_symbol(cpu_resume)); +#ifdef CONFIG_ARM + reentry = __pa_symbol(cpu_resume_arm); +#else + reentry = __pa_symbol(cpu_resume); +#endif + return psci_ops.cpu_suspend(state[index - 1], reentry); } int psci_cpu_suspend_enter(unsigned long index) @@ -437,8 +442,15 @@ CPUIDLE_METHOD_OF_DECLARE(psci, "psci", &psci_cpuidle_ops); static int psci_system_suspend(unsigned long unused) { + unsigned long reentry; + +#ifdef CONFIG_ARM + reentry = __pa_symbol(cpu_resume_arm); +#else + reentry = __pa_symbol(cpu_resume); +#endif return invoke_psci_fn(PSCI_FN_NATIVE(1_0, SYSTEM_SUSPEND), - __pa_symbol(cpu_resume), 0, 0); + reentry, 0, 0); } static int psci_system_suspend_enter(suspend_state_t state) From patchwork Thu Sep 27 19:27:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 10618513 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4F699913 for ; Thu, 27 Sep 2018 19:31:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3B3D92BC8B for ; Thu, 27 Sep 2018 19:31:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2EE562BC90; Thu, 27 Sep 2018 19:31:35 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 1916C2BC8B for ; Thu, 27 Sep 2018 19:31:31 +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=bFW/7B9k6kvEMIWUPEIe8xqeOXaScKVkFHSE2qW17gk=; b=U1Al7lI9FL2zQjyOqDdwga3Ev2 54y6QkI18o9wdFv0PwK3Qayd6yHhr2h8OrpbAcR8HEyMv74FOu5BiPse6t+1y1CUbIaeetjZlFiz7 zDcmXWYSdGUE6YiyuIs49dsotFMnSf7gbe3R1Rz1zCwUGNLl8mgbuqQ1s5dCVoqUmuV/tpxlXYVc8 5pPIPCCdASMliNyxhDRFJO0omXJOr21d7Ms3wRGLWqGnDyWGQ8//Mpk7OrDGW4TGnmq/B7LrP6R1l TZ2BGq9Ar42M2jT8Qs1Ydm1RrvrCwoaM73kHLb99aCVtZwa5b/nIJPXZwwndU9GdNm0fzxyBel6K5 kmXpPBcw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1g5c0O-00044V-1K; Thu, 27 Sep 2018 19:31:20 +0000 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g5bxW-0001sq-4Q for linux-arm-kernel@lists.infradead.org; Thu, 27 Sep 2018 19:28:26 +0000 Received: by mail-pf1-x443.google.com with SMTP id m77-v6so2585503pfi.8 for ; Thu, 27 Sep 2018 12:27:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=wuh9PQJuORDhEW1Qd/Bh2TINja23GTiwyoguU2JzXEg=; b=BreOZlqXIoivOHZ2ib1XqFRve8Dd/ktNmN5tHceWLVx4Wa7/qZl1KKFkcqIbEeg4XZ yKKaVfAoAPaRiQdLH0z/pnHCIuOMVfqbpvfBD8rp9Ag/AIIUZ/0Gx2i+2FR89jXIGmXD NE9YFKr4ff9IOkFLjKRBeJ7KpbxkYYywtpcJRnDpST9c1eU6JmiEKrj9jIh0+mrPn9Sl /bxLDEDW73BMEAgNYL44wEzymDSO9LRntwBJ2drabw7HexF8FOd0jy8FROmKwc6DpJ1y jAwgoDOJ2uswfFCNCtC+pqs7bqAmqs+l8W/iI/auEuc613YOed2StO7TpkO+Q6KrDW1g Y6gA== 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=wuh9PQJuORDhEW1Qd/Bh2TINja23GTiwyoguU2JzXEg=; b=PCazRBXHn42VAWzYw0U7OYLOd1OpRHzFZMmXolKhdFaVTurC3W4FainhmDE/MSkY37 0OFfO/Fd8oZflp8POJcnTnXPsQftKFHp5UJQ/zFVH7/c6a+DblBENsELyIaWj92JOkbG 4+iKUFLMMRBWR1y1pXVS0EIUtNFba710nYJx32Z0S25sNnfSS1bPWKVo9mb3jagMp1Rd fUjKhsjHLXC9/QYLljpd9wN6ZJNsrJ65HKlFtOaGb7SO4JRrSDQrQsLPn9/WsZmojayY QtnKY/2EFsSyF+pr5av6bV6hWAj4fSb2DdKaWQLrmSEIK165SMWku07QLHSrZl2IgjgJ NvAw== X-Gm-Message-State: ABuFfoi7IOPFG9lesiBT6jNwynw4ndxWBWtQesQvh0XYRZBmjPZLYDNf abmgByrjXwNYV1E0XWGVOdCVTDzn X-Google-Smtp-Source: ACcGV633b8E5X0PZQju3F1eHG9FSpBW5Bizb8t+FcNwsVHoPWMXcjQxBMhmuo/yWmsqE9gHYb9rR4w== X-Received: by 2002:a63:d70c:: with SMTP id d12-v6mr6709685pgg.110.1538076475816; Thu, 27 Sep 2018 12:27:55 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id q2-v6sm8531502pfc.17.2018.09.27.12.27.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Sep 2018 12:27:54 -0700 (PDT) From: Florian Fainelli To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/3] ARM: psci: Fix secondary core boot with THUMB2_KERNEL Date: Thu, 27 Sep 2018 12:27:10 -0700 Message-Id: <20180927192711.26455-3-f.fainelli@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180927192711.26455-1-f.fainelli@gmail.com> References: <20180927192711.26455-1-f.fainelli@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180927_122822_240112_86AD5574 X-CRM114-Status: GOOD ( 13.75 ) 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: Mark Rutland , Rob Herring , Lorenzo Pieralisi , Russell King , open list , Florian Fainelli , "maintainer:BROADCOM BCM7XXX ARM ARCHITECTURE" , Gregory Fong , Doug Berger , Brian Norris 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 When THUMB2_KERNEL is enabled, we would be setting the secondary core's entry point to secondary_startup() which is already Thumb2 code, utilize secondary_startup_arm() which takes care of doing the mode switching for us. Fixes: 05774088391c ("arm: introduce psci_smp_ops") Signed-off-by: Florian Fainelli --- arch/arm/kernel/psci_smp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/kernel/psci_smp.c b/arch/arm/kernel/psci_smp.c index cb3fcaeb2233..547a11b065d2 100644 --- a/arch/arm/kernel/psci_smp.c +++ b/arch/arm/kernel/psci_smp.c @@ -47,13 +47,13 @@ * */ -extern void secondary_startup(void); +extern void secondary_startup_arm(void); static int psci_boot_secondary(unsigned int cpu, struct task_struct *idle) { if (psci_ops.cpu_on) return psci_ops.cpu_on(cpu_logical_map(cpu), - virt_to_idmap(&secondary_startup)); + virt_to_idmap(&secondary_startup_arm)); return -ENODEV; } From patchwork Thu Sep 27 19:27:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 10618511 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0B2FC14BD for ; Thu, 27 Sep 2018 19:30:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E80462BC88 for ; Thu, 27 Sep 2018 19:30:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DC0A92BC8C; Thu, 27 Sep 2018 19:30:40 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 C08B12BC88 for ; Thu, 27 Sep 2018 19:30:36 +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=gdBwamW6YUENbWyoPtmjz2DqnGurNv9M62iPKlTdW2Y=; b=BwhNV/lQYLDWVc15e6hFUajj+T IIhbdfz3B5J+DZGLFv78tN4iJT4/U+uGbEqLdlgzAgxH/goYI05cwVj2j3u0qHRLZA9kj2EYGvsqd 4gSo5JHGiiHrpxltreAQeYNMYFU2r4Sk1EKRw9iiOgpHKH6JV1sQ0+P2oeCunNC3qojBOAXUvkjmk Ez/NEhWxNhj+AKIAcDhjOFBtGRv0UgMMvhWl0kIIA093A20EWlKH66q6YJgP6tDOBJuGcz7grBYOt oaYg7rIdC3MMVbOuaDNtrCxMoKPXc20p3Hf4ccQ2d9AygFDCAYSinRIEBpEHlX/pGOJT+ftz2p5KU 94G2qdlQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1g5bzU-0002ad-G5; Thu, 27 Sep 2018 19:30:24 +0000 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g5bxV-0001ss-UA for linux-arm-kernel@lists.infradead.org; Thu, 27 Sep 2018 19:28:26 +0000 Received: by mail-pf1-x441.google.com with SMTP id j26-v6so2576908pfi.10 for ; Thu, 27 Sep 2018 12:27:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=BGoSejrBEFtVHbBL0BYK36ryiXzv88p81h8++1Dth7E=; b=OMwBU7+uS3Q2jD69NvKxs8pumvEgjNDPHQCG8WCX+bIPXcTQqJZKKb39B7vzSYvKTn wktA+XUkcCiqrbfQuUNMblzYwRHAYLFTHRe8Q+IQqkSiDCdB2YOuiA++pMUF8hfbHP1Q yQiF+qOwTKUDoIBzbzy8FYfDHQFGfy+TjJJbmY7PvxrbHSZC5YAp8esngwgO5bjodkru 2VkKRIR7Q75PnswDoTnvMVk5TnZE6sE4V1PSxPrcQ3iWNr53S+hifmLnUHvuxg3JdHGF oBISpmGYs+mUoZV/FjJzpb0IihE19hD2jaTGR7O2tOpodhxCqGCw3n3o8EYjQV0MylUb KgyA== 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=BGoSejrBEFtVHbBL0BYK36ryiXzv88p81h8++1Dth7E=; b=k95Qy9+7lqMXYN9HjpwdkFM08lX1RablfEasnUv5e+YsEfmnijiyA9fGRGcJIk/ufj QwVTZu6H8VfqE1ZR7wvDuUAkk/kKeTlILaqFDYkdXFiEIu5mkQKIUsreCuY6AJemI78F rJQKvo0vIo36sfUIGUORSGgtSumYGc9d3BV8rRy5mAdNMiN7/Lwq+YsIE3Mbq83VRLdG d6l5and960//lQ5mnrT62re2KL8pkXcoSuApe2TcdLYliRerObMcBI1lK7/qOJu8NmTB MhtSlkMqvOIdraCjjA1qmi1npxm0GhLAOKHE0/YB/aEfCR04vXAPI+t49zL9QawmfP4T 3dVA== X-Gm-Message-State: ABuFfohUzjYF+K739whJ7jPDLPGm+Q2/VMuaZz0MZ/HG2UA816roJoSW 9MTDbCMZ1Sfspv1FhMzJMosq/oke X-Google-Smtp-Source: ACcGV62L/rFYWIyyL2JeyRobD/AQ0X8ikN3rzpbMH/hdmqdWxh5LoxpPBBTeVj/pWEEzF5AQ9nqRnA== X-Received: by 2002:a63:5558:: with SMTP id f24-v6mr11791116pgm.37.1538076477816; Thu, 27 Sep 2018 12:27:57 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id q2-v6sm8531502pfc.17.2018.09.27.12.27.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Sep 2018 12:27:56 -0700 (PDT) From: Florian Fainelli To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 3/3] soc: bcm: brcmstb: Fix re-entry point with a THUMB2_KERNEL Date: Thu, 27 Sep 2018 12:27:11 -0700 Message-Id: <20180927192711.26455-4-f.fainelli@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180927192711.26455-1-f.fainelli@gmail.com> References: <20180927192711.26455-1-f.fainelli@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180927_122821_985666_55B498AE X-CRM114-Status: GOOD ( 16.80 ) 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: Mark Rutland , Rob Herring , Lorenzo Pieralisi , Russell King , open list , Florian Fainelli , "maintainer:BROADCOM BCM7XXX ARM ARCHITECTURE" , Gregory Fong , Doug Berger , Brian Norris 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 When the kernel is built with CONFIG_THUMB2_KERNEL we would set the kernel's resume entry point to be a function that is already built as Thumb-2 code while the boot agent doing the resume is in ARM mode, so this does not work. There is a header label defined: cpu_resume_arm which we can use to do the switching for us. Fixes: 0b741b8234c8 ("soc: bcm: brcmstb: Add support for S2/S3/S5 suspend states (ARM)") Signed-off-by: Florian Fainelli --- drivers/soc/bcm/brcmstb/pm/pm-arm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/soc/bcm/brcmstb/pm/pm-arm.c b/drivers/soc/bcm/brcmstb/pm/pm-arm.c index a5577dd5eb08..8ee06347447c 100644 --- a/drivers/soc/bcm/brcmstb/pm/pm-arm.c +++ b/drivers/soc/bcm/brcmstb/pm/pm-arm.c @@ -404,7 +404,7 @@ noinline int brcmstb_pm_s3_finish(void) { struct brcmstb_s3_params *params = ctrl.s3_params; dma_addr_t params_pa = ctrl.s3_params_pa; - phys_addr_t reentry = virt_to_phys(&cpu_resume); + phys_addr_t reentry = virt_to_phys(&cpu_resume_arm); enum bsp_initiate_command cmd; u32 flags;