Skip to contentSkip to conversation

PATCH [email protected] 1 participant 1 message Feb 17, 2008 x86

lore
Share & tools
lore
#0 lore raw
Quoted 1 line

From David P. Reed <[email protected]> Sat Feb 16 15:05:17 2008

Message-Id: <[email protected]>>
References: <[email protected]>>
User-Agent: quilt/0.46-1
Date: Sat, 16 Feb 2008 15:05:19 -0500
From: David P. Reed <[email protected]>
To: Thomas Gleixner <[email protected]>,
Ingo Molnar <[email protected]>,
"H. Peter Anvin" <[email protected]>
Cc: [email protected],
"David P. Reed" <[email protected]>
Subject: [PATCH 2/3] x86: fix cmos read and write to not use inb_p and outb_p
Content-Disposition: inline; filename=fix-rtc-iodelay.patch

fix code to access CMOS rtc registers so that it does not use inb_p and outb_p routines, which are deprecated. Extensive research on all known CMOS RTC chipset timing shows that there is no need for a delay in accessing the registers of these chips even on old machines. These chipa are never on an expansion bus, but have always been "motherboard" resources, either in the processor chipset or explicitly on the motherboard, and they are not part of the ISA/LPC or PCI buses, so delays should not be based on bus timing. The reason to fix it:
1) port 80 writes often hang some laptops that use ENE EC chipsets, esp. those designed and manufactured by Quanta for HP;
2) RTC accesses are timing sensitive, and extra microseconds may matter;
3) the new "io_delay" function is calibrated by expansion bus timing needs, thus is not appropriate for access to CMOS rtc registers.

arch/x86/kernel/rtc.c +4 -4
Index: linux-2.6/arch/x86/kernel/rtc.c
===================================================================
@@ -151,8 +151,8 @@ unsigned char rtc_cmos_read(unsigned cha
 	unsigned char val;
 
 	lock_cmos_prefix(addr);
-	outb_p(addr, RTC_PORT(0));
-	val = inb_p(RTC_PORT(1));
+	outb(addr, RTC_PORT(0));
+	val = inb(RTC_PORT(1));
 	lock_cmos_suffix(addr);
 	return val;
 }
@@ -161,8 +161,8 @@ EXPORT_SYMBOL(rtc_cmos_read);
 void rtc_cmos_write(unsigned char val, unsigned char addr)
 {
 	lock_cmos_prefix(addr);
-	outb_p(addr, RTC_PORT(0));
-	outb_p(val, RTC_PORT(1));
+	outb(addr, RTC_PORT(0));
+	outb(val, RTC_PORT(1));
 	lock_cmos_suffix(addr);
 }
 EXPORT_SYMBOL(rtc_cmos_write);