From: andrew@lunn•ch (Andrew Lunn)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH] arm: mvebu: fix coherency_late_init() for multiplatform
Date: Thu, 20 Jun 2013 09:48:56 +0200 [thread overview]
Message-ID: <20130620074856.GA19959@lunn.ch> (raw)
In-Reply-To: <1371714326-25971-1-git-send-email-thomas.petazzoni@free-electrons.com>
On Thu, Jun 20, 2013 at 09:45:26AM +0200, Thomas Petazzoni wrote:
> As noticed by Arnaud Patard (Rtp) <arnaud.patard@rtp-net•org>, commit
> 865e0527d2d7 ('arm: mvebu: avoid hardcoded virtual address in
> coherency code') added a postcore_initcall() to register the bus
> notifier that the mvebu code needs to apply correct DMA operations on
> its platform devices breaks the multiplatform boot on other platforms,
> because the bus notifier registration is unconditional.
>
> This commit fixes that by registering the bus notifier only if we have
> the mvebu coherency unit described in the Device Tree. The conditional
> used is exactly the same in which the bus_register_notifier() call was
> originally enclosed before 865e0527d2d7 ('arm: mvebu: avoid hardcoded
> virtual address in coherency code').
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons•com>
> Reported-by: Arnaud Patard (Rtp) <arnaud.patard@rtp-net•org>
> ---
> This fix has been reported by Arnaud to fix the boot on his OMAP4
> PandaBoard, and it continues to work well on Marvell Armada XP GP.
>
> This commit is based on jcooper/mvebu/regmap.
> ---
> arch/arm/mach-mvebu/coherency.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c
> index 32fcf69..be11759 100644
> --- a/arch/arm/mach-mvebu/coherency.c
> +++ b/arch/arm/mach-mvebu/coherency.c
> @@ -147,8 +147,9 @@ int __init coherency_init(void)
>
> static int __init coherency_late_init(void)
> {
> - bus_register_notifier(&platform_bus_type,
> - &mvebu_hwcc_platform_nb);
> + if (of_find_matching_node(NULL, of_coherency_table))
> + bus_register_notifier(&platform_bus_type,
> + &mvebu_hwcc_platform_nb);
> return 0;
> }
>
> --
> 1.8.1.2
>
Acked-by: Andrew Lunn <andrew@lunn•ch>
Andrew
next prev parent reply other threads:[~2013-06-20 7:48 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-20 7:45 [PATCH] arm: mvebu: fix coherency_late_init() for multiplatform Thomas Petazzoni
2013-06-20 7:48 ` Andrew Lunn [this message]
2013-06-20 12:16 ` Jason Cooper
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=20130620074856.GA19959@lunn.ch \
--to=andrew@lunn$(echo .)ch \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox