powerpc/8xxx: Add is_core_disabled to remove disabled cores from dtb
If we explicitly disabled a core remove it from the dtb we pass on to the kernel. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
parent
11beefa382
commit
8f3a7fa4a2
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright 2007-2009 Freescale Semiconductor, Inc.
|
* Copyright 2007-2010 Freescale Semiconductor, Inc.
|
||||||
*
|
*
|
||||||
* (C) Copyright 2000
|
* (C) Copyright 2000
|
||||||
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
||||||
|
@ -404,8 +404,8 @@ void ft_cpu_setup(void *blob, bd_t *bd)
|
||||||
|
|
||||||
#ifdef CONFIG_MP
|
#ifdef CONFIG_MP
|
||||||
ft_fixup_cpu(blob, (u64)bd->bi_memstart + (u64)bd->bi_memsize);
|
ft_fixup_cpu(blob, (u64)bd->bi_memstart + (u64)bd->bi_memsize);
|
||||||
#endif
|
|
||||||
ft_fixup_num_cores(blob);
|
ft_fixup_num_cores(blob);
|
||||||
|
#endif
|
||||||
|
|
||||||
ft_fixup_cache(blob);
|
ft_fixup_cache(blob);
|
||||||
|
|
||||||
|
|
|
@ -77,6 +77,13 @@ int cpu_disable(int nr)
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int is_core_disabled(int nr) {
|
||||||
|
ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
|
||||||
|
u32 coredisrl = in_be32(&gur->coredisrl);
|
||||||
|
|
||||||
|
return (coredisrl & (1 << nr));
|
||||||
|
}
|
||||||
#else
|
#else
|
||||||
int cpu_disable(int nr)
|
int cpu_disable(int nr)
|
||||||
{
|
{
|
||||||
|
@ -96,6 +103,22 @@ int cpu_disable(int nr)
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int is_core_disabled(int nr) {
|
||||||
|
ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
|
||||||
|
u32 devdisr = in_be32(&gur->devdisr);
|
||||||
|
|
||||||
|
switch (nr) {
|
||||||
|
case 0:
|
||||||
|
return (devdisr & MPC85xx_DEVDISR_CPU0);
|
||||||
|
case 1:
|
||||||
|
return (devdisr & MPC85xx_DEVDISR_CPU1);
|
||||||
|
default:
|
||||||
|
printf("Invalid cpu number for disable %d\n", nr);
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static u8 boot_entry_map[4] = {
|
static u8 boot_entry_map[4] = {
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright 2008 Freescale Semiconductor, Inc.
|
* Copyright 2008,2010 Freescale Semiconductor, Inc.
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or
|
* This program is free software; you can redistribute it and/or
|
||||||
* modify it under the terms of the GNU General Public License
|
* modify it under the terms of the GNU General Public License
|
||||||
|
@ -55,6 +55,7 @@ void ft_cpu_setup(void *blob, bd_t *bd)
|
||||||
off = fdt_add_mem_rsv(blob, bootpg, (u64)4096);
|
off = fdt_add_mem_rsv(blob, bootpg, (u64)4096);
|
||||||
if (off < 0)
|
if (off < 0)
|
||||||
printf("%s: %s\n", __FUNCTION__, fdt_strerror(off));
|
printf("%s: %s\n", __FUNCTION__, fdt_strerror(off));
|
||||||
#endif
|
|
||||||
ft_fixup_num_cores(blob);
|
ft_fixup_num_cores(blob);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -66,6 +66,23 @@ int cpu_disable(int nr)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int is_core_disabled(int nr) {
|
||||||
|
immap_t *immap = (immap_t *) CONFIG_SYS_CCSRBAR;
|
||||||
|
ccsr_gur_t *gur = &immap->im_gur;
|
||||||
|
u32 devdisr = in_be32(&gur->devdisr);
|
||||||
|
|
||||||
|
switch (nr) {
|
||||||
|
case 0:
|
||||||
|
return (devdisr & MPC86xx_DEVDISR_CPU0);
|
||||||
|
case 1:
|
||||||
|
return (devdisr & MPC86xx_DEVDISR_CPU1);
|
||||||
|
default:
|
||||||
|
printf("Invalid cpu number for disable %d\n", nr);
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
int cpu_release(int nr, int argc, char * const argv[])
|
int cpu_release(int nr, int argc, char * const argv[])
|
||||||
{
|
{
|
||||||
/* dummy function so common/cmd_mp.c will build
|
/* dummy function so common/cmd_mp.c will build
|
||||||
|
|
|
@ -26,8 +26,9 @@
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <libfdt.h>
|
#include <libfdt.h>
|
||||||
#include <fdt_support.h>
|
#include <fdt_support.h>
|
||||||
|
#include <asm/mp.h>
|
||||||
|
|
||||||
#if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx)
|
#if defined(CONFIG_MP) && (defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx))
|
||||||
static int ft_del_cpuhandle(void *blob, int cpuhandle)
|
static int ft_del_cpuhandle(void *blob, int cpuhandle)
|
||||||
{
|
{
|
||||||
int off, ret = -FDT_ERR_NOTFOUND;
|
int off, ret = -FDT_ERR_NOTFOUND;
|
||||||
|
@ -57,7 +58,7 @@ void ft_fixup_num_cores(void *blob) {
|
||||||
while (off != -FDT_ERR_NOTFOUND) {
|
while (off != -FDT_ERR_NOTFOUND) {
|
||||||
u32 *reg = (u32 *)fdt_getprop(blob, off, "reg", 0);
|
u32 *reg = (u32 *)fdt_getprop(blob, off, "reg", 0);
|
||||||
|
|
||||||
if (*reg > num_cores-1) {
|
if ((*reg > num_cores-1) || (is_core_disabled(*reg))) {
|
||||||
int ph = fdt_get_phandle(blob, off);
|
int ph = fdt_get_phandle(blob, off);
|
||||||
|
|
||||||
/* Delete the cpu node once there are no cpu handles */
|
/* Delete the cpu node once there are no cpu handles */
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright 2009 Freescale Semiconductor, Inc.
|
* Copyright 2009-2010 Freescale Semiconductor, Inc.
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or
|
* This program is free software; you can redistribute it and/or
|
||||||
* modify it under the terms of the GNU General Public License as
|
* modify it under the terms of the GNU General Public License as
|
||||||
|
@ -26,5 +26,6 @@
|
||||||
void setup_mp(void);
|
void setup_mp(void);
|
||||||
void cpu_mp_lmb_reserve(struct lmb *lmb);
|
void cpu_mp_lmb_reserve(struct lmb *lmb);
|
||||||
u32 determine_mp_bootpg(void);
|
u32 determine_mp_bootpg(void);
|
||||||
|
int is_core_disabled(int nr);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue