From nobody Fri Apr 11 21:26:28 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 4ZZ8rP4K9gz5shlD; Fri, 11 Apr 2025 21:26:29 +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 4ZZ8rN6CXSz3v2S; Fri, 11 Apr 2025 21:26:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744406788; 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=Fmp3066jCtZGLxgm6G41svJahKa7f8cwo796/Zt54B4=; b=sQg7+K+35Smw5/QqmhDmADQ87lY4dpxwV9KsEB3HL/4THFZ2jm9esKBf4QFoMlLy3CpnCc lmE0s+Mp9vwSO2UVTFRLJHqcDrcUeq3Yr4VqtpipAcK2z5tP9GHTEbVccpGaGdPycvrAgR K4uP/+e1SfqDEPLgy5bN/sdK57Y4CiLwdbT38NRSu5IyG7hKEaZZPQpjSIVMGD+XvoHRBw Bt70XDb46Qe/fEjzAPD4P3S9HlF1nxamubxlirhzaCjUSPiS3KjcrXnS0DBtA7wVJCnhkQ dJ5kK0Jh7hUMIeTOLJMy/uI2uZwwfmXTZR2ikEHNZmXEljz75Yahj9MQxh8ugw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744406788; a=rsa-sha256; cv=none; b=lTrQrA+hrbBqahdR/L1S1UKn3vdzbWLyI4fOrqvXjIo5jKpDmWi0XXfdMktb72nSHdPhq/ MtXZk6FQ50tLnZz/xIPr6S73QUA+e/8lOY3HSgGThPuiemX3O2pIQkjMxEODQm/0ZQ5AC5 Tth38T4V8HCAanZIul/M1bfH3mDgoqgMS4Ni6/LyMP4kJX1Qytbr5doYouYA0d4KAHtFH5 QyLhe7j4pUbSZp57tzDeMSgbL+Z69khjZ99CCAAryYWMZUUBPiMwGDLc/fwru+VzmCgjLR Xuqm3AyFw4rkNGXG8J/mmoJpcmBQSVZl6cMEqEW4fmiz15xkoMydTX+gkaev/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744406788; 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=Fmp3066jCtZGLxgm6G41svJahKa7f8cwo796/Zt54B4=; b=O1/c/WDbUD63TKxrMpfoJNkbu7fMOnvBLpzYjvy9wCdVt/IrfvfegZmgbxUkZ6re4fQY3f Ax3kKAsyA/kPYuD2m8I9IZWwsn1VrIYQOEzYM1dinA1QEIFZYfFi2idTpMb8M6rAolM1/8 ItoGbwlY8XdV26KutuTWD60J9nWKWnWKyFlVEJdRVZkrfFc8WCeD/zjY/fEubW46IouKFY vyooqUSn2Hxo8zbnRsKfm/G39JhqQWH52S0VGe+wpprI6fS/H28bYtmpjySYSnxcIIRKWP tnocguCFPJzNlB2TgH6md+nZF3aNSfRDvSAERsLm/eRrcAg5XQiS7LEafDg4+g== 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 4ZZ8rN5W47zqC1; Fri, 11 Apr 2025 21:26:28 +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 53BLQSCU078497; Fri, 11 Apr 2025 21:26:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53BLQSbO078494; Fri, 11 Apr 2025 21:26:28 GMT (envelope-from git) Date: Fri, 11 Apr 2025 21:26:28 GMT Message-Id: <202504112126.53BLQSbO078494@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 97ddb6371b72 - main - iwlwifi: fix iwl_uefi_get_uats_table() if not compiled with ACPI 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 97ddb6371b7206c622de40745927e98f0dfd2e85 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=97ddb6371b7206c622de40745927e98f0dfd2e85 commit 97ddb6371b7206c622de40745927e98f0dfd2e85 Author: Bjoern A. Zeeb AuthorDate: 2025-04-11 15:22:55 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-04-11 21:26:06 +0000 iwlwifi: fix iwl_uefi_get_uats_table() if not compiled with ACPI Apply a temporary fix to FreeBSD only to allow AX101 to proceed further. While this fix results in a debug error message if firmware debugging is on we currently take this for the version we have. A proper fix will eventually show up in future versions of iwlwifi. Sponsored by: The FreeBSD Foundation Reported by: bapt Tested by: bapt MFC after: 3 days --- sys/contrib/dev/iwlwifi/fw/uefi.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/contrib/dev/iwlwifi/fw/uefi.h b/sys/contrib/dev/iwlwifi/fw/uefi.h index 1f8884ca8997..50327bb8c2d6 100644 --- a/sys/contrib/dev/iwlwifi/fw/uefi.h +++ b/sys/contrib/dev/iwlwifi/fw/uefi.h @@ -318,7 +318,11 @@ static inline int iwl_uefi_get_uats_table(struct iwl_trans *trans, struct iwl_fw_runtime *fwrt) { +#if defined(__linux__) return 0; +#elif defined(__FreeBSD__) + return -ENOENT; +#endif } #endif /* CONFIG_EFI */ #endif /* __iwl_fw_uefi__ */