From nobody Thu Nov 16 22:06:10 2023 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 4SWYyV4KSdz518Yd; Thu, 16 Nov 2023 22:06:10 +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 4SWYyV1yBcz4XmJ; Thu, 16 Nov 2023 22:06:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700172370; 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=wByEWGuu3KdWc76lKdFVXeIljtMkiLGB/Ev3HGw0Re8=; b=eUzy5B2GHPonuVKFn+wghYT/DFsfz1rQVbYAhdpzvk6g/yQejfoKeGQZn2QOrWUxRQYh7k 9JQjuaWtJ5+XgDrq3wzP+3fFXb/zk+pDU6b7428d0OswBIHOJWAlkta3aiqENgg+C6Nr1n v7H+HqE34zUBWhEwUDPhENPMhKpeFKqjlShNIdPhVUfkp3OcA8MC2QShYLSzGFZn5FZU7q CmJI+TWMBcThdn5OwCAwuV+XH+I0jLWKMwVKA1JbaVEeYNF9dfXXkUHqaKoCzPQGKTRiia VHoRnEvh/mge8RkppK3aREXXwPR8+sSf4hLXJbaq+m/tGnx/1O2AU9wrPtXeOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700172370; 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=wByEWGuu3KdWc76lKdFVXeIljtMkiLGB/Ev3HGw0Re8=; b=DTIwd1WQiCYcPaY8DPLsiliA35VQWNT3dg1AOmgJhLdGpz6cbTXHr5okbxlMt7K5LIp1pg Domu4eMOz1I6PfKYL95vlyLhV9v0jaF0NB4Pv97rxUr/0CWsxoKD2mfIcYuPLn2gxmyLak rCAx+6qO6Q1Y2CBQSMYY3AbSa8K10cZuPzWB8z4mrEupn99XKgk6RAkwbgOSELnOT4jAnJ n+3NoeVKoXc9Yxx+/00uL4/NNNxR2ZMOudoxBWjPFsNVeDN7CQdgXkr/5UZ/Glgnj1sPdk oWJVCaBo+hgiSn/kvjcKcSgVCyw1gGgLwv8sIdowyhTdqMCWoIuRQcGxDZ7FMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700172370; a=rsa-sha256; cv=none; b=qYrFOk2fy5Bz/qC2luvxN1LzItkElaItv+Y6nLBdOo8jzNCkpKOAlDg5OoLgRZyyq5FFse MQmYtmNPItmXGxRtBatRddgKRAGzIbI04fsYwyIbVIRXsmn643np0vH4hnHi/7k2G77XFw 7OTpIlLeGrHA4zb6t1F5gTwghEiCDM+Q7sRDFML5qUaewCfiSMYhYSNv3gjpq+o237Y2Mv Vz2Rf4zsgk/A/DWNN6V81y6j44VlDD1Ii8lvkGG7ENruuFDU3ylCyG0Gm0eq0INWviX89+ SS+6BrDe44M50q/kgbTKvXJwAho+uyM67/g/czvnrfDBA3bcREv/1P4nzDbIKw== 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 4SWYyV0xvYz3BJ; Thu, 16 Nov 2023 22:06:10 +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 3AGM6Ad1071521; Thu, 16 Nov 2023 22:06:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AGM6APE071518; Thu, 16 Nov 2023 22:06:10 GMT (envelope-from git) Date: Thu, 16 Nov 2023 22:06:10 GMT Message-Id: <202311162206.3AGM6APE071518@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 0aa93010c571 - main - arm64: do not register elf32 brand if hardware cannot exec aarch32 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0aa93010c571b88a6402405be22745fa05a5baab Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0aa93010c571b88a6402405be22745fa05a5baab commit 0aa93010c571b88a6402405be22745fa05a5baab Author: Konstantin Belousov AuthorDate: 2023-11-16 19:45:52 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-16 22:04:40 +0000 arm64: do not register elf32 brand if hardware cannot exec aarch32 Reviewed by: imp, jrtc27 Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D42639 --- 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) {