Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 994c8c94 authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Jason Cooper
Browse files

ARM: mvebu: Remove the harcoded BootROM window allocation 



The address decoding window to access the BootROM should not be
allocated programatically, but instead declared in the device tree.

Signed-off-by: default avatarEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Tested-by: default avatarAndrew Lunn <andrew@lunn.ch>
Tested-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 59cb2fc6

arch/arm/mach-mvebu/platsmp.c

+24 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/smp.h>

#include <linux/clk.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/mbus.h>

#include <asm/cacheflush.h>

#include <asm/smp_plat.h>
@@ -29,6 +30,9 @@ 
#include "pmsu.h"

#include "coherency.h"



#define AXP_BOOTROM_BASE 0xfff00000

#define AXP_BOOTROM_SIZE 0x100000



void __init set_secondary_cpus_clock(void)

{

	int thiscpu;
@@ -115,10 +119,29 @@ static void __init armada_xp_smp_init_cpus(void) 


void __init armada_xp_smp_prepare_cpus(unsigned int max_cpus)

{

	struct device_node *node;

	struct resource res;

	int err;



	set_secondary_cpus_clock();

	flush_cache_all();

	set_cpu_coherent(cpu_logical_map(smp_processor_id()), 0);

	mvebu_mbus_add_window("bootrom", 0xfff00000, SZ_1M);



	/*

	 * In order to boot the secondary CPUs we need to ensure

	 * the bootROM is mapped at the correct address.

	 */

	node = of_find_compatible_node(NULL, NULL, "marvell,bootrom");

	if (!node)

		panic("Cannot find 'marvell,bootrom' compatible node");



	err = of_address_to_resource(node, 0, &res);

	if (err < 0)

		panic("Cannot get 'bootrom' node address");



	if (res.start != AXP_BOOTROM_BASE ||

	    resource_size(&res) != AXP_BOOTROM_SIZE)

		panic("The address for the BootROM is incorrect");

}



struct smp_operations armada_xp_smp_ops __initdata = {