From nobody Wed Jan 01 10:38:14 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 4YNRBb6l5yz5jkJY; Wed, 01 Jan 2025 10:38:15 +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 4YNRBb1D6Cz4gs8; Wed, 1 Jan 2025 10:38:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735727895; 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=ZpNuV96QA/pK6G6B0dj7PvsPjImHY8NvTOW+fE090+w=; b=tLpC7k4LL01W+kiH51RQa2Qk6DVio68+MzyXH0tNDys4eLyGpkKnrs03dnMrZeRivKGEYq kNjKa1u5F3w3v+QvDgPtD8nvm7bvY/fHMs55GoAoEVbGnigVyIzE9v4o3no5Gg2bnE4pkL iBBZBQKIqg2K2FzCZqXKcU3PcbsslGqhYXtWKH2a8buxrQpYykAqm4I+vT2ZPdDgH1T8Q6 PbGd+8OjDSVZ04q0MSdqEcDFfpreewTvczNMLBlTu0mEAHqKIlV3SrVgf94dRF3Rz0CKZ3 NNA9S9UZsKdrG8DOVY2HtNWazTQjXXJ9tCpdknm/aTfwkzmP5NG7GnlwnI6vsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735727895; 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=ZpNuV96QA/pK6G6B0dj7PvsPjImHY8NvTOW+fE090+w=; b=el2fp5VPpfO8JLWa+ZNaAYyhPTxWIg5oFaLvCqBrULAdMiV7sEdolrXdqJfuGZdgCpGdz1 5/5SJOaRr+UNW1gp7Wq3qep8l1h3M5GWcKIUbGtA545s+PHFXm80hKh6jIu6pr33c/K24r Ng9uvZuK+qCrLe5KKFOdd3eSrQcd0jCdBjJH1q013kFxHFLGH9I3brUIN3nxgGxxtORlbl DlKDgGog0sj9YeG8Um+YhEiaXo+4saira0YNeYrLmyHS02+n/wjgCy7gflfIQZs54bf6NW OqPqpNjriMw5iAkIAcx32KtWZh11DwudeuwSzGQk4UzQZyJ/IAi9hBtMuoRiww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735727895; a=rsa-sha256; cv=none; b=o4U8Z/0WtefsYuNoKix1NgR+FRn6pEIUAn8am09NfqmqMIvzgDJ6jKnZ+4z9PKnQXP+8bK 0AuHLUfkQG39w7/GLYpYccQFY/NRiTJCQwROmbefiVQDC3fNG8LhCAbryaXeQSCvRxrS8U YxVkBxtojmiejgRmWqhrXvjdY6YNnBn+aNfqSMNYO/zaApb3TsrceepdBE0z3kNleoNlu2 8YFrtFrmlDaAlmS1aALAc77oGFdC5kKNpEVP48+3xKgEz9AkHY3BctUBQsACAE0vEN2vgR 7UcBpQccKD2zcOwaKZVZenTeut3BvQURZcybcnpQuVgYvK5Vs2/57x9dMyeLoA== 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 4YNRBb0VWTzLCm; Wed, 1 Jan 2025 10:38:14 +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 501AcEOx078880; Wed, 1 Jan 2025 10:38:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 501AcEcp078877; Wed, 1 Jan 2025 10:38:14 GMT (envelope-from git) Date: Wed, 1 Jan 2025 10:38:14 GMT Message-Id: <202501011038.501AcEcp078877@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: bc3dfb03fd49 - stable/14 - efirt: use correct ABI for runtime EFI functions 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bc3dfb03fd4979b50c380c1688cfcc2e3d517361 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bc3dfb03fd4979b50c380c1688cfcc2e3d517361 commit bc3dfb03fd4979b50c380c1688cfcc2e3d517361 Author: Ahmad Khalifa AuthorDate: 2024-12-21 21:09:54 +0000 Commit: Konstantin Belousov CommitDate: 2025-01-01 10:30:20 +0000 efirt: use correct ABI for runtime EFI functions (cherry picked from commit 3e8f4a30594fad6784504d019613ad815b6c9dc5) --- sys/dev/efidev/efirt.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/sys/dev/efidev/efirt.c b/sys/dev/efidev/efirt.c index a74ce9fa9a06..1fb9b3bb01d1 100644 --- a/sys/dev/efidev/efirt.c +++ b/sys/dev/efidev/efirt.c @@ -490,31 +490,32 @@ efi_rt_arch_call_nofault(struct efirt_callinfo *ec) switch (ec->ec_argcnt) { case 0: - ec->ec_efi_status = ((register_t (*)(void))ec->ec_fptr)(); + ec->ec_efi_status = ((register_t EFIABI_ATTR (*)(void)) + ec->ec_fptr)(); break; case 1: - ec->ec_efi_status = ((register_t (*)(register_t))ec->ec_fptr) - (ec->ec_arg1); + ec->ec_efi_status = ((register_t EFIABI_ATTR (*)(register_t)) + ec->ec_fptr)(ec->ec_arg1); break; case 2: - ec->ec_efi_status = ((register_t (*)(register_t, register_t)) - ec->ec_fptr)(ec->ec_arg1, ec->ec_arg2); + ec->ec_efi_status = ((register_t EFIABI_ATTR (*)(register_t, + register_t))ec->ec_fptr)(ec->ec_arg1, ec->ec_arg2); break; case 3: - ec->ec_efi_status = ((register_t (*)(register_t, register_t, - register_t))ec->ec_fptr)(ec->ec_arg1, ec->ec_arg2, - ec->ec_arg3); + ec->ec_efi_status = ((register_t EFIABI_ATTR (*)(register_t, + register_t, register_t))ec->ec_fptr)(ec->ec_arg1, + ec->ec_arg2, ec->ec_arg3); break; case 4: - ec->ec_efi_status = ((register_t (*)(register_t, register_t, - register_t, register_t))ec->ec_fptr)(ec->ec_arg1, - ec->ec_arg2, ec->ec_arg3, ec->ec_arg4); + ec->ec_efi_status = ((register_t EFIABI_ATTR (*)(register_t, + register_t, register_t, register_t))ec->ec_fptr)( + ec->ec_arg1, ec->ec_arg2, ec->ec_arg3, ec->ec_arg4); break; case 5: - ec->ec_efi_status = ((register_t (*)(register_t, register_t, - register_t, register_t, register_t))ec->ec_fptr)( - ec->ec_arg1, ec->ec_arg2, ec->ec_arg3, ec->ec_arg4, - ec->ec_arg5); + ec->ec_efi_status = ((register_t EFIABI_ATTR (*)(register_t, + register_t, register_t, register_t, register_t)) + ec->ec_fptr)(ec->ec_arg1, ec->ec_arg2, ec->ec_arg3, + ec->ec_arg4, ec->ec_arg5); break; default: panic("efi_rt_arch_call: %d args", (int)ec->ec_argcnt);