From nobody Thu Jun 27 19:33:01 2024 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 4W97yP4rVrz5QGxb; Thu, 27 Jun 2024 19:33:01 +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 4W97yP45hQz4nZ4; Thu, 27 Jun 2024 19:33:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719516781; 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=r2MTg+TWRska1rtWuLpk2UEdFc1RT4FcdBk6ysao8AE=; b=Co6rCEUCaQNXaC9XRqnQFhyv55iTFLj79Q99h2eBAVivdRr6oIpwGyqWzDNH7hgd/N4ZEF wbeR2DAuY0p/5WYHgilo0OIdKBOogRMg+MGLvrJfSuW+fWMjZ6ZxPK4fcjusQMiqUYHEZT Ak4OPa+EhyUuDyH7j8+05XTmkBX81rYPtkEytReaSpet/Z6jjEqvPlpsa9/U0N/IURXmX9 +V8YcMEvttBTw3Y2FNi5AYUqlqDfnCDR9HDOCgfTgYWYeTQl5oQfC8vQ6bXe1gvNJ5LnKY aVoeqnPoFNPVofWWNiiDJyg2Uog025gLZn2CY+14yo1c6huw9JiLZJ6UZbyGHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719516781; a=rsa-sha256; cv=none; b=a9MscjrL3wK6f9NoAy0HeJXk5oMlAJZfWXgq3dB9mNJCx9KFQuSoAz8a23F3pGvYm1x1ZH aDncdDbRCNjGaoqi7ia+5F3fK1VQHB1ff+Lf4Rv6DS9ZaGM8tHsXSNQa5LItuBBJmzasjX S0vPPW3kn31/vF6/L5UHoY4v9oBpTP6lwfAkQpOohz3HxK3Ve+qhtdPbpzQMVviZcDAQxw HlH3kaWbcSinDuQUNuIbePjWUqXKJ+YdnjeqHquR2LThao61dWF5+jjOJi+J11ymmWQ9JF 4uh3M6LT7ITTbAHBHfkGRZH4FMxN0BK2r63oSnCdtglHs1FKKF0RSUD+jHsXZA== 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=1719516781; 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=r2MTg+TWRska1rtWuLpk2UEdFc1RT4FcdBk6ysao8AE=; b=eW4WqhrsWchJmk1v6CPGARXYzmBtnnoBd0kPO3c+4dB9+fxSdt2TBqF4cRTBzRltYVVzCl v8JZrA8CKw8dFv/R/7rlTHiyJuy9L7XYpY4ANDrU7ZYjlStMbr+I8Yf08jxjjBnbnFROTl N+UosCMfJ9AOJ6uXyHw/MAqARPrjDrxX3VQK/QLadDhEtqWIhTHQvmCkgb6Pfh7a1Vynr8 qXSNBPCW9rhlyfVBvkHJ6W6a6rxwzOLAypFT4PwH8qJvNwZXMvp6WM6SQtlQBmpnXCqrB6 sGV/0yEWSiZMbialNRJZtZenNjNSMhUvttYUK7z9qcJlHhzbIqo6dsgJ4oPcmQ== 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 4W97yP3dh0zQFK; Thu, 27 Jun 2024 19:33:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45RJX1Lj090129; Thu, 27 Jun 2024 19:33:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45RJX1XY090126; Thu, 27 Jun 2024 19:33:01 GMT (envelope-from git) Date: Thu, 27 Jun 2024 19:33:01 GMT Message-Id: <202406271933.45RJX1XY090126@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 32d2a1de3d64 - main - arm64: correct physmap bounds in pmap_bootstrap() 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: 32d2a1de3d64981ad99650bb0d9bc011a0aab7fc Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=32d2a1de3d64981ad99650bb0d9bc011a0aab7fc commit 32d2a1de3d64981ad99650bb0d9bc011a0aab7fc Author: Mitchell Horne AuthorDate: 2024-06-27 19:30:00 +0000 Commit: Mitchell Horne CommitDate: 2024-06-27 19:32:44 +0000 arm64: correct physmap bounds in pmap_bootstrap() physmap_idx now contains the raw value; we should not multiply it. Reviewed by: markj Fixes: d03e1ffbea6d ("arm64: Remove some redundant calculations...") --- sys/arm64/arm64/pmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index d072a387d9b9..f4a46823428a 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -1215,7 +1215,7 @@ pmap_bootstrap_dmap(vm_paddr_t min_pa) dmap_phys_max = 0; dmap_max_addr = 0; - for (i = 0; i < (physmap_idx * 2); i += 2) { + for (i = 0; i < physmap_idx; i += 2) { bs_state.pa = physmap[i] & ~L3_OFFSET; bs_state.va = bs_state.pa - dmap_phys_base + DMAP_MIN_ADDRESS;