From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1752691AbdHXMIP (ORCPT <rfc822;w@1wt.eu>);
        Thu, 24 Aug 2017 08:08:15 -0400
Received: from esa6.microchip.iphmx.com ([216.71.154.253]:53513 "EHLO
        esa6.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1751348AbdHXMIO (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Thu, 24 Aug 2017 08:08:14 -0400
X-IronPort-AV: E=Sophos;i="5.41,421,1498546800"; 
   d="scan'208";a="3928661"
Subject: Re: [PATCH] ARM: at91: Replace uses of virt_to_phys with __pa_symbol
To: Alexandre Belloni <alexandre.belloni@free-electrons.com>
CC: Ludovic Desroches <ludovic.desroches@atmel.com>,
        Florian Fainelli <f.fainelli@gmail.com>,
        <linux-arm-kernel@lists.infradead.org>, <linux-kernel@vger.kernel.org>
References: <20170824114454.22812-1-alexandre.belloni@free-electrons.com>
From: Nicolas Ferre <nicolas.ferre@microchip.com>
Organization: microchip
Message-ID: <062c5218-3370-905a-d113-4d9526d13cd1@microchip.com>
Date: Thu, 24 Aug 2017 14:09:08 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101
 Thunderbird/52.2.1
MIME-Version: 1.0
In-Reply-To: <20170824114454.22812-1-alexandre.belloni@free-electrons.com>
Content-Type: text/plain; charset="utf-8"
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 24/08/2017 at 13:44, Alexandre Belloni wrote:
> The PM code wrongly uses virt_to_phys() instead of __pa_symbol() and was
> not updated by commit 64fc2a947a98 ("ARM: 8641/1: treewide: Replace uses of
> virt_to_phys with __pa_symbol") because it was not yet in tree.
> 
> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>

Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>

> ---
>  arch/arm/mach-at91/pm.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
> index b1a59d638321..ccaaaa138d13 100644
> --- a/arch/arm/mach-at91/pm.c
> +++ b/arch/arm/mach-at91/pm.c
> @@ -535,8 +535,8 @@ static void __init at91_pm_backup_init(void)
>  	}
>  
>  	pm_bu->suspended = 0;
> -	pm_bu->canary = virt_to_phys(&canary);
> -	pm_bu->resume = virt_to_phys(cpu_resume);
> +	pm_bu->canary = __pa_symbol(&canary);
> +	pm_bu->resume = __pa_symbol(cpu_resume);
>  
>  	return;
>  
> 


-- 
Nicolas Ferre