From nobody Wed Jun 25 09:25:40 2025 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 4bRxJ44m8Pz5yn9T; Wed, 25 Jun 2025 09:25:40 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bRxJ43CJPz3MYl; Wed, 25 Jun 2025 09:25:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750843540; 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=h7K+ZeQmex+RBgD075gi6C7yUAajW35KAPH2MGEH4ew=; b=tglNJ3jDsggIWYnTfYOiFOi5S6YTVP9hJOwfJw1+Z+emfpN2InVV37zdq9XmGlE/Wbu8l6 +A99yOzIojRua5PHGZL3agHuBmHk5qHCPOTM+dDKxeWMvoaAAbu+jazgJ8p0698WDzh6Sr vgPZCZA3Br+nacL3TrkeK3GglhqG5JqYlLFVGZF92hEBe4mkIPrkx/M37rSbubkCguKvO/ 0M6R3gIENelJhNj4bPkbWkIyeWRS2pFcF+PKqhDwuzuNRdJckvi7KRsCG3uEd/VP9c/Muc Z5dQSiBKCA82WdrgOjqWrHob1l7TOhGIVqLoXrR6jCrIuife7frq/B34BtSwEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750843540; 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=h7K+ZeQmex+RBgD075gi6C7yUAajW35KAPH2MGEH4ew=; b=TvS/il/e0EudLx0BwTn0b+4Yn5h1J7aZd2dfb23hzaYktA5EWw3A7WNBs06Ug+q3dhJvDk JX/gSz2VRevaHM0NKcxoyPie9bYjnOGxvdShzqsDs5DWL2EwcMThJxIDssLU7q6P9n0rEP 1ajc1Kb1JsqVZYPdFeQ730Wex+qeifBR8qbTSzXvIhQrRmsWxS3bw8HPd7wYA21fYluR/N 31B+VRvyysKwOJzD+O79TGB5ImY4dBl/EqhBEQhFP1S452sXroedXCI4dQ03LQrSK3KgUQ VFLllfJDmWr66nfia2kUz3vBa/c/1rsgbv9G4bwr0Dz3mzRjQPfOJeoPBluAxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750843540; a=rsa-sha256; cv=none; b=u0RF6ePAhD4tf8qqefbYlnjBGyI8jSEK+pioLYwNXk2AZD3RtXBQMGq6/Ik5dUQHc17L7E Z8euR7MBmujZXxyiAklHyRtiPy8BlP2e+JKrZ+rMeIKYEnOC3HV1BwNCb4izG5TRaJ++3S sSvfFOhoMV3KFXGfkmBrsojH+KYCCuyTR+676p/UJP70q7BMbxXwQUfmJ0Lbb66tcrEqt9 xkApITg+2YlsXNZfJtrNDq8Q6UMFwIkEieLhqr8EFe1m63xyOTRdq1TMZxmMdKwcOXDLjy u1GVRuBjJV5aotpXPilU12mxN8v3rkhbNFXgI7J1IpDZol/RYy4FBc3kwUskgA== 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 4bRxJ42X8xz1QBx; Wed, 25 Jun 2025 09:25:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55P9PeRf077261; Wed, 25 Jun 2025 09:25:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55P9PeMI077257; Wed, 25 Jun 2025 09:25:40 GMT (envelope-from git) Date: Wed, 25 Jun 2025 09:25:40 GMT Message-Id: <202506250925.55P9PeMI077257@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: fc04d82226e5 - main - arm64: Add AT_HWCAP3 and AT_HWCAP4 support 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: fc04d82226e5844fcf57d681b711e47e38b5f7c4 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=fc04d82226e5844fcf57d681b711e47e38b5f7c4 commit fc04d82226e5844fcf57d681b711e47e38b5f7c4 Author: Andrew Turner AuthorDate: 2025-06-24 14:57:08 +0000 Commit: Andrew Turner CommitDate: 2025-06-24 16:26:40 +0000 arm64: Add AT_HWCAP3 and AT_HWCAP4 support The adds the parts needed to export the new AT_HWCAP3 and 4 from the kernel. Reviewed by: brooks, imp, kib Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D51008 --- sys/arm64/arm64/elf_machdep.c | 8 ++++++-- sys/arm64/include/md_var.h | 4 ++++ sys/arm64/linux/linux.h | 2 +- sys/arm64/linux/linux_sysvec.c | 6 ++++-- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/sys/arm64/arm64/elf_machdep.c b/sys/arm64/arm64/elf_machdep.c index 6ca8a711839f..970dba0ca7d9 100644 --- a/sys/arm64/arm64/elf_machdep.c +++ b/sys/arm64/arm64/elf_machdep.c @@ -57,9 +57,13 @@ u_long __read_frequently elf_hwcap; u_long __read_frequently elf_hwcap2; +u_long __read_frequently elf_hwcap3; +u_long __read_frequently elf_hwcap4; /* TODO: Move to a better location */ u_long __read_frequently linux_elf_hwcap; u_long __read_frequently linux_elf_hwcap2; +u_long __read_frequently linux_elf_hwcap3; +u_long __read_frequently linux_elf_hwcap4; struct arm64_addr_mask elf64_addr_mask; @@ -101,8 +105,8 @@ static struct sysentvec elf64_freebsd_sysvec = { .sv_trap = NULL, .sv_hwcap = &elf_hwcap, .sv_hwcap2 = &elf_hwcap2, - .sv_hwcap3 = NULL, - .sv_hwcap4 = NULL, + .sv_hwcap3 = &elf_hwcap3, + .sv_hwcap4 = &elf_hwcap4, .sv_onexec_old = exec_onexec_old, .sv_protect = arm64_exec_protect, .sv_onexit = exit_onexit, diff --git a/sys/arm64/include/md_var.h b/sys/arm64/include/md_var.h index f9aaaeba7306..da136ff091db 100644 --- a/sys/arm64/include/md_var.h +++ b/sys/arm64/include/md_var.h @@ -37,8 +37,12 @@ extern char sigcode[]; extern int szsigcode; extern u_long elf_hwcap; extern u_long elf_hwcap2; +extern u_long elf_hwcap3; +extern u_long elf_hwcap4; extern u_long linux_elf_hwcap; extern u_long linux_elf_hwcap2; +extern u_long linux_elf_hwcap3; +extern u_long linux_elf_hwcap4; #ifdef COMPAT_FREEBSD32 extern u_long elf32_hwcap; extern u_long elf32_hwcap2; diff --git a/sys/arm64/linux/linux.h b/sys/arm64/linux/linux.h index d612ba8e5d9e..00a70fabc54f 100644 --- a/sys/arm64/linux/linux.h +++ b/sys/arm64/linux/linux.h @@ -77,7 +77,7 @@ typedef struct { #define l_fd_set fd_set /* Miscellaneous */ -#define LINUX_AT_COUNT 21 /* Count of used aux entry types. +#define LINUX_AT_COUNT 23 /* Count of used aux entry types. * Keep this synchronized with * linux_copyout_auxargs() code. */ diff --git a/sys/arm64/linux/linux_sysvec.c b/sys/arm64/linux/linux_sysvec.c index 13c42e061094..084b7a11b01f 100644 --- a/sys/arm64/linux/linux_sysvec.c +++ b/sys/arm64/linux/linux_sysvec.c @@ -156,6 +156,8 @@ linux64_arch_copyout_auxargs(struct image_params *imgp, Elf_Auxinfo **pos) AUXARGS_ENTRY((*pos), LINUX_AT_SYSINFO_EHDR, linux_vdso_base); AUXARGS_ENTRY((*pos), LINUX_AT_HWCAP, *imgp->sysent->sv_hwcap); AUXARGS_ENTRY((*pos), LINUX_AT_HWCAP2, *imgp->sysent->sv_hwcap2); + AUXARGS_ENTRY((*pos), LINUX_AT_HWCAP3, *imgp->sysent->sv_hwcap3); + AUXARGS_ENTRY((*pos), LINUX_AT_HWCAP4, *imgp->sysent->sv_hwcap4); AUXARGS_ENTRY((*pos), LINUX_AT_PLATFORM, PTROUT(linux_platform)); } @@ -458,8 +460,8 @@ struct sysentvec elf_linux_sysvec = { .sv_trap = NULL, .sv_hwcap = &linux_elf_hwcap, .sv_hwcap2 = &linux_elf_hwcap2, - .sv_hwcap3 = NULL, - .sv_hwcap4 = NULL, + .sv_hwcap3 = &linux_elf_hwcap3, + .sv_hwcap4 = &linux_elf_hwcap4, .sv_onexec = linux_on_exec_vmspace, .sv_onexit = linux_on_exit, .sv_ontdexit = linux_thread_dtor,