From nobody Fri Aug 7 13:08:23 2026 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 4hGkws06jpz6n3gV for ; Fri, 07 Aug 2026 13:08:29 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hGkwr6fgpz49m4 for ; Fri, 07 Aug 2026 13:08:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786108108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H3cKHQ26/z1mM5eLBqjIa8fTSBxnDDaRD+7wqmf0450=; b=vXApDmgtgPDUdQx3V912LvyZ/nzzSbKLWkbjxmQU71fY0epWmDRAOW9leup/65P1JeZOYh xxjJnCkTlPKmbFX3hQNBPc4XtfTf1UBrTKnDc1TbizGMoPtKtkPDy4jxFaWKp7S/ib07R3 TUrs+jpZL4EsmAIlsVdKkjMCZK1bHnQ3x8CRfhyFWKCJa/VYCnZTbDJufgmfw87Tv0suZK qI6yb9X8J3iamt1X15A6ipBDgzyvOnA93VpyhPncuzHKw95zjWGydgQY9+zRJPUBy9DwTP fPnmh3AivRSRysfwxAGIZ6WJ+VvwlV8NRr36u14MCzo2n610Kd+ovGWJjyfuzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786108108; a=rsa-sha256; cv=none; b=DkmEIC9WzpJFgxTHDJ1WxgPgzY5vtz6XoroyxEpv7dItfGBI7fSaFqpZV/+PcDM6kMej9X NzIgLyo3VYHPJTn5NIq1gCc8jhI4VlxFY6tsztQ777XH2E6azkrWmIBGPaWA0Ovb6v3CUd kKgho4mVM560rCocTsvsDguF2J8smiXAavR0lGoJw46/wK61b+KkIH7MNE1qsTr14ntB2k lEFZxx5KIFBxCSmohzntkUBqg0jgqiU9VuUQf8oeICwXY8P2VaYnsgWmM27mw54s3IK+ss 1yJ3r/GY06CwNtXXupwLYnKLDYJyhvdOJB+xPAiYzFIGYMc2OQVYc9I3VqhBgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786108108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H3cKHQ26/z1mM5eLBqjIa8fTSBxnDDaRD+7wqmf0450=; b=edzZNRL+UiDLcDGOBqVayueXN2qzJu7p0Z9wwz+r0dCQnUkSW9PKQkOEiQda+DWp23fcqj DnX/M1tsYHSy2KwSehpXi92bAW1aqizHud+z17cMxV82boFEqauSaKpaU4nx+pr2CuP6gE 9YrhYwqvSD29xuHDF+vY+9n3pdeMo1eT83p4AqgZzCvQsmFPHrtWK6trbg41Cy7HraTDxE Bs7gyl7Z0Ig/dV1Wutf8MdRAvIPNu6NA91JvKUhhtc5Zp6oTjTKZoTvV7bVGjRsZSfewVB Y/gKlpJswFWl6rgzGRk1PdPJUFJzWy/0rFQDPZdWYgZuymwCh4H/ClVnFC+qdQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hGkwr5kkgz17ST for ; Fri, 07 Aug 2026 13:08:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3cf85 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 07 Aug 2026 13:08:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Kajetan Puchalski From: Jessica Clarke Subject: git: a554906ea44c - main - bhyve: rtc_pl031: Fix PeriphID and CellID values 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/main X-Git-Reftype: branch X-Git-Commit: a554906ea44c26925730a25263e64890d48d2b36 Auto-Submitted: auto-generated Date: Fri, 07 Aug 2026 13:08:23 +0000 Message-Id: <6a75d8c7.3cf85.1cdaf8d7@gitrepo.freebsd.org> The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=a554906ea44c26925730a25263e64890d48d2b36 commit a554906ea44c26925730a25263e64890d48d2b36 Author: Kajetan Puchalski AuthorDate: 2026-08-07 11:57:02 +0000 Commit: Jessica Clarke CommitDate: 2026-08-07 13:04:30 +0000 bhyve: rtc_pl031: Fix PeriphID and CellID values PeriphID and CellID values are determined by macros which take an index. They currently receive a bus offset which has a stride of 4 bytes. This causes the ID1-3 registers to report incorrect values. Scale the offset before passing it to the macro to fix this. Tested with kvm-unit-tests/arm/pl031. Signed-off-by: Kajetan Puchalski Reviewed by: jrtc27 Fixes: 014d7082a239 ("bhyve: Implement a PL031 RTC on arm64") MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/2358 Closes: https://github.com/freebsd/freebsd-src/pull/2358 --- usr.sbin/bhyve/rtc_pl031.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bhyve/rtc_pl031.c b/usr.sbin/bhyve/rtc_pl031.c index e334de6f92bb..74d392e5c023 100644 --- a/usr.sbin/bhyve/rtc_pl031.c +++ b/usr.sbin/bhyve/rtc_pl031.c @@ -236,13 +236,13 @@ rtc_pl031_read(struct rtc_pl031_softc *sc, int offset) case RTCPeriphID1: case RTCPeriphID2: case RTCPeriphID3: - reg = RTCPeriphID_VAL(offset - RTCPeriphID0); + reg = RTCPeriphID_VAL((offset - RTCPeriphID0) >> 2); break; case RTCCellID0: case RTCCellID1: case RTCCellID2: case RTCCellID3: - reg = RTCCellID_VAL(offset - RTCCellID0); + reg = RTCCellID_VAL((offset - RTCCellID0) >> 2); break; default: /* Return 0 in reads from unasigned registers */