x86/platform/uv: Simplify uv_send_IPI_one()

Merge two helpers only used by uv_send_IPI_one() into the main function.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Not-acked-by:  Dimitri Sivanich <sivanich@hpe.com>
Cc: Russ Anderson <rja@hpe.com>
Link: https://lkml.kernel.org/r/20200504171527.2845224-9-hch@lst.de

diff --git a/arch/x86/include/asm/uv/uv_hub.h b/arch/x86/include/asm/uv/uv_hub.h
index a998e65..8a25d95 100644 (file)
--- a/arch/x86/include/asm/uv/uv_hub.h
+++ b/arch/x86/include/asm/uv/uv_hub.h
@@ -837,26 +837,6 @@ static inline void uv_set_cpu_scir_bits(int cpu, unsigned char value)
 }
 
 extern unsigned int uv_apicid_hibits;
-static unsigned long uv_hub_ipi_value(int apicid, int vector, int mode)
-{
-       apicid |= uv_apicid_hibits;
-       return (1UL << UVH_IPI_INT_SEND_SHFT) |
-                       ((apicid) << UVH_IPI_INT_APIC_ID_SHFT) |
-                       (mode << UVH_IPI_INT_DELIVERY_MODE_SHFT) |
-                       (vector << UVH_IPI_INT_VECTOR_SHFT);
-}
-
-static inline void uv_hub_send_ipi(int pnode, int apicid, int vector)
-{
-       unsigned long val;
-       unsigned long dmode = dest_Fixed;
-
-       if (vector == NMI_VECTOR)
-               dmode = dest_NMI;
-
-       val = uv_hub_ipi_value(apicid, vector, dmode);
-       uv_write_global_mmr64(pnode, UVH_IPI_INT, val);
-}
 
 /*
  * Get the minimum revision number of the hub chips within the partition.

diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index f1a0142..3830538 100644 (file)
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -588,12 +588,21 @@ static int uv_wakeup_secondary(int phys_apicid, unsigned long start_rip)
 
 static void uv_send_IPI_one(int cpu, int vector)
 {
-       unsigned long apicid;
-       int pnode;
+       unsigned long apicid = per_cpu(x86_cpu_to_apicid, cpu);
+       int pnode = uv_apicid_to_pnode(apicid);
+       unsigned long dmode, val;
+
+       if (vector == NMI_VECTOR)
+               dmode = dest_NMI;
+       else
+               dmode = dest_Fixed;
 
-       apicid = per_cpu(x86_cpu_to_apicid, cpu);
-       pnode = uv_apicid_to_pnode(apicid);
-       uv_hub_send_ipi(pnode, apicid, vector);
+       val = (1UL << UVH_IPI_INT_SEND_SHFT) |
+               ((apicid | uv_apicid_hibits) << UVH_IPI_INT_APIC_ID_SHFT) |
+               (dmode << UVH_IPI_INT_DELIVERY_MODE_SHFT) |
+               (vector << UVH_IPI_INT_VECTOR_SHFT);
+
+       uv_write_global_mmr64(pnode, UVH_IPI_INT, val);
 }
 
 static void uv_send_IPI_mask(const struct cpumask *mask, int vector)