From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 44DA7C433F5 for ; Tue, 28 Sep 2021 08:43:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 28AC760F12 for ; Tue, 28 Sep 2021 08:43:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239671AbhI1IpI (ORCPT ); Tue, 28 Sep 2021 04:45:08 -0400 Received: from esa.microchip.iphmx.com ([68.232.154.123]:62356 "EHLO esa.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239668AbhI1Ioy (ORCPT ); Tue, 28 Sep 2021 04:44:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1632818596; x=1664354596; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Q0IZHstorNE0oUCKxBodA9uRcfcTGnYv+7N52jiTOP8=; b=d/tkaD9+Z65r7mV5pcgBT0PSeaQaDmIhbJDn1r6RArLZdTrf/qgl9g50 xa/91vRh+2dHI3MO4WlgCCkY6YK/ut54vVqp5kUzIy4LWClqlfRjheKsu VD1O19BY5oGl+AY0DuU94rMNsden58Hzcp8xBDVr9Wa9ZT7u78KrjPL73 34WZ9xDUfo+By7C3DaBvJIaiA2ZR5xqslwyEdnG/7J4jbu6FjTP5ywipQ C7eJysm+eon7/ihWof7Ez29Hxc7v+RVfxIIU79gDy2OYd1F8Dl/tiHAPs mxKvC1+YgwczlRotWNdliQG0xv6Ri5KT5TGWUHjLGbwzOhD9YLiWOBT6D w==; IronPort-SDR: xRoBRr4Irb7a9Gg3jgjebKUHmWvsmRI0wHDoUCH8DaoZu5WTAUuJXHc25otsTHsMiTNQLWXMoL RrMXd+h393u+uDQiw5zeXj8F1ohIpkPF/5geoA0TfvZam9FyNWOGp/TZ3AOIM84SOHdJE/7C+v FEvQSM3nNqyyBEA164eOfUJdOHCIsBxeGzOu3n8rKWc92bwvXgMK4F1PyZnUbe5+92a09J9wRi IjOGcU3mUL7wgg/68M5WJINJBowp8u85DtlvE1xljje50dFRJ2YAda1UN07W6Gj0cQwBmymjtX h/rp3yPcFSotF7pm8Kf6EW5t X-IronPort-AV: E=Sophos;i="5.85,329,1624345200"; d="scan'208";a="133440610" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa2.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 28 Sep 2021 01:43:15 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14; Tue, 28 Sep 2021 01:43:14 -0700 Received: from rob-dk-mpu01.microchip.com (10.10.115.15) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server id 15.1.2176.14 via Frontend Transport; Tue, 28 Sep 2021 01:43:12 -0700 From: Claudiu Beznea To: , , , , CC: , , , Claudiu Beznea Subject: [PATCH 2/3] ARM: at91: pm: group constants and addresses loading Date: Tue, 28 Sep 2021 11:42:56 +0300 Message-ID: <20210928084257.2188017-3-claudiu.beznea@microchip.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210928084257.2188017-1-claudiu.beznea@microchip.com> References: <20210928084257.2188017-1-claudiu.beznea@microchip.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Group constants and addresses loading. This commit prepares the field for the next one. Added fixes tag on this commit as the next one will fail to apply if backported alone to older kernels. Fixes: f0bbf17958e8 ("ARM: at91: pm: add self-refresh support for sama7g5") Signed-off-by: Claudiu Beznea --- arch/arm/mach-at91/pm_suspend.S | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/arch/arm/mach-at91/pm_suspend.S b/arch/arm/mach-at91/pm_suspend.S index cbd61a3bcab1..34f251fdb743 100644 --- a/arch/arm/mach-at91/pm_suspend.S +++ b/arch/arm/mach-at91/pm_suspend.S @@ -1014,6 +1014,15 @@ ENTRY(at91_pm_suspend_in_sram) mov tmp1, #0 mcr p15, 0, tmp1, c7, c10, 4 + ldr tmp1, [r0, #PM_DATA_PMC_MCKR_OFFSET] + str tmp1, .mckr_offset + ldr tmp1, [r0, #PM_DATA_PMC_VERSION] + str tmp1, .pmc_version + ldr tmp1, [r0, #PM_DATA_MEMCTRL] + str tmp1, .memtype + ldr tmp1, [r0, #PM_DATA_MODE] + str tmp1, .pm_mode + ldr tmp1, [r0, #PM_DATA_PMC] str tmp1, .pmc_base ldr tmp1, [r0, #PM_DATA_RAMC0] @@ -1022,14 +1031,6 @@ ENTRY(at91_pm_suspend_in_sram) str tmp1, .sramc1_base ldr tmp1, [r0, #PM_DATA_RAMC_PHY] str tmp1, .sramc_phy_base - ldr tmp1, [r0, #PM_DATA_MEMCTRL] - str tmp1, .memtype - ldr tmp1, [r0, #PM_DATA_MODE] - str tmp1, .pm_mode - ldr tmp1, [r0, #PM_DATA_PMC_MCKR_OFFSET] - str tmp1, .mckr_offset - ldr tmp1, [r0, #PM_DATA_PMC_VERSION] - str tmp1, .pmc_version /* Both ldrne below are here to preload their address in the TLB */ ldr tmp1, [r0, #PM_DATA_SHDWC] str tmp1, .shdwc -- 2.25.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 55613C433EF for ; Tue, 28 Sep 2021 08:45:37 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1C39261159 for ; Tue, 28 Sep 2021 08:45:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 1C39261159 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=microchip.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Wh5+sHQxDN+3LVb8UFf4JZI7akPjjI3eeCBUvdHiv0s=; b=35WKTNcKb2mRlz CSgXQj7Vh/+xv8phRYGpoLmzgZ7NQZIZXvKclEDhQC7jHEUP/nFPIzgFQul9Q4StFBvrDHBn+01+j NIdOZ9Sz8uEHlZui/R8lncqzgtIA1nny9wk2z12jWHdirUsi+epQEouIEfa5LS07eMcMEi1685Xcc bboaOQbkb2RZ3tJj8h2wiEqbKM4AFI8tw07g8+dQ/cgvkd/yJst3sc2G0P4nFkMjaqQtSbO8S2E3T wJXapA/24bhsTEMbjD59AnJjWRLGL90SvUI8ZvdMxc6s9xqkDmZh47bcSeB/MnQRUAkF0ZzMvFbhp Of5+280U2XhTxK99DgbA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mV8iB-006IXq-GD; Tue, 28 Sep 2021 08:43:39 +0000 Received: from esa.microchip.iphmx.com ([68.232.154.123]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mV8ho-006ISm-55 for linux-arm-kernel@lists.infradead.org; Tue, 28 Sep 2021 08:43:17 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1632818596; x=1664354596; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Q0IZHstorNE0oUCKxBodA9uRcfcTGnYv+7N52jiTOP8=; b=d/tkaD9+Z65r7mV5pcgBT0PSeaQaDmIhbJDn1r6RArLZdTrf/qgl9g50 xa/91vRh+2dHI3MO4WlgCCkY6YK/ut54vVqp5kUzIy4LWClqlfRjheKsu VD1O19BY5oGl+AY0DuU94rMNsden58Hzcp8xBDVr9Wa9ZT7u78KrjPL73 34WZ9xDUfo+By7C3DaBvJIaiA2ZR5xqslwyEdnG/7J4jbu6FjTP5ywipQ C7eJysm+eon7/ihWof7Ez29Hxc7v+RVfxIIU79gDy2OYd1F8Dl/tiHAPs mxKvC1+YgwczlRotWNdliQG0xv6Ri5KT5TGWUHjLGbwzOhD9YLiWOBT6D w==; IronPort-SDR: xRoBRr4Irb7a9Gg3jgjebKUHmWvsmRI0wHDoUCH8DaoZu5WTAUuJXHc25otsTHsMiTNQLWXMoL RrMXd+h393u+uDQiw5zeXj8F1ohIpkPF/5geoA0TfvZam9FyNWOGp/TZ3AOIM84SOHdJE/7C+v FEvQSM3nNqyyBEA164eOfUJdOHCIsBxeGzOu3n8rKWc92bwvXgMK4F1PyZnUbe5+92a09J9wRi IjOGcU3mUL7wgg/68M5WJINJBowp8u85DtlvE1xljje50dFRJ2YAda1UN07W6Gj0cQwBmymjtX h/rp3yPcFSotF7pm8Kf6EW5t X-IronPort-AV: E=Sophos;i="5.85,329,1624345200"; d="scan'208";a="133440610" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa2.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 28 Sep 2021 01:43:15 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14; Tue, 28 Sep 2021 01:43:14 -0700 Received: from rob-dk-mpu01.microchip.com (10.10.115.15) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server id 15.1.2176.14 via Frontend Transport; Tue, 28 Sep 2021 01:43:12 -0700 From: Claudiu Beznea To: , , , , CC: , , , Claudiu Beznea Subject: [PATCH 2/3] ARM: at91: pm: group constants and addresses loading Date: Tue, 28 Sep 2021 11:42:56 +0300 Message-ID: <20210928084257.2188017-3-claudiu.beznea@microchip.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210928084257.2188017-1-claudiu.beznea@microchip.com> References: <20210928084257.2188017-1-claudiu.beznea@microchip.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210928_014316_279778_7C101C85 X-CRM114-Status: UNSURE ( 8.60 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Group constants and addresses loading. This commit prepares the field for the next one. Added fixes tag on this commit as the next one will fail to apply if backported alone to older kernels. Fixes: f0bbf17958e8 ("ARM: at91: pm: add self-refresh support for sama7g5") Signed-off-by: Claudiu Beznea --- arch/arm/mach-at91/pm_suspend.S | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/arch/arm/mach-at91/pm_suspend.S b/arch/arm/mach-at91/pm_suspend.S index cbd61a3bcab1..34f251fdb743 100644 --- a/arch/arm/mach-at91/pm_suspend.S +++ b/arch/arm/mach-at91/pm_suspend.S @@ -1014,6 +1014,15 @@ ENTRY(at91_pm_suspend_in_sram) mov tmp1, #0 mcr p15, 0, tmp1, c7, c10, 4 + ldr tmp1, [r0, #PM_DATA_PMC_MCKR_OFFSET] + str tmp1, .mckr_offset + ldr tmp1, [r0, #PM_DATA_PMC_VERSION] + str tmp1, .pmc_version + ldr tmp1, [r0, #PM_DATA_MEMCTRL] + str tmp1, .memtype + ldr tmp1, [r0, #PM_DATA_MODE] + str tmp1, .pm_mode + ldr tmp1, [r0, #PM_DATA_PMC] str tmp1, .pmc_base ldr tmp1, [r0, #PM_DATA_RAMC0] @@ -1022,14 +1031,6 @@ ENTRY(at91_pm_suspend_in_sram) str tmp1, .sramc1_base ldr tmp1, [r0, #PM_DATA_RAMC_PHY] str tmp1, .sramc_phy_base - ldr tmp1, [r0, #PM_DATA_MEMCTRL] - str tmp1, .memtype - ldr tmp1, [r0, #PM_DATA_MODE] - str tmp1, .pm_mode - ldr tmp1, [r0, #PM_DATA_PMC_MCKR_OFFSET] - str tmp1, .mckr_offset - ldr tmp1, [r0, #PM_DATA_PMC_VERSION] - str tmp1, .pmc_version /* Both ldrne below are here to preload their address in the TLB */ ldr tmp1, [r0, #PM_DATA_SHDWC] str tmp1, .shdwc -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel