Received: from mail.onstor.com ([66.201.51.107]) by onstor-exch02.onstor.net with Microsoft SMTPSVC(6.0.3790.1830);
	 Wed, 6 Aug 2008 17:11:54 -0700
Received: from chiesmta2-2.messageone.com ([216.203.30.55]) by mail.onstor.com with Microsoft SMTPSVC(6.0.3790.1830);
	 Wed, 6 Aug 2008 17:11:52 -0700
Received: from smtp119.sbc.mail.sp1.yahoo.com (smtp119.sbc.mail.sp1.yahoo.com [69.147.64.92])
	by chiesmta2-2.messageone.com (8.13.8/8.13.8) with SMTP id m770Bol9029935
	for <andy.sharp@onstor.com>; Wed, 6 Aug 2008 19:11:51 -0500
Received: (qmail 68234 invoked from network); 7 Aug 2008 00:11:50 -0000
DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws;
  s=s1024; d=pacbell.net;
  h=Received:X-YMail-OSG:X-Yahoo-Newman-Property:From:To:Subject:Date:User-Agent:Cc:MIME-Version:Content-Disposition:Message-Id:Content-Type:Content-Transfer-Encoding;
  b=NZdSgHBNmONLRMivvX1/pWJUQSCJjbkxktuOEN3g8bXONvDt1grfk9ObCphFJD5jYfFxWFzr8gRJDjMyboT977/CjC8RI9Wo47nStPYfJieoYA/wRNDDb4oKfm2/pYzEC/qz34g/H49PKAwitaMRYIFdtCnQJvYicCurFx5fpEQ=  ;
Received: from unknown (HELO pogo) (david-b@pacbell.net@69.226.227.37 with plain)
  by smtp119.sbc.mail.sp1.yahoo.com with SMTP; 7 Aug 2008 00:11:50 -0000
X-YMail-OSG: Y_zFMhgVM1lozDnxI08g93KsGpTP75jlgMDo8VLdTe9KeR0RefbQjOcSKvjJ3tArxpdHD6gLoQubib73EcZp2SmSE_UUHc_LFnSnwqTeBbqCAwMP1jLtiaBmM7iYbICo4r8-
X-Yahoo-Newman-Property: ymail-3
From: David Brownell <david-b@pacbell.net>
To: rtc-linux@googlegroups.com
Subject: [patch 2.6.27-rc2] rtc: file close() consistently disables repeating irqs
Date: Wed, 6 Aug 2008 17:11:48 -0700
User-Agent: KMail/1.9.9
Cc: Andrew Morton <akpm@linux-foundation.org>,
        Andrew Sharp <andy.sharp@onstor.com>,
        Angelo Castello <angelo.castello@st.com>,
        Atsushi Nemoto <anemo@mba.ocn.ne.jp>, Paul Mundt <lethal@linux-sh.org>,
        Thomas Hommel <thomas.hommel@gefanuc.com>
MIME-Version: 1.0
Content-Disposition: inline
Message-Id: <200808061711.49022.david-b@pacbell.net>
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
X-MessageOne-Virus-Version: vendor=fsecure engine=4.65.7161:2.4.4,1.2.40,4.0.164 definitions=2008-08-06_06:2008-08-05,2008-08-06,2008-08-06 signatures=0
X-MessageOne-Virus-Scanned: Clean
X-MessageOne-Envelope-Sender: david-b@pacbell.net
X-MessageOne-Spam-Details: rule=m773emszm_notspam policy=m773emszm score=0 spamscore=0 ipscore=0 phishscore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx engine=3.1.0-0805090000 definitions=main-0808060114
X-MessageOne-Spam-Score: 0
X-MessageOne-Spam-Bar: 
Return-Path: david-b@pacbell.net
X-OriginalArrivalTime: 07 Aug 2008 00:11:52.0219 (UTC) FILETIME=[3171FEB0:01C8F822]

From: David Brownell <dbrownell@users.sourceforge.net>

Make the rtc framework consistent about disabling 1/second update IRQs
that may have been activated through the /dev interface, when that /dev
file is closed.  (It may have closed because of coredump, etc.)  This
was previously done only for emulated update IRQs ... now, do it always.

Also comment the current policy:  repeating IRQs (periodic, update) that
userspace enabled will be cleanly disabled, but alarms are left alone.
Such repeating IRQs are a constant and pointless system load.

Update some RTC drivers to remove now-needless release() methods.  Most
such methods just enforce that policy.  The others all seem to be buggy,
and mistreat in-kernel clients of periodic or alarm IRQs.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Cc: Andrew Sharp <andy.sharp@onstor.com>
Cc: Angelo Castello <angelo.castello@st.com>
Cc: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Thomas Hommel <thomas.hommel@gefanuc.com>
---
 drivers/rtc/rtc-dev.c      |   12 +++++++++---
 drivers/rtc/rtc-ds1511.c   |   13 -------------
 drivers/rtc/rtc-ds1553.c   |   12 ------------
 drivers/rtc/rtc-sh.c       |    7 -------
 drivers/rtc/rtc-stk17ta8.c |   12 ------------
 5 files changed, 9 insertions(+), 47 deletions(-)

--- a/drivers/rtc/rtc-dev.c	2008-07-30 14:22:05.000000000 -0700
+++ b/drivers/rtc/rtc-dev.c	2008-07-30 14:39:53.000000000 -0700
@@ -429,9 +429,15 @@ static int rtc_dev_release(struct inode 
 {
 	struct rtc_device *rtc = file->private_data;
 
-#ifdef CONFIG_RTC_INTF_DEV_UIE_EMUL
-	clear_uie(rtc);
-#endif
+	/* We shut down the repeating IRQs that userspace enabled,
+	 * since nothing is listening to them.
+	 *  - Update (UIE) ... currently only managed through ioctls
+	 *  - Periodic (PIE) ... also used through rtc_*() interface calls
+	 *
+	 * Leave the alarm alone; it may be set to trigger a system wakeup
+	 * later, or be used by kernel code, and is a one-shot event anyway.
+	 */
+	rtc_dev_ioctl(file, RTC_UIE_OFF, 0);
 	rtc_irq_set_state(rtc, NULL, 0);
 
 	if (rtc->ops->release)
--- a/drivers/rtc/rtc-ds1511.c	2008-07-30 14:20:24.000000000 -0700
+++ b/drivers/rtc/rtc-ds1511.c	2008-07-30 14:37:05.000000000 -0700
@@ -379,18 +379,6 @@ ds1511_interrupt(int irq, void *dev_id)
 	return IRQ_HANDLED;
 }
 
- static void
-ds1511_rtc_release(struct device *dev)
-{
-	struct platform_device *pdev = to_platform_device(dev);
-	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
-
-	if (pdata->irq >= 0) {
-		pdata->irqen = 0;
-		ds1511_rtc_update_alarm(pdata);
-	}
-}
-
  static int
 ds1511_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)
 {
@@ -428,7 +416,6 @@ static const struct rtc_class_ops ds1511
 	.set_time	= ds1511_rtc_set_time,
 	.read_alarm	= ds1511_rtc_read_alarm,
 	.set_alarm	= ds1511_rtc_set_alarm,
-	.release	= ds1511_rtc_release,
 	.ioctl		= ds1511_rtc_ioctl,
 };
 
--- a/drivers/rtc/rtc-ds1553.c	2008-07-30 14:20:24.000000000 -0700
+++ b/drivers/rtc/rtc-ds1553.c	2008-07-30 14:37:05.000000000 -0700
@@ -207,17 +207,6 @@ static irqreturn_t ds1553_rtc_interrupt(
 	return IRQ_HANDLED;
 }
 
-static void ds1553_rtc_release(struct device *dev)
-{
-	struct platform_device *pdev = to_platform_device(dev);
-	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
-
-	if (pdata->irq >= 0) {
-		pdata->irqen = 0;
-		ds1553_rtc_update_alarm(pdata);
-	}
-}
-
 static int ds1553_rtc_ioctl(struct device *dev, unsigned int cmd,
 			    unsigned long arg)
 {
@@ -254,7 +243,6 @@ static const struct rtc_class_ops ds1553
 	.set_time	= ds1553_rtc_set_time,
 	.read_alarm	= ds1553_rtc_read_alarm,
 	.set_alarm	= ds1553_rtc_set_alarm,
-	.release	= ds1553_rtc_release,
 	.ioctl		= ds1553_rtc_ioctl,
 };
 
--- a/drivers/rtc/rtc-sh.c	2008-07-30 14:20:24.000000000 -0700
+++ b/drivers/rtc/rtc-sh.c	2008-07-30 14:37:05.000000000 -0700
@@ -257,12 +257,6 @@ static inline void sh_rtc_setaie(struct 
 	spin_unlock_irq(&rtc->lock);
 }
 
-static void sh_rtc_release(struct device *dev)
-{
-	sh_rtc_setpie(dev, 0);
-	sh_rtc_setaie(dev, 0);
-}
-
 static int sh_rtc_proc(struct device *dev, struct seq_file *seq)
 {
 	struct sh_rtc *rtc = dev_get_drvdata(dev);
@@ -559,7 +553,6 @@ static int sh_rtc_irq_set_freq(struct de
 }
 
 static struct rtc_class_ops sh_rtc_ops = {
-	.release	= sh_rtc_release,
 	.ioctl		= sh_rtc_ioctl,
 	.read_time	= sh_rtc_read_time,
 	.set_time	= sh_rtc_set_time,
--- a/drivers/rtc/rtc-stk17ta8.c	2008-07-30 14:20:24.000000000 -0700
+++ b/drivers/rtc/rtc-stk17ta8.c	2008-07-30 14:37:05.000000000 -0700
@@ -215,17 +215,6 @@ static irqreturn_t stk17ta8_rtc_interrup
 	return IRQ_HANDLED;
 }
 
-static void stk17ta8_rtc_release(struct device *dev)
-{
-	struct platform_device *pdev = to_platform_device(dev);
-	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
-
-	if (pdata->irq >= 0) {
-		pdata->irqen = 0;
-		stk17ta8_rtc_update_alarm(pdata);
-	}
-}
-
 static int stk17ta8_rtc_ioctl(struct device *dev, unsigned int cmd,
 			    unsigned long arg)
 {
@@ -254,7 +243,6 @@ static const struct rtc_class_ops stk17t
 	.set_time	= stk17ta8_rtc_set_time,
 	.read_alarm	= stk17ta8_rtc_read_alarm,
 	.set_alarm	= stk17ta8_rtc_set_alarm,
-	.release	= stk17ta8_rtc_release,
 	.ioctl		= stk17ta8_rtc_ioctl,
 };
 

