From nobody Thu Mar 10 11:08:07 2022 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 1DF6919F70C5; Thu, 10 Mar 2022 11:08:08 +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 4KDmWW5tX4z4rP9; Thu, 10 Mar 2022 11:08:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646910487; 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=imqHPHU/EWM25KYmEkuEwEYOyUkQ+zek4fCHh/vPX18=; b=shHnYynKDbVW4PRYay6+I7VYuBz3esKm4DlGtMWFjz9vLDr2nYsdaqIF3URT8l7NP6qE2B yB3Ek43Pq7JPmIQ0B5+fc+OGpmurbf6uTMJA4q4KFVM8ZuR79eH0MtZzsbz220TtYmgsLf SFGtV+qHrYfc0paHXFz+34RKeHzTJALn4bl6SDjVApUZECF5z9ukyBpZ4sx0eAL/rF12eZ 5pCMDnHBlP/2gUBvjPHEz4Byjk7EbM25PyxwS4JC0pDij8HlIjOWHla/qR7mEyzr1Ehp1E zTGqDKem8M1HyB18kAOhCnODMVOoYyoAQcinxJvvijk1AJckDOvNhcEzjI0QRg== 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 A68E023E05; Thu, 10 Mar 2022 11:08:07 +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 22AB87gO005521; Thu, 10 Mar 2022 11:08:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22AB87AD005520; Thu, 10 Mar 2022 11:08:07 GMT (envelope-from git) Date: Thu, 10 Mar 2022 11:08:07 GMT Message-Id: <202203101108.22AB87AD005520@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: f62e099ed51b - main - Fix the TCR_TG0 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f62e099ed51bf15ebafa20a044e106480547a0ad Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646910487; 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=imqHPHU/EWM25KYmEkuEwEYOyUkQ+zek4fCHh/vPX18=; b=VTfOxcX/Ylp4VJMV4t+TZxPKbHrfCbBhfq7riFFheQNd/jjPN+7QtpHveB11YJE4ywGtDH YxX3zP02f92gURwx5SDTiLR9EDK8HMliDXtv+Fi1WQYXwBC6sjaST8GtLMiBOuIwoacHoa U9ix8M/17ZXY1+Y7mBb7694pa8v47xBCUtvzvIDTNg80pRF5cvM1QEY998w/uNT/LkIURw ELATSRkaIEcKeUuSosiIcKX1p6Mg/yWXsDrtIxUqz7/KXoo5rlhD3r7ygUQbrNb6Orzhw1 5O4I1HX2NsoL4E5PC+5k65cFQYEb+G7AJhVb5ZCR4SeRmRWAgU9bebOg9d0Q5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646910487; a=rsa-sha256; cv=none; b=JFGppM2O8N8g3AMNwNpVTholSeDDMRzYuX67VstDXiMYgnkUfmZq4j7pHKY6OiR4gOnQ6q AcOh62yUOCHrU/9c/dcK4dDL9XAXn70Rh/6jjuL+1ZGhBU6Bae2G/YmjtfmFceVuf5Pqm3 NFDt3YotACbF/S08hgfTdveebiHp6b3cmshA2t1o3fC5crrGQEPGk0PwGHN/pmnFOeRoL7 zhITh6O6xZV/GCDPXnvbwqgZ2eSsuCwQyd7R47OlP8WzkHPAriKci6+SZWZVbXdlQUmJ9y 91BjfHU0vGxjri7D5giycrNmsch6NmL7df+O+/NHpxtxjjazphHRzd8/+heL4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=f62e099ed51bf15ebafa20a044e106480547a0ad commit f62e099ed51bf15ebafa20a044e106480547a0ad Author: Andrew Turner AuthorDate: 2022-03-10 10:54:39 +0000 Commit: Andrew Turner CommitDate: 2022-03-10 10:54:39 +0000 Fix the TCR_TG0 values They are in a different order to the TCR_TG1 values but appear to have been copied incorrectly. While here use TCR_TG0_4K in locore.S to make it explicit the userspace page size is 4K. Sponsored by: The FreeBSD Foundation --- sys/arm64/arm64/locore.S | 2 +- sys/arm64/include/armreg.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S index d72747f0896d..c9cf25aae37f 100644 --- a/sys/arm64/arm64/locore.S +++ b/sys/arm64/arm64/locore.S @@ -742,7 +742,7 @@ mair: MAIR_ATTR(MAIR_NORMAL_WT, VM_MEMATTR_WRITE_THROUGH) | \ MAIR_ATTR(MAIR_DEVICE_nGnRE, VM_MEMATTR_DEVICE_nGnRE) tcr: - .quad (TCR_TxSZ(64 - VIRT_BITS) | TCR_TG1_4K | \ + .quad (TCR_TxSZ(64 - VIRT_BITS) | TCR_TG1_4K | TCR_TG0_4K | \ TCR_CACHE_ATTRS | TCR_SMP_ATTRS) sctlr_set: /* Bits to set */ diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index cd09807ec4be..5d9172cd3d6b 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -1404,9 +1404,9 @@ #define TCR_T1SZ_SHIFT 16 #define TCR_T1SZ(x) ((x) << TCR_T1SZ_SHIFT) #define TCR_TG0_SHIFT 14 -#define TCR_TG0_16K (1UL << TCR_TG0_SHIFT) -#define TCR_TG0_4K (2UL << TCR_TG0_SHIFT) -#define TCR_TG0_64K (3UL << TCR_TG0_SHIFT) +#define TCR_TG0_4K (0UL << TCR_TG0_SHIFT) +#define TCR_TG0_64K (1UL << TCR_TG0_SHIFT) +#define TCR_TG0_16K (2UL << TCR_TG0_SHIFT) #define TCR_SH0_SHIFT 12 #define TCR_SH0_IS (3UL << TCR_SH0_SHIFT) #define TCR_ORGN0_SHIFT 10