From nobody Fri Feb 27 02:29:55 2026 X-Original-To: dev-commits-src-branches@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 4fMXNM51WGz6T7tj for ; Fri, 27 Feb 2026 02:29:55 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fMXNM2xvPz41HS for ; Fri, 27 Feb 2026 02:29:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772159395; 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=EpLDNyoyEUyLIB5YSqvc06GeLuK6E/FkRmkSO/RIsPI=; b=kDV9jGU+JtdU8R+Zvaor2yiXUxTZU3Yeny2cYgk4fRxjlASyegoXfPIUmj99u+u3ovrlOA Z29KYjPO0ElPKrSj7mZzfuFwAHa3lXsRoFJy8PxKwA9lf4JLDc/P1TK7UP1PnAhdVm8zGt 2gNB/Q876KKxJZTIuqNbuzRZ1IH55ccPXbvFsXQPyXfI0nB7OO1l1lOb1Gue3wqvSvfFa/ jcOxIPh3JpJ7NXo9WbOSjY8YmnXAntPwtlYCQqhRugga0ACvPhYQgcXHFim0fpr8xsrWSE edVrpSHogYvq1MkRhGycZfiyrck2PZAuQ97VEk8e6SVWa3zh3dZC5umN3YObAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772159395; a=rsa-sha256; cv=none; b=YvhyZaR/XRGq0HApMcXbGQcQZXYby752ju7PwEWK+55fD/bVQ99aixmlHsKQi/nwsWT8ip +MkhrmExhjTWitMNVwDPDa4pnt7m3aY+Rt+P/eoUFrvg2EmulFzwr+WalzlNJ6LX/ZmAVf jle5v0NPCXOPEtXh5MEgPuFevVR/kBQGu8fMkr35X9haqASZe+YXs6+3lVSpmDhTP0wJol SKBFkdo9+kd4jYL1Xrh2FbT1jx65VvvM9n39s6AstLUhaP1rXXL2C/aqWn9yc1Ltwh5ybr +qNUMgVxzsCXkAK35WbIeGALTe/8WGevUfH7xtZtw4a8IHDH9FFXIxXY2iIJJA== 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=1772159395; 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=EpLDNyoyEUyLIB5YSqvc06GeLuK6E/FkRmkSO/RIsPI=; b=ZFJBLfM5uiPZmCDUlIR+r4ISzdS1caP1MLSt8VwD8Xz8ZPJYZZqLeAqnegAJu4LlV8E+54 VaCkv9hSBd09I0AV/pd5RxP50VBhm+pm79CNM1IdS+gNUPfD++ZXBfVGxYsyV5WQT/0nWY 8Ny+unoCU5Wi/4yYDfeFhZMsjFKyg0DgF5erGDFPVFmx925u6w8DiZUt/7sl5nuZUaVkpI JlWxRh/YepGtn0SR1omC76m/u7JF1roi0d5a57/epAiiXa8KrTpdutIBrI2+Z0bfatxfbM dEZXY1H0Y7nTG9Jwg1zoPUC/YscyPjVMsLWZVw5yN2c8zEsY6Uz0t3NgQWEDog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fMXNM2RrVzyZd for ; Fri, 27 Feb 2026 02:29:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1fe74 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Feb 2026 02:29:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: c2b7d9ae065d - stable/15 - ath10k: cleanup some bits no longer FreeBSD-specific List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/15 X-Git-Reftype: branch X-Git-Commit: c2b7d9ae065d3ff49098aa485d567aa4e3622477 Auto-Submitted: auto-generated Date: Fri, 27 Feb 2026 02:29:55 +0000 Message-Id: <69a101a3.1fe74.da476c8@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c2b7d9ae065d3ff49098aa485d567aa4e3622477 commit c2b7d9ae065d3ff49098aa485d567aa4e3622477 Author: Bjoern A. Zeeb AuthorDate: 2025-12-14 22:28:46 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-26 23:05:35 +0000 ath10k: cleanup some bits no longer FreeBSD-specific We have since I did this port in 2023 added ACPI support to LinuxKPI, so we can use it. Also there is a linux/of.h header so we no longer need to guard the #include. (cherry picked from commit db20376a4fc949d6a5b30b11f8bf9146c6b3395d) --- sys/contrib/dev/athk/ath10k/core.c | 4 +--- sys/contrib/dev/athk/ath10k/htt_rx.c | 5 ++--- sys/contrib/dev/athk/ath10k/mac.c | 36 +----------------------------------- sys/modules/ath10k/Makefile | 1 + 4 files changed, 5 insertions(+), 41 deletions(-) diff --git a/sys/contrib/dev/athk/ath10k/core.c b/sys/contrib/dev/athk/ath10k/core.c index 9ec08b402fd2..6167338b5c79 100644 --- a/sys/contrib/dev/athk/ath10k/core.c +++ b/sys/contrib/dev/athk/ath10k/core.c @@ -13,9 +13,7 @@ #include #include #include -#if defined(__linux__) || (defined(__FreeBSD__) && defined(CONFIG_OF)) #include -#endif #include #include #include @@ -2048,7 +2046,7 @@ static int ath10k_download_cal_nvmem(struct ath10k *ar, const char *cell_name) ret = ath10k_download_board_data(ar, buf, len); kfree(buf); #elif defined(__FreeBSD__) - ret = -ENXIO; + ret = -EOPNOTSUPP; #endif if (ret) ath10k_warn(ar, "failed to download calibration data from nvmem-cell '%s': %d\n", diff --git a/sys/contrib/dev/athk/ath10k/htt_rx.c b/sys/contrib/dev/athk/ath10k/htt_rx.c index ad61fad315c5..d73369ffb697 100644 --- a/sys/contrib/dev/athk/ath10k/htt_rx.c +++ b/sys/contrib/dev/athk/ath10k/htt_rx.c @@ -849,9 +849,6 @@ int ath10k_htt_rx_alloc(struct ath10k_htt *htt) timer_setup(timer, ath10k_htt_rx_ring_refill_retry, 0); spin_lock_init(&htt->rx_ring.lock); -#if defined(__FreeBSD__) - spin_lock_init(&htt->tx_fetch_ind_q.lock); -#endif htt->rx_ring.fill_cnt = 0; htt->rx_ring.sw_rd_idx.msdu_payld = 0; @@ -1670,6 +1667,7 @@ static void ath10k_htt_rx_h_undecap_nwifi(struct ath10k *ar, ether_addr_copy(ieee80211_get_DA(hdr), da); ether_addr_copy(ieee80211_get_SA(hdr), sa); #elif defined(__FreeBSD__) + /* ieee80211_get_[DS]A() do not take a const argument. */ hdr2 = (struct ieee80211_hdr *)msdu->data; ether_addr_copy(ieee80211_get_DA(hdr2), da); ether_addr_copy(ieee80211_get_SA(hdr2), sa); @@ -1812,6 +1810,7 @@ static void ath10k_htt_rx_h_undecap_eth(struct ath10k *ar, ether_addr_copy(ieee80211_get_DA(hdr), da); ether_addr_copy(ieee80211_get_SA(hdr), sa); #elif defined(__FreeBSD__) + /* ieee80211_get_[DS]A() do not take a const argument. */ hdr2 = (struct ieee80211_hdr *)msdu->data; ether_addr_copy(ieee80211_get_DA(hdr2), da); ether_addr_copy(ieee80211_get_SA(hdr2), sa); diff --git a/sys/contrib/dev/athk/ath10k/mac.c b/sys/contrib/dev/athk/ath10k/mac.c index e2bda3c0d925..d8e6bd2d277d 100644 --- a/sys/contrib/dev/athk/ath10k/mac.c +++ b/sys/contrib/dev/athk/ath10k/mac.c @@ -13,9 +13,7 @@ #include #include #include -#if defined(__linux__) || (defined(__FreeBSD__) && defined(CONFIG_OF)) #include -#endif #include #include @@ -5130,7 +5128,7 @@ static int __ath10k_fetch_bb_timing_dt(struct ath10k *ar, bb_timing->bb_tx_timing, bb_timing->bb_xpa_timing); return 0; #else - return -EINVAL; + return -ENOENT; #endif } @@ -9914,22 +9912,14 @@ static u32 ath10k_mac_wrdd_get_mcc(struct ath10k *ar, union acpi_object *wrdd) union acpi_object *mcc_value; u32 i; -#if defined(__linux__) if (wrdd->type != ACPI_TYPE_PACKAGE || wrdd->package.count < 2 || wrdd->package.elements[0].type != ACPI_TYPE_INTEGER || wrdd->package.elements[0].integer.value != 0) { -#elif defined(__FreeBSD__) - if (wrdd->Type != ACPI_TYPE_PACKAGE || - wrdd->Package.Count < 2 || - wrdd->Package.Elements[0].Type != ACPI_TYPE_INTEGER || - wrdd->Package.Elements[0].Integer.Value != 0) { -#endif ath10k_warn(ar, "ignoring malformed/unsupported wrdd structure\n"); return 0; } -#if defined(__linux__) for (i = 1; i < wrdd->package.count; ++i) { mcc_pkg = &wrdd->package.elements[i]; @@ -9947,25 +9937,6 @@ static u32 ath10k_mac_wrdd_get_mcc(struct ath10k *ar, union acpi_object *wrdd) mcc_value = &mcc_pkg->package.elements[1]; return mcc_value->integer.value; -#elif defined(__FreeBSD__) - for (i = 1; i < wrdd->Package.Count; ++i) { - mcc_pkg = &wrdd->Package.Elements[i]; - - if (mcc_pkg->Type != ACPI_TYPE_PACKAGE) - continue; - if (mcc_pkg->Package.Count < 2) - continue; - if (mcc_pkg->Package.Elements[0].Type != ACPI_TYPE_INTEGER || - mcc_pkg->Package.Elements[1].Type != ACPI_TYPE_INTEGER) - continue; - - domain_type = &mcc_pkg->Package.Elements[0]; - if (domain_type->Integer.Value != WRDD_WIFI) - continue; - - mcc_value = &mcc_pkg->Package.Elements[1]; - return mcc_value->Integer.Value; -#endif } return 0; } @@ -9997,13 +9968,8 @@ static int ath10k_mac_get_wrdd_regulatory(struct ath10k *ar, u16 *rd) return -EIO; } -#if defined(__linux__) alpha2_code = ath10k_mac_wrdd_get_mcc(ar, wrdd.pointer); kfree(wrdd.pointer); -#elif defined(__FreeBSD__) - alpha2_code = ath10k_mac_wrdd_get_mcc(ar, wrdd.Pointer); - kfree(wrdd.Pointer); -#endif if (!alpha2_code) return -EIO; diff --git a/sys/modules/ath10k/Makefile b/sys/modules/ath10k/Makefile index d8196854b681..93518c66f89f 100644 --- a/sys/modules/ath10k/Makefile +++ b/sys/modules/ath10k/Makefile @@ -38,6 +38,7 @@ CFLAGS+= ${LINUXKPI_INCLUDES} #CFLAGS+= -ferror-limit=0 CFLAGS+= -DCONFIG_ATH10K_DEBUG +CFLAGS+= -DLINUXKPI_WANT_LINUX_ACPI #CFLAGS+= -DCONFIG_ATH10K_AHB #CFLAGS+= -DCONFIG_ATH10K_DEBUGFS