From nobody Wed Feb 5 14:50:46 2025 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 4Yp37p3Hgrz5ms3H; Wed, 05 Feb 2025 14:50:46 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yp37p1b6vz3b62; Wed, 05 Feb 2025 14:50:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738767046; 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=755eyM6/jA5YfQFmHOzC+rKnJHph8bI3uoQCTDQQooQ=; b=qvaOLglrmdmEHnBhuyjyV7R2RLX5UZqkmckG41/1yDBM8Akf4ONITIC19KoUXv1OWs0Ukg xMwdZfgx/lJtnxWtoTkJgkdI6hxpzINl4vxFqpRVYZDAp765mnJFHKc1ule3RKXJtysktZ ZYH0fiBQ6ug45d7+LyCrkBvmHn7zHV9R+IxgUDo4hNrRjrJlAlz++Kbgtj389Sal6/PoGF BsUNayxZefFa8/dZ6f5aE45tAstGsZq5lJspzqdTg1R8PlAwc1psE/n8fcp3wOk0YP3AXL iBM7WTI65abCNMH+sbuvyWm4nlBY4QQrp927iJmREwvO7/gEhRMH19AMLM9yvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738767046; 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=755eyM6/jA5YfQFmHOzC+rKnJHph8bI3uoQCTDQQooQ=; b=wS3MI5ejTOamEuEEIf0i/VXgt3xQdWeamQz3QXiL1tubNR7Xc2JPNUowXgZuaBIEKz9Iv9 8HDOBCws1FwXAIm9vmk3j5HXAR3d/9aLNfiljhOkVJDnUZcy0o7nlCyqQYYcggYFYTtc5o qvq6XI3meLtPKtJx1pmOn+xehBruEwVIrEntKSB29pk49kf8uBoalnsJnsTsW/Q+F7vTFH bMo+UXD9cFGPb5XM2nn4Ul2HhndLDyJny67UtIgIkZhBVAjw9uTPgmd+baTmwtvxnrLePf Mszq+TrWCi8mK7OtG3L2+6kp1dm2QIxORAE6JUqUqaLptzK/ToEFhXA6vzB+TA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738767046; a=rsa-sha256; cv=none; b=GD2cOyBoYEwj4TO+lLvJR4nB0X9xmsmuRibYDcMkIBTAoBQlqChHU872B2S84/iLg/uUG7 IXP9AeJG+3hMSr1s6E0aF6UjqPRj8kCDOGKQf1avK5G0yt9siNfxK6egLadjmA1WHqA98m h1Y1HR5G4ot6CdsQg4XpvX83Ag2s+Kc3uTlVtM9RVj18pw12UZSoBiA2oPum4PUWqiwZ9B i1sQEZRyQyMhh+tMErnxdRx9GuJyBZLF1ztqGM+AU2UjKrgf7T8Mi3dwSexLpXEmzFBCkV AbckoyhLSD71W1R2aHLPGkydj7/IStapeqwDMasbdF7YA5Ky9JZK3AgGzWZZtg== 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 4Yp37p18cDzwjr; Wed, 05 Feb 2025 14:50:46 +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 515Eokh3016968; Wed, 5 Feb 2025 14:50:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515EokGH016958; Wed, 5 Feb 2025 14:50:46 GMT (envelope-from git) Date: Wed, 5 Feb 2025 14:50:46 GMT Message-Id: <202502051450.515EokGH016958@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 856d3167995a - main - arm64: Hook up efi_rt_arch_call in efirt.ko 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 856d3167995a5c9e1fc69a69ad393ab9e552c420 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=856d3167995a5c9e1fc69a69ad393ab9e552c420 commit 856d3167995a5c9e1fc69a69ad393ab9e552c420 Author: John Baldwin AuthorDate: 2025-02-05 14:50:15 +0000 Commit: John Baldwin CommitDate: 2025-02-05 14:50:15 +0000 arm64: Hook up efi_rt_arch_call in efirt.ko Note that this requires marking efi_rt_fault as a non-preemptible local symbol. Co-authored-by: Jessica Clarke Reviewed by: imp, andrew Obtained from: CheriBSD Fixes: d7f930b80e89 ("arm64: Implement efi_rt_arch_call") Differential Revision: https://reviews.freebsd.org/D48715 --- sys/arm64/arm64/efirt_support.S | 4 ++-- sys/modules/efirt/Makefile | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/sys/arm64/arm64/efirt_support.S b/sys/arm64/arm64/efirt_support.S index b7bef7500ee4..994380f1691e 100644 --- a/sys/arm64/arm64/efirt_support.S +++ b/sys/arm64/arm64/efirt_support.S @@ -85,7 +85,7 @@ ENTRY(efi_rt_arch_call) ret END(efi_rt_arch_call) -ENTRY(efi_rt_fault) +LENTRY(efi_rt_fault) /* Clear pcb_onfault */ SET_FAULT_HANDLER(xzr, x11) /* Load curthread */ @@ -96,6 +96,6 @@ ENTRY(efi_rt_fault) /* Normal exit returning an error */ ldr x0, =EFAULT b .Lefi_rt_arch_call_exit -END(efi_rt_fault) +LEND(efi_rt_fault) GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL) diff --git a/sys/modules/efirt/Makefile b/sys/modules/efirt/Makefile index 2befdcb7dd8d..4738996fd4e6 100644 --- a/sys/modules/efirt/Makefile +++ b/sys/modules/efirt/Makefile @@ -4,16 +4,17 @@ KMOD= efirt SRCS= efirt.c efirt_machdep.c efidev.c SRCS+= efirtc.c +SRCS+= efirt_support.S SRCS+= device_if.h bus_if.h clock_if.h +DPSRCS+= assym.inc .if ${MACHINE_CPUARCH} == "amd64" SRCS+= opt_hwpmc_hooks.h opt_kstack_pages.h -SRCS+= efirt_support.S -DPSRCS+= assym.inc +.endif + efirt_support.o: efirt_support.S assym.inc ${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \ ${.IMPSRC} -o ${.TARGET} -.endif EXPORT_SYMS= YES