From nobody Fri Feb 27 02:30:03 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 4fMXNW4TD2z6T85x for ; Fri, 27 Feb 2026 02:30:03 +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 4fMXNW0c9vz41YB for ; Fri, 27 Feb 2026 02:30:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772159403; 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=eVzRO19+jgD7zt9mCZgchGeOjpySFIx9ns/PYCx2Z6A=; b=V2Kd3RQaiqJykgyaTrr55Fop2yLJa7LNXY5q5RCS81ZPk5J0lz6iEkPq3H2jnkRU6Ds+KC Km5exUabJC4gHcIleHasRAwTBg96aUx/k8kCRfQ8O/r7XwLgQSZquqLoAp+Wt8cCs4gBQA yy6DoW8LM/YAh0Gpb+rl9Ezr7XZo3P00iNXyKJVup1gz30bNwFqR3vae7rhuY0llF4Ivy9 ieP6nHXMEPtH67OxjCEjE8LzS8RMsWOhBXnhXfNnOIvCoCBIE7QyX2Z6DD81etAx1bBceq KHsTynIT9xRnSDij699EMHO1ckzcUxHgB2dxeElUrPiwIzTlIb+XXHMMEsP2cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772159403; a=rsa-sha256; cv=none; b=W/D72NZVbRfvzCBM6cWA+/RlfvpdFhEvKnfRM+4aqP8dLktOwtMhnH7tc8QsuD6VKpIQKP OB0hFonNxIfAjZvyFli/+pn8NCgtHY4MgE09rtLYdf6q3F5N7CT877PTfVOGS6Su3VZbK1 M9ejuaGmaF0xX1ta4+qAlw+vD+KlDQ6VPyH2J1lem80C1clqMaIjjDHTz3nEPqNps6ougW YfMYacHQND7FatI9r1wrt7pq4Mg0Zfw4gftqOILDw1w8v1OvMWSAX/cJjtBsFg91fNZNjy 1aI9JwSpQkBHTIM+41wEi7cI1rXLTdFzSEX0k8W2tqvhIFMYXXWKngeCOai3xA== 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=1772159403; 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=eVzRO19+jgD7zt9mCZgchGeOjpySFIx9ns/PYCx2Z6A=; b=Sj7RYumIIwgD4bpJwIl3Cf2mq/9Vbax3xqHn+csnbCu4N8Oouim4/mDvvhhoBD2yt2+Aar Sa5VLr1QcOK0NHD7WtLc5aXU+Z9BuenrQ2ffyShQ1rMCz/f38L+XAIw77i38109spAyZ/p uYXO5ofq5HddIvGQbzmW7MCsmaRpwZpzM4dwlkY9GBBwddYs/RHh1MZi02HX3V6f+vZY+M tipQOct/oCuvHsNJI9/OU6ac943Q6FwgtHdTmaz5Dv7pmMdXxBwUAEqJjJu/lyJwnIN0/e +OI+MYkD0f6FMhyjhLPR24WIpsCttZIpZjP0ydsSTBpPKPFObVa4U6F68MYqfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fMXNW08KVzyX8 for ; Fri, 27 Feb 2026 02:30:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22400 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Feb 2026 02:30:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: e5643f312af2 - stable/15 - rtw89: cleanup static_assert() calls 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: e5643f312af2da1e77b3cf90d204e910ee851134 Auto-Submitted: auto-generated Date: Fri, 27 Feb 2026 02:30:03 +0000 Message-Id: <69a101ab.22400.478ab5b3@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=e5643f312af2da1e77b3cf90d204e910ee851134 commit e5643f312af2da1e77b3cf90d204e910ee851134 Author: Bjoern A. Zeeb AuthorDate: 2026-01-20 22:51:28 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-26 23:06:37 +0000 rtw89: cleanup static_assert() calls These days we can use static_assert() without trouble so remove the FreeBSD-specific rtw89_static_assert implementation. This reduces the diff to upstream and will ease future driver updates. Sponsored by: The FreeBSD Foundation (cherry picked from commit 57b839612b7abb891057f1efe380c509664f868b) --- sys/contrib/dev/rtw89/core.h | 6 ------ sys/contrib/dev/rtw89/debug.c | 12 ------------ sys/contrib/dev/rtw89/fw.h | 8 -------- sys/contrib/dev/rtw89/phy.c | 8 -------- sys/contrib/dev/rtw89/rtw8851b.c | 6 ------ sys/contrib/dev/rtw89/rtw8852c.c | 6 ------ sys/contrib/dev/rtw89/rtw8852c_rfk.c | 4 ---- sys/contrib/dev/rtw89/sar.c | 4 ---- sys/contrib/dev/rtw89/ser.c | 4 ---- 9 files changed, 58 deletions(-) diff --git a/sys/contrib/dev/rtw89/core.h b/sys/contrib/dev/rtw89/core.h index a8bfa538515e..b6b810567a35 100644 --- a/sys/contrib/dev/rtw89/core.h +++ b/sys/contrib/dev/rtw89/core.h @@ -7703,10 +7703,4 @@ void rtw89_core_ntfy_btc_event(struct rtw89_dev *rtwdev, enum rtw89_btc_hmsg eve int rtw89_core_mlsr_switch(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif, unsigned int link_id); -#if defined(__linux__) -#define rtw89_static_assert(_x) static_assert(_x) -#elif defined(__FreeBSD__) -#define rtw89_static_assert(_x) _Static_assert(_x, "bad array size") -#endif - #endif diff --git a/sys/contrib/dev/rtw89/debug.c b/sys/contrib/dev/rtw89/debug.c index ad11256fffb7..0db142ba6d89 100644 --- a/sys/contrib/dev/rtw89/debug.c +++ b/sys/contrib/dev/rtw89/debug.c @@ -505,11 +505,7 @@ static const struct txpwr_ent __txpwr_ent_byr_ax[] = { __GEN_TXPWR_ENT4("HEDCM_2NSS", "MCS0 ", "MCS1 ", "MCS3 ", "MCS4 "), }; -#if defined(__linux__) static_assert((ARRAY_SIZE(__txpwr_ent_byr_ax) * 4) == -#elif defined(__FreeBSD__) -rtw89_static_assert((ARRAY_SIZE(__txpwr_ent_byr_ax) * 4) == -#endif (R_AX_PWR_BY_RATE_MAX - R_AX_PWR_BY_RATE + 4)); static const struct txpwr_map __txpwr_map_byr_ax = { @@ -565,11 +561,7 @@ static const struct txpwr_ent __txpwr_ent_lmt_ax[] = { __GEN_TXPWR_ENT2("MCS_2TX_40M_2p5", "NON_BF", "BF"), }; -#if defined(__linux__) static_assert((ARRAY_SIZE(__txpwr_ent_lmt_ax) * 2) == -#elif defined(__FreeBSD__) -rtw89_static_assert((ARRAY_SIZE(__txpwr_ent_lmt_ax) * 2) == -#endif (R_AX_PWR_LMT_MAX - R_AX_PWR_LMT + 4)); static const struct txpwr_map __txpwr_map_lmt_ax = { @@ -597,11 +589,7 @@ static const struct txpwr_ent __txpwr_ent_lmt_ru_ax[] = { "RU106_4", "RU106_5", "RU106_6", "RU106_7"), }; -#if defined(__linux__) static_assert((ARRAY_SIZE(__txpwr_ent_lmt_ru_ax) * 8) == -#elif defined(__FreeBSD__) -rtw89_static_assert((ARRAY_SIZE(__txpwr_ent_lmt_ru_ax) * 8) == -#endif (R_AX_PWR_RU_LMT_MAX - R_AX_PWR_RU_LMT + 4)); static const struct txpwr_map __txpwr_map_lmt_ru_ax = { diff --git a/sys/contrib/dev/rtw89/fw.h b/sys/contrib/dev/rtw89/fw.h index 940a7b39bee1..cedb4a47a769 100644 --- a/sys/contrib/dev/rtw89/fw.h +++ b/sys/contrib/dev/rtw89/fw.h @@ -3608,11 +3608,7 @@ struct rtw89_fw_c2h_attr { static inline struct rtw89_fw_c2h_attr *RTW89_SKB_C2H_CB(struct sk_buff *skb) { -#if defined(__linux__) static_assert(sizeof(skb->cb) >= sizeof(struct rtw89_fw_c2h_attr)); -#elif defined(__FreeBSD__) - rtw89_static_assert(sizeof(skb->cb) >= sizeof(struct rtw89_fw_c2h_attr)); -#endif return (struct rtw89_fw_c2h_attr *)skb->cb; } @@ -3818,11 +3814,7 @@ struct rtw89_mac_mcc_tsf_rpt { u32 tsf_y_high; }; -#if defined(__linux__) static_assert(sizeof(struct rtw89_mac_mcc_tsf_rpt) <= RTW89_COMPLETION_BUF_SIZE); -#elif defined(__FreeBSD__) -rtw89_static_assert(sizeof(struct rtw89_mac_mcc_tsf_rpt) <= RTW89_COMPLETION_BUF_SIZE); -#endif #define RTW89_GET_MAC_C2H_MCC_TSF_RPT_MACID_X(c2h) \ le32_get_bits(*((const __le32 *)(c2h) + 2), GENMASK(7, 0)) diff --git a/sys/contrib/dev/rtw89/phy.c b/sys/contrib/dev/rtw89/phy.c index bbd4e3d7d360..f60753369516 100644 --- a/sys/contrib/dev/rtw89/phy.c +++ b/sys/contrib/dev/rtw89/phy.c @@ -2856,11 +2856,7 @@ rtw89_phy_fill_txpwr_limit_ru_160m_ax(struct rtw89_dev *rtwdev, static const int ofst[] = { -14, -10, -6, -2, 2, 6, 10, 14 }; int i; -#if defined(__linux__) static_assert(ARRAY_SIZE(ofst) == RTW89_RU_SEC_NUM_AX); -#elif defined(__FreeBSD__) - rtw89_static_assert(ARRAY_SIZE(ofst) == RTW89_RU_SEC_NUM_AX); -#endif for (i = 0; i < RTW89_RU_SEC_NUM_AX; i++) { lmt_ru->ru26[i] = rtw89_phy_read_txpwr_limit_ru(rtwdev, band, RTW89_RU26, @@ -7556,11 +7552,7 @@ static void [RTW89_RFK_F_DELAY] = _rfk_delay, }; -#if defined(__linux__) static_assert(ARRAY_SIZE(_rfk_handler) == RTW89_RFK_F_NUM); -#elif defined(__FreeBSD__) -rtw89_static_assert(ARRAY_SIZE(_rfk_handler) == RTW89_RFK_F_NUM); -#endif void rtw89_rfk_parser(struct rtw89_dev *rtwdev, const struct rtw89_rfk_tbl *tbl) diff --git a/sys/contrib/dev/rtw89/rtw8851b.c b/sys/contrib/dev/rtw89/rtw8851b.c index 04246a31cc0e..84b628d23882 100644 --- a/sys/contrib/dev/rtw89/rtw8851b.c +++ b/sys/contrib/dev/rtw89/rtw8851b.c @@ -1825,15 +1825,9 @@ static void rtw8851b_bb_set_tx_shape_dfir(struct rtw89_dev *rtwdev, #define __DFIR_CFG_ADDR(i) (R_TXFIR0 + ((i) << 2)) #define __DFIR_CFG_MASK 0xffffffff #define __DFIR_CFG_NR 8 -#if defined(__linux__) #define __DECL_DFIR_PARAM(_name, _val...) \ static const u32 param_ ## _name[] = {_val}; \ static_assert(ARRAY_SIZE(param_ ## _name) == __DFIR_CFG_NR) -#elif defined(__FreeBSD__) -#define __DECL_DFIR_PARAM(_name, _val...) \ - static const u32 param_ ## _name[] = {_val}; \ - rtw89_static_assert(ARRAY_SIZE(param_ ## _name) == __DFIR_CFG_NR) -#endif __DECL_DFIR_PARAM(flat, 0x023D23FF, 0x0029B354, 0x000FC1C8, 0x00FDB053, diff --git a/sys/contrib/dev/rtw89/rtw8852c.c b/sys/contrib/dev/rtw89/rtw8852c.c index 6f272aab48a5..db99450e9158 100644 --- a/sys/contrib/dev/rtw89/rtw8852c.c +++ b/sys/contrib/dev/rtw89/rtw8852c.c @@ -2085,15 +2085,9 @@ static void rtw8852c_bb_set_tx_shape_dfir(struct rtw89_dev *rtwdev, { #define __DFIR_CFG_MASK 0xffffff #define __DFIR_CFG_NR 8 -#if defined(__linux__) #define __DECL_DFIR_VAR(_prefix, _name, _val...) \ static const u32 _prefix ## _ ## _name[] = {_val}; \ static_assert(ARRAY_SIZE(_prefix ## _ ## _name) == __DFIR_CFG_NR) -#elif defined(__FreeBSD__) -#define __DECL_DFIR_VAR(_prefix, _name, _val...) \ - static const u32 _prefix ## _ ## _name[] = {_val}; \ - rtw89_static_assert(ARRAY_SIZE(_prefix ## _ ## _name) == __DFIR_CFG_NR) -#endif #define __DECL_DFIR_PARAM(_name, _val...) __DECL_DFIR_VAR(param, _name, _val) #define __DECL_DFIR_ADDR(_name, _val...) __DECL_DFIR_VAR(addr, _name, _val) diff --git a/sys/contrib/dev/rtw89/rtw8852c_rfk.c b/sys/contrib/dev/rtw89/rtw8852c_rfk.c index 129b940da62a..cbee484dee30 100644 --- a/sys/contrib/dev/rtw89/rtw8852c_rfk.c +++ b/sys/contrib/dev/rtw89/rtw8852c_rfk.c @@ -2704,11 +2704,7 @@ static void _dpk_cal_select(struct rtw89_dev *rtwdev, bool force, u8 path; bool is_fail = true, reloaded[RTW8852C_DPK_RF_PATH] = {false}; -#if defined(__linux__) static_assert(ARRAY_SIZE(kip_reg) == RTW8852C_DPK_KIP_REG_NUM); -#elif defined(__FreeBSD__) - rtw89_static_assert(ARRAY_SIZE(kip_reg) == RTW8852C_DPK_KIP_REG_NUM); -#endif if (dpk->is_dpk_reload_en) { for (path = 0; path < RTW8852C_DPK_RF_PATH; path++) { diff --git a/sys/contrib/dev/rtw89/sar.c b/sys/contrib/dev/rtw89/sar.c index ed3fa4e6b0a5..ef7feccccd5e 100644 --- a/sys/contrib/dev/rtw89/sar.c +++ b/sys/contrib/dev/rtw89/sar.c @@ -406,11 +406,7 @@ static const struct cfg80211_sar_freq_ranges rtw89_common_sar_freq_ranges[] = { { .start_freq = 6875, .end_freq = 7115, }, }; -#if defined(__linux__) static_assert(RTW89_SAR_SUBBAND_NR == -#elif defined(__FreeBSD__) -rtw89_static_assert(RTW89_SAR_SUBBAND_NR == -#endif ARRAY_SIZE(rtw89_common_sar_freq_ranges)); const struct cfg80211_sar_capa rtw89_sar_capa = { diff --git a/sys/contrib/dev/rtw89/ser.c b/sys/contrib/dev/rtw89/ser.c index 03f56b03875a..f99e179f7ff9 100644 --- a/sys/contrib/dev/rtw89/ser.c +++ b/sys/contrib/dev/rtw89/ser.c @@ -620,11 +620,7 @@ struct __fw_backtrace_info { u32 sp; } __packed; -#if defined(__linux__) static_assert(RTW89_FW_BACKTRACE_INFO_SIZE == -#elif defined(__FreeBSD__) -rtw89_static_assert(RTW89_FW_BACKTRACE_INFO_SIZE == -#endif sizeof(struct __fw_backtrace_info)); static u32 convert_addr_from_wcpu(u32 wcpu_addr)