mirror of
https://github.com/edk2-porting/linux-next.git
synced 2025-01-13 08:04:45 +08:00
c1a01a0360
In commit 54fe26a900bc528f3df1e4235cb6b9ca5c6d4dc2 ('ARM: mvebu: Add thermal quirk for the Armada 375 DB board'), a check on the Armada SoC revision was added to decide whether a quirk for the thermal device should be applied or not. However, the quirk implementation has a bug: it assumes mvebu_get_soc_id() returns true on success, but it returns 0. Therefore, the condition: if (mvebu_get_soc_id(&dev, &rev) && rev > ARMADA_375_Z1_REV) is always false (as long as mvebu-soc-id is properly initialized). As a consequence, the quirk is always applied, even on A0 steppings, for which the quirk should not be applied. This was spotted by testing the thermal driver on Armada 375 A0, which Ezequiel could not do since he does not have access to the A0 revision of the SoC for the moment. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Link: https://lkml.kernel.org/r/1399302326-6917-2-git-send-email-thomas.petazzoni@free-electrons.com Fixes: 54fe26a900bc528f3df1e4235cb6b9ca5c6d4dc2 ('ARM: mvebu: Add thermal quirk for the Armada 375 DB board') Acked-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
215 lines
5.6 KiB
C
215 lines
5.6 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/clk-provider.h>
|
|
#include <linux/of_address.h>
|
|
#include <linux/of_platform.h>
|
|
#include <linux/io.h>
|
|
#include <linux/clocksource.h>
|
|
#include <linux/dma-mapping.h>
|
|
#include <linux/mbus.h>
|
|
#include <linux/signal.h>
|
|
#include <linux/slab.h>
|
|
#include <asm/hardware/cache-l2x0.h>
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/map.h>
|
|
#include <asm/mach/time.h>
|
|
#include <asm/smp_scu.h>
|
|
#include "armada-370-xp.h"
|
|
#include "common.h"
|
|
#include "coherency.h"
|
|
#include "mvebu-soc-id.h"
|
|
|
|
/*
|
|
* Enables the SCU when available. Obviously, this is only useful on
|
|
* Cortex-A based SOCs, not on PJ4B based ones.
|
|
*/
|
|
static void __init mvebu_scu_enable(void)
|
|
{
|
|
void __iomem *scu_base;
|
|
|
|
struct device_node *np =
|
|
of_find_compatible_node(NULL, NULL, "arm,cortex-a9-scu");
|
|
if (np) {
|
|
scu_base = of_iomap(np, 0);
|
|
scu_enable(scu_base);
|
|
of_node_put(np);
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Early versions of Armada 375 SoC have a bug where the BootROM
|
|
* leaves an external data abort pending. The kernel is hit by this
|
|
* data abort as soon as it enters userspace, because it unmasks the
|
|
* data aborts at this moment. We register a custom abort handler
|
|
* below to ignore the first data abort to work around this
|
|
* problem.
|
|
*/
|
|
static int armada_375_external_abort_wa(unsigned long addr, unsigned int fsr,
|
|
struct pt_regs *regs)
|
|
{
|
|
static int ignore_first;
|
|
|
|
if (!ignore_first && fsr == 0x1406) {
|
|
ignore_first = 1;
|
|
return 0;
|
|
}
|
|
|
|
return 1;
|
|
}
|
|
|
|
static void __init mvebu_timer_and_clk_init(void)
|
|
{
|
|
of_clk_init(NULL);
|
|
clocksource_of_init();
|
|
mvebu_scu_enable();
|
|
coherency_init();
|
|
BUG_ON(mvebu_mbus_dt_init(coherency_available()));
|
|
l2x0_of_init(0, ~0UL);
|
|
|
|
if (of_machine_is_compatible("marvell,armada375"))
|
|
hook_fault_code(16 + 6, armada_375_external_abort_wa, SIGBUS, 0,
|
|
"imprecise external abort");
|
|
}
|
|
|
|
static void __init i2c_quirk(void)
|
|
{
|
|
struct device_node *np;
|
|
u32 dev, rev;
|
|
|
|
/*
|
|
* Only revisons more recent than A0 support the offload
|
|
* mechanism. We can exit only if we are sure that we can
|
|
* get the SoC revision and it is more recent than A0.
|
|
*/
|
|
if (mvebu_get_soc_id(&dev, &rev) == 0 && rev > MV78XX0_A0_REV)
|
|
return;
|
|
|
|
for_each_compatible_node(np, NULL, "marvell,mv78230-i2c") {
|
|
struct property *new_compat;
|
|
|
|
new_compat = kzalloc(sizeof(*new_compat), GFP_KERNEL);
|
|
|
|
new_compat->name = kstrdup("compatible", GFP_KERNEL);
|
|
new_compat->length = sizeof("marvell,mv78230-a0-i2c");
|
|
new_compat->value = kstrdup("marvell,mv78230-a0-i2c",
|
|
GFP_KERNEL);
|
|
|
|
of_update_property(np, new_compat);
|
|
}
|
|
return;
|
|
}
|
|
|
|
#define A375_Z1_THERMAL_FIXUP_OFFSET 0xc
|
|
|
|
static void __init thermal_quirk(void)
|
|
{
|
|
struct device_node *np;
|
|
u32 dev, rev;
|
|
|
|
if (mvebu_get_soc_id(&dev, &rev) == 0 && rev > ARMADA_375_Z1_REV)
|
|
return;
|
|
|
|
for_each_compatible_node(np, NULL, "marvell,armada375-thermal") {
|
|
struct property *prop;
|
|
__be32 newval, *newprop, *oldprop;
|
|
int len;
|
|
|
|
/*
|
|
* The register offset is at a wrong location. This quirk
|
|
* creates a new reg property as a clone of the previous
|
|
* one and corrects the offset.
|
|
*/
|
|
oldprop = (__be32 *)of_get_property(np, "reg", &len);
|
|
if (!oldprop)
|
|
continue;
|
|
|
|
/* Create a duplicate of the 'reg' property */
|
|
prop = kzalloc(sizeof(*prop), GFP_KERNEL);
|
|
prop->length = len;
|
|
prop->name = kstrdup("reg", GFP_KERNEL);
|
|
prop->value = kzalloc(len, GFP_KERNEL);
|
|
memcpy(prop->value, oldprop, len);
|
|
|
|
/* Fixup the register offset of the second entry */
|
|
oldprop += 2;
|
|
newprop = (__be32 *)prop->value + 2;
|
|
newval = cpu_to_be32(be32_to_cpu(*oldprop) -
|
|
A375_Z1_THERMAL_FIXUP_OFFSET);
|
|
*newprop = newval;
|
|
of_update_property(np, prop);
|
|
|
|
/*
|
|
* The thermal controller needs some quirk too, so let's change
|
|
* the compatible string to reflect this.
|
|
*/
|
|
prop = kzalloc(sizeof(*prop), GFP_KERNEL);
|
|
prop->name = kstrdup("compatible", GFP_KERNEL);
|
|
prop->length = sizeof("marvell,armada375-z1-thermal");
|
|
prop->value = kstrdup("marvell,armada375-z1-thermal",
|
|
GFP_KERNEL);
|
|
of_update_property(np, prop);
|
|
}
|
|
return;
|
|
}
|
|
|
|
static void __init mvebu_dt_init(void)
|
|
{
|
|
if (of_machine_is_compatible("plathome,openblocks-ax3-4"))
|
|
i2c_quirk();
|
|
if (of_machine_is_compatible("marvell,a375-db"))
|
|
thermal_quirk();
|
|
|
|
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
|
|
}
|
|
|
|
static const char * const armada_370_xp_dt_compat[] = {
|
|
"marvell,armada-370-xp",
|
|
NULL,
|
|
};
|
|
|
|
DT_MACHINE_START(ARMADA_370_XP_DT, "Marvell Armada 370/XP (Device Tree)")
|
|
.smp = smp_ops(armada_xp_smp_ops),
|
|
.init_machine = mvebu_dt_init,
|
|
.init_time = mvebu_timer_and_clk_init,
|
|
.restart = mvebu_restart,
|
|
.dt_compat = armada_370_xp_dt_compat,
|
|
MACHINE_END
|
|
|
|
static const char * const armada_375_dt_compat[] = {
|
|
"marvell,armada375",
|
|
NULL,
|
|
};
|
|
|
|
DT_MACHINE_START(ARMADA_375_DT, "Marvell Armada 375 (Device Tree)")
|
|
.init_time = mvebu_timer_and_clk_init,
|
|
.init_machine = mvebu_dt_init,
|
|
.restart = mvebu_restart,
|
|
.dt_compat = armada_375_dt_compat,
|
|
MACHINE_END
|
|
|
|
static const char * const armada_38x_dt_compat[] = {
|
|
"marvell,armada380",
|
|
"marvell,armada385",
|
|
NULL,
|
|
};
|
|
|
|
DT_MACHINE_START(ARMADA_38X_DT, "Marvell Armada 380/385 (Device Tree)")
|
|
.init_time = mvebu_timer_and_clk_init,
|
|
.restart = mvebu_restart,
|
|
.dt_compat = armada_38x_dt_compat,
|
|
MACHINE_END
|