[S390] rework smp code

Define struct pcpu and merge some of the NR_CPUS arrays into it, including
__cpu_logical_map, current_set and smp_cpu_state. Split smp related
functions to those operating on physical cpus and the functions operating
on a logical cpu number. Make the functions for physical cpus use a
pointer to a struct pcpu. This hides the knowledge about cpu addresses in
smp.c, entry[64].S and swsusp_asm64.S, thus remove the sigp.h header.

The PSW restart mechanism is used to start secondary cpus, calling a
function on an online cpu, calling a function on the ipl cpu, and for
the nmi signal. Replace the different assembler functions with a
single function restart_int_handler. The new entry point calls a function
whose pointer is stored in the lowcore of the target cpu and it can wait
for the source cpu to stop. This covers all existing use cases.

Overall the code is now simpler and there are ~380 lines less code.

Reviewed-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

1 files changed, 8 insertions, 22 deletions

diff --git a/arch/s390/lib/spinlock.c b/arch/s390/lib/spinlock.c
index 91754ffb9203..093eb694d9c1 100644
--- a/arch/s390/lib/spinlock.c
+++ b/arch/s390/lib/spinlock.c
@@ -10,6 +10,7 @@
 #include <linux/module.h>
 #include <linux/spinlock.h>
 #include <linux/init.h>
+#include <linux/smp.h>
 #include <asm/io.h>
 
 int spin_retry = 1000;
@@ -24,21 +25,6 @@ static int __init spin_retry_setup(char *str)
 }
 __setup("spin_retry=", spin_retry_setup);
 
-static inline void _raw_yield(void)
-{
-        if (MACHINE_HAS_DIAG44)
-                asm volatile("diag 0,0,0x44");
-}
-
-static inline void _raw_yield_cpu(int cpu)
-{
-        if (MACHINE_HAS_DIAG9C)
-                asm volatile("diag %0,0,0x9c"
-                             : : "d" (cpu_logical_map(cpu)));
-        else
-                _raw_yield();
-}
-
 void arch_spin_lock_wait(arch_spinlock_t *lp)
 {
         int count = spin_retry;
@@ -60,7 +46,7 @@ void arch_spin_lock_wait(arch_spinlock_t *lp)
                 }
                 owner = lp->owner_cpu;
                 if (owner)
-                        _raw_yield_cpu(~owner);
+                        smp_yield_cpu(~owner);
                 if (_raw_compare_and_swap(&lp->owner_cpu, 0, cpu) == 0)
                         return;
         }
@@ -91,7 +77,7 @@ void arch_spin_lock_wait_flags(arch_spinlock_t *lp, unsigned long flags)
                 }
                 owner = lp->owner_cpu;
                 if (owner)
-                        _raw_yield_cpu(~owner);
+                        smp_yield_cpu(~owner);
                 local_irq_disable();
                 if (_raw_compare_and_swap(&lp->owner_cpu, 0, cpu) == 0)
                         return;
@@ -121,7 +107,7 @@ void arch_spin_relax(arch_spinlock_t *lock)
         if (cpu != 0) {
                 if (MACHINE_IS_VM || MACHINE_IS_KVM ||
                     !smp_vcpu_scheduled(~cpu))
-                        _raw_yield_cpu(~cpu);
+                        smp_yield_cpu(~cpu);
         }
 }
 EXPORT_SYMBOL(arch_spin_relax);
@@ -133,7 +119,7 @@ void _raw_read_lock_wait(arch_rwlock_t *rw)
 
         while (1) {
                 if (count-- <= 0) {
-                        _raw_yield();
+                        smp_yield();
                         count = spin_retry;
                 }
                 if (!arch_read_can_lock(rw))
@@ -153,7 +139,7 @@ void _raw_read_lock_wait_flags(arch_rwlock_t *rw, unsigned long flags)
         local_irq_restore(flags);
         while (1) {
                 if (count-- <= 0) {
-                        _raw_yield();
+                        smp_yield();
                         count = spin_retry;
                 }
                 if (!arch_read_can_lock(rw))
@@ -188,7 +174,7 @@ void _raw_write_lock_wait(arch_rwlock_t *rw)
 
         while (1) {
                 if (count-- <= 0) {
-                        _raw_yield();
+                        smp_yield();
                         count = spin_retry;
                 }
                 if (!arch_write_can_lock(rw))
@@ -206,7 +192,7 @@ void _raw_write_lock_wait_flags(arch_rwlock_t *rw, unsigned long flags)
         local_irq_restore(flags);
         while (1) {
                 if (count-- <= 0) {
-                        _raw_yield();
+                        smp_yield();
                         count = spin_retry;
                 }
                 if (!arch_write_can_lock(rw))