From nobody Mon Apr 04 11:06:01 2022 X-Original-To: dev-commits-src-branches@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 4BB291A96FF2; Mon, 4 Apr 2022 11:06:02 +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 4KX7HY6Q3pz3NR6; Mon, 4 Apr 2022 11:06:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649070362; 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=8/nDjA1QEv1UPQoWv62ZVJ68LArkxa4MksE+uDmXdwE=; b=Je2d8zsHENdLQ9b5y3Vf361W/P1XYXWM3GFQHvfVxesKrQKfaxnuG/yn4KjU/dAA6zgWu8 ZQ+KxRIojRqMZqqjBIyC1qzfEVYAK0zfC7lTz0BP9moxtvl4GE9Qz1qvkQUE22ob0uFAHy +tl4E6UkD+YBcMFCjTcLafggNWXKvDP5VtFkoemzlbEzPUjQbHzdgIIHnh0ZvkIu0sYfyi LxoLY3L1BqyOv6RMwtKQdfyOrdtgSQDVwOzf7/+osuFGClLIYTaTWiReYluptBR8Ps8LN4 yov5N8Nw9soN8hU3CuS5l5uckvZBe6tQ6EA2SCf6s8B1h6Q5sduT/LdNOm700Q== 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 831AC10C9A; Mon, 4 Apr 2022 11:06:01 +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 234B61io086518; Mon, 4 Apr 2022 11:06:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 234B61r9086517; Mon, 4 Apr 2022 11:06:01 GMT (envelope-from git) Date: Mon, 4 Apr 2022 11:06:01 GMT Message-Id: <202204041106.234B61r9086517@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 912492325ac7 - stable/13 - Fix the TCR_TG0 values List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 912492325ac7fb5eb07e2b5b89733091ceea1206 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649070362; 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=8/nDjA1QEv1UPQoWv62ZVJ68LArkxa4MksE+uDmXdwE=; b=xHDJn06+v4C2MoZ8lFEBXN0nLPNKepxgxeNq0jUfIF53rp299uz/SPrQBIy3u1W0AVEjtH IAHxZ+jWRDqZ617zF635xIlpVgRKcY0teaG+lE64JNKTPvDp6zUUn1f84oSdPJq0OcHlxC 2ElC1CcTG4FK8DFMsKlsuKKdcR8o3oO3xYSRwdEVoZ3PTQF7Nif0V0F/cCBi8WqzeCuPf7 lYL0AU/Rvt/S1tgkYX4I4hF6xVIqosS0wLuB6UsEfts3pTrjWcSCftmj0tvBneBgbyJ1bN NYW8bq1xThAP0y+DTtPqJuwxrsZ/oYNYySyvSEvYy+L5Js/v6opVIcsavnUoOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649070362; a=rsa-sha256; cv=none; b=bNJgjIYbSnv8qD5omVVptvRoIW4gc7PO91AL0+R6V+I++dBRiDmLucSd/ZUM/CwaBvb4Wo 3pWFNre+qJW7yoIor0g+AuCqMwQ3TcvnwRbPRdue3tTtAjXRIdfG+mnS3Q1bPMiDo3NwFA 7BChbrowpYHs2xZHKE/tUJNames54spvAL6G2hTZrY69n2NWQ0aL8asblfebE6lMRNc/3b wWNiJ7oaSt4AOyajfP9u7yt5EhnK6yEQ5tpZFXDbSZqTvtXQm0u7o8GxXEqGnVRgYii7dI PHRPsSAxuyKYYdCHbzCtcQTLqZAgzLMYEyMqMNSLOmLUAUkyhp0g05MLk/NwXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=912492325ac7fb5eb07e2b5b89733091ceea1206 commit 912492325ac7fb5eb07e2b5b89733091ceea1206 Author: Andrew Turner AuthorDate: 2022-03-10 10:54:39 +0000 Commit: Andrew Turner CommitDate: 2022-04-04 09:37:06 +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 (cherry picked from commit f62e099ed51bf15ebafa20a044e106480547a0ad) --- 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 64067ac31c8f..37483c321f48 100644 --- a/sys/arm64/arm64/locore.S +++ b/sys/arm64/arm64/locore.S @@ -753,7 +753,7 @@ mair: MAIR_ATTR(MAIR_NORMAL_WB, VM_MEMATTR_WRITE_BACK) | \ MAIR_ATTR(MAIR_NORMAL_WT, VM_MEMATTR_WRITE_THROUGH) 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 bd024a0f4d0d..3a26c7bb5d40 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -1401,9 +1401,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