From: Mark Rutland <mark.rutland@arm.com>
To: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: Laura Abbott <labbott@redhat.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will.deacon@arm.com>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
linux-arm-kernel@lists.infradead.org,
linux-renesas-soc@vger.kernel.org
Subject: Re: [PATCH] drivers: firmware: psci: Use __pa_symbol for cpu_resume
Date: Tue, 24 Jan 2017 15:33:51 +0000 [thread overview]
Message-ID: <20170124153351.GF7572@leverpostej> (raw)
In-Reply-To: <1485271819-2977-1-git-send-email-geert+renesas@glider.be>
On Tue, Jan 24, 2017 at 04:30:19PM +0100, Geert Uytterhoeven wrote:
> If CONFIG_DEBUG_VIRTUAL=y, during s2ram:
>
> virt_to_phys used for non-linear address: ffffff80085db280 (cpu_resume+0x0/0x20)
> ------------[ cut here ]------------
> WARNING: CPU: 0 PID: 1628 at arch/arm64/mm/physaddr.c:14 __virt_to_phys+0x28/0x60
> ...
> [<ffffff800809abb4>] __virt_to_phys+0x28/0x60
> [<ffffff80084a0c38>] psci_system_suspend+0x20/0x44
> [<ffffff8008095b28>] cpu_suspend+0x3c/0x68
> [<ffffff80084a0b48>] psci_system_suspend_enter+0x18/0x20
> [<ffffff80080ea3e0>] suspend_devices_and_enter+0x3f8/0x7e8
> [<ffffff80080ead14>] pm_suspend+0x544/0x5f4
>
> Fixes: 1a08e3d9e0ac4577 ("drivers: firmware: psci: Use __pa_symbol for kernel symbol")
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Argh, I should have spotted this. :(
Acked-by: Mark Rutland <mark.rutland@arm.com>
This should go via the arm64 tree -- Will, could you pick this up?
Thanks,
Mark.
> ---
> drivers/firmware/psci.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c
> index 66a8793f3b3793ff..493a56a4cfc4a836 100644
> --- a/drivers/firmware/psci.c
> +++ b/drivers/firmware/psci.c
> @@ -419,7 +419,7 @@ int psci_cpu_suspend_enter(unsigned long index)
> static int psci_system_suspend(unsigned long unused)
> {
> return invoke_psci_fn(PSCI_FN_NATIVE(1_0, SYSTEM_SUSPEND),
> - virt_to_phys(cpu_resume), 0, 0);
> + __pa_symbol(cpu_resume), 0, 0);
> }
>
> static int psci_system_suspend_enter(suspend_state_t state)
> --
> 1.9.1
>
WARNING: multiple messages have this Message-ID (diff)
From: mark.rutland@arm.com (Mark Rutland)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] drivers: firmware: psci: Use __pa_symbol for cpu_resume
Date: Tue, 24 Jan 2017 15:33:51 +0000 [thread overview]
Message-ID: <20170124153351.GF7572@leverpostej> (raw)
In-Reply-To: <1485271819-2977-1-git-send-email-geert+renesas@glider.be>
On Tue, Jan 24, 2017 at 04:30:19PM +0100, Geert Uytterhoeven wrote:
> If CONFIG_DEBUG_VIRTUAL=y, during s2ram:
>
> virt_to_phys used for non-linear address: ffffff80085db280 (cpu_resume+0x0/0x20)
> ------------[ cut here ]------------
> WARNING: CPU: 0 PID: 1628 at arch/arm64/mm/physaddr.c:14 __virt_to_phys+0x28/0x60
> ...
> [<ffffff800809abb4>] __virt_to_phys+0x28/0x60
> [<ffffff80084a0c38>] psci_system_suspend+0x20/0x44
> [<ffffff8008095b28>] cpu_suspend+0x3c/0x68
> [<ffffff80084a0b48>] psci_system_suspend_enter+0x18/0x20
> [<ffffff80080ea3e0>] suspend_devices_and_enter+0x3f8/0x7e8
> [<ffffff80080ead14>] pm_suspend+0x544/0x5f4
>
> Fixes: 1a08e3d9e0ac4577 ("drivers: firmware: psci: Use __pa_symbol for kernel symbol")
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Argh, I should have spotted this. :(
Acked-by: Mark Rutland <mark.rutland@arm.com>
This should go via the arm64 tree -- Will, could you pick this up?
Thanks,
Mark.
> ---
> drivers/firmware/psci.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c
> index 66a8793f3b3793ff..493a56a4cfc4a836 100644
> --- a/drivers/firmware/psci.c
> +++ b/drivers/firmware/psci.c
> @@ -419,7 +419,7 @@ int psci_cpu_suspend_enter(unsigned long index)
> static int psci_system_suspend(unsigned long unused)
> {
> return invoke_psci_fn(PSCI_FN_NATIVE(1_0, SYSTEM_SUSPEND),
> - virt_to_phys(cpu_resume), 0, 0);
> + __pa_symbol(cpu_resume), 0, 0);
> }
>
> static int psci_system_suspend_enter(suspend_state_t state)
> --
> 1.9.1
>
next prev parent reply other threads:[~2017-01-24 15:34 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-24 15:30 [PATCH] drivers: firmware: psci: Use __pa_symbol for cpu_resume Geert Uytterhoeven
2017-01-24 15:30 ` Geert Uytterhoeven
2017-01-24 15:33 ` Mark Rutland [this message]
2017-01-24 15:33 ` Mark Rutland
2017-01-24 15:58 ` Will Deacon
2017-01-24 15:58 ` Will Deacon
2017-01-25 9:30 ` Laura Abbott
2017-01-25 9:30 ` Laura Abbott
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170124153351.GF7572@leverpostej \
--to=mark.rutland@arm.com \
--cc=catalin.marinas@arm.com \
--cc=geert+renesas@glider.be \
--cc=labbott@redhat.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.