ETR support.
Subsystems (3)
From: Martin Schwidefsky <[email protected]>
[S390] ETR support.
This patch adds support for clock synchronization to an external time reference (ETR). The external time reference sends an oscillator signal and a synchronization signal every 2^20 microseconds to keep the TOD clocks of all connected servers in sync. For availability two ETR units can be connected to a machine. If the clock deviates for more than the sync-check tolerance all cpus get a machine check that indicates that the clock is out of sync. For the lovely details how to get the clock back in sync see the code below.
---
arch/s390/kernel/s390_ext.c | 8 arch/s390/kernel/smp.c | 3 arch/s390/kernel/time.c | 1179 ++++++++++++++++++++++++++++++++++++++--- arch/s390/kernel/vtime.c | 8 arch/s390/lib/delay.c | 48 + drivers/s390/block/dasd.c | 13 drivers/s390/block/dasd_eckd.c | 44 - drivers/s390/cio/cio.c | 17 drivers/s390/s390mach.c | 17 drivers/s390/s390mach.h | 3 include/asm-s390/etr.h | 219 +++++++ include/asm-s390/hardirq.h | 2 include/asm-s390/timex.h | 36 + 13 files changed, 1488 insertions(+), 109 deletions(-)
arch/s390/kernel/s390_ext.c +3 -5
@@ -125,14 +125,12 @@ void do_extint(struct pt_regs *regs, uns* Make sure that the i/o interrupt did not "overtake" * the last HZ timer interrupt. */ -account_ticks (); +account_ticks (S390_lowcore.int_clock);kstat_cpu (smp_processor_id ()).irqs[EXTERNAL_INTERRUPT ]++; index =ext_hash (code);for (p = ext_int_hash[index]; p; p = p->next) { -if (likely (p->code == code)) { -if (likely (p->handler)) - p->handler (code); - } +if (likely (p->code == code)) + p->handler (code); }irq_exit ();set_irq_regs (old_regs);
arch/s390/kernel/smp.c +2 -1
@@ -457,9 +457,10 @@ int __devinit start_secondary(void *cpuv/* Setup the cpu */ cpu_init ();preempt_disable (); -/* init per CPU timer */ +/* Enable TOD clock interrupts on the secondary cpu. */ init_cpu_timer ();#ifdef CONFIG_VIRT_TIMER +/* Enable cpu timer interrupts on the secondary cpu. */ init_cpu_vtimer ();#endif /* Enable pfault pseudo page faults on this cpu. */
arch/s390/kernel/time.c +1117 -62
1,261 lines not on this page · raw message
arch/s390/kernel/vtime.c +4 -4
@@ -524,16 +524,15 @@ EXPORT_SYMBOL(del_virt_timer);void init_cpu_vtimer (void ) {struct vtimer_queue *vt_list; -unsigned long cr0;/* kick the virtual timer */ S390_lowcore.exit_timer =VTIMER_MAX_SLICE ; S390_lowcore.last_update_timer =VTIMER_MAX_SLICE ; asmvolatile ("SPT %0" : :"m" (S390_lowcore.last_update_timer)); asmvolatile ("STCK %0" :"=m" (S390_lowcore.last_update_clock)); -__ctl_store (cr0,0 ,0 ); - cr0 |=0x400 ; -__ctl_load (cr0,0 ,0 ); + +/* enable cpu timer interrupts */ +__ctl_set_bit (0 ,10 ); vt_list = &per_cpu (virt_cpu_timer,smp_processor_id ());INIT_LIST_HEAD (&vt_list->list);
@@ -572,6 +571,7 @@ void __init vtime_init(void)if (register_idle_notifier (&vtimer_idle_nb))panic ("Couldn't register idle notifier" ); +/* Enable cpu timer interrupts on the boot cpu. */ init_cpu_vtimer (); }
arch/s390/lib/delay.c +34 -14
66 lines not on this page · raw message
drivers/s390/block/dasd.c +13 -0
@@ -1232,6 +1232,19 @@ __dasd_process_blk_queue(struct dasd_devif (IS_ERR (cqr)) {if (PTR_ERR (cqr) == -ENOMEM )break ;/* terminate request queue loop */ +if (PTR_ERR (cqr) == -EAGAIN ) { +/* +* The current request cannot be build right +* now, we have to try later. If this request +* is the head-of-queue we stop the device +* for 1/2 second. +*/ +if (!list_empty (&device->ccw_queue)) +break ; + device->stopped |=DASD_STOPPED_PENDING ; +dasd_set_timer (device,HZ /2 ); +break ; + } DBF_DEV_EVENT(DBF_ERR, device, "CCW creation failed (rc=%ld) " "on request %p",
drivers/s390/block/dasd_eckd.c +26 -18
95 lines not on this page · raw message
drivers/s390/cio/cio.c +15 -2
@@ -646,7 +646,7 @@ do_IRQ (struct pt_regs *regs)* Make sure that the i/o interrupt did not "overtake" * the last HZ timer interrupt. */ -account_ticks (); +account_ticks (S390_lowcore.int_clock);/* * Get interrupt information from lowcore */
@@ -850,6 +850,19 @@ __disable_subchannel_easy(struct subchanreturn -EBUSY ;/* uhm... */ } +/* we can't use the normal udelay here, since it enables external interrupts */ + +static void udelay_reset (unsigned long usecs) +{ +uint64_t start_cc, end_cc; + + asmvolatile ("STCK %0" :"=m" (start_cc)); +do { +cpu_relax (); + asmvolatile ("STCK %0" :"=m" (end_cc)); + }while (((end_cc - start_cc)/4096 ) < usecs); +} +static inline int __clear_subchannel_easy (struct subchannel_id schid) {
@@ -865,7 +878,7 @@ __clear_subchannel_easy(struct subchanneif (schid_equal (&ti.schid, &schid))return 0 ; } -udelay (100 ); +udelay_reset (100 ); }return -EBUSY ; }
drivers/s390/s390mach.c +15 -2
@@ -15,7 +15,7 @@#include <linux/time.h> #include <linux/device.h> #include <linux/kthread.h> - +#include <asm/etr.h> #include <asm/lowcore.h> #include <asm/cio.h> #include "cio/cio.h"
@@ -466,6 +466,19 @@ s390_do_machine_check(struct pt_regs *res390_handle_damage ("unable to revalidate registers." ); } +if (mci->cd) { +/* Timing facility damage */ +s390_handle_damage ("TOD clock damaged" ); + } + +if (mci->ed && mci->ec) { +/* External damage */ +if (S390_lowcore.external_damage_code & (1U <<ED_ETR_SYNC )) +etr_sync_check (); +if (S390_lowcore.external_damage_code & (1U <<ED_ETR_SWITCH )) +etr_switch_to_local (); + } +if (mci->se)/* Storage error uncorrected */ s390_handle_damage("received storage error uncorrected "
@@ -504,7 +517,7 @@ static intmachine_check_init (void) {init_MUTEX_LOCKED (&m_sem); -ctl_clear_bit (14 ,25 );/* disable external damage MCH */ +ctl_set_bit (14 ,25 );/* enable external damage MCH */ ctl_set_bit (14 ,27 );/* enable system recovery MCH */ #ifdef CONFIG_MACHCHK_WARNING ctl_set_bit (14 ,24 );/* enable warning MCH */
drivers/s390/s390mach.h +3 -0
@@ -102,4 +102,7 @@ static inline int stcrw(struct crw *pcrw return ccode; } +#define ED_ETR_SYNC 12/* External damage ETR sync check */ +#define ED_ETR_SWITCH 13/* External damage ETR switch to local */ +#endif /* __s390mach */
include/asm-s390/etr.h +219 -0
219 lines not on this page · raw message
include/asm-s390/hardirq.h +1 -1
@@ -32,6 +32,6 @@ typedef struct {#define HARDIRQ_BITS 8 -extern void account_ticks (void ); +extern void account_ticks (u64 time);#endif /* __ASM_HARDIRQ_H */
include/asm-s390/timex.h +36 -0
@@ -11,6 +11,41 @@#ifndef _ASM_S390_TIMEX_H#define _ASM_S390_TIMEX_H +/* Inline functions for clock register access. */ +static inline int set_clock (__u64 time) +{ +int cc; + + asmvolatile ( +" sck 0(%2)\n" +" ipm %0\n" +" srl %0,28\n" + :"=d" (cc) :"m" (time),"a" (&time) :"cc" ); +return cc; +} + +static inline int store_clock (__u64 *time) +{ +int cc; + + asmvolatile ( +" stck 0(%2)\n" +" ipm %0\n" +" srl %0,28\n" + :"=d" (cc),"=m" (*time) :"a" (time) :"cc" ); +return cc; +} + +static inline void set_clock_comparator (__u64 time) +{ + asmvolatile ("sckc 0(%1)" : :"m" (time),"a" (&time)); +} + +static inline void store_clock_comparator (__u64 *time) +{ + asmvolatile ("stckc 0(%1)" :"=m" (*time) :"a" (time)); +} +#define CLOCK_TICK_RATE 1193180/* Underlying HZ */ typedef unsigned long long cycles_t ;
@@ -32,6 +67,7 @@ static inline cycles_t get_cycles(void) return (cycles_t) get_clock() >> 2; } +int get_sync_clock (unsigned long long *clock);void init_cpu_timer (void );#endif