From nobody Thu Nov 23 04:01:01 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 4SbPY9307Nz51C75; Thu, 23 Nov 2023 04:01:01 +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 4SbPY92W5Qz4Nwh; Thu, 23 Nov 2023 04:01:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700712061; 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=c/wucx1diwwKRokDWAWq1oEfWXdh256o4iBi91tGQ/U=; b=vpgyjw0peYq6jo3KA3KZCgUqroDqDTtcmbipo0jsfH+OZDPWxmigszwI1zo4z3sqsg9yec 6kTGR7x7I3oPsk/lQg5B5Da3nBjYjlLt4VO4k8BINqzKrMMhWOMWil/uUWqcuz3FRGu8sH XfKWVnm+KTCfV2p1o0+e/1xFPc6Puj71rvwRYsFchIcIiazd11xLrl5XGB+uoYcefcblp/ Ed2RCsqUFlh822ek2NTMnnUEkUBsUAj7oYxgW8irkoM5wk84x5+tvhzp2DrWnkydKNaJTN HtqmcmnugOr8im7jQIixoDpZA/uSCCUFzTr9ZQj9SJNIEPA+xo50yuynxxA60g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700712061; 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=c/wucx1diwwKRokDWAWq1oEfWXdh256o4iBi91tGQ/U=; b=iomgxsgkyAI2BfcCgpAa7AQAEievRWvku/jr6vVeSEqo360Y6IWgWj38IyU7CbbWnl+RID JSx0yT7NlKexBfAnlhGRdP/liIXck2CQ4O8qMTNHM41RR3NTQC6oKXa/LE4zYl7cUK3ZKZ S+mD+Ta7iPOd3Qdyk1SAykvVnWp4YsTlLCQBxHi46q+S0jsfOjL83H1D4KC/v4J6jNNLEm Z/lbh0VRX0QsX42K0Gr/kLK32cuHBbnKm1jqt8iJ3YKrqYu6hfsvlxcOWw1+abNvT/sOjE vwgUyMekk7cwpLP74A/Zg1LW/8LJH6C2TWm8gJWgaC47NPt1GJ1knOnJbRUF9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700712061; a=rsa-sha256; cv=none; b=o2vUKYVWSso6O8DyEYPk9xSkHEwJo8nzWgcxlBvmqbhMGNhqNLlnahL+okcCcpVJegJ8Ux WWe2hQuMFL5sOMQCGeUfkNVu1W0xb9FjNO/cElale5/5Q03oMcSDRDBxhf44a8TlcfI6up JywzdkpHwEq/U+XUqNpfy4EZbffZKc0QTXG4RGjKHk3mBeclSB1QGkkXWckV4un4Z543OL cpuyPNWFpp9xOzkPT598QFWpbEKHSyOWeldRPGUwKI37WoTrG4dg6ksLz1wtRg78isj/0Y k695J9XHWw7G5dPcCmv9u0jElPAHyye6zlAX/AfuI92wDG9SoAetesU/gcs2dg== 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 4SbPY91ZJZzmbM; Thu, 23 Nov 2023 04:01:01 +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 3AN411rd098597; Thu, 23 Nov 2023 04:01:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AN411OM098594; Thu, 23 Nov 2023 04:01:01 GMT (envelope-from git) Date: Thu, 23 Nov 2023 04:01:01 GMT Message-Id: <202311230401.3AN411OM098594@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 5889b1f052fe - stable/14 - arm64: do not register elf32 brand if hardware cannot exec aarch32 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5889b1f052fef73cd75dbb71e05d855fa8a10bb4 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5889b1f052fef73cd75dbb71e05d855fa8a10bb4 commit 5889b1f052fef73cd75dbb71e05d855fa8a10bb4 Author: Konstantin Belousov AuthorDate: 2023-11-16 19:45:52 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-23 04:00:36 +0000 arm64: do not register elf32 brand if hardware cannot exec aarch32 (cherry picked from commit 0aa93010c571b88a6402405be22745fa05a5baab) --- sys/arm64/arm64/elf32_machdep.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/sys/arm64/arm64/elf32_machdep.c b/sys/arm64/arm64/elf32_machdep.c index 26aa2cddfdb2..4acb68b09108 100644 --- a/sys/arm64/arm64/elf32_machdep.c +++ b/sys/arm64/arm64/elf32_machdep.c @@ -153,8 +153,16 @@ static Elf32_Brandinfo freebsd32_brand_info = { .header_supported= elf32_arm_abi_supported, }; -SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_FIRST, - (sysinit_cfunc_t)elf32_insert_brand_entry, &freebsd32_brand_info); +static void +register_elf32_brand(void *arg) +{ + /* Check if we support AArch32 */ + if (ID_AA64PFR0_EL0_VAL(READ_SPECIALREG(id_aa64pfr0_el1)) == + ID_AA64PFR0_EL0_64_32) { + elf32_insert_brand_entry(&freebsd32_brand_info); + } +} +SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_FIRST, register_elf32_brand, NULL); static bool elf32_arm_abi_supported(struct image_params *imgp, int32_t *osrel __unused, @@ -162,11 +170,6 @@ elf32_arm_abi_supported(struct image_params *imgp, int32_t *osrel __unused, { const Elf32_Ehdr *hdr; - /* Check if we support AArch32 */ - if (ID_AA64PFR0_EL0_VAL(READ_SPECIALREG(id_aa64pfr0_el1)) != - ID_AA64PFR0_EL0_64_32) - return (false); - #define EF_ARM_EABI_FREEBSD_MIN EF_ARM_EABI_VER4 hdr = (const Elf32_Ehdr *)imgp->image_header; if (EF_ARM_EABI_VERSION(hdr->e_flags) < EF_ARM_EABI_FREEBSD_MIN) {