From owner-svn-src-all@freebsd.org Wed Sep 2 09:04:09 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 472AF3D1A40; Wed, 2 Sep 2020 09:04:09 +0000 (UTC) (envelope-from andrew@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BhJ0918J7z4TH5; Wed, 2 Sep 2020 09:04:09 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0B77881DE; Wed, 2 Sep 2020 09:04:09 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 082948cn065843; Wed, 2 Sep 2020 09:04:08 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082948BO065842; Wed, 2 Sep 2020 09:04:08 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <202009020904.082948BO065842@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Wed, 2 Sep 2020 09:04:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365234 - head/sys/arm64/arm64 X-SVN-Group: head X-SVN-Commit-Author: andrew X-SVN-Commit-Paths: head/sys/arm64/arm64 X-SVN-Commit-Revision: 365234 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2020 09:04:09 -0000 Author: andrew Date: Wed Sep 2 09:04:08 2020 New Revision: 365234 URL: https://svnweb.freebsd.org/changeset/base/365234 Log: Partially revert r365069. This whitespace was intentionally added to help differentiate the different register groups within this file. While here add missing whitespace from earlier in the file, Sponsored by: Innovate UK Modified: head/sys/arm64/arm64/identcpu.c Modified: head/sys/arm64/arm64/identcpu.c ============================================================================== --- head/sys/arm64/arm64/identcpu.c Wed Sep 2 01:35:45 2020 (r365233) +++ head/sys/arm64/arm64/identcpu.c Wed Sep 2 09:04:08 2020 (r365234) @@ -82,6 +82,7 @@ sysctl_hw_machine(SYSCTL_HANDLER_ARGS) static const char machine32[] = "arm"; #endif int error; + #ifdef SCTL_MASK32 if ((req->flags & SCTL_MASK32) != 0 && adaptive_machine_arch) error = SYSCTL_OUT(req, machine32, sizeof(machine32)); @@ -188,6 +189,7 @@ static const struct cpu_parts cpu_parts_arm[] = { { CPU_PART_NEOVERSE_N1, "Neoverse-N1" }, CPU_PART_NONE, }; + /* Cavium */ static const struct cpu_parts cpu_parts_cavium[] = { { CPU_PART_THUNDERX, "ThunderX" }, @@ -263,6 +265,7 @@ struct mrs_field_value { MRS_FIELD_VALUE(13ul<< _reg ## _ ## _field ## _SHIFT, "14 "_desc "s"), \ MRS_FIELD_VALUE(14ul<< _reg ## _ ## _field ## _SHIFT, "15 "_desc "s"), \ MRS_FIELD_VALUE(15ul<< _reg ## _ ## _field ## _SHIFT, "16 "_desc "s") + #define MRS_FIELD_VALUE_END { .desc = NULL } struct mrs_field { @@ -283,6 +286,7 @@ struct mrs_field { .mask = _register ## _ ## _name ## _MASK, \ .values = (_values), \ } + #define MRS_FIELD_END { .type = MRS_INVALID, } /* ID_AA64AFR0_EL1 */ @@ -290,11 +294,13 @@ static struct mrs_field id_aa64afr0_fields[] = { MRS_FIELD_END, }; + /* ID_AA64AFR1_EL1 */ static struct mrs_field id_aa64afr1_fields[] = { MRS_FIELD_END, }; + /* ID_AA64DFR0_EL1 */ static struct mrs_field_value id_aa64dfr0_pmsver[] = { MRS_FIELD_VALUE(ID_AA64DFR0_PMSVer_NONE, ""), @@ -352,11 +358,13 @@ static struct mrs_field id_aa64dfr0_fields[] = { MRS_FIELD_END, }; + /* ID_AA64DFR1 */ static struct mrs_field id_aa64dfr1_fields[] = { MRS_FIELD_END, }; + /* ID_AA64ISAR0_EL1 */ static struct mrs_field_value id_aa64isar0_rndr[] = { MRS_FIELD_VALUE(ID_AA64ISAR0_RNDR_NONE, ""), @@ -453,6 +461,7 @@ static struct mrs_field id_aa64isar0_fields[] = { MRS_FIELD_END, }; + /* ID_AA64ISAR1_EL1 */ static struct mrs_field_value id_aa64isar1_i8mm[] = { MRS_FIELD_VALUE_NONE_IMPL(ID_AA64ISAR1, I8MM, NONE, IMPL), @@ -549,6 +558,7 @@ static struct mrs_field id_aa64isar1_fields[] = { MRS_FIELD_END, }; + /* ID_AA64MMFR0_EL1 */ static struct mrs_field_value id_aa64mmfr0_tgran4[] = { MRS_FIELD_VALUE_NONE_IMPL(ID_AA64MMFR0, TGran4, NONE, IMPL), @@ -614,6 +624,7 @@ static struct mrs_field id_aa64mmfr0_fields[] = { MRS_FIELD_END, }; + /* ID_AA64MMFR1_EL1 */ static struct mrs_field_value id_aa64mmfr1_xnx[] = { MRS_FIELD_VALUE_NONE_IMPL(ID_AA64MMFR1, XNX, NONE, IMPL), @@ -675,6 +686,7 @@ static struct mrs_field id_aa64mmfr1_fields[] = { MRS_FIELD_END, }; + /* ID_AA64MMFR2_EL1 */ static struct mrs_field_value id_aa64mmfr2_nv[] = { MRS_FIELD_VALUE_NONE_IMPL(ID_AA64MMFR2, NV, NONE, IMPL), @@ -725,6 +737,7 @@ static struct mrs_field id_aa64mmfr2_fields[] = { MRS_FIELD_END, }; + /* ID_AA64PFR0_EL1 */ static struct mrs_field_value id_aa64pfr0_csv3[] = { MRS_FIELD_VALUE(ID_AA64PFR0_CSV3_NONE, ""), @@ -831,6 +844,7 @@ static struct mrs_field id_aa64pfr0_fields[] = { MRS_FIELD(ID_AA64PFR0, EL0, false, MRS_LOWER, id_aa64pfr0_el0), MRS_FIELD_END, }; + /* ID_AA64PFR1_EL1 */ static struct mrs_field_value id_aa64pfr1_bt[] = {