/*
- * Copyright 2008 Freescale Semiconductor, Inc.
+ * Copyright 2008-2009 Freescale Semiconductor, Inc.
*
* See file CREDITS for list of people who contributed to this
* project.
#include <common.h>
#include <command.h>
-int
-cpu_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+static int
+cpu_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
- unsigned long cpuid, val = 0;
+ unsigned long cpuid;
- if (argc < 3) {
- printf ("Usage:\n%s\n", cmdtp->usage);
- return 1;
- }
+ if (argc < 3)
+ return CMD_RET_USAGE;
cpuid = simple_strtoul(argv[1], NULL, 10);
- if (cpuid >= CONFIG_NR_CPUS) {
- printf ("Core num: %d is out of range[0..%d]\n",
- cpuid, CONFIG_NR_CPUS - 1);
+ if (!is_core_valid(cpuid)) {
+ printf ("Core num: %lu is not valid\n", cpuid);
return 1;
}
if (argc == 3) {
- if (strncmp(argv[2], "reset", 5) == 0) {
+ if (strncmp(argv[2], "reset", 5) == 0)
cpu_reset(cpuid);
- } else if (strncmp(argv[2], "status", 6) == 0) {
+ else if (strncmp(argv[2], "status", 6) == 0)
cpu_status(cpuid);
- } else {
- printf ("Usage:\n%s\n", cmdtp->usage);
- return 1;
- }
+ else if (strncmp(argv[2], "disable", 7) == 0)
+ return cpu_disable(cpuid);
+ else
+ return CMD_RET_USAGE;
+
return 0;
}
/* 4 or greater, make sure its release */
- if (strncmp(argv[2], "release", 7) != 0) {
- printf ("Usage:\n%s\n", cmdtp->usage);
- return 1;
- }
-
- val = simple_strtoul(argv[3], NULL, 16);
+ if (strncmp(argv[2], "release", 7) != 0)
+ return CMD_RET_USAGE;
- if (cpu_release(cpuid, val, argc - 4, argv + 4)) {
- printf ("Usage:\n%s\n", cmdtp->usage);
- return 1;
- }
+ if (cpu_release(cpuid, argc - 3, argv + 3))
+ return CMD_RET_USAGE;
return 0;
}
+#ifdef CONFIG_SYS_LONGHELP
+static char cpu_help_text[] =
+ "<num> reset - Reset cpu <num>\n"
+ "cpu <num> status - Status of cpu <num>\n"
+ "cpu <num> disable - Disable cpu <num>\n"
+ "cpu <num> release <addr> [args] - Release cpu <num> at <addr> with [args]"
#ifdef CONFIG_PPC
-#define CPU_ARCH_HELP \
- " [args] : <pir> <r3> <r4> <r6> <r7>\n" \
+ "\n"
+ " [args] : <pir> <r3> <r6>\n" \
" pir - processor id (if writeable)\n" \
" r3 - value for gpr 3\n" \
- " r4 - value for gpr 4\n" \
" r6 - value for gpr 6\n" \
- " r7 - value for gpr 7\n" \
"\n" \
" Use '-' for any arg if you want the default value.\n" \
- " Default for r3, r4, r7 is 0, r6 is 0x65504150\n" \
+ " Default for r3 is <num> and r6 is 0\n" \
"\n" \
- " When cpu <num> is released r5 = 0 per the ePAPR spec.\n"
+ " When cpu <num> is released r4 and r5 = 0.\n" \
+ " r7 will contain the size of the initial mapped area"
+#endif
+ "";
#endif
U_BOOT_CMD(
- cpu, CFG_MAXARGS, 1, cpu_cmd,
- "cpu - Multiprocessor CPU boot manipulation and release\n",
- "<num> reset - Reset cpu <num>\n"
- "cpu <num> status - Status of cpu <num>\n"
- "cpu <num> release <addr> [args] - Release cpu <num> at <addr> with [args]\n"
-#ifdef CPU_ARCH_HELP
- CPU_ARCH_HELP
-#endif
- );
+ cpu, CONFIG_SYS_MAXARGS, 1, cpu_cmd,
+ "Multiprocessor CPU boot manipulation and release", cpu_help_text
+);