diff options
| -rw-r--r-- | arch/powerpc/cpu/mpc83xx/cpu.c | 1 | ||||
| -rw-r--r-- | arch/powerpc/cpu/mpc8xx/cpu.c | 1 | ||||
| -rw-r--r-- | arch/sh/cpu/sh4/cpu.c | 1 | ||||
| -rw-r--r-- | arch/x86/cpu/broadwell/cpu_from_spl.c | 1 | ||||
| -rw-r--r-- | arch/x86/cpu/coreboot/coreboot.c | 1 | ||||
| -rw-r--r-- | arch/x86/cpu/efi/app.c | 1 | ||||
| -rw-r--r-- | arch/x86/cpu/efi/payload.c | 1 | ||||
| -rw-r--r-- | arch/x86/cpu/ivybridge/cpu.c | 1 | ||||
| -rw-r--r-- | arch/x86/cpu/qemu/qemu.c | 1 | ||||
| -rw-r--r-- | arch/x86/cpu/quark/quark.c | 1 | ||||
| -rw-r--r-- | arch/x86/cpu/slimbootloader/slimbootloader.c | 1 | ||||
| -rw-r--r-- | arch/x86/cpu/tangier/tangier.c | 1 | ||||
| -rw-r--r-- | arch/x86/cpu/x86_64/cpu.c | 1 | ||||
| -rw-r--r-- | arch/x86/lib/fsp/fsp_common.c | 1 | ||||
| -rw-r--r-- | common/board_f.c | 1 | ||||
| -rw-r--r-- | include/common.h | 1 | ||||
| -rw-r--r-- | include/cpu_func.h | 29 |
17 files changed, 44 insertions, 1 deletions
diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c index 363c0ff..0710f5a 100644 --- a/arch/powerpc/cpu/mpc83xx/cpu.c +++ b/arch/powerpc/cpu/mpc83xx/cpu.c @@ -10,6 +10,7 @@ */ #include <common.h> +#include <cpu_func.h> #include <vsprintf.h> #include <watchdog.h> #include <command.h> diff --git a/arch/powerpc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c index 6ad86e9..2b7c5d4 100644 --- a/arch/powerpc/cpu/mpc8xx/cpu.c +++ b/arch/powerpc/cpu/mpc8xx/cpu.c @@ -17,6 +17,7 @@ */ #include <common.h> +#include <cpu_func.h> #include <vsprintf.h> #include <watchdog.h> #include <command.h> diff --git a/arch/sh/cpu/sh4/cpu.c b/arch/sh/cpu/sh4/cpu.c index a8b50a9..ee36aca 100644 --- a/arch/sh/cpu/sh4/cpu.c +++ b/arch/sh/cpu/sh4/cpu.c @@ -6,6 +6,7 @@ #include <common.h> #include <command.h> +#include <cpu_func.h> #include <netdev.h> #include <asm/processor.h> diff --git a/arch/x86/cpu/broadwell/cpu_from_spl.c b/arch/x86/cpu/broadwell/cpu_from_spl.c index c3d4a8d..2aa6f24 100644 --- a/arch/x86/cpu/broadwell/cpu_from_spl.c +++ b/arch/x86/cpu/broadwell/cpu_from_spl.c @@ -6,6 +6,7 @@ #include <common.h> #include <bloblist.h> +#include <cpu_func.h> #include <debug_uart.h> #include <handoff.h> #include <asm/mtrr.h> diff --git a/arch/x86/cpu/coreboot/coreboot.c b/arch/x86/cpu/coreboot/coreboot.c index 9686f8e..0c4c634 100644 --- a/arch/x86/cpu/coreboot/coreboot.c +++ b/arch/x86/cpu/coreboot/coreboot.c @@ -6,6 +6,7 @@ */ #include <common.h> +#include <cpu_func.h> #include <fdtdec.h> #include <usb.h> #include <asm/io.h> diff --git a/arch/x86/cpu/efi/app.c b/arch/x86/cpu/efi/app.c index ba7c02b..1307741 100644 --- a/arch/x86/cpu/efi/app.c +++ b/arch/x86/cpu/efi/app.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <cpu_func.h> #include <fdtdec.h> #include <netdev.h> diff --git a/arch/x86/cpu/efi/payload.c b/arch/x86/cpu/efi/payload.c index 225aef7..af6dd2f 100644 --- a/arch/x86/cpu/efi/payload.c +++ b/arch/x86/cpu/efi/payload.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <cpu_func.h> #include <efi.h> #include <errno.h> #include <usb.h> diff --git a/arch/x86/cpu/ivybridge/cpu.c b/arch/x86/cpu/ivybridge/cpu.c index 6db9da8..8f30cdb 100644 --- a/arch/x86/cpu/ivybridge/cpu.c +++ b/arch/x86/cpu/ivybridge/cpu.c @@ -11,6 +11,7 @@ */ #include <common.h> +#include <cpu_func.h> #include <dm.h> #include <errno.h> #include <fdtdec.h> diff --git a/arch/x86/cpu/qemu/qemu.c b/arch/x86/cpu/qemu/qemu.c index 5e8b4f0..716351a 100644 --- a/arch/x86/cpu/qemu/qemu.c +++ b/arch/x86/cpu/qemu/qemu.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <cpu_func.h> #include <pci.h> #include <qfw.h> #include <asm/irq.h> diff --git a/arch/x86/cpu/quark/quark.c b/arch/x86/cpu/quark/quark.c index d39edb2..d6611ee 100644 --- a/arch/x86/cpu/quark/quark.c +++ b/arch/x86/cpu/quark/quark.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <cpu_func.h> #include <mmc.h> #include <asm/io.h> #include <asm/ioapic.h> diff --git a/arch/x86/cpu/slimbootloader/slimbootloader.c b/arch/x86/cpu/slimbootloader/slimbootloader.c index e6b174c..21dcfb2 100644 --- a/arch/x86/cpu/slimbootloader/slimbootloader.c +++ b/arch/x86/cpu/slimbootloader/slimbootloader.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <cpu_func.h> #include <asm/arch/slimbootloader.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/x86/cpu/tangier/tangier.c b/arch/x86/cpu/tangier/tangier.c index df2c600..43bee1f 100644 --- a/arch/x86/cpu/tangier/tangier.c +++ b/arch/x86/cpu/tangier/tangier.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <cpu_func.h> #include <asm/u-boot-x86.h> /* diff --git a/arch/x86/cpu/x86_64/cpu.c b/arch/x86/cpu/x86_64/cpu.c index 42abb23..90925e4 100644 --- a/arch/x86/cpu/x86_64/cpu.c +++ b/arch/x86/cpu/x86_64/cpu.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <cpu_func.h> #include <debug_uart.h> /* diff --git a/arch/x86/lib/fsp/fsp_common.c b/arch/x86/lib/fsp/fsp_common.c index 40ba866..a5efe35 100644 --- a/arch/x86/lib/fsp/fsp_common.c +++ b/arch/x86/lib/fsp/fsp_common.c @@ -5,6 +5,7 @@ #include <common.h> #include <acpi_s3.h> +#include <cpu_func.h> #include <dm.h> #include <errno.h> #include <rtc.h> diff --git a/common/board_f.c b/common/board_f.c index 0104445..05f4b73 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -13,6 +13,7 @@ #include <bloblist.h> #include <console.h> #include <cpu.h> +#include <cpu_func.h> #include <dm.h> #include <env.h> #include <env_internal.h> diff --git a/include/common.h b/include/common.h index ce08bfe..96bb42c 100644 --- a/include/common.h +++ b/include/common.h @@ -203,7 +203,6 @@ void trap_init (ulong); void s_init(void); -int checkcpu (void); int checkicache (void); int checkdcache (void); void upmconfig (unsigned int, unsigned int *, unsigned int); diff --git a/include/cpu_func.h b/include/cpu_func.h index a99b69b..03feaa6 100644 --- a/include/cpu_func.h +++ b/include/cpu_func.h @@ -20,4 +20,33 @@ int cpu_reset(u32 nr); int cpu_disable(u32 nr); int cpu_release(u32 nr, int argc, char * const argv[]); +static inline int cpumask_next(int cpu, unsigned int mask) +{ + for (cpu++; !((1 << cpu) & mask); cpu++) + ; + + return cpu; +} + +#define for_each_cpu(iter, cpu, num_cpus, mask) \ + for (iter = 0, cpu = cpumask_next(-1, mask); \ + iter < num_cpus; \ + iter++, cpu = cpumask_next(cpu, mask)) \ + +int cpu_numcores(void); +int cpu_num_dspcores(void); +u32 cpu_mask(void); +u32 cpu_dsp_mask(void); +int is_core_valid(unsigned int core); + +/** + * checkcpu() - perform an early check of the CPU + * + * This is used on PowerPC, SH and X86 machines as a CPU init mechanism. It is + * called during the pre-relocation init sequence in board_init_f(). + * + * @return 0 if oK, -ve on error + */ +int checkcpu(void); + #endif |