From nobody Mon Oct 21 12:24:13 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 4XXDy56BZHz5Ywrn; Mon, 21 Oct 2024 12:24:13 +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 4XXDy55dzLz4DZJ; Mon, 21 Oct 2024 12:24:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729513453; 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=zIGKJkINRok9lnb4oxKieDS5KJbA3Bh8LYGc06wK/Cg=; b=OxoB5yR7A9zdshxMZAW1QQMr97JeMizD/YtY/srjikdeR1KF2GrtsrOyOyNy5FNv2d8Uug wYpQ8yhNnnbVHtAkdmVxcQc4F0pmUGuxboms5O5RJ6yvnbFB5ZMIRWoC3S1jGSs/D29pNF mUfeuNQsh+UoJBdQpoM4W0DS5k/4nPKyyXvMbwW3qvBraBVS9otgnXwV/3ywcT6IxEBDCh bMTyHbWibn5G9BQqR+csse+LH66wR7y4Thhps+q0ju1NS2F305ccLinMa0Krmq6Um+KMPB KYcSUtC3Vk9xf/HoV2ZgX25fU2VtghSxCAu83xd8X/QMm40KlUoxriRqST9bYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729513453; 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=zIGKJkINRok9lnb4oxKieDS5KJbA3Bh8LYGc06wK/Cg=; b=YC8eSLFQNFaq/BagaXiA+cBJ3RhYhHivpD4KheFebT5aoklUzW1+I4SFkEo11gnhD8x0cx I4bBrVgwntXi/t8klsEYBUjJwkr7xRI4ZSVTccnysZXKpk+lytaStjZdLPMJbOkLQorDVH 9otoKV9N7sDg2Odp0oFGDAWnF5RPlCzUZJAnVvpcwJ/MyP6gn1BK/opRg8FTXJCAd0dYri ++lx0gWMTFpw8jm/j89JuQZvKyDBTD/jKkv+NM+CzXip1Vft3Ebf014fWPUhOBsqFkHjzS iDy/KLrbLa3Kz6Ct8Fv5Qik/bZ2xLO8Nb/sb4MgoHuSuHvEzDp2QIFvIhxbsVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729513453; a=rsa-sha256; cv=none; b=ZTcGuFZH7YkuijlDdsm4PrA6b+IPS3DPFQcGAZRcl/I7KRucN1tpuem+7XywDLanQRIVaH AahFEKCMWcEeQjFw37K2+R+3EOL4fGd80teZ6I3SSYBzLL7IY/iFCT54goiVq0T+q72QOP REMEvh13UZUlSyUojWZ5n46qZTXcPl5FGdux784JFduIA9Z1JbKJ7UYCdKbAqG7Dhhiq1Q XK7Mtr28m27MsDI9ciPN3n7qldu5XhoMxQHtsmhjrRRHHSFjrQ4KSBjpPBwF+T0QYLYv22 e0LSp9IMZDDNGuI3ZmXeqQysBfxxY6GJCfviYb8fKwZ9WeSr6uZVYxbgbBLZ8Q== 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 4XXDy55FF9zW64; Mon, 21 Oct 2024 12:24:13 +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 49LCOD55048784; Mon, 21 Oct 2024 12:24:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49LCODkE048781; Mon, 21 Oct 2024 12:24:13 GMT (envelope-from git) Date: Mon, 21 Oct 2024 12:24:13 GMT Message-Id: <202410211224.49LCODkE048781@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: 2b3d9ac8907f - main - arm64: Remove old I-Cache types 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b3d9ac8907fecbeb873cfb9e0d03f2c7dc18bc4 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=2b3d9ac8907fecbeb873cfb9e0d03f2c7dc18bc4 commit 2b3d9ac8907fecbeb873cfb9e0d03f2c7dc18bc4 Author: Andrew Turner AuthorDate: 2024-10-18 09:15:52 +0000 Commit: Andrew Turner CommitDate: 2024-10-21 12:23:15 +0000 arm64: Remove old I-Cache types The VPIPT and AIVIVT cache types are reserved from Armv8.0. Remove them as nothing will report these values. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D47117 --- sys/arm64/arm64/identcpu.c | 9 --------- sys/arm64/include/armreg.h | 2 -- 2 files changed, 11 deletions(-) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index 0e82381a9ac6..0f2104419aad 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -2441,12 +2441,6 @@ print_ctr_fields(struct sbuf *sb, uint64_t reg, const void *arg __unused) reg &= ~(CTR_DLINE_MASK | CTR_ILINE_MASK); switch(CTR_L1IP_VAL(reg)) { - case CTR_L1IP_VPIPT: - sbuf_printf(sb, "VPIPT"); - break; - case CTR_L1IP_AIVIVT: - sbuf_printf(sb, "AIVIVT"); - break; case CTR_L1IP_VIPT: sbuf_printf(sb, "VIPT"); break; @@ -2817,9 +2811,6 @@ identify_cache(uint64_t ctr) switch (CTR_L1IP_VAL(ctr)) { case CTR_L1IP_PIPT: break; - case CTR_L1IP_VPIPT: - icache_vmid = true; - break; default: case CTR_L1IP_VIPT: icache_aliasing = true; diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index 08a046762a58..b48441f2b413 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -388,8 +388,6 @@ #define CTR_L1IP_SHIFT 14 #define CTR_L1IP_MASK (0x3 << CTR_L1IP_SHIFT) #define CTR_L1IP_VAL(reg) ((reg) & CTR_L1IP_MASK) -#define CTR_L1IP_VPIPT (0 << CTR_L1IP_SHIFT) -#define CTR_L1IP_AIVIVT (1 << CTR_L1IP_SHIFT) #define CTR_L1IP_VIPT (2 << CTR_L1IP_SHIFT) #define CTR_L1IP_PIPT (3 << CTR_L1IP_SHIFT) #define CTR_ILINE_SHIFT 0