From nobody Fri Apr 18 14:37:05 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 4ZfHQp4C55z5stTH; Fri, 18 Apr 2025 14:37:06 +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 4ZfHQp049Cz3KHs; Fri, 18 Apr 2025 14:37:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744987026; 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=55i89JW6VLoWvp77Hyti5IrXdd2tIWzL6gan9V0ixX0=; b=mnbX0e45u5bpUv5eiylulIJpIVRm3QBHFfdb4W170k8ELPQeI37OtfZtOULM2AhAVyWPDF 7b3hz+tjPdBIQ353+1Xe2qwFQhsblugFvoMs9sPhXpyTDruoTpa/KNccVLcxNqCCbltorp XSoh3U6ZONlJjaUXzji4EpGFutnjg8oFofjcoaX2UXVilqE5LljW57fcQ5UPnlyZDvZkoK nZ3v/PgRQf29xUHrDYIN6J05pnvLRSd/+VtXFysE1X3QiT0j6bswcj54V4r4xDii7kayhA zllBgQ5ZIA9lFPA4eF5Eb/QPCLsdU2ZkwvbZzG1uPPs84WqpzizsxvZV2LXbrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744987026; a=rsa-sha256; cv=none; b=q+YqdNPTFdUzXgKnxpz3gQcj5NK2UmWXigz1zaqThvVUCWXoDBTLO2KgaRaKFCDHqVYou/ JITDXh7N9F0KvIELYVqA8YDAafzzwcGBQYqRuLcRUP+3RL0k7tKQCKwTO9YU4pxnCxA3Fu hiQBroIrJKNrP1x2sLmKSaspHxIBdMIurkk8irwS9q4y5j24H/bdbBwuzkCwAMZWMdNwLh ZGlKfZVAcLR6zOeMHMrmJwNPP5mUZ/9mJkMiPGI6U78TN4vnqVsnqXPW2i7gjXLFqVk2HZ cctLpokPrVzBBl+KTXPokT2o7KmXH7Q5wI/Rus6bCPdD1f8HcR7WP/BsgfwYZA== 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=1744987026; 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=55i89JW6VLoWvp77Hyti5IrXdd2tIWzL6gan9V0ixX0=; b=Lqs4D/PwwEoB3O+cx5p8oMcOKs74bQzg2aN0WUVvTal1ab994Syw2dOXw5WXKl6ABN23LG EExnKIux+puly7xx6MlGOH4T2LkJrbzp0P1D3CRozUKTj4DdacE/0klAQcjowpAx0JpSUC gAbOzZFDMVA6hN7J6u+Y60AKR97vrir0+Y35egomNquIqT4Q0JeRhZSI4Tn9NJE74teQAi sGRKvQW+5E0ioN4Ierqi5D1ugq3bQzNgAlw5AEbRwc1/q8Uh5+6DhOgUvp3Wie0mh+j53e lu5sAOD+0M8T3Si7XKq+lVCZHgyaQqZZeM6Bht7nTwpDFJp/RFeKG0zTqGzczw== 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 4ZfHQn5XBnzdxv; Fri, 18 Apr 2025 14:37:05 +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 53IEb5Pk091584; Fri, 18 Apr 2025 14:37:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53IEb5qF091581; Fri, 18 Apr 2025 14:37:05 GMT (envelope-from git) Date: Fri, 18 Apr 2025 14:37:05 GMT Message-Id: <202504181437.53IEb5qF091581@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 241fb1757415 - stable/14 - iwlwifi: fix iwl_uefi_get_uats_table() if not compiled with ACPI 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 241fb175741532b7e9820399e0032137e938e520 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=241fb175741532b7e9820399e0032137e938e520 commit 241fb175741532b7e9820399e0032137e938e520 Author: Bjoern A. Zeeb AuthorDate: 2025-04-11 15:22:55 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-04-18 14:35:59 +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 (cherry picked from commit 97ddb6371b7206c622de40745927e98f0dfd2e85) --- 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__ */