From nobody Thu Sep 05 12:27:53 2024 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 4WzzCY6GGjz5Vwky; Thu, 05 Sep 2024 12:27: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WzzCY4RR3z4GlM; Thu, 5 Sep 2024 12:27:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725539273; 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=wwdbf14aEeqbNaxfdMC+szoFPI0Vj8w1pxNMC6kb4Fo=; b=AmjHv+X+68T5Jn1V3GUWW+js2oXJZfjmUyeoJmdLCStF4wueZfnXdFa2zvRP6QEaUuNEfn tz5hnX/Bkh+xAr+iN1oS8x3RgHX93Cbh56EiDDon5avNjPPGEl0fYse3ftt0KxL8uagzV7 B83lAxY8Irx3DRMuyLenEf0EZDtzVKP718jfU2dTllwVQ5un+/dAo1Ra6YDHMGsxnQcYM2 bNK7+mJ2PkOzBO/3gnUVrUm66PcUmre3K/Tx/wKuvCAAgca8L7+auLShXJjdLx7Cda73jp KdNMziCIQgWkgxfWpNPJyVkRnDCcf2+8QUTL8iU0CONEJEzMWRXyKkdHyoQ/oQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725539273; a=rsa-sha256; cv=none; b=c0cYwEEOgG4Fx1/FafSnHgUUOeP/YlInSMqqMTgclX9JHsi6w38NhjuKHOXvWbWQp0gwEu Yse5x0sfHwF2dLO5VelZqAwG7Tnx+aEX5hWA6hWtkwxK0Oo9Op86AVVszVVXTUs+a5Kl5J xVleOiDl1y9X3PeHlTZeu4mhvT2QVAUeI9yEFVGjaUGbdhiW0/Oad5UyQ0nj945MU1KQxJ 1H4rPX8XA76qh/32PeKmTdZiFNhvb+189lXpoRLKVQ8o//qHsGihZQVAIkDZXbD9a/Hv+N +LM0SANG73w2nQcrJ/xCGZ95SSdVzR7xIXZ06kLZ1haazbkbFM+6bp5rLFsXUg== 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=1725539273; 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=wwdbf14aEeqbNaxfdMC+szoFPI0Vj8w1pxNMC6kb4Fo=; b=LIDU6FWCJ5JHzbJlF+kZmo+tTeVhS5hMwryn0q3UD68K9XiOUy8nfzeUnpKA7c0M7R20WD LSPN4StZbzhpbGeRBfC5kxTKN43EKu5nNGAFkxOwL50tVHYJJuRSCe6frsoC4EIUZhYwms If4Z9neFqNox78A8OpB5FRjUq4ds2HVyIMVNCyCWK7P9BXL3+dnvh3O2+8ZrSV6/K00I3V IM/VmsqXJUE/XoB59H6j+6+aCr9SttvyMaBc/+UVPqzoJ1iw5x2gbzJuLKN5oTo5hPIja0 DY38drTyQigKc7gUYrBZDBlnpDg60jkyWAId3rBSo1lTUvZpbzKh03iTxJEuTg== 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 4WzzCY3wHcz178X; Thu, 5 Sep 2024 12:27:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 485CRra8029377; Thu, 5 Sep 2024 12:27:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 485CRrUU029374; Thu, 5 Sep 2024 12:27:53 GMT (envelope-from git) Date: Thu, 5 Sep 2024 12:27:53 GMT Message-Id: <202409051227.485CRrUU029374@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: 3a3aa2cc0756 - main - arm64: Remove TCR_CACHE_ATTRS and TCR_SMP_ATTRS 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 3a3aa2cc07563e288950affbda6b743487e9d49d Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=3a3aa2cc07563e288950affbda6b743487e9d49d commit 3a3aa2cc07563e288950affbda6b743487e9d49d Author: Andrew Turner AuthorDate: 2024-09-05 12:11:48 +0000 Commit: Andrew Turner CommitDate: 2024-09-05 12:12:16 +0000 arm64: Remove TCR_CACHE_ATTRS and TCR_SMP_ATTRS These are only used in one place so expand them there. While here always set TCR_SH0_IS and TCR_SH1_IS. There is no advantage to not set them in a UP kernel. Reviewed by: alc, kib, markj Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D46393 --- sys/arm64/arm64/locore.S | 5 +++-- sys/arm64/include/armreg.h | 8 -------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S index ae1a005fd68f..daf8a936eda2 100644 --- a/sys/arm64/arm64/locore.S +++ b/sys/arm64/arm64/locore.S @@ -945,8 +945,9 @@ tcr: #error Unsupported page size #endif - .quad (TCR_TxSZ(64 - VIRT_BITS) | TCR_TG | \ - TCR_CACHE_ATTRS | TCR_SMP_ATTRS) + .quad (TCR_TxSZ(64 - VIRT_BITS) | TCR_TG | \ + TCR_SH1_IS | TCR_ORGN1_WBWA | TCR_IRGN1_WBWA | \ + TCR_SH0_IS | TCR_ORGN0_WBWA | TCR_IRGN0_WBWA) sctlr_set: /* Bits to set */ .quad (SCTLR_LSMAOE | SCTLR_nTLSMD | SCTLR_UCI | SCTLR_SPAN | \ diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index b4adc3d2c254..54600d63891e 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -2543,14 +2543,6 @@ #define TCR_T0SZ(x) ((x) << TCR_T0SZ_SHIFT) #define TCR_TxSZ(x) (TCR_T1SZ(x) | TCR_T0SZ(x)) -#define TCR_CACHE_ATTRS ((TCR_IRGN0_WBWA | TCR_IRGN1_WBWA) |\ - (TCR_ORGN0_WBWA | TCR_ORGN1_WBWA)) -#ifdef SMP -#define TCR_SMP_ATTRS (TCR_SH0_IS | TCR_SH1_IS) -#else -#define TCR_SMP_ATTRS 0 -#endif - /* TCR_EL12 */ #define TCR_EL12_REG MRS_REG_ALT_NAME(TCR_EL12) #define TCR_EL12_op0 3