From: Icenowy Zheng <icenowy@sipeed.com> To: Rob Herring <robh+dt@kernel.org>, Maxime Ripard <mripard@kernel.org>, Chen-Yu Tsai <wens@csie.org>, Jernej Skrabec <jernej.skrabec@gmail.com>, Ulf Hansson <ulf.hansson@linaro.org>, Linus Walleij <linus.walleij@linaro.org>, Alexandre Belloni <alexandre.belloni@bootlin.com>, Andre Przywara <andre.przywara@arm.com>, Samuel Holland <samuel@sholland.org> Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 03/17] rtc: sun6i: Add support for broken-down alarm registers Date: Mon, 2 Aug 2021 14:21:58 +0800 [thread overview] Message-ID: <20210802062212.73220-4-icenowy@sipeed.com> (raw) In-Reply-To: <20210802062212.73220-1-icenowy@sipeed.com> From: Andre Przywara <andre.przywara@arm.com> Newer versions of the Allwinner RTC, for instance as found in the H616 SoC, not only store the current day as a linear number, but also change the way the alarm is handled: There are now two registers, that explicitly store the wakeup time, in the same format as the current time. Add support for that variant by writing the requested wakeup time directly into the registers, instead of programming the seconds left, as the old SoCs required. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Reviewed by: Jernej Skrabec <jernej.skrabec@gmail.com> --- drivers/rtc/rtc-sun6i.c | 57 +++++++++++++++++++++++++++++------------ 1 file changed, 40 insertions(+), 17 deletions(-) diff --git a/drivers/rtc/rtc-sun6i.c b/drivers/rtc/rtc-sun6i.c index a980d4e7408d..752bea949050 100644 --- a/drivers/rtc/rtc-sun6i.c +++ b/drivers/rtc/rtc-sun6i.c @@ -48,7 +48,8 @@ /* Alarm 0 (counter) */ #define SUN6I_ALRM_COUNTER 0x0020 -#define SUN6I_ALRM_CUR_VAL 0x0024 +/* This holds the remaining alarm seconds on older SoCs (current value) */ +#define SUN6I_ALRM_COUNTER_HMS 0x0024 #define SUN6I_ALRM_EN 0x0028 #define SUN6I_ALRM_EN_CNT_EN BIT(0) #define SUN6I_ALRM_IRQ_EN 0x002c @@ -523,32 +524,54 @@ static int sun6i_rtc_setalarm(struct device *dev, struct rtc_wkalrm *wkalrm) struct sun6i_rtc_dev *chip = dev_get_drvdata(dev); struct rtc_time *alrm_tm = &wkalrm->time; struct rtc_time tm_now; - time64_t time_now, time_set; + time64_t time_set; + u32 counter_val, counter_val_hms; int ret; - ret = sun6i_rtc_gettime(dev, &tm_now); - if (ret < 0) { - dev_err(dev, "Error in getting time\n"); - return -EINVAL; - } - time_set = rtc_tm_to_time64(alrm_tm); - time_now = rtc_tm_to_time64(&tm_now); - if (time_set <= time_now) { - dev_err(dev, "Date to set in the past\n"); - return -EINVAL; - } - if ((time_set - time_now) > U32_MAX) { - dev_err(dev, "Date too far in the future\n"); - return -EINVAL; + if (chip->flags & RTC_LINEAR_DAY) { + /* + * The alarm registers hold the actual alarm time, encoded + * in the same way (linear day + HMS) as the current time. + */ + counter_val_hms = SUN6I_TIME_SET_SEC_VALUE(alrm_tm->tm_sec) | + SUN6I_TIME_SET_MIN_VALUE(alrm_tm->tm_min) | + SUN6I_TIME_SET_HOUR_VALUE(alrm_tm->tm_hour); + /* The division will cut off the H:M:S part of alrm_tm. */ + counter_val = div_u64(rtc_tm_to_time64(alrm_tm), SECS_PER_DAY); + } else { + /* The alarm register holds the number of seconds left. */ + time64_t time_now; + + ret = sun6i_rtc_gettime(dev, &tm_now); + if (ret < 0) { + dev_err(dev, "Error in getting time\n"); + return -EINVAL; + } + + time_now = rtc_tm_to_time64(&tm_now); + if (time_set <= time_now) { + dev_err(dev, "Date to set in the past\n"); + return -EINVAL; + } + if ((time_set - time_now) > U32_MAX) { + dev_err(dev, "Date too far in the future\n"); + return -EINVAL; + } + + counter_val = time_set - time_now; } sun6i_rtc_setaie(0, chip); writel(0, chip->base + SUN6I_ALRM_COUNTER); + if (chip->flags & RTC_LINEAR_DAY) + writel(0, chip->base + SUN6I_ALRM_COUNTER_HMS); usleep_range(100, 300); - writel(time_set - time_now, chip->base + SUN6I_ALRM_COUNTER); + writel(counter_val, chip->base + SUN6I_ALRM_COUNTER); + if (chip->flags & RTC_LINEAR_DAY) + writel(counter_val_hms, chip->base + SUN6I_ALRM_COUNTER_HMS); chip->alarm = time_set; sun6i_rtc_setaie(wkalrm->enabled, chip); -- 2.30.2
WARNING: multiple messages have this Message-ID (diff)
From: Icenowy Zheng <icenowy@sipeed.com> To: Rob Herring <robh+dt@kernel.org>, Maxime Ripard <mripard@kernel.org>, Chen-Yu Tsai <wens@csie.org>, Jernej Skrabec <jernej.skrabec@gmail.com>, Ulf Hansson <ulf.hansson@linaro.org>, Linus Walleij <linus.walleij@linaro.org>, Alexandre Belloni <alexandre.belloni@bootlin.com>, Andre Przywara <andre.przywara@arm.com>, Samuel Holland <samuel@sholland.org> Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 03/17] rtc: sun6i: Add support for broken-down alarm registers Date: Mon, 2 Aug 2021 14:21:58 +0800 [thread overview] Message-ID: <20210802062212.73220-4-icenowy@sipeed.com> (raw) In-Reply-To: <20210802062212.73220-1-icenowy@sipeed.com> From: Andre Przywara <andre.przywara@arm.com> Newer versions of the Allwinner RTC, for instance as found in the H616 SoC, not only store the current day as a linear number, but also change the way the alarm is handled: There are now two registers, that explicitly store the wakeup time, in the same format as the current time. Add support for that variant by writing the requested wakeup time directly into the registers, instead of programming the seconds left, as the old SoCs required. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Reviewed by: Jernej Skrabec <jernej.skrabec@gmail.com> --- drivers/rtc/rtc-sun6i.c | 57 +++++++++++++++++++++++++++++------------ 1 file changed, 40 insertions(+), 17 deletions(-) diff --git a/drivers/rtc/rtc-sun6i.c b/drivers/rtc/rtc-sun6i.c index a980d4e7408d..752bea949050 100644 --- a/drivers/rtc/rtc-sun6i.c +++ b/drivers/rtc/rtc-sun6i.c @@ -48,7 +48,8 @@ /* Alarm 0 (counter) */ #define SUN6I_ALRM_COUNTER 0x0020 -#define SUN6I_ALRM_CUR_VAL 0x0024 +/* This holds the remaining alarm seconds on older SoCs (current value) */ +#define SUN6I_ALRM_COUNTER_HMS 0x0024 #define SUN6I_ALRM_EN 0x0028 #define SUN6I_ALRM_EN_CNT_EN BIT(0) #define SUN6I_ALRM_IRQ_EN 0x002c @@ -523,32 +524,54 @@ static int sun6i_rtc_setalarm(struct device *dev, struct rtc_wkalrm *wkalrm) struct sun6i_rtc_dev *chip = dev_get_drvdata(dev); struct rtc_time *alrm_tm = &wkalrm->time; struct rtc_time tm_now; - time64_t time_now, time_set; + time64_t time_set; + u32 counter_val, counter_val_hms; int ret; - ret = sun6i_rtc_gettime(dev, &tm_now); - if (ret < 0) { - dev_err(dev, "Error in getting time\n"); - return -EINVAL; - } - time_set = rtc_tm_to_time64(alrm_tm); - time_now = rtc_tm_to_time64(&tm_now); - if (time_set <= time_now) { - dev_err(dev, "Date to set in the past\n"); - return -EINVAL; - } - if ((time_set - time_now) > U32_MAX) { - dev_err(dev, "Date too far in the future\n"); - return -EINVAL; + if (chip->flags & RTC_LINEAR_DAY) { + /* + * The alarm registers hold the actual alarm time, encoded + * in the same way (linear day + HMS) as the current time. + */ + counter_val_hms = SUN6I_TIME_SET_SEC_VALUE(alrm_tm->tm_sec) | + SUN6I_TIME_SET_MIN_VALUE(alrm_tm->tm_min) | + SUN6I_TIME_SET_HOUR_VALUE(alrm_tm->tm_hour); + /* The division will cut off the H:M:S part of alrm_tm. */ + counter_val = div_u64(rtc_tm_to_time64(alrm_tm), SECS_PER_DAY); + } else { + /* The alarm register holds the number of seconds left. */ + time64_t time_now; + + ret = sun6i_rtc_gettime(dev, &tm_now); + if (ret < 0) { + dev_err(dev, "Error in getting time\n"); + return -EINVAL; + } + + time_now = rtc_tm_to_time64(&tm_now); + if (time_set <= time_now) { + dev_err(dev, "Date to set in the past\n"); + return -EINVAL; + } + if ((time_set - time_now) > U32_MAX) { + dev_err(dev, "Date too far in the future\n"); + return -EINVAL; + } + + counter_val = time_set - time_now; } sun6i_rtc_setaie(0, chip); writel(0, chip->base + SUN6I_ALRM_COUNTER); + if (chip->flags & RTC_LINEAR_DAY) + writel(0, chip->base + SUN6I_ALRM_COUNTER_HMS); usleep_range(100, 300); - writel(time_set - time_now, chip->base + SUN6I_ALRM_COUNTER); + writel(counter_val, chip->base + SUN6I_ALRM_COUNTER); + if (chip->flags & RTC_LINEAR_DAY) + writel(counter_val_hms, chip->base + SUN6I_ALRM_COUNTER_HMS); chip->alarm = time_set; sun6i_rtc_setaie(wkalrm->enabled, chip); -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-08-02 6:24 UTC|newest] Thread overview: 112+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-08-02 6:21 [PATCH 00/17] Basical Allwinner R329 support Icenowy Zheng 2021-08-02 6:21 ` Icenowy Zheng 2021-08-02 6:21 ` [PATCH 01/17] rtc: sun6i: Fix time overflow handling Icenowy Zheng 2021-08-02 6:21 ` Icenowy Zheng 2021-08-02 6:21 ` [PATCH 02/17] rtc: sun6i: Add support for linear day storage Icenowy Zheng 2021-08-02 6:21 ` Icenowy Zheng 2021-08-02 6:21 ` Icenowy Zheng [this message] 2021-08-02 6:21 ` [PATCH 03/17] rtc: sun6i: Add support for broken-down alarm registers Icenowy Zheng 2021-08-02 6:21 ` [PATCH 04/17] dt-bindings: rtc: sun6i: add compatible string for R329 RTC Icenowy Zheng 2021-08-02 6:21 ` Icenowy Zheng 2021-08-06 21:39 ` Rob Herring 2021-08-06 21:39 ` Rob Herring 2021-08-02 6:22 ` [PATCH 05/17] rtc: sun6i: add support " Icenowy Zheng 2021-08-02 6:22 ` Icenowy Zheng 2021-08-02 6:22 ` [PATCH 06/17] dt-bindings: pinctrl: document Allwinner R329 PIO and R-PIO Icenowy Zheng 2021-08-02 6:22 ` Icenowy Zheng 2021-08-06 21:40 ` Rob Herring 2021-08-06 21:40 ` Rob Herring 2021-08-18 8:48 ` Maxime Ripard 2021-08-18 8:48 ` Maxime Ripard 2021-08-19 2:40 ` Samuel Holland 2021-08-19 2:40 ` Samuel Holland 2021-08-02 6:22 ` [PATCH 07/17] pinctrl: sunxi: add support for R329 CPUX pin controller Icenowy Zheng 2021-08-02 6:22 ` Icenowy Zheng 2021-08-11 9:23 ` Linus Walleij 2021-08-11 9:23 ` Linus Walleij 2021-08-11 9:23 ` Linus Walleij 2021-08-18 8:48 ` Maxime Ripard 2021-08-18 8:48 ` Maxime Ripard 2021-08-19 3:09 ` Samuel Holland 2021-08-19 3:09 ` Samuel Holland 2021-08-02 6:22 ` [PATCH 08/17] pinctrl: sunxi: add support for R329 R-PIO " Icenowy Zheng 2021-08-02 6:22 ` Icenowy Zheng 2021-08-18 8:52 ` Maxime Ripard 2021-08-18 8:52 ` Maxime Ripard 2021-08-19 3:22 ` Samuel Holland 2021-08-19 3:22 ` Samuel Holland 2021-08-02 6:22 ` [PATCH 09/17] dt-bindings: clock: sunxi-ng: add compatibles for R329 CCUs Icenowy Zheng 2021-08-02 6:22 ` Icenowy Zheng 2021-08-06 21:41 ` Rob Herring 2021-08-06 21:41 ` Rob Herring 2021-08-02 6:22 ` [PATCH 10/17] clk: sunxi=ng: add support for R329 R-CCU Icenowy Zheng 2021-08-02 6:22 ` Icenowy Zheng 2021-08-02 9:03 ` Icenowy Zheng 2021-08-02 9:03 ` Icenowy Zheng 2021-08-02 9:52 ` Icenowy Zheng 2021-08-02 9:52 ` Icenowy Zheng 2021-08-06 21:42 ` Rob Herring 2021-08-06 21:42 ` Rob Herring 2021-08-18 8:50 ` Maxime Ripard 2021-08-18 8:50 ` Maxime Ripard 2021-08-20 0:55 ` Samuel Holland 2021-08-20 0:55 ` Samuel Holland 2021-08-20 4:34 ` Jernej Škrabec 2021-08-20 4:34 ` Jernej Škrabec 2021-08-25 14:50 ` Maxime Ripard 2021-08-25 14:50 ` Maxime Ripard 2021-08-25 15:03 ` Jernej Škrabec 2021-08-25 15:03 ` Jernej Škrabec 2021-08-25 15:37 ` Maxime Ripard 2021-08-25 15:37 ` Maxime Ripard 2021-08-26 0:20 ` Samuel Holland 2021-08-26 0:20 ` Samuel Holland 2021-08-02 6:22 ` [PATCH 11/17] clk: sunxi-ng: add support for Allwinner R329 CCU Icenowy Zheng 2021-08-02 6:22 ` Icenowy Zheng 2021-08-06 21:42 ` Rob Herring 2021-08-06 21:42 ` Rob Herring 2021-08-20 2:41 ` Samuel Holland 2021-08-20 2:41 ` Samuel Holland 2021-08-20 3:52 ` Icenowy Zheng 2021-08-20 3:52 ` Icenowy Zheng 2021-08-25 14:54 ` Maxime Ripard 2021-08-25 14:54 ` Maxime Ripard 2021-08-02 6:22 ` [PATCH 12/17] dt-bindings: mmc: sunxi-mmc: add R329 MMC compatible string Icenowy Zheng 2021-08-02 6:22 ` Icenowy Zheng 2021-08-06 21:42 ` Rob Herring 2021-08-06 21:42 ` Rob Herring 2021-08-18 8:47 ` Maxime Ripard 2021-08-18 8:47 ` Maxime Ripard 2021-08-02 6:22 ` [PATCH 13/17] mmc: sunxi: add support for R329 MMC controllers Icenowy Zheng 2021-08-02 6:22 ` Icenowy Zheng 2021-08-18 8:47 ` Maxime Ripard 2021-08-18 8:47 ` Maxime Ripard 2021-08-20 2:43 ` Samuel Holland 2021-08-20 2:43 ` Samuel Holland 2021-08-02 6:22 ` [PATCH 14/17] dt-bindings: arm: sunxi: add compatible strings for Sipeed MaixSense Icenowy Zheng 2021-08-02 6:22 ` Icenowy Zheng 2021-08-06 21:43 ` Rob Herring 2021-08-06 21:43 ` Rob Herring 2021-08-18 9:03 ` Maxime Ripard 2021-08-18 9:03 ` Maxime Ripard 2021-08-02 6:22 ` [PATCH 15/17] arm64: allwinner: dts: add DTSI file for R329 SoC Icenowy Zheng 2021-08-02 6:22 ` Icenowy Zheng 2021-08-18 9:01 ` Maxime Ripard 2021-08-18 9:01 ` Maxime Ripard 2021-08-18 9:15 ` Icenowy Zheng 2021-08-18 9:15 ` Icenowy Zheng 2021-08-19 2:32 ` Samuel Holland 2021-08-19 2:32 ` Samuel Holland 2021-08-20 3:06 ` Samuel Holland 2021-08-20 3:06 ` Samuel Holland 2021-08-25 15:00 ` Maxime Ripard 2021-08-25 15:00 ` Maxime Ripard 2021-08-20 2:59 ` Samuel Holland 2021-08-20 2:59 ` Samuel Holland 2021-08-02 6:22 ` [PATCH 16/17] arm64: allwinner: dts: r329: add DTSI file for Sipeed Maix IIA Icenowy Zheng 2021-08-02 6:22 ` Icenowy Zheng 2021-08-02 6:22 ` [PATCH 17/17] arm64: allwinner: dts: r329: add support for Sipeed MaixSense Icenowy Zheng 2021-08-02 6:22 ` Icenowy Zheng 2021-08-10 11:04 ` [PATCH 00/17] Basical Allwinner R329 support Ulf Hansson 2021-08-10 11:04 ` Ulf Hansson 2021-08-10 11:04 ` Ulf Hansson
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210802062212.73220-4-icenowy@sipeed.com \ --to=icenowy@sipeed.com \ --cc=alexandre.belloni@bootlin.com \ --cc=andre.przywara@arm.com \ --cc=devicetree@vger.kernel.org \ --cc=jernej.skrabec@gmail.com \ --cc=linus.walleij@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-sunxi@lists.linux.dev \ --cc=mripard@kernel.org \ --cc=robh+dt@kernel.org \ --cc=samuel@sholland.org \ --cc=ulf.hansson@linaro.org \ --cc=wens@csie.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.