From patchwork Sun Feb 25 08:18:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeffy Chen X-Patchwork-Id: 877512 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-rtc-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=rock-chips.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zpyfg1GpBz9s2L for ; Sun, 25 Feb 2018 19:24:11 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751640AbeBYIYK (ORCPT ); Sun, 25 Feb 2018 03:24:10 -0500 Received: from regular1.263xmail.com ([211.150.99.141]:53128 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751634AbeBYIYI (ORCPT ); Sun, 25 Feb 2018 03:24:08 -0500 X-Greylist: delayed 347 seconds by postgrey-1.27 at vger.kernel.org; Sun, 25 Feb 2018 03:24:07 EST Received: from jeffy.chen?rock-chips.com (unknown [192.168.167.205]) by regular1.263xmail.com (Postfix) with ESMTP id 09B8262; Sun, 25 Feb 2018 16:18:08 +0800 (CST) X-263anti-spam: KSV:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 4 Received: from localhost (localhost [127.0.0.1]) by smtp.263.net (Postfix) with ESMTPA id 5E22B363; Sun, 25 Feb 2018 16:18:05 +0800 (CST) X-RL-SENDER: jeffy.chen@rock-chips.com X-FST-TO: linux-kernel@vger.kernel.org X-SENDER-IP: 103.29.142.67 X-LOGIN-NAME: jeffy.chen@rock-chips.com X-UNIQUE-TAG: <28c82eebf04a5b4a371e3ab24c2dcbee> X-ATTACHMENT-NUM: 0 X-SENDER: cjf@rock-chips.com X-DNS-TYPE: 0 Received: from localhost (unknown [103.29.142.67]) by smtp.263.net (Postfix) whith ESMTP id 18738EZHEFS; Sun, 25 Feb 2018 16:18:07 +0800 (CST) From: Jeffy Chen To: linux-kernel@vger.kernel.org Cc: zyw@rock-chips.com, briannorris@google.com, dianders@google.com, jwerner@chromium.org, Jeffy Chen , linux-rtc@vger.kernel.org, Alexandre Belloni , Alessandro Zummo Subject: [PATCH] rtc: cros-ec: return -ETIME when refused to set alarms in the past Date: Sun, 25 Feb 2018 16:18:02 +0800 Message-Id: <20180225081802.8965-1-jeffy.chen@rock-chips.com> X-Mailer: git-send-email 2.11.0 Sender: linux-rtc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rtc@vger.kernel.org We have a check in __rtc_set_alarm() to return -ETIME when the alarm is in the past. Since accessing a Chrome OS EC based rtc is a slow operation, we should do that check again inside of the EC rtc driver's .set_alarm() callback. Signed-off-by: Jeffy Chen --- drivers/rtc/rtc-cros-ec.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/rtc/rtc-cros-ec.c b/drivers/rtc/rtc-cros-ec.c index f0ea6899c731..ee0062e2d222 100644 --- a/drivers/rtc/rtc-cros-ec.c +++ b/drivers/rtc/rtc-cros-ec.c @@ -188,6 +188,10 @@ static int cros_ec_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) if (alarm_time < 0 || alarm_time > U32_MAX) return -EINVAL; + /* Don't set an alarm in the past. */ + if ((u32)alarm_time <= current_time) + return -ETIME; + if (!alrm->enabled) { /* * If the alarm is being disabled, send an alarm @@ -196,11 +200,7 @@ static int cros_ec_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) alarm_offset = EC_RTC_ALARM_CLEAR; cros_ec_rtc->saved_alarm = (u32)alarm_time; } else { - /* Don't set an alarm in the past. */ - if ((u32)alarm_time < current_time) - alarm_offset = EC_RTC_ALARM_CLEAR; - else - alarm_offset = (u32)alarm_time - current_time; + alarm_offset = (u32)alarm_time - current_time; } ret = cros_ec_rtc_set(cros_ec, EC_CMD_RTC_SET_ALARM, alarm_offset);