From nobody Tue Nov 15 17:31:59 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 4NBYC32h7Zz4hK2q; Tue, 15 Nov 2022 17:31:59 +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 4NBYC32Fyzz42FZ; Tue, 15 Nov 2022 17:31:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668533519; 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=T0nEFmfgwYHEA/qqI8k9sNfuOKR/KR+27DQloAtTN+A=; b=nwb+GtkKJXhREKYAxe++kFU6N7A7K6rwCGqDx3qQvNCG5ut3+QWJaEd6wlBbwh/XYIck14 mOcEvXal1MyOBYEwaDeWe6e5M/BPkxZaHFgtg6VZhCeuPlO+C/ERrQj7+TuxpeGAKDCm4A p4K1FKux0kKBlhgaMyeMJszzQok6h1bzUMHooTbNgu/X0JAIebSI3VxkjVwVRgUshywZ7+ 5LamgSnh98PYqeNiU31H8+h1/8mKrosXBX+M8C4jhaiKaaB/cdeOE9VrJYdIa6P9A3zv4W 4v6x8CwA+LdwskQgY0ExXe8kE/bjqBcuEEzw09XVNu+M1PCFo0Yg8cB7rMjvVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668533519; 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=T0nEFmfgwYHEA/qqI8k9sNfuOKR/KR+27DQloAtTN+A=; b=Ru0IX9UU/yaPfGPRA7zEs6cb9AdNGwPyCR1De99Ys9BE556N87kxNNZ4c0zmYvsKCIdEzX pCDecQaFjoNW8w62yLnYwgGtz3ytuLVzCgMA6xTUL/pcB559L7ryylPN/0rO660m1FRL2Q zvxmWk5yzUlb/ZyjPBdcqwx8+34hRUKSvFZ9tmpJVbbsdZ1F9mLw0v83Yu210iWmxSNhZZ nh7wpWSwwXIwt/SMPbuaqkizgQD3cCnJQ5lkl4CAQzTYXHLonyfLDwSfGHFj3dPAKyRPpQ 0TidKOgomLJ81vaMKoOZFAy8NLrLU6kgQDWuz3GwjQudXIuymSOBQWuVMPDxOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668533519; a=rsa-sha256; cv=none; b=khc2SbVWKIWU1aG4ctf/FQgkX0jDJ0TIFvBpReDaldPTYCqe9skDWIg+H9SxE3e0PS432z hM9WMjNgBm282wB/05G6mCjijEBELbErwMtqM81Q/U6cT7BK/7r9FTpyWsY14FzmkWPTpl /2L/CNdWGURbEgPlJK60/voWxdOKjMY6Sw00yI4qNg9mz2WTW1cQ50RQGaX4pTkRM1UMaL I1W343LR++MEHD03Y2xrQmOTIbhXst3a+pmjAjMqK6gTuCMYo0ZtY2EH+Dnc7VOoy164A7 SOCY+4BxurCiO9BVTcTn53wY4qZeE0/3HOQtLvrv1KOUEJlBL09prjbu6cMcvA== 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 4NBYC31HgWzWFm; Tue, 15 Nov 2022 17:31:59 +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 2AFHVxCh013031; Tue, 15 Nov 2022 17:31:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AFHVxJl013030; Tue, 15 Nov 2022 17:31:59 GMT (envelope-from git) Date: Tue, 15 Nov 2022 17:31:59 GMT Message-Id: <202211151731.2AFHVxJl013030@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: 80ba994bfacd - main - Add the arch field to the arm64 MIDR macros 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: 80ba994bfacd8a843af4eb9cb7558b62e8de26ee Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=80ba994bfacd8a843af4eb9cb7558b62e8de26ee commit 80ba994bfacd8a843af4eb9cb7558b62e8de26ee Author: Andrew Turner AuthorDate: 2022-11-14 15:48:43 +0000 Commit: Andrew Turner CommitDate: 2022-11-15 17:26:52 +0000 Add the arch field to the arm64 MIDR macros For completeness add accessors for the MIDR field. As the field is always 0xf on arm64 it is unneeded in the current MICR handling, but will be used in the vmm module for bhyve. Obtained from: https://github.com/FreeBSD-UPB/freebsd-src (earlier version) Sponsored by: The FreeBSD Foundation --- sys/arm64/include/cpu.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/arm64/include/cpu.h b/sys/arm64/include/cpu.h index 7dee5fa4cd25..2318c9d54cf3 100644 --- a/sys/arm64/include/cpu.h +++ b/sys/arm64/include/cpu.h @@ -129,16 +129,19 @@ #define CPU_IMPL(midr) (((midr) >> 24) & 0xff) #define CPU_PART(midr) (((midr) >> 4) & 0xfff) #define CPU_VAR(midr) (((midr) >> 20) & 0xf) +#define CPU_ARCH(midr) (((midr) >> 16) & 0xf) #define CPU_REV(midr) (((midr) >> 0) & 0xf) #define CPU_IMPL_TO_MIDR(val) (((val) & 0xff) << 24) #define CPU_PART_TO_MIDR(val) (((val) & 0xfff) << 4) #define CPU_VAR_TO_MIDR(val) (((val) & 0xf) << 20) +#define CPU_ARCH_TO_MIDR(val) (((val) & 0xf) << 16) #define CPU_REV_TO_MIDR(val) (((val) & 0xf) << 0) #define CPU_IMPL_MASK (0xff << 24) #define CPU_PART_MASK (0xfff << 4) #define CPU_VAR_MASK (0xf << 20) +#define CPU_ARCH_MASK (0xf << 16) #define CPU_REV_MASK (0xf << 0) #define CPU_ID_RAW(impl, part, var, rev) \