Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753756AbcDTPG7 (ORCPT ); Wed, 20 Apr 2016 11:06:59 -0400 Received: from mail-cys01nam02on0066.outbound.protection.outlook.com ([104.47.37.66]:30497 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751302AbcDTPG6 convert rfc822-to-8bit (ORCPT ); Wed, 20 Apr 2016 11:06:58 -0400 Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=xilinx.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=bestguesspass action=none header.from=xilinx.com; From: Anurag Kumar Vulisha To: Anurag Kumar Vulisha , Alessandro Zummo , Alexandre Belloni , Soren Brinkmann CC: Michal Simek , "rtc-linux@googlegroups.com" , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" , Punnaiah Choudary Kalluri , Anirudha Sarangi , Srikanth Vemula , Srinivas Goud Subject: RE: [PATCH V3] rtc: zynqmp: Update seconds time programming logic Thread-Topic: [PATCH V3] rtc: zynqmp: Update seconds time programming logic Thread-Index: AQHRmxUqPQI8VVyp+065y6VxZWrsl5+S9bBA Date: Wed, 20 Apr 2016 15:06:51 +0000 Message-ID: <3802E9A6666DF54886E2B9CBF743BA9825E0B56D@XAP-PVEXMBX01.xlnx.xilinx.com> References: <1461164331-13732-1-git-send-email-anuragku@xilinx.com> In-Reply-To: <1461164331-13732-1-git-send-email-anuragku@xilinx.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [172.23.97.204] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.0.0.1202-22272.005 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:149.199.60.83;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(2980300002)(438002)(13464003)(189002)(377454003)(199003)(53754006)(2906002)(2900100001)(3846002)(23726003)(6116002)(102836003)(586003)(46406003)(86362001)(92566002)(6806005)(2950100001)(5001770100001)(4001450100002)(4001430100002)(1096002)(5004730100002)(11100500001)(55846006)(5008740100001)(189998001)(107886002)(2920100001)(1220700001)(50986999)(5250100002)(87936001)(76176999)(33656002)(19580405001)(19580395003)(50466002)(4326007)(81166005)(106116001)(106466001)(47776003)(97756001)(54356999)(63266004)(15650500001)(5003600100002)(107986001);DIR:OUT;SFP:1101;SCL:1;SRVR:SN1NAM02HT057;H:xsj-pvapsmtpgw01;FPR:;SPF:Pass;MLV:sfv;MX:1;A:1;LANG:en; X-MS-Office365-Filtering-Correlation-Id: db900b81-05d5-43e4-a9b4-08d3692d69ca X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(8251501002);SRVR:SN1NAM02HT057; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(9101521040)(601004)(2401047)(13024025)(13018025)(13023025)(13015025)(5005006)(8121501046)(13017025)(10201501046)(3002001);SRVR:SN1NAM02HT057;BCL:0;PCL:0;RULEID:;SRVR:SN1NAM02HT057; X-Forefront-PRVS: 0918748D70 X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2016 15:06:55.6206 (UTC) X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c;Ip=[149.199.60.83];Helo=[xsj-pvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1NAM02HT057 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5021 Lines: 135 Hi all, Made a small typo mistake , Please ignore this patch. Sorry for the inconvenience caused. Thanks, Anurag Kumar V > -----Original Message----- > From: Anurag Kumar Vulisha [mailto:anurag.kumar.vulisha@xilinx.com] > Sent: Wednesday, April 20, 2016 8:29 PM > To: Alessandro Zummo ; Alexandre Belloni > ; Soren Brinkmann > > Cc: Michal Simek ; rtc-linux@googlegroups.com; linux- > arm-kernel@lists.infradead.org; linux-kernel@vger.kernel.org; Punnaiah > Choudary Kalluri ; Anirudha Sarangi > ; Srikanth Vemula ; Srinivas > Goud ; Anurag Kumar Vulisha > Subject: [PATCH V3] rtc: zynqmp: Update seconds time programming logic > > We programe RTC time using SET_TIME_WRITE register and read the RTC > current time using CURRENT_TIME register. When we set the time by writing > into SET_TIME_WRITE Register and immediately try to read the rtc time from > CURRENT_TIME register, the previous old value is returned instead of the > new loaded time. This is because RTC takes nearly 1 sec to update the new > loaded value into the CURRENT_TIME register. This behaviour is expected in > our RTC IP. > > This patch updates the driver to read the current time from SET_TIME_WRITE > register instead of CURRENT_TIME when rtc time is requested within an 1sec > period after setting the RTC time. Doing so will ensure the correct time is > given to the user. > > Since there is an delay of 1sec in updating the CURRENT_TIME we are loading > set time +1sec while programming the SET_TIME_WRITE register, doing this > will give correct time without any delay when read from CURRENT_TIME. > > This patch updates the above said. > > Signed-off-by: Anurag Kumar Vulisha > --- > Changes in v3: > 1. Corrected the read time logic > Changes in v2: > 1. Updated the Time programming logic as suggested by Alexandre Belloni > 2. Changed the commit message > --- > drivers/rtc/rtc-zynqmp.c | 44 > ++++++++++++++++++++++++++++++++++++++------ > 1 file changed, 38 insertions(+), 6 deletions(-) > > diff --git a/drivers/rtc/rtc-zynqmp.c b/drivers/rtc/rtc-zynqmp.c index > f87f971..c2f4495 100644 > --- a/drivers/rtc/rtc-zynqmp.c > +++ b/drivers/rtc/rtc-zynqmp.c > @@ -64,7 +64,12 @@ static int xlnx_rtc_set_time(struct device *dev, struct > rtc_time *tm) > struct xlnx_rtc_dev *xrtcdev = dev_get_drvdata(dev); > unsigned long new_time; > > - new_time = rtc_tm_to_time64(tm); > + /* > + * The value written will be updated after 1 sec into the > + * seconds read register, so we need to program time +1 sec > + * to get the correct time on read. > + */ > + new_time = rtc_tm_to_time64(tm) + 1; > > if (new_time > RTC_SEC_MAX_VAL) > return -EINVAL; > @@ -78,14 +83,43 @@ static int xlnx_rtc_set_time(struct device *dev, struct > rtc_time *tm) > > writel(new_time, xrtcdev->reg_base + RTC_SET_TM_WR); > > + /* > + * Clear the rtc interrupt status register after setting the > + * time. During a read_time function, the code should read the > + * RTC_INT_STATUS register and if bit 0 is still 0, it means > + * that one second has not elapsed yet since RTC was set and > + * the current time should be read from SET_TIME_READ register; > + * otherwise, CURRENT_TIME register is read to report the time > + */ > + writel(RTC_INT_SEC, xrtcdev->reg_base + RTC_INT_STS); > + > return 0; > } > > static int xlnx_rtc_read_time(struct device *dev, struct rtc_time *tm) { > + u32 status, read_time; > struct xlnx_rtc_dev *xrtcdev = dev_get_drvdata(dev); > > - rtc_time64_to_tm(readl(xrtcdev->reg_base + RTC_CUR_TM), tm); > + status = readl(xrtcdev->reg_base + RTC_INT_STS); > + > + if (status & RTC_INT_SEC) { > + /* > + * RTC has updated the CURRENT_TIME with the time written > into > + * SET_TIME_WRITE register. > + */ > + rtc_time64_to_tm(readl(xrtcdev->reg_base + > RTC_CUR_TM), tm); > + } else { > + /* > + * Time written in SET_TIME_WRITE has not yet updated into > + * the seconds read register, so read the time from the > + * SET_TIME_WRITE instead of CURRENT_TIME register. > + * Since we add +1 sec while writing, we need to -1 sec while > + * reading. > + */ > + read_time = readl(xrtcdev->reg_base + RTC_SET_TM_RD) - > 1; > + rtc_time64_to_tm(read_time, tm); > + } > > return rtc_valid_tm(tm); > } > @@ -166,11 +200,9 @@ static irqreturn_t xlnx_rtc_interrupt(int irq, void *id) > if (!(status & (RTC_INT_SEC | RTC_INT_ALRM))) > return IRQ_NONE; > > - /* Clear interrupt */ > - writel(status, xrtcdev->reg_base + RTC_INT_STS); > + /* Clear RTC_INT_ALRM interrupt only */ > + writel(RTC_INT_ALRM, xrtcdev->reg_base + RTC_INT_STS); > > - if (status & RTC_INT_SEC) > - rtc_update_irq(xrtcdev->rtc, 1, RTC_IRQF | RTC_UF); > if (status & RTC_INT_ALRM) > rtc_update_irq(xrtcdev->rtc, 1, RTC_IRQF | RTC_AF); > > -- > 2.1.2