From patchwork Thu Feb 11 15:48:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 581934 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-qk0-x23e.google.com (mail-qk0-x23e.google.com [IPv6:2607:f8b0:400d:c09::23e]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DC4214033B for ; Fri, 12 Feb 2016 02:49:20 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b=UfT1jl96; dkim-atps=neutral Received: by mail-qk0-x23e.google.com with SMTP id u128sf16562662qkh.1 for ; Thu, 11 Feb 2016 07:49:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20120806; h=mime-version:from:to:cc:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :reply-to:content-type:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive:sender :list-subscribe:list-unsubscribe; bh=iNIkH7p+HMl3a/X5eNCVx9bIHs/JBX39qF3301D3S8U=; b=UfT1jl96e/Atjwk2otTG0ctprLrC4VNI93TOY5al7VRZlvkoPdvescTyzz0uhlTioh rsmxvdNjoqWVkVbr9B2Yhgtj8YwroKCl8fS9GlGToucT669z2Yc/7G+NT2MHIokMRc07 qX6mU2ubbh5A16xvQs6mLfsXB2Q8evB7qSB1WQ9sg75soXDbSxLoVi5Z5TG87Odgnqt0 SRbyrDpIZfVwAqlm6/IDsJ6t432ZO/5ZSgtHAPeFdxcKMpDv6FtSzHr4vyuKySjIc8Sa kCTOWayJGYSr+kISwoxdREkebqt9VxXSIdLtq5lyG7P0X0cCLaBsKpmPZ3U859cwz7GK sHyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:from:to:cc:subject:date:message-id :in-reply-to:references:x-original-sender :x-original-authentication-results:reply-to:content-type:precedence :mailing-list:list-id:x-spam-checked-in-group:list-post:list-help :list-archive:sender:list-subscribe:list-unsubscribe; bh=iNIkH7p+HMl3a/X5eNCVx9bIHs/JBX39qF3301D3S8U=; b=c62rFBvaQpmLGOh4MK2ZIvFvL3OTPVrfrpkj55ED58xsNsliXUrfxEWFmecLdeVBKp W65lMOgB76wpw/QssoQeb0V6yZEedb6qXuga2uwC+fXLIHnM2zvguLqQP9EHCXzSD9mH CJXGVZLXbLODghvAHuPteeYxTBaIdLRWGcaSY4Mg5AQpsVnF4zpPCas4TuiSLLwitr6L Du40hk8QWdodKoI3EiCUYy555PSIi+KiE1CwnXUoJ8diKi+sqDkGAMan6Ir7rj2azBLa bgsDLb6SubpzgruNgt+H+pjgjPpgziwtZJi2Rpj6VTpael0QUCf5BLM2Q5shFuqw+2xI 3xPg== X-Gm-Message-State: AG10YOTM3bgBXdn1m4qSyTe5/eCvrcduXXUbg6cZTfhusXKxE19YF0LF7fc0hhrmLebmKg== X-Received: by 10.50.155.65 with SMTP id vu1mr96103igb.0.1455205758260; Thu, 11 Feb 2016 07:49:18 -0800 (PST) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.50.62.46 with SMTP id v14ls551138igr.4.gmail; Thu, 11 Feb 2016 07:49:16 -0800 (PST) X-Received: by 10.50.87.7 with SMTP id t7mr15429802igz.11.1455205756941; Thu, 11 Feb 2016 07:49:16 -0800 (PST) Received: from mail-pf0-x242.google.com (mail-pf0-x242.google.com. [2607:f8b0:400e:c00::242]) by gmr-mx.google.com with ESMTPS id 79si1177371pft.0.2016.02.11.07.49.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Feb 2016 07:49:16 -0800 (PST) Received-SPF: pass (google.com: domain of akinobu.mita@gmail.com designates 2607:f8b0:400e:c00::242 as permitted sender) client-ip=2607:f8b0:400e:c00::242; Received: by mail-pf0-x242.google.com with SMTP id e127so2699424pfe.3 for ; Thu, 11 Feb 2016 07:49:16 -0800 (PST) X-Received: by 10.98.17.129 with SMTP id 1mr68030837pfr.30.1455205756817; Thu, 11 Feb 2016 07:49:16 -0800 (PST) Received: from localhost.localdomain (KD113159139091.ppp-bb.dion.ne.jp. [113.159.139.91]) by smtp.gmail.com with ESMTPSA id z3sm13255515par.17.2016.02.11.07.49.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 11 Feb 2016 07:49:15 -0800 (PST) From: Akinobu Mita To: rtc-linux@googlegroups.com Cc: Akinobu Mita , Alessandro Zummo , Alexandre Belloni , Jack Lan , Srikanth Srinivasan , Dennis Aberilla Subject: [rtc-linux] [PATCH 4/4] rtc: ds3232-core: fix read on /dev/rtc after RTC_AIE_ON Date: Fri, 12 Feb 2016 00:48:56 +0900 Message-Id: <1455205736-24425-4-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1455205736-24425-1-git-send-email-akinobu.mita@gmail.com> References: <1455205736-24425-1-git-send-email-akinobu.mita@gmail.com> X-Original-Sender: Akinobu.Mita@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of akinobu.mita@gmail.com designates 2607:f8b0:400e:c00::242 as permitted sender) smtp.mailfrom=akinobu.mita@gmail.com; dkim=pass header.i=@gmail.com; dmarc=pass (p=NONE dis=NONE) header.from=gmail.com Reply-To: rtc-linux@googlegroups.com Precedence: list Mailing-list: list rtc-linux@googlegroups.com; contact rtc-linux+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: rtc-linux@googlegroups.com X-Google-Group-Id: 712029733259 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , The rtctest (tools/testing/selftests/timers/rtctest.c) found that reading ds3232 rtc device immediately return the value 0x20 (RTC_AF) without waiting alarm interrupt. This is because alarm_irq_enable() of ds3232 driver changes RTC_AF flag in rtc->irq_data. So calling ioctl with RTC_AIE_ON generates invalid value in rtc device. The lower-level driver should not touch rtc->irq_data directly. Signed-off-by: Akinobu Mita Cc: Alessandro Zummo Cc: Alexandre Belloni Cc: Jack Lan Cc: Srikanth Srinivasan Cc: Dennis Aberilla --- drivers/rtc/rtc-ds3232-core.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/rtc/rtc-ds3232-core.c b/drivers/rtc/rtc-ds3232-core.c index a45a755..b4e8be8 100644 --- a/drivers/rtc/rtc-ds3232-core.c +++ b/drivers/rtc/rtc-ds3232-core.c @@ -273,7 +273,7 @@ out: return ret; } -static void ds3232_update_alarm(struct device *dev) +static void ds3232_update_alarm(struct device *dev, unsigned int enabled) { struct ds3232 *ds3232 = dev_get_drvdata(dev); int control; @@ -303,7 +303,7 @@ static void ds3232_update_alarm(struct device *dev) if (control < 0) goto unlock; - if (ds3232->rtc->irq_data & (RTC_AF | RTC_UF)) + if (enabled || (ds3232->rtc->irq_data & RTC_UF)) /* enable alarm1 interrupt */ control |= DS3232_REG_CR_A1IE; else @@ -322,12 +322,8 @@ static int ds3232_alarm_irq_enable(struct device *dev, unsigned int enabled) if (ds3232->ops->irq(dev) <= 0) return -EINVAL; - if (enabled) - ds3232->rtc->irq_data |= RTC_AF; - else - ds3232->rtc->irq_data &= ~RTC_AF; + ds3232_update_alarm(dev, enabled); - ds3232_update_alarm(dev); return 0; }