mirror of
https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
synced 2024-10-31 18:09:19 +00:00
2667677fb8
commit 5686a1e5aa436c49187a60052d5885fb1f541ce6 upstream. Until now, the mvebu-mbus was guessing by itself whether hardware I/O coherency was available or not by poking into the Device Tree to see if the coherency fabric Device Tree node was present or not. However, on some upcoming SoCs, the presence or absence of the coherency fabric DT node isn't sufficient: in CONFIG_SMP, the coherency can be enabled, but not in !CONFIG_SMP. In order to clean this up, the mvebu_mbus_dt_init() function is extended to get a boolean argument telling whether coherency is enabled or not. Therefore, the logic to decide whether coherency is available or not now belongs to the core SoC code instead of the mvebu-mbus driver itself, which is much better. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Link: https://lkml.kernel.org/r/1397483228-25625-4-git-send-email-thomas.petazzoni@free-electrons.com Signed-off-by: Jason Cooper <jason@lakedaemon.net> [ Greg Ungerer: back ported to linux-3.10.y Back port necessary due to large code differences in affected files. This change in combination with commit e553554536 ("ARM: mvebu: disable I/O coherency on non-SMP situations on Armada 370/375/38x/XP") is critical to the hardware I/O coherency being set correctly by both the mbus driver and all peripheral hardware drivers. Without this change drivers will incorrectly enable I/O coherency window attributes and this causes rare unreliable system behavior including oops. ] Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
97 lines
2.5 KiB
C
97 lines
2.5 KiB
C
/*
|
|
* Device Tree support for Armada 370 and XP platforms.
|
|
*
|
|
* Copyright (C) 2012 Marvell
|
|
*
|
|
* Lior Amsalem <alior@marvell.com>
|
|
* Gregory CLEMENT <gregory.clement@free-electrons.com>
|
|
* Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
*
|
|
* This file is licensed under the terms of the GNU General Public
|
|
* License version 2. This program is licensed "as is" without any
|
|
* warranty of any kind, whether express or implied.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/of_platform.h>
|
|
#include <linux/io.h>
|
|
#include <linux/time-armada-370-xp.h>
|
|
#include <linux/clk/mvebu.h>
|
|
#include <linux/dma-mapping.h>
|
|
#include <linux/mbus.h>
|
|
#include <linux/irqchip.h>
|
|
#include <asm/hardware/cache-l2x0.h>
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/map.h>
|
|
#include <asm/mach/time.h>
|
|
#include "armada-370-xp.h"
|
|
#include "common.h"
|
|
#include "coherency.h"
|
|
|
|
static struct map_desc armada_370_xp_io_desc[] __initdata = {
|
|
{
|
|
.virtual = (unsigned long) ARMADA_370_XP_REGS_VIRT_BASE,
|
|
.pfn = __phys_to_pfn(ARMADA_370_XP_REGS_PHYS_BASE),
|
|
.length = ARMADA_370_XP_REGS_SIZE,
|
|
.type = MT_DEVICE,
|
|
},
|
|
};
|
|
|
|
void __init armada_370_xp_map_io(void)
|
|
{
|
|
iotable_init(armada_370_xp_io_desc, ARRAY_SIZE(armada_370_xp_io_desc));
|
|
}
|
|
|
|
void __init armada_370_xp_timer_and_clk_init(void)
|
|
{
|
|
mvebu_clocks_init();
|
|
armada_370_xp_timer_init();
|
|
}
|
|
|
|
void __init armada_370_xp_init_early(void)
|
|
{
|
|
char *mbus_soc_name;
|
|
|
|
/*
|
|
* This initialization will be replaced by a DT-based
|
|
* initialization once the mvebu-mbus driver gains DT support.
|
|
*/
|
|
if (of_machine_is_compatible("marvell,armada370"))
|
|
mbus_soc_name = "marvell,armada370-mbus";
|
|
else
|
|
mbus_soc_name = "marvell,armadaxp-mbus";
|
|
|
|
mvebu_mbus_init(mbus_soc_name,
|
|
ARMADA_370_XP_MBUS_WINS_BASE,
|
|
ARMADA_370_XP_MBUS_WINS_SIZE,
|
|
ARMADA_370_XP_SDRAM_WINS_BASE,
|
|
ARMADA_370_XP_SDRAM_WINS_SIZE,
|
|
coherency_available());
|
|
|
|
#ifdef CONFIG_CACHE_L2X0
|
|
l2x0_of_init(0, ~0UL);
|
|
#endif
|
|
}
|
|
|
|
static void __init armada_370_xp_dt_init(void)
|
|
{
|
|
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
|
|
coherency_init();
|
|
}
|
|
|
|
static const char * const armada_370_xp_dt_compat[] = {
|
|
"marvell,armada-370-xp",
|
|
NULL,
|
|
};
|
|
|
|
DT_MACHINE_START(ARMADA_XP_DT, "Marvell Armada 370/XP (Device Tree)")
|
|
.smp = smp_ops(armada_xp_smp_ops),
|
|
.init_machine = armada_370_xp_dt_init,
|
|
.map_io = armada_370_xp_map_io,
|
|
.init_early = armada_370_xp_init_early,
|
|
.init_irq = irqchip_init,
|
|
.init_time = armada_370_xp_timer_and_clk_init,
|
|
.restart = mvebu_restart,
|
|
.dt_compat = armada_370_xp_dt_compat,
|
|
MACHINE_END
|