Re: [U-Boot] [PATCH v2 17/20] x86: Allow CPUs to be set up after relocation

2015-04-29 Thread Bin Meng
Hi Simon,

On Wed, Apr 29, 2015 at 10:25 AM, Simon Glass  wrote:
> This permits init of additional CPU cores after relocation and when driver
> model is ready.
>
> Signed-off-by: Simon Glass 
> ---
>
> Changes in v2: None
>
>  arch/x86/cpu/cpu.c| 37 +
>  arch/x86/include/asm/cpu.h| 14 ++
>  arch/x86/include/asm/u-boot-x86.h |  2 ++
>  common/board_r.c  |  2 +-
>  4 files changed, 54 insertions(+), 1 deletion(-)
>
> diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c
> index 78eb3fe..6263511 100644
> --- a/arch/x86/cpu/cpu.c
> +++ b/arch/x86/cpu/cpu.c
> @@ -21,6 +21,8 @@
>
>  #include 
>  #include 
> +#include 
> +#include 
>  #include 
>  #include 
>  #include 
> @@ -518,6 +520,15 @@ char *cpu_get_name(char *name)
> return ptr;
>  }
>
> +int x86_cpu_get_desc(struct udevice *dev, char *buf, int size)
> +{
> +   if (size < CPU_MAX_NAME_LEN)
> +   return -ENOSPC;

Please add a blank line here.

> +   cpu_get_name(buf);
> +
> +   return 0;
> +}
> +
>  int default_print_cpuinfo(void)
>  {
> printf("CPU: %s, vendor %s, device %xh\n",
> @@ -600,3 +611,29 @@ int last_stage_init(void)
> return 0;
>  }
>  #endif
> +
> +__weak int x86_init_cpus(void)
> +{
> +   return 0;
> +}
> +
> +int cpu_init_r(void)
> +{
> +   return x86_init_cpus();
> +}
> +
> +static const struct cpu_ops cpu_x86_ops = {
> +   .get_desc   = x86_cpu_get_desc,
> +};
> +
> +static const struct udevice_id cpu_x86_ids[] = {
> +   { .compatible = "cpu-x86" },
> +   { }
> +};
> +
> +U_BOOT_DRIVER(cpu_x86_drv) = {
> +   .name   = "cpu_x86",
> +   .id = UCLASS_CPU,
> +   .of_match   = cpu_x86_ids,
> +   .ops= &cpu_x86_ops,
> +};
> diff --git a/arch/x86/include/asm/cpu.h b/arch/x86/include/asm/cpu.h
> index 08284ee..01bee52 100644
> --- a/arch/x86/include/asm/cpu.h
> +++ b/arch/x86/include/asm/cpu.h
> @@ -197,6 +197,20 @@ const char *cpu_vendor_name(int vendor);
>  char *cpu_get_name(char *name);
>
>  /**
> + *
> +* x86_cpu_get_desc() - Get a description string for an x86 CPU
> +*
> +* This uses cpu_get_name() and is suitable to use as the get_desc() method 
> for
> +* the I2C uclass.

I2C uclass?

> +*
> +* @dev:Device to check (UCLASS_CPU)
> +* @buf:Buffer to place string
> +* @size:   Size of string space
> +* @return 0 if OK, -ENOSPC if buffer is too small, other -ve on error
> +*/
> +int x86_cpu_get_desc(struct udevice *dev, char *buf, int size);
> +
> +/**
>   * cpu_call64() - Jump to a 64-bit Linux kernel (internal function)
>   *
>   * The kernel is uncompressed and the 64-bit entry point is expected to be
> diff --git a/arch/x86/include/asm/u-boot-x86.h 
> b/arch/x86/include/asm/u-boot-x86.h
> index 122e054..be103c0 100644
> --- a/arch/x86/include/asm/u-boot-x86.h
> +++ b/arch/x86/include/asm/u-boot-x86.h
> @@ -69,6 +69,8 @@ uint64_t timer_get_tsc(void);
>
>  void quick_ram_check(void);
>
> +int x86_init_cpus(void);
> +
>  #define PCI_VGA_RAM_IMAGE_START0xc
>
>  #endif /* _U_BOOT_I386_H_ */
> diff --git a/common/board_r.c b/common/board_r.c
> index 307124e..1a46f62 100644
> --- a/common/board_r.c
> +++ b/common/board_r.c
> @@ -779,7 +779,7 @@ init_fnc_t init_sequence_r[] = {
> initr_flash,
>  #endif
> INIT_FUNC_WATCHDOG_RESET
> -#if defined(CONFIG_PPC) || defined(CONFIG_M68K)
> +#if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_X86)
> /* initialize higher level parts of CPU like time base and timers */
> cpu_init_r,

I see there is a cpu_secondary_init_r() in board_r.c. Looks that it is
intended for multicore initialization. Should we use that instead?

>  #endif
> --

Regards,
Bin
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


[U-Boot] [PATCH v2 17/20] x86: Allow CPUs to be set up after relocation

2015-04-28 Thread Simon Glass
This permits init of additional CPU cores after relocation and when driver
model is ready.

Signed-off-by: Simon Glass 
---

Changes in v2: None

 arch/x86/cpu/cpu.c| 37 +
 arch/x86/include/asm/cpu.h| 14 ++
 arch/x86/include/asm/u-boot-x86.h |  2 ++
 common/board_r.c  |  2 +-
 4 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c
index 78eb3fe..6263511 100644
--- a/arch/x86/cpu/cpu.c
+++ b/arch/x86/cpu/cpu.c
@@ -21,6 +21,8 @@
 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -518,6 +520,15 @@ char *cpu_get_name(char *name)
return ptr;
 }
 
+int x86_cpu_get_desc(struct udevice *dev, char *buf, int size)
+{
+   if (size < CPU_MAX_NAME_LEN)
+   return -ENOSPC;
+   cpu_get_name(buf);
+
+   return 0;
+}
+
 int default_print_cpuinfo(void)
 {
printf("CPU: %s, vendor %s, device %xh\n",
@@ -600,3 +611,29 @@ int last_stage_init(void)
return 0;
 }
 #endif
+
+__weak int x86_init_cpus(void)
+{
+   return 0;
+}
+
+int cpu_init_r(void)
+{
+   return x86_init_cpus();
+}
+
+static const struct cpu_ops cpu_x86_ops = {
+   .get_desc   = x86_cpu_get_desc,
+};
+
+static const struct udevice_id cpu_x86_ids[] = {
+   { .compatible = "cpu-x86" },
+   { }
+};
+
+U_BOOT_DRIVER(cpu_x86_drv) = {
+   .name   = "cpu_x86",
+   .id = UCLASS_CPU,
+   .of_match   = cpu_x86_ids,
+   .ops= &cpu_x86_ops,
+};
diff --git a/arch/x86/include/asm/cpu.h b/arch/x86/include/asm/cpu.h
index 08284ee..01bee52 100644
--- a/arch/x86/include/asm/cpu.h
+++ b/arch/x86/include/asm/cpu.h
@@ -197,6 +197,20 @@ const char *cpu_vendor_name(int vendor);
 char *cpu_get_name(char *name);
 
 /**
+ *
+* x86_cpu_get_desc() - Get a description string for an x86 CPU
+*
+* This uses cpu_get_name() and is suitable to use as the get_desc() method for
+* the I2C uclass.
+*
+* @dev:Device to check (UCLASS_CPU)
+* @buf:Buffer to place string
+* @size:   Size of string space
+* @return 0 if OK, -ENOSPC if buffer is too small, other -ve on error
+*/
+int x86_cpu_get_desc(struct udevice *dev, char *buf, int size);
+
+/**
  * cpu_call64() - Jump to a 64-bit Linux kernel (internal function)
  *
  * The kernel is uncompressed and the 64-bit entry point is expected to be
diff --git a/arch/x86/include/asm/u-boot-x86.h 
b/arch/x86/include/asm/u-boot-x86.h
index 122e054..be103c0 100644
--- a/arch/x86/include/asm/u-boot-x86.h
+++ b/arch/x86/include/asm/u-boot-x86.h
@@ -69,6 +69,8 @@ uint64_t timer_get_tsc(void);
 
 void quick_ram_check(void);
 
+int x86_init_cpus(void);
+
 #define PCI_VGA_RAM_IMAGE_START0xc
 
 #endif /* _U_BOOT_I386_H_ */
diff --git a/common/board_r.c b/common/board_r.c
index 307124e..1a46f62 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -779,7 +779,7 @@ init_fnc_t init_sequence_r[] = {
initr_flash,
 #endif
INIT_FUNC_WATCHDOG_RESET
-#if defined(CONFIG_PPC) || defined(CONFIG_M68K)
+#if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_X86)
/* initialize higher level parts of CPU like time base and timers */
cpu_init_r,
 #endif
-- 
2.2.0.rc0.207.ga3a616c

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot