From nobody Sun Sep 14 16:17:48 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1D87AC25B50 for ; Fri, 20 Jan 2023 19:02:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230045AbjATTCg (ORCPT ); Fri, 20 Jan 2023 14:02:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36648 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229904AbjATTCa (ORCPT ); Fri, 20 Jan 2023 14:02:30 -0500 Received: from mail-il1-x12c.google.com (mail-il1-x12c.google.com [IPv6:2607:f8b0:4864:20::12c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AB46385347; Fri, 20 Jan 2023 11:02:29 -0800 (PST) Received: by mail-il1-x12c.google.com with SMTP id h15so2874824ilh.4; Fri, 20 Jan 2023 11:02:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5rhB+jCWXlDHeyaWPTfhoKZG0YZcAyGqC3yxhLv7U6w=; b=lknvwgacWgowNZLC4XECbtZKNlv6HqjFRHYejN+rgvjaZ5WNBGQWmWzQGZ+QtDTGRk Ca/IdGy/Fp/yIQEIdXDjKJas19zHXmPUiJgkKEyInmq/R1f/nIo/PkFD1Lwa0AG9NNTd b1jjB77CEuqFd5Z47Rn1DLAuM2pzQ71u/gUwp1bhMiRdLAcWPnNS/NMNBQnEhOtmLsPC 2p5Pg0OMGn4IewYGDV9wTo8Sk5SkX02wnx3TlsEkIuEFcSuD2IsTdwI9kXUkq7zWXMq8 +ccujkOLxcCK6C8lVneugYs6LpdYvkYuXnazLtwvjRG3osyWhJ6FbpndCJlfIup/+bVy h0MQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5rhB+jCWXlDHeyaWPTfhoKZG0YZcAyGqC3yxhLv7U6w=; b=zA1BYhjYEKBkxMVit2LHGAbxgoNmU0HF7PB16yMo8CDr/2Rjnl55HmoO7SHc2TLmBY 9DJjS5bgwtrzeaOeyGzWghPwIX3M9kzDXS7u3dw8MCJcD/TDY2A9m9URB+ntU8ozK0lr dApX2aDjkhn1zd4Y3OX+BF8jcxdpXnOIKodSRb4sX3CuLWOZOf6tIJb/iXqk3PIXQSJU 7zMzCXcL3rogkAkNoDYyOGMH+XHOciiVLlDdk/7MM6qp0nJqmU/L6K6O174TnzUAYahe 282cs/25Ht05iqo80hIvIi0V4i6KThqtuObr7lLYpJMPKtLsh+Qh3BnN9wDzClaYu6UG HVjw== X-Gm-Message-State: AFqh2krOzW+02X/NSBuQ62MvQ6k+Bi6wJN/8HFPvGyZxnA2KvEkZcGdh C3HYM5SMfryptpn8EkZYqH4= X-Google-Smtp-Source: AMrXdXv80xjIQ0RsNbyGUUz57F77A94w0EL9s2R0Rrmto+KRjhEpamBGGAuY5ReJGlNNSVACcPF0Ow== X-Received: by 2002:a05:6e02:6cc:b0:30c:4846:57c3 with SMTP id p12-20020a056e0206cc00b0030c484657c3mr12050911ils.4.1674241348972; Fri, 20 Jan 2023 11:02:28 -0800 (PST) Received: from stbirv-lnx-3.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id y13-20020a37f60d000000b006fa2b1c3c1esm10379806qkj.58.2023.01.20.11.02.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 11:02:28 -0800 (PST) From: Doug Berger To: Alessandro Zummo , Alexandre Belloni Cc: Brian Norris , Markus Mayer , Rob Herring , Krzysztof Kozlowski , Florian Fainelli , Broadcom internal kernel review list , linux-rtc@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Doug Berger Subject: [PATCH 3/6] rtc: brcmstb-waketimer: compensate for lack of wktmr disable Date: Fri, 20 Jan 2023 11:01:44 -0800 Message-Id: <20230120190147.718976-4-opendmb@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230120190147.718976-1-opendmb@gmail.com> References: <20230120190147.718976-1-opendmb@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Since the WKTMR hardware block cannot be disabled it is necessary for the driver to accommodate for associated timing hazards. This commit targets the following possibilities: A possible race between clearing a wktmr event and the alarm expiring is made one-sided by setting the alarm to its maximum value before clearing the event. Programming alarm values close to the current time may not trigger events if the counter advances while the alarm is being programmed. After programming an alarm, a check is made to ensure that it is either in the future or an expiration event is pending. Signed-off-by: Doug Berger Acked-by: Florian Fainelli --- drivers/rtc/rtc-brcmstb-waketimer.c | 52 +++++++++++++++++++---------- 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/drivers/rtc/rtc-brcmstb-waketimer.c b/drivers/rtc/rtc-brcmstb-= waketimer.c index 582c23793550..c791e92532b8 100644 --- a/drivers/rtc/rtc-brcmstb-waketimer.c +++ b/drivers/rtc/rtc-brcmstb-waketimer.c @@ -31,6 +31,8 @@ struct brcmstb_waketmr { struct notifier_block reboot_notifier; struct clk *clk; u32 rate; + unsigned long rtc_alarm; + bool alarm_en; }; =20 #define BRCMSTB_WKTMR_EVENT 0x00 @@ -52,6 +54,11 @@ static inline bool brcmstb_waketmr_is_pending(struct brc= mstb_waketmr *timer) =20 static inline void brcmstb_waketmr_clear_alarm(struct brcmstb_waketmr *tim= er) { + u32 reg; + + timer->alarm_en =3D false; + reg =3D readl_relaxed(timer->base + BRCMSTB_WKTMR_COUNTER); + writel_relaxed(reg - 1, timer->base + BRCMSTB_WKTMR_ALARM); writel_relaxed(WKTMR_ALARM_EVENT, timer->base + BRCMSTB_WKTMR_EVENT); (void)readl_relaxed(timer->base + BRCMSTB_WKTMR_EVENT); } @@ -59,12 +66,22 @@ static inline void brcmstb_waketmr_clear_alarm(struct b= rcmstb_waketmr *timer) static void brcmstb_waketmr_set_alarm(struct brcmstb_waketmr *timer, unsigned int secs) { + unsigned int now; + brcmstb_waketmr_clear_alarm(timer); =20 /* Make sure we are actually counting in seconds */ writel_relaxed(timer->rate, timer->base + BRCMSTB_WKTMR_PRESCALER); =20 - writel_relaxed(secs + 1, timer->base + BRCMSTB_WKTMR_ALARM); + writel_relaxed(secs, timer->base + BRCMSTB_WKTMR_ALARM); + now =3D readl_relaxed(timer->base + BRCMSTB_WKTMR_COUNTER); + + while ((int)(secs - now) <=3D 0 && + !brcmstb_waketmr_is_pending(timer)) { + secs =3D now + 1; + writel_relaxed(secs, timer->base + BRCMSTB_WKTMR_ALARM); + now =3D readl_relaxed(timer->base + BRCMSTB_WKTMR_COUNTER); + } } =20 static irqreturn_t brcmstb_waketmr_irq(int irq, void *data) @@ -155,27 +172,30 @@ static int brcmstb_waketmr_getalarm(struct device *de= v, struct rtc_wkalrm *alarm) { struct brcmstb_waketmr *timer =3D dev_get_drvdata(dev); - time64_t sec; =20 - sec =3D readl_relaxed(timer->base + BRCMSTB_WKTMR_ALARM); - if (sec !=3D 0) { - /* Alarm is enabled */ - alarm->enabled =3D 1; - rtc_time64_to_tm(sec, &alarm->time); - } + alarm->enabled =3D timer->alarm_en; + rtc_time64_to_tm(timer->rtc_alarm, &alarm->time); =20 alarm->pending =3D brcmstb_waketmr_is_pending(timer); =20 return 0; } =20 -/* - * Does not do much but keep the RTC class happy. We always support - * alarms. - */ static int brcmstb_waketmr_alarm_enable(struct device *dev, unsigned int enabled) { + struct brcmstb_waketmr *timer =3D dev_get_drvdata(dev); + + if (enabled && !timer->alarm_en) { + if ((int)(readl_relaxed(timer->base + BRCMSTB_WKTMR_COUNTER) - + readl_relaxed(timer->base + BRCMSTB_WKTMR_ALARM)) >=3D 0 && + !brcmstb_waketmr_is_pending(timer)) + return -EINVAL; + timer->alarm_en =3D true; + } else if (!enabled && timer->alarm_en) { + timer->alarm_en =3D false; + } + return 0; } =20 @@ -183,14 +203,10 @@ static int brcmstb_waketmr_setalarm(struct device *de= v, struct rtc_wkalrm *alarm) { struct brcmstb_waketmr *timer =3D dev_get_drvdata(dev); - time64_t sec; =20 - if (alarm->enabled) - sec =3D rtc_tm_to_time64(&alarm->time); - else - sec =3D 0; + timer->rtc_alarm =3D rtc_tm_to_time64(&alarm->time); =20 - brcmstb_waketmr_set_alarm(timer, sec); + brcmstb_waketmr_set_alarm(timer, timer->rtc_alarm); =20 return brcmstb_waketmr_alarm_enable(dev, alarm->enabled); } --=20 2.25.1