[3/4] xen: Drop raw_smp_processor_id()
diff mbox series

Message ID 20200320212453.21685-4-andrew.cooper3@citrix.com
State New
Headers show
Series
  • x86/ucode: Cleanup - Part 2/n
Related show

Commit Message

Andrew Cooper March 20, 2020, 9:24 p.m. UTC
There is only a single user of raw_smp_processor_id() left in the tree (and it
is unconditionally compiled out).  Drop the alias from all architectures.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Jan Beulich <JBeulich@suse.com>
CC: Wei Liu <wl@xen.org>
CC: Roger Pau Monné <roger.pau@citrix.com>
CC: Stefano Stabellini <sstabellini@kernel.org>
CC: Julien Grall <julien@xen.org>
CC: Volodymyr Babchuk <Volodymyr_Babchuk@epam.com>
---
 xen/arch/x86/cpu/microcode/amd.c | 2 +-
 xen/include/asm-arm/smp.h        | 2 +-
 xen/include/asm-x86/smp.h        | 2 +-
 xen/include/xen/smp.h            | 2 --
 4 files changed, 3 insertions(+), 5 deletions(-)

Comments

Julien Grall March 21, 2020, 10:14 a.m. UTC | #1
On 20/03/2020 21:24, Andrew Cooper wrote:
> There is only a single user of raw_smp_processor_id() left in the tree (and it
> is unconditionally compiled out).  Drop the alias from all architectures.
> 
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

Acked-by: Julien Grall <jgrall@amazon.com>

Cheers,

> ---
> CC: Jan Beulich <JBeulich@suse.com>
> CC: Wei Liu <wl@xen.org>
> CC: Roger Pau Monné <roger.pau@citrix.com>
> CC: Stefano Stabellini <sstabellini@kernel.org>
> CC: Julien Grall <julien@xen.org>
> CC: Volodymyr Babchuk <Volodymyr_Babchuk@epam.com>
> ---
>   xen/arch/x86/cpu/microcode/amd.c | 2 +-
>   xen/include/asm-arm/smp.h        | 2 +-
>   xen/include/asm-x86/smp.h        | 2 +-
>   xen/include/xen/smp.h            | 2 --
>   4 files changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/xen/arch/x86/cpu/microcode/amd.c b/xen/arch/x86/cpu/microcode/amd.c
> index a053e43923..0998a36b5c 100644
> --- a/xen/arch/x86/cpu/microcode/amd.c
> +++ b/xen/arch/x86/cpu/microcode/amd.c
> @@ -306,7 +306,7 @@ static int get_ucode_from_buffer_amd(
>       memcpy(mc_amd->mpb, mpbuf->data, mpbuf->len);
>   
>       pr_debug("microcode: CPU%d size %zu, block size %u offset %zu equivID %#x rev %#x\n",
> -             raw_smp_processor_id(), bufsize, mpbuf->len, *offset,
> +             smp_processor_id(), bufsize, mpbuf->len, *offset,
>                ((struct microcode_header_amd *)mc_amd->mpb)->processor_rev_id,
>                ((struct microcode_header_amd *)mc_amd->mpb)->patch_id);
>   
> diff --git a/xen/include/asm-arm/smp.h b/xen/include/asm-arm/smp.h
> index fdbcefa241..af5a2fe652 100644
> --- a/xen/include/asm-arm/smp.h
> +++ b/xen/include/asm-arm/smp.h
> @@ -12,7 +12,7 @@ DECLARE_PER_CPU(cpumask_var_t, cpu_core_mask);
>   
>   #define cpu_is_offline(cpu) unlikely(!cpu_online(cpu))
>   
> -#define raw_smp_processor_id() (get_processor_id())
> +#define smp_processor_id() get_processor_id()
>   
>   /*
>    * Do we, for platform reasons, need to actually keep CPUs online when we
> diff --git a/xen/include/asm-x86/smp.h b/xen/include/asm-x86/smp.h
> index 6150363655..f7485f602e 100644
> --- a/xen/include/asm-x86/smp.h
> +++ b/xen/include/asm-x86/smp.h
> @@ -53,7 +53,7 @@ int cpu_add(uint32_t apic_id, uint32_t acpi_id, uint32_t pxm);
>    * from the initial startup. We map APIC_BASE very early in page_setup(),
>    * so this is correct in the x86 case.
>    */
> -#define raw_smp_processor_id() (get_processor_id())
> +#define smp_processor_id() get_processor_id()
>   
>   void __stop_this_cpu(void);
>   
> diff --git a/xen/include/xen/smp.h b/xen/include/xen/smp.h
> index a64c9b3882..d5a3644611 100644
> --- a/xen/include/xen/smp.h
> +++ b/xen/include/xen/smp.h
> @@ -65,8 +65,6 @@ void smp_call_function_interrupt(void);
>   
>   void smp_send_call_function_mask(const cpumask_t *mask);
>   
> -#define smp_processor_id() raw_smp_processor_id()
> -
>   int alloc_cpu_id(void);
>   
>   extern void *stack_base[NR_CPUS];
>
Wei Liu March 21, 2020, 4:50 p.m. UTC | #2
On Fri, Mar 20, 2020 at 09:24:51PM +0000, Andrew Cooper wrote:
> There is only a single user of raw_smp_processor_id() left in the tree (and it
> is unconditionally compiled out).  Drop the alias from all architectures.
> 
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

Reviewed-by: Wei Liu <wl@xen.org>

Patch
diff mbox series

diff --git a/xen/arch/x86/cpu/microcode/amd.c b/xen/arch/x86/cpu/microcode/amd.c
index a053e43923..0998a36b5c 100644
--- a/xen/arch/x86/cpu/microcode/amd.c
+++ b/xen/arch/x86/cpu/microcode/amd.c
@@ -306,7 +306,7 @@  static int get_ucode_from_buffer_amd(
     memcpy(mc_amd->mpb, mpbuf->data, mpbuf->len);
 
     pr_debug("microcode: CPU%d size %zu, block size %u offset %zu equivID %#x rev %#x\n",
-             raw_smp_processor_id(), bufsize, mpbuf->len, *offset,
+             smp_processor_id(), bufsize, mpbuf->len, *offset,
              ((struct microcode_header_amd *)mc_amd->mpb)->processor_rev_id,
              ((struct microcode_header_amd *)mc_amd->mpb)->patch_id);
 
diff --git a/xen/include/asm-arm/smp.h b/xen/include/asm-arm/smp.h
index fdbcefa241..af5a2fe652 100644
--- a/xen/include/asm-arm/smp.h
+++ b/xen/include/asm-arm/smp.h
@@ -12,7 +12,7 @@  DECLARE_PER_CPU(cpumask_var_t, cpu_core_mask);
 
 #define cpu_is_offline(cpu) unlikely(!cpu_online(cpu))
 
-#define raw_smp_processor_id() (get_processor_id())
+#define smp_processor_id() get_processor_id()
 
 /*
  * Do we, for platform reasons, need to actually keep CPUs online when we
diff --git a/xen/include/asm-x86/smp.h b/xen/include/asm-x86/smp.h
index 6150363655..f7485f602e 100644
--- a/xen/include/asm-x86/smp.h
+++ b/xen/include/asm-x86/smp.h
@@ -53,7 +53,7 @@  int cpu_add(uint32_t apic_id, uint32_t acpi_id, uint32_t pxm);
  * from the initial startup. We map APIC_BASE very early in page_setup(),
  * so this is correct in the x86 case.
  */
-#define raw_smp_processor_id() (get_processor_id())
+#define smp_processor_id() get_processor_id()
 
 void __stop_this_cpu(void);
 
diff --git a/xen/include/xen/smp.h b/xen/include/xen/smp.h
index a64c9b3882..d5a3644611 100644
--- a/xen/include/xen/smp.h
+++ b/xen/include/xen/smp.h
@@ -65,8 +65,6 @@  void smp_call_function_interrupt(void);
 
 void smp_send_call_function_mask(const cpumask_t *mask);
 
-#define smp_processor_id() raw_smp_processor_id()
-
 int alloc_cpu_id(void);
 
 extern void *stack_base[NR_CPUS];