From nobody Thu Aug 3 18:14:35 2023 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 4RGxnm0Dkbz4TmDW; Thu, 3 Aug 2023 18:14:36 +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 4RGxnl6pfdz4pM9; Thu, 3 Aug 2023 18:14:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691086476; 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=UxsRhNX46E2/AEUWOmknrJfzhvYM/Om9r1nCwmUo/3Q=; b=PGxfXvjstiuttRdF4LTzT308wf+j0t/p6XgRNgHtJuU1Sx76spaW7VyyEHDYRgmJlxWPF1 EEF0Ty8t4P9UNBzhE4L8otKJ1RV8R1cf4D05Fhs4cWQEoha2tAFN9KA9k0mlItqROrEamP 4ruF4ZCfgqvby1NMNENvS1RUfaG5nNp/sDCs64gmOqrbwlik7H09lHGeDwf1z6YsnCuMqw 4u9sZu+3qWLY22A7fRSg83mf5O1LdiF8I8langKG+Z1KQiaAp34IdPr7BVc95GOBwW7sZ5 ZCvVLaLnS0KrCi3HyJWnlxJh/koumwRww1fnOkwqSfk5/aLehlxWkFMg+q9W4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691086476; 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=UxsRhNX46E2/AEUWOmknrJfzhvYM/Om9r1nCwmUo/3Q=; b=kV07C/fX6tPuTDtT3ZrI6J07vMqUEmzcY0+MAoigarvGA3dR9JHInPEZWwzs1qj2C1iBKj M8w9D7lNCOYq5WktTo0g0M2MXhqfUgT+Zhzk0ItofuTBp4qqCzXqlZyi6rbv++2XdPa+vl bczVwIph0Anj5I9dWQ3kZsFSHkV+HxXZhGkmyDALl/db535eH/brge9MjrzB72S2Sh6LJ4 0f3rGByUJHUlqISlZDgPpX+BY3wP7JgOWFb5A/ly7cKfLH2JttRRqee4c5AP3HI93GfGtQ JrH9+Kaz27ilKD0744ScJTacaCEU71Q5V2m/nw6xkFVL2/oVRijjE2qWxiUzFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691086476; a=rsa-sha256; cv=none; b=B7/I16fotfz0UGTe479P7y+T3+5nL4OIAIFQv6oKinX54+jD7m/Jell7btMjChRijJorko Tho4JnEBpYTjtx89d4OwYTK7m2sAwYIIQH9sVcbfOlp+wK9As8Ic3bFOoLDcGiBvyiqWXL WvVYUGHXZaWivlZLY8R9XZbTdavRSxwnNKuA+dvOMfrza4DOYNomNalPHhGBYpM0UvzhUG Cc7Lub/pjj2xHFVrCvUgiYEF48kaYwQtw67Bjf++IbQelpFO+VU2AytjiClSTgTNrKu6t0 UZkNT61qeDiNE8VTvwuUn8rnNX3cFIuybEnaKyFSgJxLVlxDtCm0FDXmL5W6qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RGxnl5X54zVf8; Thu, 3 Aug 2023 18:14:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 373IEZRW005173; Thu, 3 Aug 2023 18:14:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373IEZpr005172; Thu, 3 Aug 2023 18:14:35 GMT (envelope-from git) Date: Thu, 3 Aug 2023 18:14:35 GMT Message-Id: <202308031814.373IEZpr005172@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: f12952eaeeba - main - arm64: Comment out some ID registers 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: f12952eaeeba706725d888a46ff24baa2ac420d7 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=f12952eaeeba706725d888a46ff24baa2ac420d7 commit f12952eaeeba706725d888a46ff24baa2ac420d7 Author: Andrew Turner AuthorDate: 2023-08-03 18:02:25 +0000 Commit: Andrew Turner CommitDate: 2023-08-03 18:13:17 +0000 arm64: Comment out some ID registers Older toolchains don't support reading these registers. Until a fix is added comment them out. Reported by: jhb Sponsored by: Arm Ltd --- sys/arm64/arm64/identcpu.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index 2347d27c69e1..4beb34b04381 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -139,11 +139,15 @@ struct cpu_desc { uint64_t id_aa64mmfr0; uint64_t id_aa64mmfr1; uint64_t id_aa64mmfr2; +#ifdef NOTYET uint64_t id_aa64mmfr3; uint64_t id_aa64mmfr4; +#endif uint64_t id_aa64pfr0; uint64_t id_aa64pfr1; +#ifdef NOTYET uint64_t id_aa64pfr2; +#endif uint64_t id_aa64zfr0; uint64_t ctr; #ifdef COMPAT_FREEBSD32 @@ -1268,6 +1272,7 @@ static const struct mrs_field id_aa64mmfr2_fields[] = { }; +#ifdef NOTYET /* ID_AA64MMFR2_EL1 */ static const struct mrs_field_value id_aa64mmfr3_spec_fpacc[] = { MRS_FIELD_VALUE_NONE_IMPL(ID_AA64MMFR3, Spec_FPACC, NONE, IMPL), @@ -1303,6 +1308,7 @@ static const struct mrs_field id_aa64mmfr3_fields[] = { static const struct mrs_field id_aa64mmfr4_fields[] = { MRS_FIELD_END, }; +#endif /* ID_AA64PFR0_EL1 */ @@ -1543,10 +1549,12 @@ static const struct mrs_field id_aa64pfr1_fields[] = { }; +#ifdef NOTYET /* ID_AA64PFR2_EL1 */ static const struct mrs_field id_aa64pfr2_fields[] = { MRS_FIELD_END, }; +#endif /* ID_AA64ZFR0_EL1 */ @@ -1846,12 +1854,16 @@ static const struct mrs_user_reg user_regs[] = { USER_REG(ID_AA64MMFR0_EL1, id_aa64mmfr0), USER_REG(ID_AA64MMFR1_EL1, id_aa64mmfr1), USER_REG(ID_AA64MMFR2_EL1, id_aa64mmfr2), +#ifdef NOTYET USER_REG(ID_AA64MMFR3_EL1, id_aa64mmfr3), USER_REG(ID_AA64MMFR4_EL1, id_aa64mmfr4), +#endif USER_REG(ID_AA64PFR0_EL1, id_aa64pfr0), USER_REG(ID_AA64PFR1_EL1, id_aa64pfr1), +#ifdef NOTYET USER_REG(ID_AA64PFR2_EL1, id_aa64pfr2), +#endif USER_REG(ID_AA64ZFR0_EL1, id_aa64zfr0), @@ -2560,10 +2572,12 @@ print_cpu_features(u_int cpu, struct cpu_desc *desc, print_id_register(sb, "Processor Features 1", desc->id_aa64pfr1, id_aa64pfr1_fields); +#ifdef NOTYET /* AArch64 Processor Feature Register 2 */ if (SHOULD_PRINT_REG(id_aa64pfr2)) print_id_register(sb, "Processor Features 2", desc->id_aa64pfr2, id_aa64pfr2_fields); +#endif /* AArch64 Memory Model Feature Register 0 */ if (SHOULD_PRINT_REG(id_aa64mmfr0)) @@ -2580,6 +2594,7 @@ print_cpu_features(u_int cpu, struct cpu_desc *desc, print_id_register(sb, "Memory Model Features 2", desc->id_aa64mmfr2, id_aa64mmfr2_fields); +#ifdef NOTYET /* AArch64 Memory Model Feature Register 3 */ if (SHOULD_PRINT_REG(id_aa64mmfr3)) print_id_register(sb, "Memory Model Features 3", @@ -2589,6 +2604,7 @@ print_cpu_features(u_int cpu, struct cpu_desc *desc, if (SHOULD_PRINT_REG(id_aa64mmfr4)) print_id_register(sb, "Memory Model Features 4", desc->id_aa64mmfr4, id_aa64mmfr4_fields); +#endif /* AArch64 Debug Feature Register 0 */ if (SHOULD_PRINT_REG(id_aa64dfr0)) @@ -2704,11 +2720,15 @@ identify_cpu(u_int cpu) desc->id_aa64mmfr0 = READ_SPECIALREG(id_aa64mmfr0_el1); desc->id_aa64mmfr1 = READ_SPECIALREG(id_aa64mmfr1_el1); desc->id_aa64mmfr2 = READ_SPECIALREG(id_aa64mmfr2_el1); +#ifdef NOTYET desc->id_aa64mmfr3 = READ_SPECIALREG(id_aa64mmfr3_el1); desc->id_aa64mmfr4 = READ_SPECIALREG(id_aa64mmfr4_el1); +#endif desc->id_aa64pfr0 = READ_SPECIALREG(id_aa64pfr0_el1); desc->id_aa64pfr1 = READ_SPECIALREG(id_aa64pfr1_el1); +#ifdef NOTYET desc->id_aa64pfr2 = READ_SPECIALREG(id_aa64pfr2_el1); +#endif /* * ID_AA64ZFR0_EL1 is only valid when at least one of: