From nobody Mon Dec 15 15:33:11 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dVPGH3qWQz6Kt1D for ; Mon, 15 Dec 2025 15:33:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dVPGH37RHz3ZsG for ; Mon, 15 Dec 2025 15:33:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765812791; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X0XNe6+2zsxeg+S3t3/mcbmEc7w/VSSNRaNqdfy33BY=; b=NQbfBVIt0P+blw3JXNzBaumMTC25kyHA1mjXu6KOL2wKy5BKY3LFnUcuDM2kGwUQ5qPcJk l/C2xSWzyykE8UAxMuipbTfky3rTv71JWh98pWMl+96Kg2OyaGfJA1YiO7G8ECddKrAZJf yTAIR3zO1Crvy3SHzP2p5Gmi3LUASnsBXxbAmfuPxnFo/DHvD5nFK3kIeKDBL9Fn8/92gV 8AknuW9Ue93ApnTRoM7nkkN6cokV+y4hZGU5UsaQiYceWh6qKXiPAb+9I3gpdioCgsHvrz +amshU15M+6R40cMlCVyffYMIuimA+PJThy60g+R9/XrIhi3iBskxGooN00BRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765812791; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X0XNe6+2zsxeg+S3t3/mcbmEc7w/VSSNRaNqdfy33BY=; b=YVzLAWfwm3lbwjuXvEvS1+qD/QWKUEqYwF1LIJrfIvHmci4OiPM7DDP3JkhL/jS3U7d358 KHThxNSHnOP3tb/YAYOO4X84L7xoqVcGjUpsfeiOiIXZEQzGIukFmNXKCkCZTpRybNQatw zR+6IHEOQ0S77Td246kbF8XMa2wTgHphbag+dEZJhJL1nqkPd/WPmz0sreoDLZIXAztNZy P0pgjhc5F+Rph211E/Y0ZPdFJ9qJ0xvLd4UtcmxgbaS1yi6SV0vD5yQOh3rDl0z0wjGViT OYR56h+ZUWXEUuDTgPp9knPrsdYPl/QBXw/vyWyWJ0fS4rIIeAy2oyyYtIFlQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765812791; a=rsa-sha256; cv=none; b=ycykfeZ/1PR6IuRN01DxpOgaZ78AWr1PX/t+B8dXcCznRDcDGlQ6QdmBTZFuuexwNFMaCp 5min7QZCTks7DWC8vX5Iy8S0r9w3Yf0LNLz+fzePMBYn7DBS2Dhe1vEqXOTr8uM6WAwYbd 1wSeAnkKeGiL7TNKHZaBjytaJssl9TGwx/vAlhdxTaDdP55GywAfeBAhSNpRHLi9NUU2Vu C/qkets9KzcMHJlDVpnCZ+ZXWstYQ54AAukrX7np/C6FP6z0h+1V5Fme6Se4FObJarN+4w ACEsBeqTOTIjMHa+Tt5+EMo6zJWBEeiI7NQwlYjRL+GVxjU9xsg7fhiQd6sOxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dVPGH2hY9z952 for ; Mon, 15 Dec 2025 15:33:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d458 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 15 Dec 2025 15:33:11 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: cae9ae66ad1b - main - aw_rtc: bump settime() delays List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cae9ae66ad1b01e84597d03c436bc0579bd07fd4 Auto-Submitted: auto-generated Date: Mon, 15 Dec 2025 15:33:11 +0000 Message-Id: <69402a37.3d458.526c64a1@gitrepo.freebsd.org> The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=cae9ae66ad1b01e84597d03c436bc0579bd07fd4 commit cae9ae66ad1b01e84597d03c436bc0579bd07fd4 Author: Mitchell Horne AuthorDate: 2025-12-15 15:29:21 +0000 Commit: Mitchell Horne CommitDate: 2025-12-15 15:29:21 +0000 aw_rtc: bump settime() delays There are delay loops, checking the BUSY status bit, before writing to the date or time registers. Each iteration contains a 1usec delay, for a maximum of 70 iterations. This is frequently not enough on the D1 platform, where the message is emitted: rtc0: could not set date, RTC busy Bump the loop delay to 10usecs each, and the maximum number of iterations to 150, for a maximum delay of 1.5msecs between each write of the register. In my testing this seems to be adequate. The loop variable is renamed for clarity/simplicity. Reviewed by: manu MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54180 --- sys/arm/allwinner/aw_rtc.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/sys/arm/allwinner/aw_rtc.c b/sys/arm/allwinner/aw_rtc.c index 4af57ab879e8..d3a73d98d86a 100644 --- a/sys/arm/allwinner/aw_rtc.c +++ b/sys/arm/allwinner/aw_rtc.c @@ -87,7 +87,7 @@ #define HALF_OF_SEC_NS 500000000 #define RTC_RES_US 1000000 -#define RTC_TIMEOUT 70 +#define RTC_TIMEOUT 150 #define RTC_READ(sc, reg) bus_read_4((sc)->res, (reg)) #define RTC_WRITE(sc, reg, val) bus_write_4((sc)->res, (reg), (val)) @@ -321,7 +321,8 @@ aw_rtc_settime(device_t dev, struct timespec *ts) { struct aw_rtc_softc *sc = device_get_softc(dev); struct clocktime ct; - uint32_t clk, rdate, rtime; + uint32_t rdate, rtime; + u_int i; /* RTC resolution is 1 sec */ if (ts->tv_nsec >= HALF_OF_SEC_NS) @@ -335,12 +336,12 @@ aw_rtc_settime(device_t dev, struct timespec *ts) return (EINVAL); } - for (clk = 0; RTC_READ(sc, LOSC_CTRL_REG) & LOSC_BUSY_MASK; clk++) { - if (clk > RTC_TIMEOUT) { + for (i = 0; RTC_READ(sc, LOSC_CTRL_REG) & LOSC_BUSY_MASK; i++) { + if (i > RTC_TIMEOUT) { device_printf(dev, "could not set time, RTC busy\n"); return (EINVAL); } - DELAY(1); + DELAY(10); } /* reset time register to avoid unexpected date increment */ RTC_WRITE(sc, sc->conf->rtc_time, 0); @@ -352,21 +353,21 @@ aw_rtc_settime(device_t dev, struct timespec *ts) rtime = SET_SEC_VALUE(ct.sec) | SET_MIN_VALUE(ct.min) | SET_HOUR_VALUE(ct.hour); - for (clk = 0; RTC_READ(sc, LOSC_CTRL_REG) & LOSC_BUSY_MASK; clk++) { - if (clk > RTC_TIMEOUT) { + for (i = 0; RTC_READ(sc, LOSC_CTRL_REG) & LOSC_BUSY_MASK; i++) { + if (i > RTC_TIMEOUT) { device_printf(dev, "could not set date, RTC busy\n"); return (EINVAL); } - DELAY(1); + DELAY(10); } RTC_WRITE(sc, sc->conf->rtc_date, rdate); - for (clk = 0; RTC_READ(sc, LOSC_CTRL_REG) & LOSC_BUSY_MASK; clk++) { - if (clk > RTC_TIMEOUT) { + for (i = 0; RTC_READ(sc, LOSC_CTRL_REG) & LOSC_BUSY_MASK; i++) { + if (i > RTC_TIMEOUT) { device_printf(dev, "could not set time, RTC busy\n"); return (EINVAL); } - DELAY(1); + DELAY(10); } RTC_WRITE(sc, sc->conf->rtc_time, rtime);