patch-2.4.1 linux/arch/sparc64/kernel/time.c

• Lines: 135
• Date: Mon Jan 22 13:30:20 2001
• Orig file: v2.4.0/linux/arch/sparc64/kernel/time.c
• Orig date: Tue Oct 3 09:24:41 2000

diff -u --recursive --new-file v2.4.0/linux/arch/sparc64/kernel/time.c linux/arch/sparc64/kernel/time.c
@@ -1,4 +1,4 @@
-/* $Id: time.c,v 1.32 2000/09/22 23:02:13 davem Exp $
+/* $Id: time.c,v 1.33 2001/01/11 15:07:09 davem Exp $
  * time.c: UltraSparc timer and TOD clock support.
  *
  * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu)
@@ -34,7 +34,9 @@
 
 extern rwlock_t xtime_lock;
 
+spinlock_t mostek_lock = SPIN_LOCK_UNLOCKED;
 unsigned long mstk48t02_regs = 0UL;
+
 static unsigned long mstk48t08_regs = 0UL;
 static unsigned long mstk48t59_regs = 0UL;
 
@@ -187,6 +189,8 @@
 
 	prom_printf("CLOCK: Clock was stopped. Kick start ");
 
+	spin_lock_irq(&mostek_lock);
+
 	/* Turn on the kick start bit to start the oscillator. */
 	tmp = mostek_read(regs + MOSTEK_CREG);
 	tmp |= MSTK_CREG_WRITE;
@@ -201,6 +205,8 @@
 	tmp &= ~MSTK_CREG_WRITE;
 	mostek_write(regs + MOSTEK_CREG, tmp);
 
+	spin_unlock_irq(&mostek_lock);
+
 	/* Delay to allow the clock oscillator to start. */
 	sec = MSTK_REG_SEC(regs);
 	for (i = 0; i < 3; i++) {
@@ -212,6 +218,8 @@
 	}
 	prom_printf("\n");
 
+	spin_lock_irq(&mostek_lock);
+
 	/* Turn off kick start and set a "valid" time and date. */
 	tmp = mostek_read(regs + MOSTEK_CREG);
 	tmp |= MSTK_CREG_WRITE;
@@ -230,9 +238,14 @@
 	tmp &= ~MSTK_CREG_WRITE;
 	mostek_write(regs + MOSTEK_CREG, tmp);
 
+	spin_unlock_irq(&mostek_lock);
+
 	/* Ensure the kick start bit is off. If it isn't, turn it off. */
 	while (mostek_read(regs + MOSTEK_HOUR) & MSTK_KICK_START) {
 		prom_printf("CLOCK: Kick start still on!\n");
+
+		spin_lock_irq(&mostek_lock);
+
 		tmp = mostek_read(regs + MOSTEK_CREG);
 		tmp |= MSTK_CREG_WRITE;
 		mostek_write(regs + MOSTEK_CREG, tmp);
@@ -244,6 +257,8 @@
 		tmp = mostek_read(regs + MOSTEK_CREG);
 		tmp &= ~MSTK_CREG_WRITE;
 		mostek_write(regs + MOSTEK_CREG, tmp);
+
+		spin_unlock_irq(&mostek_lock);
 	}
 
 	prom_printf("CLOCK: Kick start procedure successful.\n");
@@ -255,11 +270,15 @@
 	unsigned long regs = mstk48t02_regs;
 	u8 data1, data2;
 
+	spin_lock_irq(&mostek_lock);
+
 	data1 = mostek_read(regs + MOSTEK_EEPROM);	/* Read some data. */
 	mostek_write(regs + MOSTEK_EEPROM, ~data1);	/* Write back the complement. */
 	data2 = mostek_read(regs + MOSTEK_EEPROM);	/* Read back the complement. */
 	mostek_write(regs + MOSTEK_EEPROM, data1);	/* Restore original value. */
 
+	spin_unlock_irq(&mostek_lock);
+
 	return (data1 == data2);	/* Was the write blocked? */
 }
 
@@ -278,6 +297,8 @@
 		prom_halt();
 	}		
 
+	spin_lock_irq(&mostek_lock);
+
 	tmp = mostek_read(mregs + MOSTEK_CREG);
 	tmp |= MSTK_CREG_READ;
 	mostek_write(mregs + MOSTEK_CREG, tmp);
@@ -294,6 +315,8 @@
 	tmp = mostek_read(mregs + MOSTEK_CREG);
 	tmp &= ~MSTK_CREG_READ;
 	mostek_write(mregs + MOSTEK_CREG, tmp);
+
+	spin_unlock_irq(&mostek_lock);
 }
 
 void __init clock_probe(void)
@@ -512,6 +535,7 @@
 {
 	int real_seconds, real_minutes, mostek_minutes;
 	unsigned long regs = mstk48t02_regs;
+	unsigned long flags;
 	u8 tmp;
 
 	/* 
@@ -521,6 +545,8 @@
 	if (!regs) 
 		return -1;
 
+	spin_lock_irqsave(&mostek_lock, flags);
+
 	/* Read the current RTC minutes. */
 	tmp = mostek_read(regs + MOSTEK_CREG);
 	tmp |= MSTK_CREG_READ;
@@ -555,8 +581,13 @@
 		tmp = mostek_read(regs + MOSTEK_CREG);
 		tmp &= ~MSTK_CREG_WRITE;
 		mostek_write(regs + MOSTEK_CREG, tmp);
-	} else
-		return -1;
 
-	return 0;
+		spin_unlock_irqrestore(&mostek_lock, flags);
+
+		return 0;
+	} else {
+		spin_unlock_irqrestore(&mostek_lock, flags);
+
+		return -1;
+	}
 }