From nobody Tue Jan 31 01:51:53 2023 X-Original-To: dev-commits-src-all@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 4P5Shn31fMz3c3r3; Tue, 31 Jan 2023 01:51:53 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P5Shn28wrz3Cm0; Tue, 31 Jan 2023 01:51:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675129913; 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=aHmdb7bbq5Mh3chaiUubbvZybx/Xcalyb8BrO/ZRosE=; b=FiW01RLlcj+jCYT1vGtM9sLJseQplpSSCyDMZbeGxgiPOm9QIwnlVCLIqs/T0XN91He2ld 4+ItH39YAIW4rNPAt8PCi05tMwOf73vdO0ldSmvKTEJ3RxPmt04z5TtrOUExZ4sEpkq+/R B5AWauKARMBY/CmXfdQOT8rP9uI9UALNSHf8SqryvINsC/jS1uu24qzoUzcDlOB25K7sZU p7tBTGY2kwAfvXEDs8iSq/Wlj6z9T3IORdCdGcrnW48t2gYn4v4K/tYf1vMg/TWrZ2wG+j haQfPQmY26q7krNL83FRMoaBf/nQq37nVStGXLYxYuXB44DOf5vREWm2QTAXhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675129913; 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=aHmdb7bbq5Mh3chaiUubbvZybx/Xcalyb8BrO/ZRosE=; b=X1NO5AzifiUAvnr8Y1x72NSKp6cB2qXnPjwAA96oywmpRRbuJySJKmtgBMgAd3NnL6NM8W vksitC6J4w5n6yw3Z8Eew2IIHu8voqPy2rbqKH2m7ctLcbnvZlacAbJxviq3soZjP1YtFB y/vEAOCuVXPG6kpt5TAUWXQqMKYyKEK0/RNjbeS8lvomN+JSAjQSsVctw+Bl1m+AYWqFUv ZY9V0VPSybWdOXx0ltV/SiingZldArf6qageTqsdbgkYLwwrG4anfc7hwIstizC4wafMUk lHakRwwc2DWNraDYhncoD3SCOg+lIZczjI8xpXxc104524ZNxQSNeNCrzey78A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675129913; a=rsa-sha256; cv=none; b=qO3/0/9rQGUcIdz4V5EykL3kg+bVOFb+yBKpooHOtggUXUCxcqoe8bvyzsevDVAK1JxoIA Eb6SsChr6L2ztrpfHtVbNy/VO6zW8z7pwjzi7E4MLqUVdK19Yp5KRA7CjJRIgwVZjUmbu5 9yMXH6jDGBeJn3HdBDEFQ5ObqHkIOch24urFhQ55MAELjvK+HOS8vT8/vBMw7uHglIRRan gQwF26gO44aahn8emkGdPsr/lRRXcYQCcZiy4pX8QK9RL6zUBgDSjpXWG6Lz/GCUrx6bFa 1KN1Trp7MeUkLSgpbhwONKGyw0XBkrXrseq8KiSak4Yfnzf+OMPRO77scSPCEA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P5Shn0xRzzWW5; Tue, 31 Jan 2023 01:51:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30V1prl9069471; Tue, 31 Jan 2023 01:51:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30V1prI3069470; Tue, 31 Jan 2023 01:51:53 GMT (envelope-from git) Date: Tue, 31 Jan 2023 01:51:53 GMT Message-Id: <202301310151.30V1prI3069470@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: 0eda98025d37 - stable/13 - goldfish_rtc: Fix handling a local time RTC List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0eda98025d37f2546722c1256074062f3b93a5c0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=0eda98025d37f2546722c1256074062f3b93a5c0 commit 0eda98025d37f2546722c1256074062f3b93a5c0 Author: Jessica Clarke AuthorDate: 2022-08-14 18:50:22 +0000 Commit: Jessica Clarke CommitDate: 2023-01-31 01:50:27 +0000 goldfish_rtc: Fix handling a local time RTC The default QEMU config is to have the RTC in UTC. However, if run with -rtc base=localtime (and wall_cmos_clock is set to match), the driver fails to account for adjkerntz due to the use of CLOCKF_SETTIME_NO_ADJ. Copy the same code used by other CLOCKF_SETTIME_NO_ADJ-using drivers to fix this, namely manually subtracting utc_offset(). Fixes: d63a631e7244 ("Add Goldfish RTC device driver for RISC-V") MFC after: 1 week (cherry picked from commit 762dcf10641251c55dda2e6950fef8bb698027ad) --- sys/dev/goldfish/goldfish_rtc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/dev/goldfish/goldfish_rtc.c b/sys/dev/goldfish/goldfish_rtc.c index d1c2b6627ae2..081ea37bb8ef 100644 --- a/sys/dev/goldfish/goldfish_rtc.c +++ b/sys/dev/goldfish/goldfish_rtc.c @@ -151,6 +151,11 @@ goldfish_rtc_settime(device_t dev, struct timespec *ts) sc = device_get_softc(dev); + /* + * We request a timespec with no resolution-adjustment. That also + * disables utc adjustment, so apply that ourselves. + */ + ts->tv_sec -= utc_offset(); nsec = (uint64_t)ts->tv_sec * 1000000000 + ts->tv_nsec; mtx_lock(&sc->mtx);