* Re: [PATCH 1/3] wifi: cfg80211: validate rx/tx MLME callback frame lengths before access
From: Johannes Berg @ 2026-07-06 10:37 UTC (permalink / raw)
To: Zhao Li; +Cc: linux-wireless, linux-kernel
In-Reply-To: <20260612185042.66260-4-enderaoelyther@gmail.com>
On Sat, 2026-06-13 at 02:50 +0800, Zhao Li wrote:
> cfg80211_rx_mlme_mgmt() and cfg80211_tx_mlme_mgmt() read the frame
> control field without first checking len >= 2, then dispatch into
> subtype handlers that assume their fixed fields are present.
>
> Add a frame-control length gate, then validate each subtype's minimum
> frame size in an if/else-if chain that mirrors the dispatch logic.
> Trace only after the frame is known to be well-formed.
>
> Side effects of this change:
> - The WARN_ON(len < 2) is replaced by a silent early return, since
> these cfg80211 callbacks can legitimately receive short frames from
> drivers.
Can they? How?
johannes
^ permalink raw reply
* Re: [PATCH v2] wifi: brcmfmac: add DPP support and fix fw-supplicant/P2P interop
From: Arend van Spriel @ 2026-07-06 10:25 UTC (permalink / raw)
To: Jason Huang; +Cc: linux-wireless, brcm80211, brcm80211-dev-list.pdl, Kurt Lee
In-Reply-To: <20260604034227.590951-1-Jason.Huang2@infineon.com>
On Thu, 4 Jun 2026 11:42:29 +0800, Jason Huang wrote:
> From: Kurt Lee <kurt.lee@cypress.com>
>
> Add DPP support in brcmfmac and include follow-up fixes needed for
> reliable operation with mixed security setups.
[...]
> if (sme->crypto.psk) {
> if (is_sae_akm &&
> profile->use_fwsup != BRCMF_PROFILE_FWSUP_SAE) {
> profile->use_fwsup = BRCMF_PROFILE_FWSUP_NONE;
> } else if (!is_sae_akm &&
> profile->use_fwsup != BRCMF_PROFILE_FWSUP_SAE) {
> if (WARN_ON(profile->use_fwsup !=
> BRCMF_PROFILE_FWSUP_NONE)) {
> err = -EINVAL;
> goto done;
> }
> brcmf_dbg(INFO, "using PSK offload\n");
> profile->use_fwsup = BRCMF_PROFILE_FWSUP_PSK;
> }
> } else {
> profile->use_fwsup = BRCMF_PROFILE_FWSUP_NONE;
> }
The else branch resets use_fwsup unconditionally when psk is NULL. For a pure
SAE connection (sae_pwd set, psk NULL), brcmf_set_key_mgmt() set use_fwsup =
FWSUP_SAE, but the else clears it to NONE. As a result sup_wpa = 0 is written
and the SAE password path below is never reached, breaking WPA3-SAE. Same
problem for 802.1X (FWSUP_1X, psk = NULL).
For DPP, use_fwsup is already FWSUP_NONE at this point, so writing sup_wpa = 0
only when use_fwsup == NONE would achieve the goal without the regression.
This patch will also conflict with the pending "wifi: brcmfmac: fix
802.11x-SHA256 call trace warning" patch as both touch brcmf_set_key_mgmt().
Please rebase on top of it.
The remain-on-channel wdev tracking fix is a pre-existing P2P bug independent of
DPP. Please split it into a separate patch with a Fixes: tag so it can be
backported to stable independently.
Regards,
Arend
^ permalink raw reply
* Re: [PATCH 5.15.y] wifi: brcmfmac: fix use-after-free when rescheduling brcmf_btcoex_info work
From: Arend van Spriel @ 2026-07-06 10:25 UTC (permalink / raw)
To: Robert Garcia; +Cc: stable, Duoming Zhou, Johannes Berg, linux-wireless
In-Reply-To: <20260528055431.4124445-1-rob_garcia@163.com>
On Thu, 28 May 2026 13:54:31 +0800, Robert Garcia wrote:
> From: Duoming Zhou <duoming@zju.edu.cn>
>
> [ Upstream commit 9cb83d4be0b9b697eae93d321e0da999f9cdfcfc ]
[...]
> + del_timer_sync(&cfg->btcoex->timer);
> + cfg->btcoex->timer_on = false;
>
> cancel_work_sync(&cfg->btcoex->work);
The upstream fix uses timer_shutdown_sync() which prevents the timer from
being re-armed after it returns. del_timer_sync() does not have this
guarantee.
brcmf_btcoex_handler() has three mod_timer() calls - two in
BRCMF_BT_DHCP_START and one in BRCMF_BT_DHCP_OPPR_WIN - none of which are
guarded by timer_on. A work item running between del_timer_sync() and
cancel_work_sync() can re-arm the timer, leaving it pending when kfree() is
called.
If the mod_timer() calls were made conditional on timer_on, setting
timer_on = false before del_timer_sync() would be sufficient. That would be
my preferred fix. Alternatively a second del_timer_sync() after
cancel_work_sync() would also work.
Also the commit message still mentions timer_shutdown_sync() rather than
del_timer_sync().
Regards,
Arend
^ permalink raw reply
* Re: [PATCH] wifi: brcmfmac: 43430 and 43455 are CYW parts
From: Arend van Spriel @ 2026-07-06 10:24 UTC (permalink / raw)
To: Shelley Yang
Cc: linux-wireless, Johannes Berg, wlan-kernel-dev-list, Phil Elwell,
Arend van Spriel
In-Reply-To: <20260525083926.583964-1-shelley.yang@infineon.com>
On Mon, 25 May 2026 16:39:26 +0800, Shelley Yang wrote:
> From: Phil Elwell <phil@raspberrypi.com>
>
> The brcmfmac driver uses the SDIO vendor ID values to identify which
> vendor's driver extensions to use. However, the Cypress/Infineon devices
> have a vendor ID of 02d0, which is Broadcom.
>
> In order to use the Cypress driver extensions, modify the static mapping
> for "43430", "4345" (sic) and "43455"
> to indicate that they are Cypress parts.
>
> Signed-off-by: Phil Elwell <phil@raspberrypi.com>
> Signed-off-by: Shelley Yang <shelley.yang@infineon.com>
> ---
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Regards,
Arend
^ permalink raw reply
* Re: [PATCH] wifi: brcmfmac: fix 802.11x-SHA256 call trace warning
From: Arend van Spriel @ 2026-07-06 10:20 UTC (permalink / raw)
To: Shelley Yang
Cc: linux-wireless, Johannes Berg, wlan-kernel-dev-list,
Arend van Spriel
In-Reply-To: <20260525083859.581246-1-shelley.yang@infineon.com>
On Mon, 25 May 2026 16:38:59 +0800, Shelley Yang wrote:
> Based on wpa_auth as 1x_256 mode, need to set up
> "use_fwsup" with BRCMF_PROFILE_FWSUP_1X.
> Or it will happen trace warning when call brcmf_cfg80211_set_pmk().
[...]
> Fixes: 2526ff21aa77 ("brcmfmac: support 4-way handshake offloading for 802.1X")
> Signed-off-by: Shelley Yang <shelley.yang@infineon.com>
> ---
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 2 +-
> 1 file changed, 2 insertions(+), 2 deletions(-)
Nit: the subject says "802.11x-SHA256" but the correct notation is "802.1X-SHA256".
Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Regards,
Arend
^ permalink raw reply
* Re: [PATCH 3/3] MIPS: BCM47XX: Convert buttons to software nodes
From: Bartosz Golaszewski @ 2026-07-06 9:57 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Bartosz Golaszewski, Arnd Bergmann, linux-wireless, linux-kernel,
linux-mips, Rafał Miłecki, Michael Buesch,
Hauke Mehrtens, Thomas Bogendoerfer
In-Reply-To: <20260704-b4-bcm47xx-swnode-v1-3-730d59340237@gmail.com>
On Sun, 5 Jul 2026 07:25:10 +0200, Dmitry Torokhov
<dmitry.torokhov@gmail.com> said:
> Convert the legacy gpio-keys platform device on BCM47XX boards to
> use software nodes/properties. This allows us to describe the GPIO
> keys and their GPIO bindings using software nodes, so that support
> for platform data can eventually be removed from the gpio-keys
> driver.
>
> Detect the active bus type (BCMA or SSB) and reference the
> corresponding GPIO controller's software node (bcma_gpio_swnode or
> ssb_gpio_swnode) in the button properties.
>
> Assisted-by: Antigravity:gemini-3.5-flash
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> ---
Reviewed-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
^ permalink raw reply
* Re: [PATCH 1/3] bcma: gpio: Add and register software node for GPIO controller
From: Bartosz Golaszewski @ 2026-07-06 9:56 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Bartosz Golaszewski, Arnd Bergmann, linux-wireless, linux-kernel,
linux-mips, Rafał Miłecki, Michael Buesch,
Hauke Mehrtens, Thomas Bogendoerfer
In-Reply-To: <20260704-b4-bcm47xx-swnode-v1-1-730d59340237@gmail.com>
On Sun, 5 Jul 2026 07:25:08 +0200, Dmitry Torokhov
<dmitry.torokhov@gmail.com> said:
> We want to convert the legacy gpio-keys platform device on BCM47XX
> boards to use software nodes. To do this properly and allow
> referencing the GPIO controller by address rather than relying on
> name-based matching (which is being removed from the gpiolib core),
> we need to associate the GPIO controller with a software node.
>
> Introduce bcma_gpio_swnode, register it if the device does not
> already have a firmware node, and associate it with the gpio_chip.
>
> Assisted-by: Antigravity:gemini-3.5-flash
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> ---
> drivers/bcma/driver_gpio.c | 17 ++++++++++++++++-
> include/linux/bcma/bcma.h | 3 +++
> 2 files changed, 19 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/bcma/driver_gpio.c b/drivers/bcma/driver_gpio.c
> index 658c7e2ac8bf..0dad8d6dbe5a 100644
> --- a/drivers/bcma/driver_gpio.c
> +++ b/drivers/bcma/driver_gpio.c
> @@ -19,6 +19,11 @@
>
> #define BCMA_GPIO_MAX_PINS 32
>
> +const struct software_node bcma_gpio_swnode = {
> + .name = "bcma-gpio",
> +};
> +EXPORT_SYMBOL_GPL(bcma_gpio_swnode);
> +
> static int bcma_gpio_get_value(struct gpio_chip *chip, unsigned gpio)
> {
> struct bcma_drv_cc *cc = gpiochip_get_data(chip);
> @@ -190,7 +195,15 @@ int bcma_gpio_init(struct bcma_drv_cc *cc)
> chip->direction_input = bcma_gpio_direction_input;
> chip->direction_output = bcma_gpio_direction_output;
> chip->parent = bus->dev;
> - chip->fwnode = dev_fwnode(&cc->core->dev);
> +
> + if (!dev_fwnode(&cc->core->dev)) {
> + err = software_node_register(&bcma_gpio_swnode);
> + if (err)
> + return err;
> + chip->fwnode = software_node_fwnode(&bcma_gpio_swnode);
> + } else {
> + chip->fwnode = dev_fwnode(&cc->core->dev);
> + }
>
> switch (bus->chipinfo.id) {
> case BCMA_CHIP_ID_BCM4707:
> @@ -234,5 +247,7 @@ int bcma_gpio_unregister(struct bcma_drv_cc *cc)
> {
> bcma_gpio_irq_exit(cc);
> gpiochip_remove(&cc->gpio);
> + if (cc->gpio.fwnode && is_software_node(cc->gpio.fwnode))
> + software_node_unregister(&bcma_gpio_swnode);
> return 0;
> }
> diff --git a/include/linux/bcma/bcma.h b/include/linux/bcma/bcma.h
> index f02cb3909375..aa88c2d64bfb 100644
> --- a/include/linux/bcma/bcma.h
> +++ b/include/linux/bcma/bcma.h
> @@ -486,4 +486,7 @@ extern u32 bcma_core_dma_translation(struct bcma_device *core);
>
> extern unsigned int bcma_core_irq(struct bcma_device *core, int num);
>
> +struct software_node;
Maybe move the forward declaration to the top of the file as is customary?
> +extern const struct software_node bcma_gpio_swnode;
> +
> #endif /* LINUX_BCMA_H_ */
>
> --
> 2.55.0.rc0.799.gd6f94ed593-goog
>
>
Bart
^ permalink raw reply
* [PATCH] wifi: mwifiex: validate scan TLV result arrays
From: Pengpeng Hou @ 2026-07-06 9:26 UTC (permalink / raw)
To: Brian Norris
Cc: Pengpeng Hou, Francesco Dolcini, Kees Cook, linux-wireless,
linux-kernel
mwifiex_ret_802_11_scan() indexes TSF and channel-band TLV
arrays by the reported number of BSS result sets.
Ignore TSF or channel-band TLVs whose payload length cannot provide one
entry per reported BSS set.
Signed-off-by: Pengpeng Hou <pengpeng@iscas.ac.cn>
---
drivers/net/wireless/marvell/mwifiex/scan.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/drivers/net/wireless/marvell/mwifiex/scan.c b/drivers/net/wireless/marvell/mwifiex/scan.c
index 97c0ec3b822e..7416756ada3b 100644
--- a/drivers/net/wireless/marvell/mwifiex/scan.c
+++ b/drivers/net/wireless/marvell/mwifiex/scan.c
@@ -2165,6 +2165,15 @@ int mwifiex_ret_802_11_scan(struct mwifiex_private *priv,
(struct mwifiex_ie_types_data **)
&chan_band_tlv);
+ if (tsf_tlv &&
+ le16_to_cpu(tsf_tlv->header.len) / TSF_DATA_SIZE <
+ scan_rsp->number_of_sets)
+ tsf_tlv = NULL;
+ if (chan_band_tlv &&
+ le16_to_cpu(chan_band_tlv->header.len) /
+ sizeof(*chan_band_tlv->chan_band_param) < scan_rsp->number_of_sets)
+ chan_band_tlv = NULL;
+
#ifdef CONFIG_PM
if (priv->wdev.wiphy->wowlan_config)
nd_config = priv->wdev.wiphy->wowlan_config->nd_config;
--
2.43.0
^ permalink raw reply related
* [PATCH] wifi: mwifiex: validate rate scope TLV length
From: Pengpeng Hou @ 2026-07-06 9:13 UTC (permalink / raw)
To: Brian Norris
Cc: Pengpeng, Francesco Dolcini, Kees Cook, linux-wireless,
linux-kernel
From: Pengpeng <pengpeng@iscas.ac.cn>
mwifiex_ret_tx_rate_cfg() verifies that a TLV stays within the command
response, then parses RATE_SCOPE as struct mwifiex_rate_scope. The
type-specific parser also needs to prove that the declared TLV payload
covers the bitmap fields that it reads.
Check the RATE_SCOPE payload length before copying the legacy bitmaps,
and require the VHT bitmap area only for firmware API version 15 where
it is consumed.
Signed-off-by: Pengpeng <pengpeng@iscas.ac.cn>
---
drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
index 85512f526c5f..5b7399038d5d 100644
--- a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
@@ -260,6 +260,7 @@ static int mwifiex_ret_tx_rate_cfg(struct mwifiex_private *priv,
struct mwifiex_rate_scope *rate_scope;
struct mwifiex_ie_types_header *head;
u16 tlv, tlv_buf_len, tlv_buf_left;
+ size_t rate_scope_len;
u8 *tlv_buf;
u32 i;
@@ -276,6 +277,14 @@ static int mwifiex_ret_tx_rate_cfg(struct mwifiex_private *priv,
switch (tlv) {
case TLV_TYPE_RATE_SCOPE:
+ rate_scope_len = offsetof(struct mwifiex_rate_scope,
+ vht_mcs_rate_bitmap) - sizeof(*head);
+ if (priv->adapter->fw_api_ver == MWIFIEX_FW_V15)
+ rate_scope_len = sizeof(*rate_scope) - sizeof(*head);
+
+ if (tlv_buf_len < rate_scope_len)
+ break;
+
rate_scope = (struct mwifiex_rate_scope *) tlv_buf;
priv->bitmap_rates[0] =
le16_to_cpu(rate_scope->hr_dsss_rate_bitmap);
--
2.43.0
^ permalink raw reply related
* Re: [PATCH] wifi: mac80211: only accept IBSS channel switch from our own BSSID
From: Johannes Berg @ 2026-07-06 8:53 UTC (permalink / raw)
To: Nathan Howard; +Cc: Yingjie Cao, linux-wireless, linux-kernel, stable
In-Reply-To: <ajrfKAmdZnPPkGKE@gpu1>
On Tue, 2026-06-23 at 15:31 -0400, Nathan Howard wrote:
>
> So, what's the litmus test?
I don't know, tbh.
> I've been watching this list for some time
> now. I've seen (what appears) to be an ushering of distrust brought
> on by llm's. This also seems to have come into prominence within the last 6 or
> so months. I understand the cautious approach, but what if one's been
> working diligently (and quietly), and has spent many hours studying and
> preparing a driver series (for oneself and submission to the kernel)?
> I've always done well by doing my homework the hard way. But now,
> submissions are met with skepticism... that the work must have been
> assisted-by if the person doesn't have a track record. How should one defend
> his work (I'd rather not share credit with a machine when my work is my own)?
> To be clear, my question is sourcing from what I've seen to be trending
> more recently whereby several submissions have been ?softly? tagged as assisted-by.
> Maybe they were, but my point still stands. Kindly provide guidance.
I'm convinced that if you've actually done the legwork you could defend
the work you've done. If you're willing to go on the record saying you
_didn't_ use an LLM I'm even going to believe it.
But if someone's sending "critical security fix that needs security@
involvement" across a wide spectrum of places then yes, I'm going to be
highly sceptical they actually know what they're doing on any individual
one of the issues.
Like here. OK, this one didn't go to security@, and it's not even a
wrong fix, but doing "Cc stable", Cc'ing half the world and not
following up *at all* are all bad signs.
johannes
^ permalink raw reply
* Re: [PATCH wireless-next v2 06/31] wifi: mm81x: add core.h
From: Johannes Berg @ 2026-07-06 8:44 UTC (permalink / raw)
To: Lachlan Hodges
Cc: Dan Callaghan, Arien Judge, ayman.grais, linux-wireless,
linux-kernel
In-Reply-To: <o5cnnv4t7je6l4d3re6cifwb6v5ox3znje7hqmy7ebkktt5iak@4vtrqqfxx3iq>
Hi,
Sorry for the delay. You probably already decided, but FWIW
> since the kernel (AFAICT) only has a single host endian structure.
> However I am a bit cautious about redefining elf sections here since
> I cannot find much precedent in the tree. it does mean we don't need
> to use __force. Of course we could also do what you wrote above and
> convert in-place using __force to the host endian struct. Do you have
> any preferences here?
I don't really, though I'd probably try to capture this in as little
code as possible, perhaps a single conversion function.
> Seems most wireless drivers have much simpler
> TLV followed by blob firmware loaders.
Indeed, why bother with anything more complex if you get to define it,
but maybe you don't get to define it.
johannes
^ permalink raw reply
* Re: [PATCH] timekeeping: Document monotonic raw timestamps in snapshots correctly
From: Thomas Weißschuh @ 2026-07-06 8:42 UTC (permalink / raw)
To: Thomas Gleixner
Cc: LKML, David Woodhouse, Miroslav Lichvar, John Stultz,
Stephen Boyd, Anna-Maria Behnsen, Frederic Weisbecker,
Arthur Kiyanovski, Rodolfo Giometti, Vincent Donnefort,
Marc Zyngier, Oliver Upton, kvmarm, Oliver Upton, Richard Cochran,
netdev, Takashi Iwai, Miri Korenblit, Johannes Berg, Jacob Keller,
Tony Nguyen, Saeed Mahameed, Peter Hilber, Michael S. Tsirkin,
virtualization, linux-wireless, linux-sound
In-Reply-To: <87wlv9k3wz.ffs@fw13>
On Sun, Jul 05, 2026 at 02:38:04PM +0200, Thomas Gleixner wrote:
> The comments related to raw monotonic timestamps for the various
> snapshot mechanisms in code and struct documentation are ambiguous. They
> reference them as CLOCK_MONOTONIC_RAW timestamps, but with the arrival
> of AUX clocks that's not longer correct.
>
> The raw monotonic timestamps only represent CLOCK_MONOTONIC_RAW for the
> system time clock IDs, i.e. REALTIME, MONOTONIC, BOOTTIME, TAI.
>
> For AUX clocks they refer to the monotonic raw clock which is related to
> the individual AUX clocks. These monotonic raw timestamps have the same
> conversion factor as CLOCK_MONOTONIC_RAW, but differ from that by an
> offset:
>
> MONORAW(AUX$N) = MONORAW(SYSTEM) + OFFSET(AUX$N)
>
> The offset is established when a AUX clock is enabled and stays constant
> for the lifetime of the AUX clock.
>
> Update the comments so they reflect reality.
>
> Signed-off-by: Thomas Gleixner <tglx@kernel.org>
> Reported-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Thanks!
Reviewed-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
(...)
^ permalink raw reply
* [PATCH wireless-next v2 1/2] wifi: nl80211/cfg80211: Add MCST value to channel switch started notification
From: Shashikala Prabhu @ 2026-07-06 8:38 UTC (permalink / raw)
To: johannes; +Cc: linux-wireless, cgopi
In-Reply-To: <20260706083900.908140-1-shashikala.prabhu@oss.qualcomm.com>
From: Chandru Gopi <cgopi@qti.qualcomm.com>
IEEE Std 802.11-2024 subclause 9.4.2.216 (Max Channel Switch Time element)
defines a Switch Time field in the Channel Switch Announcement (CSA)
element that indicates the time delta between the time the last beacon
is transmitted by the AP in the current channel and the expected time
of the first beacon transmitted by the AP in the new channel.
Add a new u32 nl80211 attribute, NL80211_ATTR_MAX_CH_SWITCH_TIME,
and extend cfg80211_ch_switch_started_notify() to carry this
value. The value is forwarded to userspace via the
NL80211_CMD_CH_SWITCH_STARTED_NOTIFY event. Userspace can use this
information to decide whether to remain connected or disconnect
before the AP moves to the new channel.
Signed-off-by: Chandru Gopi <chandru.gopi@oss.qualcomm.com>
Signed-off-by: Shashikala Prabhu <shashikala.prabhu@oss.qualcomm.com>
---
include/net/cfg80211.h | 4 +++-
include/uapi/linux/nl80211.h | 11 +++++++++++
net/wireless/nl80211.c | 13 +++++++++----
3 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 8188ad200de5..93ce6bf4d385 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -9987,6 +9987,8 @@ void cfg80211_ch_switch_notify(struct net_device *dev,
* @link_id: the link ID for MLO, must be 0 for non-MLO
* @count: the number of TBTTs until the channel switch happens
* @quiet: whether or not immediate quiet was requested by the AP
+ * @mcst_tu: max channel switch time in TUs, 0 if the MCST element was not
+ * present
*
* Inform the userspace about the channel switch that has just
* started, so that it can take appropriate actions (eg. starting
@@ -9995,7 +9997,7 @@ void cfg80211_ch_switch_notify(struct net_device *dev,
void cfg80211_ch_switch_started_notify(struct net_device *dev,
struct cfg80211_chan_def *chandef,
unsigned int link_id, u8 count,
- bool quiet);
+ bool quiet, u32 mcst_tu);
/**
* ieee80211_operating_class_to_band - convert operating class to band
diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index 9998f6c0a665..daee71bcf9cd 100644
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -953,6 +953,10 @@
* after %NL80211_ATTR_CH_SWITCH_COUNT TBTT's. The userspace may
* decide to react to this indication by requesting other
* interfaces to change channel as well.
+ * %NL80211_ATTR_MAX_CH_SWITCH_TIME included in this command indicates the
+ * AP's Max Channel Switch Time. Userspace can use this information to
+ * decide whether to remain connected or disconnect before the AP moves to
+ * the new channel.
*
* @NL80211_CMD_START_P2P_DEVICE: Start the given P2P Device, identified by
* its %NL80211_ATTR_WDEV identifier. It must have been created with
@@ -3165,6 +3169,12 @@ enum nl80211_commands {
* @NL80211_ATTR_NPCA_PRIMARY_FREQ: NPCA primary channel (u32)
* @NL80211_ATTR_NPCA_PUNCT_BITMAP: NPCA puncturing bitmap (u32)
*
+ * @NL80211_ATTR_MAX_CH_SWITCH_TIME: u32 attribute carrying the Switch Time
+ * field from the MCST (Max Channel Switch Time) element, indicating the
+ * time delta between the time the last beacon is transmitted by the AP in
+ * the current channel and the expected time of the first beacon
+ * transmitted by the AP in the new channel, expressed in TUs.
+ *
* @NUM_NL80211_ATTR: total number of nl80211_attrs available
* @NL80211_ATTR_MAX: highest attribute number currently defined
* @__NL80211_ATTR_AFTER_LAST: internal use
@@ -3762,6 +3772,7 @@ enum nl80211_attrs {
NL80211_ATTR_NPCA_PRIMARY_FREQ,
NL80211_ATTR_NPCA_PUNCT_BITMAP,
+ NL80211_ATTR_MAX_CH_SWITCH_TIME,
/* add attributes here, update the policy in nl80211.c */
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 53b4b3f76697..b6bc5e395a7f 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -22290,7 +22290,8 @@ static void nl80211_ch_switch_notify(struct cfg80211_registered_device *rdev,
struct cfg80211_chan_def *chandef,
gfp_t gfp,
enum nl80211_commands notif,
- u8 count, bool quiet)
+ u8 count, bool quiet,
+ u32 mcst_tu)
{
struct wireless_dev *wdev = netdev->ieee80211_ptr;
struct sk_buff *msg;
@@ -22322,6 +22323,10 @@ static void nl80211_ch_switch_notify(struct cfg80211_registered_device *rdev,
if (quiet &&
nla_put_flag(msg, NL80211_ATTR_CH_SWITCH_BLOCK_TX))
goto nla_put_failure;
+ if (mcst_tu && (wdev->iftype == NL80211_IFTYPE_STATION ||
+ wdev->iftype == NL80211_IFTYPE_P2P_CLIENT) &&
+ nla_put_u32(msg, NL80211_ATTR_MAX_CH_SWITCH_TIME, mcst_tu))
+ goto nla_put_failure;
}
genlmsg_end(msg, hdr);
@@ -22374,7 +22379,7 @@ void cfg80211_ch_switch_notify(struct net_device *dev,
cfg80211_sched_dfs_chan_update(rdev);
nl80211_ch_switch_notify(rdev, dev, link_id, chandef, GFP_KERNEL,
- NL80211_CMD_CH_SWITCH_NOTIFY, 0, false);
+ NL80211_CMD_CH_SWITCH_NOTIFY, 0, false, 0);
}
EXPORT_SYMBOL(cfg80211_ch_switch_notify);
@@ -22421,7 +22426,7 @@ EXPORT_SYMBOL(cfg80211_incumbent_signal_notify);
void cfg80211_ch_switch_started_notify(struct net_device *dev,
struct cfg80211_chan_def *chandef,
unsigned int link_id, u8 count,
- bool quiet)
+ bool quiet, u32 mcst_tu)
{
struct wireless_dev *wdev = dev->ieee80211_ptr;
struct wiphy *wiphy = wdev->wiphy;
@@ -22435,7 +22440,7 @@ void cfg80211_ch_switch_started_notify(struct net_device *dev,
nl80211_ch_switch_notify(rdev, dev, link_id, chandef, GFP_KERNEL,
NL80211_CMD_CH_SWITCH_STARTED_NOTIFY,
- count, quiet);
+ count, quiet, mcst_tu);
}
EXPORT_SYMBOL(cfg80211_ch_switch_started_notify);
--
2.34.1
^ permalink raw reply related
* [PATCH wireless-next v2 2/2] wifi: mac80211: Pass MCST element value in ch_switch_started_notify
From: Shashikala Prabhu @ 2026-07-06 8:39 UTC (permalink / raw)
To: johannes; +Cc: linux-wireless, cgopi
In-Reply-To: <20260706083900.908140-1-shashikala.prabhu@oss.qualcomm.com>
From: Chandru Gopi <cgopi@qti.qualcomm.com>
IEEE Std 802.11-2024 subclause 9.4.2.216 (Max Channel Switch Time element)
defines a Switch Time field in the Channel Switch Announcement (CSA)
element that indicates the time delta between the time the last beacon
is transmitted by the AP in the current channel and the expected time
of the first beacon transmitted by the AP in the new channel.
Pass the already-parsed MCST (Maximum Channel Switch Time) element
value to cfg80211_ch_switch_started_notify().
Pass mcst_tu=0 in the __ieee80211_channel_switch() call to
cfg80211_ch_switch_started_notify() since the AP-initiated channel
switch path does not carry a MCST element, as this element is only
present in Beacon/Probe Response frames processed on the STA side via
ieee80211_sta_process_chanswitch().
Signed-off-by: Chandru Gopi <chandru.gopi@oss.qualcomm.com>
Signed-off-by: Shashikala Prabhu <shashikala.prabhu@oss.qualcomm.com>
---
net/mac80211/cfg.c | 2 +-
net/mac80211/mlme.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 3b58af59f7e4..70cb8e39a64f 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -4802,7 +4802,7 @@ __ieee80211_channel_switch(struct wiphy *wiphy, struct net_device *dev,
cfg80211_ch_switch_started_notify(sdata->dev,
&link_data->csa.chanreq.oper, link_id,
- params->count, params->block_tx);
+ params->count, params->block_tx, 0);
if (changed) {
ieee80211_link_info_change_notify(sdata, link_data, changed);
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 9e92337bb6f9..507d7e81ddcd 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -3470,7 +3470,7 @@ ieee80211_sta_process_chanswitch(struct ieee80211_link_data *link,
cfg80211_ch_switch_started_notify(sdata->dev, &csa_ie.chanreq.oper,
link->link_id, csa_ie.count,
- csa_ie.mode);
+ csa_ie.mode, csa_ie.max_switch_time);
/* we may have to handle timeout for deactivated link in software */
now = ktime_get_boottime();
--
2.34.1
^ permalink raw reply related
* [PATCH wireless-next v2 0/2] wifi: cfg80211/mac80211: Add Max Channel Switch Time (MCST) in channel switch started notify event
From: Shashikala Prabhu @ 2026-07-06 8:38 UTC (permalink / raw)
To: johannes; +Cc: linux-wireless, cgopi
IEEE Std 802.11-2024 subclause 9.4.2.216 (Max Channel Switch Time element)
defines a Switch Time field in the Channel Switch Announcement (CSA)
element that indicates the time delta between the time the last beacon
is transmitted by the AP in the current channel and the expected time
of the first beacon transmitted by the AP in the new channel.
Add a new u32 nl80211 attribute, NL80211_ATTR_MAX_CH_SWITCH_TIME, to
carry this value in the NL80211_CMD_CH_SWITCH_STARTED_NOTIFY event to
userspace. This enables userspace to decide whether to remain connected
or disconnect before the AP moves to the new channel.
Chandru Gopi (2):
wifi: nl80211/cfg80211: Add MCST value to channel switch started
notification
wifi: mac80211: Pass MCST element value in ch_switch_started_notify
---
Changes in v2:
- Reorganize the patch to group nl80211 and cfg80211 changes together.
- Advertise NL80211_ATTR_MAX_CH_SWITCH_TIME only for STA and P2P client
channel switch notifications.
- Addressed review comments from v1.
- Update subjects and commit messages to reflect the revised patches.
---
include/net/cfg80211.h | 4 +++-
include/uapi/linux/nl80211.h | 11 +++++++++++
net/mac80211/cfg.c | 2 +-
net/mac80211/mlme.c | 2 +-
net/wireless/nl80211.c | 13 +++++++++----
5 files changed, 25 insertions(+), 7 deletions(-)
--
2.34.1
^ permalink raw reply
* Re: [PATCH wireless-next] wifi: mt76: fix MAC address for non OF pcie cards
From: Tobias Klausmann @ 2026-07-06 8:19 UTC (permalink / raw)
To: Thorsten Leemhuis
Cc: Rosen Penev, linux-wireless, Felix Fietkau, Lorenzo Bianconi,
Ryder Lee, Shayne Chen, Sean Wang, Matthias Brugger,
AngeloGioacchino Del Regno, open list:ARM/Mediatek SoC support,
moderated list:ARM/Mediatek SoC support,
moderated list:ARM/Mediatek SoC support,
Linux kernel regressions list, Klara Modin
In-Reply-To: <036cc81d-115a-4c0e-9542-71ed2ee04e9b@leemhuis.info>
Hi!
On Mon, 06 Jul 2026, Thorsten Leemhuis wrote:
> On 6/30/26 23:02, Rosen Penev wrote:
> > If seems the check for err is wrong as the proper macaddr gets written
> > to from the EEPROM itself. Meaning checking err from of_get_mac_address is
> > wrong as the proper macaddr has been written by this point.
>
> By our submission guidelines and requests from Linus this afaics should
> also contain:
>
> Reported-by: Klara Modin <klarasmodin@gmail.com>
> Closes: https://lore.kernel.org/all/ajRmlyx_AEGybykL@soda.int.kasm.eu/
> Reported-by: Tobias Klausmann <klausman@schwarzvogel.de>
> Closes:
> https://lore.kernel.org/linux-wireless/30a90714-02d8-45f2-a7f1-4cfe0627d50b@skade.local/
>
> Both of them now CCed, too, to give them a chance to provide a "Tested-by:".
>
> > Fixes: 31ee1582717e ("wifi: mt76: fix of_get_mac_address error handling")
Indeed:
Tested-by: Tobias Klausmann <klausman@schwarzvogel.de>
I've been running 7.2.0-rc1+the revert for a few days now with zero
issues (not that I expected any).
Best,
Tobias
^ permalink raw reply
* [PATCH] nfc: trf7970a: Use NULL when no response is expected
From: Linmao Li @ 2026-07-06 7:57 UTC (permalink / raw)
To: Mark Greer, David Heidelberg
Cc: Linmao Li, linux-wireless, oe-linux-nfc, linux-kernel
When a command's timeout is zero, no response is expected, and the TX
interrupt handler completes the command by passing ERR_PTR(0) to the
digital callback.
ERR_PTR(0) evaluates to NULL, so no errno is encoded here. Use NULL
directly to avoid suggesting that this is an error-pointer path.
Signed-off-by: Linmao Li <lilinmao@kylinos.cn>
---
drivers/nfc/trf7970a.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/nfc/trf7970a.c b/drivers/nfc/trf7970a.c
index 08c27bb438b5..7addf243c6f1 100644
--- a/drivers/nfc/trf7970a.c
+++ b/drivers/nfc/trf7970a.c
@@ -938,7 +938,7 @@ static irqreturn_t trf7970a_irq(int irq, void *dev_id)
if (!trf->timeout) {
trf->ignore_timeout =
!cancel_delayed_work(&trf->timeout_work);
- trf->rx_skb = ERR_PTR(0);
+ trf->rx_skb = NULL;
trf7970a_send_upstream(trf);
break;
}
--
2.25.1
^ permalink raw reply related
* Re: [PATCH wireless-next] wifi: mt76: fix MAC address for non OF pcie cards
From: Thorsten Leemhuis @ 2026-07-06 7:23 UTC (permalink / raw)
To: Rosen Penev, linux-wireless
Cc: Felix Fietkau, Lorenzo Bianconi, Ryder Lee, Shayne Chen,
Sean Wang, Matthias Brugger, AngeloGioacchino Del Regno,
open list:ARM/Mediatek SoC support,
moderated list:ARM/Mediatek SoC support,
moderated list:ARM/Mediatek SoC support,
Linux kernel regressions list, Klara Modin, Tobias Klausmann
In-Reply-To: <20260630210215.400379-1-rosenp@gmail.com>
On 6/30/26 23:02, Rosen Penev wrote:
> If seems the check for err is wrong as the proper macaddr gets written
> to from the EEPROM itself. Meaning checking err from of_get_mac_address is
> wrong as the proper macaddr has been written by this point.
By our submission guidelines and requests from Linus this afaics should
also contain:
Reported-by: Klara Modin <klarasmodin@gmail.com>
Closes: https://lore.kernel.org/all/ajRmlyx_AEGybykL@soda.int.kasm.eu/
Reported-by: Tobias Klausmann <klausman@schwarzvogel.de>
Closes:
https://lore.kernel.org/linux-wireless/30a90714-02d8-45f2-a7f1-4cfe0627d50b@skade.local/
Both of them now CCed, too, to give them a chance to provide a "Tested-by:".
> Fixes: 31ee1582717e ("wifi: mt76: fix of_get_mac_address error handling")
Given this and the reports linked above this afaics should also be
tagged with "wireless", and not with "wireless-next", as this commit is
in 7.2-rc1 -- and thus ideally should be fixed by now. See
https://www.kernel.org/doc/html/latest/process/handling-regressions.html#on-how-quickly-regressions-should-be-fixed,
which contains links to these quotes from Linus:
""But a user complaining should basically result in an immediate fix -
possibly a "revert and rethink"."" and ""It's also worth noting that
"immediate" obviously doesn't mean "right this *second* when the problem
has been reported". But if it's a regression with a known commit that
caused it, I think the rule of thumb should generally be "within a
week", preferably before the next rc.""
Ciao, Thorsten
> Signed-off-by: Rosen Penev <rosenp@gmail.com>
> ---
> drivers/net/wireless/mediatek/mt76/eeprom.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/mediatek/mt76/eeprom.c b/drivers/net/wireless/mediatek/mt76/eeprom.c
> index b99d7452800f..afdb73661866 100644
> --- a/drivers/net/wireless/mediatek/mt76/eeprom.c
> +++ b/drivers/net/wireless/mediatek/mt76/eeprom.c
> @@ -181,7 +181,7 @@ mt76_eeprom_override(struct mt76_phy *phy)
> if (err == -EPROBE_DEFER)
> return err;
>
> - if (err) {
> + if (!is_valid_ether_addr(phy->macaddr)) {
> eth_random_addr(phy->macaddr);
> dev_info(dev->dev,
> "Invalid MAC address, using random address %pM\n",
^ permalink raw reply
* Re: [PATCH ath-next] wifi: ath12k: fix ML-STA authentication timeout on QCC2072
From: Vasanthakumar Thiagarajan @ 2026-07-06 4:44 UTC (permalink / raw)
To: Miaoqing Pan, jjohnson; +Cc: ath12k, linux-wireless, linux-kernel
In-Reply-To: <20260704073000.3300099-1-miaoqing.pan@oss.qualcomm.com>
On 7/4/2026 1:00 PM, Miaoqing Pan wrote:
> QCC2072 firmware interprets the MLO_LINK_ADD and MLO_START_AS_ACTIVE
> flags to control the link state during MLO vdev start. MLO_LINK_ADD
> indicates that a link is being added, while MLO_START_AS_ACTIVE specifies
> that the link should become active during the start.
>
> When an association link is added without setting MLO_START_AS_ACTIVE,
> the firmware may transition the link into a suspended state. In this
> case, authentication frames transmitted by the host can be dropped,
> leading to repeated authentication retries and eventual timeout,
> for example:
> wlp1s0: send auth to <AP> (try 1/3)
> wlp1s0: send auth to <AP> (try 2/3)
> wlp1s0: send auth to <AP> (try 3/3)
> wlp1s0: authentication with <AP> timed out
>
> Avoid triggering this behavior by setting the MLO_START_AS_ACTIVE flag
> when MLO_ASSOC_LINK is set, which tells the firmware that the current
> vdev must not enter suspend mode
>
> Note that this change relies on firmware behavior observed on the QCC2072
> platform. The firmware on WCN7850 and QCN9274 does not use the
> MLO_START_AS_ACTIVE flag, so this change is effectively a no-op on those
> platforms
>
> Tested-on: QCC2072 hw1.0 PCI WLAN.COL.1.0.c2-00068-QCACOLSWPL_V1_TO_SILICONZ-1
> Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.1.c5-00302-QCAHMTSWPL_V1.0_V2.0_SILICONZ-1.115823.3
>
> Fixes: d8e1f4a19310 ("wifi: ath12k: enable QCC2072 support")
> Signed-off-by: Miaoqing Pan <miaoqing.pan@oss.qualcomm.com>
Reviewed-by: Vasanthakumar Thiagarajan <vasanthakumar.thiagarajan@oss.qualcomm.com>
^ permalink raw reply
* [PATCH rtw-next v2 9/9] wifi: rtw89: coex: Add Co-RX logic
From: Ping-Ke Shih @ 2026-07-06 2:54 UTC (permalink / raw)
To: linux-wireless; +Cc: ku920601
In-Reply-To: <20260706025445.18428-1-pkshih@realtek.com>
From: Ching-Te Ku <ku920601@realtek.com>
Co-RX means Wi-Fi & Bluetooth can be able to RX in the same time. This
patch is for judging the Wi-Fi/Bluetooth condition could be Co-RX or not,
and how to set the gain and power.
Signed-off-by: Ching-Te Ku <ku920601@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
---
drivers/net/wireless/realtek/rtw89/coex.c | 69 +++++++++++++++++++++++
drivers/net/wireless/realtek/rtw89/core.h | 1 +
2 files changed, 70 insertions(+)
diff --git a/drivers/net/wireless/realtek/rtw89/coex.c b/drivers/net/wireless/realtek/rtw89/coex.c
index e78fcaf4e196..802348166e6b 100644
--- a/drivers/net/wireless/realtek/rtw89/coex.c
+++ b/drivers/net/wireless/realtek/rtw89/coex.c
@@ -3319,7 +3319,74 @@ static void _set_bt_rx_gain(struct rtw89_dev *rtwdev, bool force_exec, u8 bid,
_write_scbd(rtwdev, bid, scbd_bit, state);
}
+}
+
+static void _set_bt_corx_table(struct rtw89_dev *rtwdev, bool en)
+{
+ struct rtw89_btc *btc = &rtwdev->btc;
+ struct rtw89_btc_cx *cx = &btc->cx;
+ struct rtw89_btc_bt_info *bt = &cx->bt0;
+ struct rtw89_btc_dm *dm = &btc->dm;
+ u8 is_24g, is_56g, i;
+ u32 scbd_bit;
+
+ /*
+ * true: bt use Hi-LNA rx gain table (f/e/3/2) in -3x~-9xdBm for co-rx
+ * false: bt use original rx gain table (f/b/7/3/2)
+ */
+
+ if (btc->dm.fdd_bind.bt_sel == BIT(BTC_BT_EXT))
+ return;
+
+ for (i = BTC_BT_1ST; i <= BTC_BT_2ND; i++) {
+ scbd_bit = 0;
+ if (i == BTC_BT_2ND) {
+ if (!(rtwdev->chip->para_ver & BTC_FEAT_DUAL_BT))
+ continue;
+ bt = &cx->bt1;
+ }
+ is_24g = (dm->corx_map[BTC_RF_S0][i] ||
+ dm->corx_map[BTC_RF_S1][i]) & BIT(RTW89_BAND_2G);
+ is_56g = (dm->corx_map[BTC_RF_S0][i] ||
+ dm->corx_map[BTC_RF_S1][i]) & BIT(RTW89_BAND_5G);
+ if (is_24g)
+ scbd_bit |= BTC_WSCB_BT_HILNA;
+ if (is_56g)
+ scbd_bit |= BTC_WSCB_BT_HILNA_56G;
+
+ if ((is_24g && (en != (!!bt->hi_lna_rx))) ||
+ (is_56g && (en != (!!bt->hi_lna_rx_6g))))
+ _write_scbd(rtwdev, i, scbd_bit, en);
+ }
+}
+
+static void _set_rf_trx_para_v9(struct rtw89_dev *rtwdev)
+{
+ struct rtw89_btc *btc = &rtwdev->btc;
+ struct rtw89_btc_cx *cx = &btc->cx;
+ struct rtw89_btc_wl_smap *wl_smap = &cx->wl.status.map;
+ struct rtw89_btc_dm *dm = &btc->dm;
+ bool bt_2r = false;
+ u8 wl_stb_chg = 0;
+
+ if (wl_smap->rf_off || wl_smap->lps == BTC_LPS_RF_OFF)
+ return;
+
+ /* must call after _set_halbb_btg_ctrl() */
+ if (dm->tdd_bind.wl_link_mode != BTC_WLINK_NOLINK) {
+ wl_stb_chg = 1;
+ if (dm->wl_btg_rx)
+ bt_2r = true;
+ }
+
+ _set_bt_corx_table(rtwdev, bt_2r);
+
+ if (wl_stb_chg != dm->wl_stb_chg) {
+ dm->wl_stb_chg = wl_stb_chg;
+ dm->ost_info.wl_btg_standby_chg = wl_stb_chg;
+ rtwdev->chip->ops->btc_wl_s1_standby(rtwdev, dm->wl_stb_chg);
+ }
}
static void _set_rf_trx_para(struct rtw89_dev *rtwdev)
@@ -3356,6 +3423,8 @@ static void _set_rf_trx_para(struct rtw89_dev *rtwdev)
if (ver->fcxtrx == 9 && chip->rf_para_ulink_v9) {
ul_para_num = chip->rf_para_ulink_num_v9;
dl_para_num = chip->rf_para_dlink_num_v9;
+ _set_rf_trx_para_v9(rtwdev);
+ return;
} else if (ver->fcxtrx == 0 && chip->rf_para_ulink_v0) {
ul_para_num = chip->rf_para_ulink_num_v0;
dl_para_num = chip->rf_para_dlink_num_v0;
diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h
index 8646a13bfd79..524b4974040c 100644
--- a/drivers/net/wireless/realtek/rtw89/core.h
+++ b/drivers/net/wireless/realtek/rtw89/core.h
@@ -3278,6 +3278,7 @@ struct rtw89_btc_fbtc_outsrc_set_info {
u8 pta_req_hw_band;
u8 rf_gbt_source;
u8 bt_enable_state;
+ u8 wl_btg_standby_chg;
} __packed;
union rtw89_btc_fbtc_slot_u {
--
2.25.1
^ permalink raw reply related
* [PATCH rtw-next v2 8/9] wifi: rtw89: coex: Update scoreboard related logic for dual Bluetooth
From: Ping-Ke Shih @ 2026-07-06 2:54 UTC (permalink / raw)
To: linux-wireless; +Cc: ku920601
In-Reply-To: <20260706025445.18428-1-pkshih@realtek.com>
From: Ching-Te Ku <ku920601@realtek.com>
Update WiFi status to each Bluetooth & collect status from the two
Bluetooth adapter by non-stop power zone register. To correct the meaning
of variable, redefine the naming for the variables.
Signed-off-by: Ching-Te Ku <ku920601@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
---
drivers/net/wireless/realtek/rtw89/coex.c | 525 ++++++++++++++--------
drivers/net/wireless/realtek/rtw89/coex.h | 9 +
drivers/net/wireless/realtek/rtw89/core.c | 4 +-
drivers/net/wireless/realtek/rtw89/core.h | 33 +-
4 files changed, 370 insertions(+), 201 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtw89/coex.c b/drivers/net/wireless/realtek/rtw89/coex.c
index efa177f8b231..e78fcaf4e196 100644
--- a/drivers/net/wireless/realtek/rtw89/coex.c
+++ b/drivers/net/wireless/realtek/rtw89/coex.c
@@ -461,7 +461,14 @@ enum btc_b2w_scoreboard {
BTC_BSCB_BT_LNAB1 = BIT(10),
BTC_BSCB_WLRFK = BIT(11),
BTC_BSCB_BT_HILNA = BIT(13),
+ BTC_BSCB_BT_HILNA_56G = BIT(14),
+ BTC_BSCB_CTCODE = BIT(15),
BTC_BSCB_BT_CONNECT = BIT(16),
+ BTC_BSCB_BT_CONNECT_56G = BIT(17),
+ BTC_BSCB_BT_LNAB0_56G = BIT(18),
+ BTC_BSCB_BT_LNAB1_56G = BIT(19),
+ BTC_BSCB_BT_15DOT4 = BIT(24),
+ BTC_BSCB_BT_PROTECT = BIT(27),
BTC_BSCB_PAN_ACT = BIT(28),
BTC_BSCB_HFP_ACT = BIT(29),
BTC_BSCB_PATCH_CODE = BIT(30),
@@ -808,6 +815,8 @@ enum btc_reset_module {
BTC_RESET_CXDM = BIT(0) | BIT(1),
BTC_RESET_BTINFO = BIT(3),
BTC_RESET_MDINFO = BIT(4),
+ BTC_RESET_BT_PSD_DM = BIT(5),
+ BTC_RESET_BTINFO2 = BIT(6),
BTC_RESET_ALL = GENMASK(7, 0),
};
@@ -905,8 +914,9 @@ enum btc_reason_and_action {
static void _run_coex(struct rtw89_dev *rtwdev,
enum btc_reason_and_action reason);
-static void _write_scbd(struct rtw89_dev *rtwdev, u32 val, bool state);
-static void _update_bt_scbd(struct rtw89_dev *rtwdev, bool only_update);
+static void _write_scbd(struct rtw89_dev *rtwdev, u8 bid, u32 val, bool state);
+static u8 _sned_h2c_w2bscbd(struct rtw89_dev *rtwdev, bool force_exec, u8 bid);
+static void _update_bt_scbd(struct rtw89_dev *rtwdev, u8 bid);
static int _send_fw_cmd(struct rtw89_dev *rtwdev, u8 h2c_class, u8 h2c_func,
void *param, u16 len)
@@ -1272,11 +1282,6 @@ static void _chk_btc_err(struct rtw89_dev *rtwdev, u8 type, u32 cnt)
dm->cnt_dm[BTC_DCNT_BTCNT_HANG]++;
else
dm->cnt_dm[BTC_DCNT_BTCNT_HANG] = 0;
-
- if ((dm->cnt_dm[BTC_DCNT_BTCNT_HANG] >= BTC_CHK_HANG_MAX &&
- bt->enable.now) || (!dm->cnt_dm[BTC_DCNT_BTCNT_HANG] &&
- !bt->enable.now))
- _update_bt_scbd(rtwdev, false);
break;
case BTC_DCNT_WL_SLOT_DRIFT:
if (cnt >= BTC_CHK_WLSLOT_DRIFT_MAX)
@@ -1755,7 +1760,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,
rtwdev->chip->ops->btc_update_bt_cnt(rtwdev);
_chk_btc_err(rtwdev, BTC_DCNT_BTCNT_HANG, 0);
- bt->bcnt[BTC_BCNT_POLUT] =
+ bt->bcnt[BTC_BCNT_POLLUTED] =
rtw89_mac_get_plt_cnt(rtwdev,
RTW89_MAC_0);
}
@@ -1778,7 +1783,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,
le32_to_cpu(prpt->v4.bt_cnt[BTC_BCNT_LO_TX]);
bt->bcnt[BTC_BCNT_LOPRI_RX] =
le32_to_cpu(prpt->v4.bt_cnt[BTC_BCNT_LO_RX]);
- bt->bcnt[BTC_BCNT_POLUT] =
+ bt->bcnt[BTC_BCNT_POLLUTED] =
le32_to_cpu(prpt->v4.bt_cnt[BTC_BCNT_POLLUTED]);
_chk_btc_err(rtwdev, BTC_DCNT_BTCNT_HANG, 0);
@@ -1810,7 +1815,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,
le16_to_cpu(prpt->v5.bt_cnt[BTC_BCNT_LO_TX]);
bt->bcnt[BTC_BCNT_LOPRI_RX] =
le16_to_cpu(prpt->v5.bt_cnt[BTC_BCNT_LO_RX]);
- bt->bcnt[BTC_BCNT_POLUT] =
+ bt->bcnt[BTC_BCNT_POLLUTED] =
le16_to_cpu(prpt->v5.bt_cnt[BTC_BCNT_POLLUTED]);
_chk_btc_err(rtwdev, BTC_DCNT_BTCNT_HANG, 0);
@@ -1837,7 +1842,7 @@ static u32 _chk_btc_report(struct rtw89_dev *rtwdev,
le16_to_cpu(prpt->v105.bt_cnt[BTC_BCNT_LO_TX_V105]);
bt->bcnt[BTC_BCNT_LOPRI_RX] =
le16_to_cpu(prpt->v105.bt_cnt[BTC_BCNT_LO_RX_V105]);
- bt->bcnt[BTC_BCNT_POLUT] =
+ bt->bcnt[BTC_BCNT_POLLUTED] =
le16_to_cpu(prpt->v105.bt_cnt[BTC_BCNT_POLLUTED_V105]);
_chk_btc_err(rtwdev, BTC_DCNT_BTCNT_HANG, 0);
@@ -2791,14 +2796,14 @@ static void _fw_set_policy(struct rtw89_dev *rtwdev, u16 policy_type,
if (dm->tdma.rxflctrl == CXFLC_NULLP ||
dm->tdma.rxflctrl == CXFLC_QOSNULL)
- btc->lps = 1;
+ btc->btc_ctrl_lps = 1;
else
- btc->lps = dm->lps_ctrl_scbd;
+ btc->btc_ctrl_lps = dm->lps_ctrl_scbd;
dm->lps_ctrl_scbd_last = dm->lps_ctrl_scbd;
- if (btc->lps == 1)
- rtw89_set_coex_ctrl_lps(rtwdev, btc->lps);
+ if (btc->btc_ctrl_lps == 1)
+ rtw89_set_coex_ctrl_lps(rtwdev, btc->btc_ctrl_lps);
ret = _send_fw_cmd(rtwdev, BTFC_SET, SET_CX_POLICY,
btc->policy, btc->policy_len);
@@ -2813,8 +2818,8 @@ static void _fw_set_policy(struct rtw89_dev *rtwdev, u16 policy_type,
if (btc->update_policy_force)
btc->update_policy_force = false;
- if (btc->lps == 0)
- rtw89_set_coex_ctrl_lps(rtwdev, btc->lps);
+ if (btc->btc_ctrl_lps == 0)
+ rtw89_set_coex_ctrl_lps(rtwdev, btc->btc_ctrl_lps);
}
static void _fw_set_drv_info(struct rtw89_dev *rtwdev, u8 index)
@@ -2913,21 +2918,35 @@ void btc_fw_event(struct rtw89_dev *rtwdev, u8 evt_id, void *data, u32 len)
{
struct rtw89_btc *btc = &rtwdev->btc;
struct rtw89_btc_btf_fwinfo *pfwinfo = &btc->fwinfo;
+ struct rtw89_btc_bt_info *bt = &btc->cx.bt0;
+ u8 i;
- rtw89_debug(rtwdev, RTW89_DBG_BTC,
- "[BTC], %s(): evt_id:%d len:%d\n",
- __func__, evt_id, len);
+ _parse_btc_report(rtwdev, pfwinfo, data, len);
- if (!len || !data)
+ if (!rtwdev->chip->scbd)
return;
- switch (evt_id) {
- case BTF_EVNT_RPT:
- _parse_btc_report(rtwdev, pfwinfo, data, len);
- break;
- default:
- break;
+ if (!btc->dm.scbd_b2w_update)
+ return; /* skip if init or no-update */
+
+ for (i = BTC_BT_1ST; i <= BTC_BT_2ND; i++) {
+ bt = (i == BTC_BT_1ST) ? &btc->cx.bt0 : &btc->cx.bt1;
+
+ if (bt->scbd_c2h != bt->scbd_rb) {
+ /* if btx b2w scbd non-sync */
+ rtw89_debug(rtwdev, RTW89_DBG_BTC,
+ "[BTC], %s() bt%d:c2h->0x%08x, rb->0x%08x\n",
+ __func__, i, bt->scbd_c2h, bt->scbd_rb);
+ bt->scbd_c2h = bt->scbd_rb;
+ _update_bt_scbd(rtwdev, i);
+ btc->dm.scbd_b2w_update = false;
+ }
}
+
+ if (!btc->dm.scbd_b2w_update)
+ _run_coex(rtwdev, BTC_RSN_UPDATE_BT_SCBD);
+ else
+ btc->dm.scbd_b2w_update = 0;
}
static void _set_gnt(struct rtw89_dev *rtwdev, u8 phy_map, u8 wl_state, u8 bt_state)
@@ -3298,7 +3317,7 @@ static void _set_bt_rx_gain(struct rtw89_dev *rtwdev, bool force_exec, u8 bid,
if (buf[0] != BTC_BT_RX_NORMAL_LVL)
state = true;
- _write_scbd(rtwdev, scbd_bit, state);
+ _write_scbd(rtwdev, bid, scbd_bit, state);
}
}
@@ -3406,7 +3425,7 @@ static void _set_rf_trx_para(struct rtw89_dev *rtwdev)
if (dm->fddt_train) {
_set_wl_rx_gain(rtwdev, 1, RTW89_PHY_0);
- _write_scbd(rtwdev, BTC_WSCB_RXGAIN, true);
+ _write_scbd(rtwdev, bid, BTC_WSCB_RXGAIN, true);
} else {
_set_wl_tx_power(rtwdev, para.wl_tx_power[RTW89_PHY_0], RTW89_PHY_0);
_set_wl_rx_gain(rtwdev, para.wl_rx_gain[RTW89_PHY_0], RTW89_PHY_0);
@@ -3899,14 +3918,22 @@ static void _set_tdma_bind(struct rtw89_dev *rtwdev, bool tdma_on)
struct rtw89_btc_dm *dm = &rtwdev->btc.dm;
struct rtw89_btc_bind_info *bind;
u8 null_role = RTW89_WIFI_ROLE_STATION;
+ u8 bt_sel;
if (dm->tdd_en)
bind = &dm->tdd_bind; /* tdd = 1 && fdd = 0 or 1 */
else
bind = &dm->fdd_bind; /* tdd = 0 && fdd = 1 */
+ if (bind->bt_sel >= (BIT(BTC_BT_1ST) | BIT(BTC_BT_2ND)))
+ bt_sel = BTC_ALL_BT;
+ else if (bind->bt_sel == BIT(BTC_BT_2ND))
+ bt_sel = BTC_BT_2ND;
+ else
+ bt_sel = BTC_BT_1ST;
+
/* notify BT TDMA on/off by scoreboard for ACL/Scan schedule */
- _write_scbd(rtwdev, BTC_WSCB_TDMA, tdma_on);
+ _write_scbd(rtwdev, bt_sel, BTC_WSCB_TDMA, tdma_on);
/*
* set hwb/bt bind to TDMA policy parameter
@@ -5849,7 +5876,7 @@ static void _set_bt_rx_agc(struct rtw89_dev *rtwdev)
if (bt_hi_lna_rx == bt->hi_lna_rx)
return;
- _write_scbd(rtwdev, BTC_WSCB_BT_HILNA, bt_hi_lna_rx);
+ _write_scbd(rtwdev, BTC_BT_1ST, BTC_WSCB_BT_HILNA, bt_hi_lna_rx);
}
static void _set_bt_rx_scan_pri(struct rtw89_dev *rtwdev)
@@ -5857,7 +5884,8 @@ static void _set_bt_rx_scan_pri(struct rtw89_dev *rtwdev)
struct rtw89_btc *btc = &rtwdev->btc;
struct rtw89_btc_bt_info *bt = &btc->cx.bt0;
- _write_scbd(rtwdev, BTC_WSCB_RXSCAN_PRI, (bool)(!!bt->scan_rx_low_pri));
+ _write_scbd(rtwdev, BTC_ALL_BT, BTC_WSCB_RXSCAN_PRI,
+ (bool)(!!bt->scan_rx_low_pri));
}
static void _wl_req_mac(struct rtw89_dev *rtwdev, u8 mac)
@@ -5897,6 +5925,7 @@ static void _action_common(struct rtw89_dev *rtwdev)
struct rtw89_btc_bt_info *bt = &btc->cx.bt0;
struct rtw89_btc_dm *dm = &btc->dm;
u32 bt_rom_code_id, bt_fw_ver;
+ u8 i;
if (btc->ver->fwlrole == 8)
_wl_req_mac(rtwdev, rinfo_v8->pta_req_band);
@@ -5929,13 +5958,8 @@ static void _action_common(struct rtw89_dev *rtwdev)
rtw89_btc_fw_en_rpt(rtwdev, RPT_EN_MREG, 1);
}
- if (wl->scbd_change) {
- rtw89_mac_cfg_sb(rtwdev, wl->scbd);
- rtw89_debug(rtwdev, RTW89_DBG_BTC, "[BTC], write scbd: 0x%08x\n",
- wl->scbd);
- wl->scbd_change = false;
- wl->wcnt[BTC_WCNT_SCBDUPDATE]++;
- }
+ for (i = BTC_BT_1ST; i <= BTC_BT_2ND; i++)
+ _sned_h2c_w2bscbd(rtwdev, false, i);
if (btc->ver->fcxosi) {
if (memcmp(&dm->ost_info_last, &dm->ost_info,
@@ -6187,42 +6211,97 @@ static void _action_wl_2g_nan(struct rtw89_dev *rtwdev)
}
}
-static u32 _read_scbd(struct rtw89_dev *rtwdev)
+static u8 _sned_h2c_w2bscbd(struct rtw89_dev *rtwdev, bool force_exec, u8 bid)
{
- const struct rtw89_chip_info *chip = rtwdev->chip;
struct rtw89_btc *btc = &rtwdev->btc;
- u32 scbd_val = 0;
+ struct rtw89_btc_cx *cx = &btc->cx;
+ struct rtw89_btc_wl_info *wl = &cx->wl;
+ u8 cnt_idx = BTC_WCNT_SCBDUPDATE;
+ u8 h2c_func = SET_IOFLD_SCBD;
+ u8 buf[4];
- if (!chip->scbd)
- return 0;
+ if (bid == BTC_BT_2ND) {
+ if (!(rtwdev->chip->para_ver & BTC_FEAT_DUAL_BT))
+ return 0;
+
+ h2c_func |= BT_H2C_FUNC_BT2ND;
+ cnt_idx = BTC_WCNT_SCBDUPDATE2;
+ }
- scbd_val = rtw89_mac_get_sb(rtwdev);
- rtw89_debug(rtwdev, RTW89_DBG_BTC, "[BTC], read scbd: 0x%08x\n",
- scbd_val);
+ if (wl->scbd_chg[bid] || force_exec) {
+ /* Add delay to avoid BT FW loss information */
- btc->cx.bt0.bcnt[BTC_BCNT_SCBDREAD]++;
- return scbd_val;
+ btc_dw2b(buf, 0, (wl->scbd[bid] | BIT(31))); /* trig */
+ if (rtwdev->chip->para_ver & BTC_FEAT_H2C_MACRO) {
+ if (!_send_fw_cmd(rtwdev, BTFC_SET,
+ h2c_func, buf, sizeof(buf)))
+ return 0;
+ } else {
+ rtw89_mac_cfg_sb(rtwdev, wl->scbd[bid]);
+ }
+ wl->scbd_chg[bid] = 0;
+ wl->wcnt[cnt_idx]++;
+ rtw89_debug(rtwdev, RTW89_DBG_BTC,
+ "[BTC], %s() write BT%d scbd:0x%08x\n",
+ __func__, bid, wl->scbd[bid]);
+ }
+ return 1;
}
-static void _write_scbd(struct rtw89_dev *rtwdev, u32 val, bool state)
+static void _write_scbd(struct rtw89_dev *rtwdev, u8 bid, u32 val, bool state)
{
const struct rtw89_chip_info *chip = rtwdev->chip;
struct rtw89_btc *btc = &rtwdev->btc;
struct rtw89_btc_wl_info *wl = &btc->cx.wl;
- u32 scbd_val = 0;
- u8 force_exec = false;
+ struct rtw89_btc_dm *dm = &btc->dm;
+ u8 force_exec, id, id_start, id_stop;
+ u32 scbd = 0;
if (!chip->scbd)
return;
- scbd_val = state ? wl->scbd | val : wl->scbd & ~val;
+ if (bid == BTC_ALL_BT) {
+ id_start = BTC_BT_1ST;
+ id_stop = BTC_BT_2ND;
+ } else {
+ id_start = bid;
+ id_stop = bid;
+ }
- if (val & BTC_WSCB_ACTIVE || val & BTC_WSCB_ON)
- force_exec = true;
+ for (id = id_start; id <= id_stop; id++) {
+ force_exec = false;
+ if (!(rtwdev->chip->para_ver & BTC_FEAT_DUAL_BT) &&
+ id == BTC_BT_2ND)
+ continue;
- if (scbd_val != wl->scbd || force_exec) {
- wl->scbd = scbd_val;
- wl->scbd_change = true;
+ if (state)
+ scbd = wl->scbd[id] | val;
+ else
+ scbd = wl->scbd[id] & (~val);
+
+ if (val & BTC_WSCB_CTCODE ||
+ val & BTC_WSCB_RXGAIN ||
+ val & BTC_WSCB_RXGAIN_56G) { /* instant exec */
+ force_exec = true;
+ wl->scbd[id] = scbd;
+ dm->scbd_write_instant = 1;
+ if (rtwdev->chip->para_ver & BTC_FEAT_H2C_MACRO)
+ _sned_h2c_w2bscbd(rtwdev, force_exec, id);
+ else
+ rtw89_mac_cfg_sb(rtwdev, wl->scbd[id]);
+ dm->scbd_write_instant = 0;
+ } else if ((val & BTC_WSCB_ACTIVE ||
+ val & BTC_WSCB_ON ||
+ val & BTC_WSCB_WLRFK) ||
+ scbd != wl->scbd[id]) {
+ /*
+ * Just update wl->scbd[] and set wl->scbd_chg[],
+ * moved "Write scoreboard I/O" to _action_common()
+ * _write_scbd will be executed if run_coex()
+ */
+ wl->scbd[id] = scbd;
+ wl->scbd_chg[id] = 1;
+ }
}
}
@@ -7522,34 +7601,27 @@ void rtw89_coex_rfk_chk_work(struct wiphy *wiphy, struct wiphy_work *work)
wl->wcnt[BTC_WCNT_RFK_TIMEOUT]++;
dm->error.map.wl_rfk_timeout = true;
wl->rfk_info.state = BTC_WRFK_STOP;
- _write_scbd(rtwdev, BTC_WSCB_WLRFK, false);
+ _write_scbd(rtwdev, BTC_ALL_BT, BTC_WSCB_WLRFK, false);
_run_coex(rtwdev, BTC_RSN_RFK_CHK_WORK);
}
}
-static void _update_bt_scbd(struct rtw89_dev *rtwdev, bool only_update)
+static void _update_bt_scbd(struct rtw89_dev *rtwdev, u8 bid)
{
+ struct rtw89_btc_bt_link_info *bt_2g, *bt_56g;
struct rtw89_btc *btc = &rtwdev->btc;
- struct rtw89_btc_bt_info *bt = &btc->cx.bt0;
const struct rtw89_btc_ver *ver = btc->ver;
- struct rtw89_btc_wl_info *wl = &btc->cx.wl;
- struct rtw89_btc_dm *dm = &rtwdev->btc.dm;
- bool bt_link_change = false, lps_ctrl = false;
- u32 val, any_bt_connect;
- u8 mode;
-
- if (rtwdev->chip->scbd)
- return;
-
- rtw89_debug(rtwdev, RTW89_DBG_BTC, "[BTC], %s\n", __func__);
+ struct rtw89_btc_cx *cx = &btc->cx;
+ struct rtw89_btc_wl_info *wl = &cx->wl;
+ struct rtw89_btc_dm *dm = &btc->dm;
+ struct rtw89_btc_bt_info *bt;
+ u32 val, any_bt_connect, any_bt_6g_connect = 0;
+ u8 id, id_start, id_stop, mode;
+ bool bt_link_change = false;
+ bool lps_ctrl = false;
- val = _read_scbd(rtwdev);
- if (val == BTC_SCB_INV_VALUE) {
- rtw89_debug(rtwdev, RTW89_DBG_BTC,
- "[BTC], %s(): return by invalid scbd value\n",
- __func__);
+ if (!rtwdev->chip->scbd || bid > BTC_ALL_BT)
return;
- }
if (ver->fwlrole == 0)
mode = wl->role_info.link_mode;
@@ -7564,66 +7636,112 @@ static void _update_bt_scbd(struct rtw89_dev *rtwdev, bool only_update)
else
return;
- if (!(val & BTC_BSCB_ON))
- bt->enable.now = 0;
- else
- bt->enable.now = 1;
+ if (bid == BTC_ALL_BT) {
+ id_start = BTC_BT_1ST;
+ id_stop = BTC_BT_2ND;
+ } else {
+ id_start = bid;
+ id_stop = bid;
+ }
+
+ dm->lps_ctrl_change = false;
+ rtw89_debug(rtwdev, RTW89_DBG_BTC, "[BTC], %s()\n", __func__);
- if (bt->enable.now != bt->enable.last)
- bt_link_change = true;
+ for (id = id_start; id <= id_stop; id++) {
+ bt = (id == BTC_BT_1ST) ? &cx->bt0 : &cx->bt1;
+ bt_2g = &bt->link_info;
+ bt_56g = &bt->link_info_56g;
- /* reset bt info if bt re-enable */
- if (bt->enable.now && !bt->enable.last) {
- _reset_btc_var(rtwdev, BTC_RESET_BTINFO);
- bt->bcnt[BTC_BCNT_REENABLE]++;
- bt->enable.now = 1;
- }
+ if (!(rtwdev->chip->para_ver & BTC_FEAT_DUAL_BT) && id == BTC_BT_2ND)
+ break;
+
+ val = bt->scbd_c2h;
- bt->enable.last = bt->enable.now;
- bt->scbd = val;
- bt->mbx_avl = !!(val & BTC_BSCB_ACT);
+ if (val == 0xffffffff) {
+ rtw89_debug(rtwdev, RTW89_DBG_BTC,
+ "[BTC], %s return by invalid scbd value\n",
+ __func__);
+ return;
+ }
- if (bt->whql_test != !!(val & BTC_BSCB_WHQL))
- bt_link_change = true;
+ if (!(val & BTC_BSCB_ON))
+ bt->enable.now = 0;
+ else
+ bt->enable.now = 1;
- bt->whql_test = !!(val & BTC_BSCB_WHQL);
- bt->btg_type = val & BTC_BSCB_BT_S1 ? BTC_BT_BTG : BTC_BT_ALONE;
- bt->link_info.a2dp_desc.exist = !!(val & BTC_BSCB_A2DP_ACT);
- bt->link_info.pan_desc.exist = !!(val & BTC_BSCB_PAN_ACT);
- bt->link_info.hfp_desc.exist = !!(val & BTC_BSCB_HFP_ACT);
+ if (bt->enable.now != bt->enable.last)
+ bt_link_change = true;
- bt->lna_constrain = !!(val & BTC_BSCB_BT_LNAB0) +
- !!(val & BTC_BSCB_BT_LNAB1) * 2 + 4;
+ /* reset bt info if bt re-enable */
+ if (bt->enable.now && !bt->enable.last) {
+ if (id == BTC_BT_1ST)
+ _reset_btc_var(rtwdev, BTC_RESET_BTINFO);
+ else
+ _reset_btc_var(rtwdev, BTC_RESET_BTINFO2);
- /* if rfk run 1->0 */
- if (bt->rfk_info.map.run && !(val & BTC_BSCB_RFK_RUN))
- bt_link_change = true;
+ bt->bcnt[BTC_BCNT_REENABLE]++;
+ bt->enable.now = 1;
+ bt->rf_band_map = BIT(RTW89_BAND_2G);
+ bt->link_weight[BTC_BT_B2G] = 5; /* no-profile */
+ }
+ bt->enable.last = bt->enable.now;
- bt->rfk_info.map.run = !!(val & BTC_BSCB_RFK_RUN);
- bt->rfk_info.map.req = !!(val & BTC_BSCB_RFK_REQ);
- bt->hi_lna_rx = !!(val & BTC_BSCB_BT_HILNA);
- any_bt_connect = !!(val & BTC_BSCB_BT_CONNECT);
+ /* if BT will disconnect and adopt protect plan */
+ if ((val & BTC_BSCB_BT_PROTECT) &&
+ !(bt->scbd & BTC_BSCB_BT_PROTECT))
+ bt->bcnt[BTC_BCNT_PROTECT]++;
- /* if connect change */
- if (bt->link_info.status.map.connect != any_bt_connect)
- bt_link_change = true;
+ bt->mbx_avl = !!(val & BTC_BSCB_ACT);
+ if (bt->whql_test != !!(val & BTC_BSCB_WHQL))
+ bt_link_change = true;
- /* if specific profile exist */
- if (((bt->link_info.a2dp_desc.exist || bt->link_info.pan_desc.exist ||
- bt->link_info.hfp_desc.exist) && mode == BTC_WLINK_2G_STA) ||
- bt->whql_test)
- lps_ctrl = true;
+ bt->whql_test = !!(val & BTC_BSCB_WHQL);
+ bt->btg_type = (val & BTC_BSCB_BT_S1 ? BTC_BT_BTG : BTC_BT_ALONE);
- if (dm->lps_ctrl_scbd != lps_ctrl) {
- dm->lps_ctrl_scbd = lps_ctrl;
- bt_link_change = true;
- dm->lps_ctrl_change = true;
- } else {
- dm->lps_ctrl_change = false;
- }
+ bt_2g->a2dp_desc.exist = !!(val & BTC_BSCB_A2DP_ACT);
+ bt_2g->pan_desc.exist = !!(val & BTC_BSCB_PAN_ACT);
+ bt_2g->hfp_desc.exist = !!(val & BTC_BSCB_HFP_ACT);
- bt->link_info.status.map.connect = any_bt_connect;
- bt->run_patch_code = !!(val & BTC_BSCB_PATCH_CODE);
+ bt->lna_constrain = 4 + !!(val & BTC_BSCB_BT_LNAB0) +
+ !!(val & BTC_BSCB_BT_LNAB1) * 2;
+
+ if (rtwdev->chip->para_ver & BTC_FEAT_DUAL_BT) {
+ if (val & BTC_BSCB_BT_15DOT4)
+ bt->func_type |= (BTC_BTF_THREAD | BTC_BTF_ZB);
+ else
+ bt->func_type &= ~(BTC_BTF_THREAD | BTC_BTF_ZB);
+ }
+
+ bt->hi_lna_rx = !!(val & BTC_BSCB_BT_HILNA);
+ any_bt_connect = !!(val & BTC_BSCB_BT_CONNECT);
+
+ /* if connect change */
+ if (bt_2g->status.map.connect != any_bt_connect ||
+ bt_56g->status.map.connect != any_bt_6g_connect) {
+ bt_link_change = true;
+ bt_2g->status.map.connect = any_bt_connect;
+ bt_56g->status.map.connect = any_bt_6g_connect;
+ }
+
+ /* if specific profile exist */
+ if (((bt->link_info.a2dp_desc.exist ||
+ bt->link_info.pan_desc.exist ||
+ bt->link_info.hfp_desc.exist) &&
+ mode == BTC_WLINK_2G_STA) ||
+ bt->whql_test)
+ lps_ctrl = true;
+
+ if (dm->lps_ctrl_scbd != lps_ctrl) {
+ dm->lps_ctrl_scbd = lps_ctrl;
+ bt_link_change = true;
+ dm->lps_ctrl_change = true;
+ } else {
+ dm->lps_ctrl_change = false;
+ }
+
+ bt->run_patch_code = !!(val & BTC_BSCB_PATCH_CODE);
+ bt->scbd = val;
+ }
if (bt_link_change) {
rtw89_debug(rtwdev, RTW89_DBG_BTC,
@@ -7651,26 +7769,6 @@ static void _update_bt_txpwr_info(struct rtw89_dev *rtwdev, u8 *buf, u32 len)
memcpy(&b->bt_txpwr_desc, &buf[2], sizeof(b->bt_txpwr_desc));
}
-static bool _chk_wl_rfk_request(struct rtw89_dev *rtwdev)
-{
- struct rtw89_btc *btc = &rtwdev->btc;
- struct rtw89_btc_cx *cx = &btc->cx;
- struct rtw89_btc_bt_info *bt = &cx->bt0;
-
- _update_bt_scbd(rtwdev, true);
-
- cx->wl.wcnt[BTC_WCNT_RFK_REQ]++;
-
- if ((bt->rfk_info.map.run || bt->rfk_info.map.req) &&
- !bt->rfk_info.map.timeout) {
- cx->wl.wcnt[BTC_WCNT_RFK_REJECT]++;
- } else {
- cx->wl.wcnt[BTC_WCNT_RFK_GO]++;
- return true;
- }
- return false;
-}
-
static void _set_bind_info(struct rtw89_btc *btc, u8 type)
{
struct rtw89_btc_cx *cx = &btc->cx;
@@ -8181,7 +8279,7 @@ void rtw89_btc_ntfy_poweroff(struct rtw89_dev *rtwdev)
btc->cx.wl.status.map.busy = 0;
wl->status.map.lps = BTC_LPS_OFF;
- _write_scbd(rtwdev, BTC_WSCB_ALL, false);
+ _write_scbd(rtwdev, BTC_ALL_BT, BTC_WSCB_ALL, false);
_run_coex(rtwdev, BTC_RSN_NTFY_POWEROFF);
rtw89_btc_fw_en_rpt(rtwdev, RPT_EN_ALL, 0);
@@ -8266,24 +8364,22 @@ void rtw89_btc_ntfy_init(struct rtw89_dev *rtwdev, u8 mode)
return;
}
+ btc->cx.bt0.enable.now = 1;
+ btc->cx.bt0.run_patch_code = 1;
if (rtwdev->chip->para_ver & BTC_FEAT_DUAL_BT) {
btc->cx.bt1.enable.now = 1;
btc->cx.bt1.run_patch_code = 1;
}
- if (rtwdev->chip->para_ver & BTC_FEAT_H2C_MACRO) {
- btc->cx.bt0.enable.now = 1;
- btc->cx.bt0.run_patch_code = 1;
+ if (rtwdev->chip->para_ver & BTC_FEAT_H2C_MACRO)
btc->io_oflld_type = BTC_IO_OFLD_BTC_H2C;
- } else {
+ else
btc->io_oflld_type = BTC_IO_OFLD_NO_SUPPORT;
- _update_bt_scbd(rtwdev, true);
- }
chip->ops->btc_set_rfe(rtwdev);
chip->ops->btc_init_cfg(rtwdev);
- _write_scbd(rtwdev,
+ _write_scbd(rtwdev, BTC_ALL_BT,
BTC_WSCB_ACTIVE | BTC_WSCB_ON | BTC_WSCB_BTLOG, true);
if (rtw89_mac_get_ctrl_path(rtwdev)) {
@@ -8842,16 +8938,16 @@ void rtw89_btc_ntfy_radio_state(struct rtw89_dev *rtwdev, enum btc_rfctrl rf_sta
if (rf_state == BTC_RFCTRL_WL_ON) {
rtw89_btc_fw_en_rpt(rtwdev, RPT_EN_MREG, true);
val = BTC_WSCB_ACTIVE | BTC_WSCB_ON | BTC_WSCB_BTLOG;
- _write_scbd(rtwdev, val, true);
+ _write_scbd(rtwdev, BTC_ALL_BT, val, true);
chip->ops->btc_init_cfg(rtwdev);
} else {
rtw89_btc_fw_en_rpt(rtwdev, RPT_EN_ALL, false);
if (rf_state == BTC_RFCTRL_FW_CTRL)
- _write_scbd(rtwdev, BTC_WSCB_ACTIVE, false);
+ _write_scbd(rtwdev, BTC_ALL_BT, BTC_WSCB_ACTIVE, false);
else if (rf_state == BTC_RFCTRL_WL_OFF)
- _write_scbd(rtwdev, BTC_WSCB_ALL, false);
+ _write_scbd(rtwdev, BTC_ALL_BT, BTC_WSCB_ALL, false);
else
- _write_scbd(rtwdev, BTC_WSCB_ACTIVE, false);
+ _write_scbd(rtwdev, BTC_ALL_BT, BTC_WSCB_ACTIVE, false);
}
btc->dm.cnt_dm[BTC_DCNT_BTCNT_HANG] = 0;
@@ -8883,27 +8979,26 @@ static bool _ntfy_wl_rfk(struct rtw89_dev *rtwdev, u8 phy_path,
switch (state) {
case BTC_WRFK_START:
- result = _chk_wl_rfk_request(rtwdev);
- wl->rfk_info.state = result ? BTC_WRFK_START : BTC_WRFK_STOP;
-
- _write_scbd(rtwdev, BTC_WSCB_WLRFK, result);
+ result = BTC_WRFK_ALLOW;
+ wl->rfk_info.state = BTC_WRFK_START;
+ btc->cx.wl.wcnt[BTC_WCNT_RFK_REQ]++;
+ btc->cx.wl.wcnt[BTC_WCNT_RFK_GO]++;
btc->dm.cnt_notify[BTC_NCNT_WL_RFK]++;
+
+ _write_scbd(rtwdev, BTC_ALL_BT, BTC_WSCB_WLRFK, true);
break;
case BTC_WRFK_ONESHOT_START:
case BTC_WRFK_ONESHOT_STOP:
- if (wl->rfk_info.state == BTC_WRFK_STOP) {
- result = BTC_WRFK_REJECT;
- } else {
- result = BTC_WRFK_ALLOW;
- wl->rfk_info.state = state;
- }
+ wl->rfk_info.state = state;
+ if (type != BTC_WRFKT_RXDCK)
+ return BTC_WRFK_ALLOW;
break;
case BTC_WRFK_STOP:
result = BTC_WRFK_ALLOW;
wl->rfk_info.state = BTC_WRFK_STOP;
- _write_scbd(rtwdev, BTC_WSCB_WLRFK, false);
+ _write_scbd(rtwdev, BTC_ALL_BT, BTC_WSCB_WLRFK, false);
wiphy_delayed_work_cancel(rtwdev->hw->wiphy, &rtwdev->coex_rfk_chk_work);
break;
default:
@@ -8927,7 +9022,7 @@ static bool _ntfy_wl_rfk(struct rtw89_dev *rtwdev, u8 phy_path,
"[BTC], %s()_finish: rfk_cnt=%d, result=%d\n",
__func__, btc->dm.cnt_notify[BTC_NCNT_WL_RFK], result);
- return result == BTC_WRFK_ALLOW;
+ return result;
}
void rtw89_btc_ntfy_wl_rfk(struct rtw89_dev *rtwdev, u8 phy_map,
@@ -9160,7 +9255,7 @@ void rtw89_btc_ntfy_wl_sta(struct rtw89_dev *rtwdev)
rtw89_debug(rtwdev, RTW89_DBG_BTC, "[BTC], %s(): busy=%d\n",
__func__, !!wl->status.map.busy);
- _write_scbd(rtwdev, BTC_WSCB_WLBUSY, (!!wl->status.map.busy));
+ _write_scbd(rtwdev, BTC_ALL_BT, BTC_WSCB_WLBUSY, (!!wl->status.map.busy));
if (data.is_traffic_change)
_fw_set_drv_info(rtwdev, CXDRVINFO_ROLE);
@@ -9251,6 +9346,7 @@ void rtw89_btc_c2h_handle(struct rtw89_dev *rtwdev, struct sk_buff *skb,
struct rtw89_btc_bt_info *bt = &rtwdev->btc.cx.bt0;
struct rtw89_btc_btf_fwinfo *pfwinfo = &btc->fwinfo;
u8 *buf = &skb->data[RTW89_C2H_HEADER_LEN];
+ u8 bid = BTC_BT_1ST;
len -= RTW89_C2H_HEADER_LEN;
@@ -9261,6 +9357,12 @@ void rtw89_btc_c2h_handle(struct rtw89_dev *rtwdev, struct sk_buff *skb,
if (class != BTFC_FW_EVENT)
return;
+ if (func & BT_C2H_FUNC_BT2ND) {
+ bid = BTC_BT_2ND;
+ func &= ~BT_C2H_FUNC_BT2ND;
+ bt = &btc->cx.bt1;
+ }
+
func = rtw89_btc_c2h_get_index_by_ver(rtwdev, func);
pfwinfo->cnt_c2h++;
@@ -9280,10 +9382,15 @@ void rtw89_btc_c2h_handle(struct rtw89_dev *rtwdev, struct sk_buff *skb,
_update_bt_info(rtwdev, buf, len);
break;
case BTF_EVNT_BT_SCBD:
- rtw89_debug(rtwdev, RTW89_DBG_BTC,
- "[BTC], handle C2H BT SCBD with data %8ph\n", buf);
bt->bcnt[BTC_BCNT_SCBDUPDATE]++;
- _update_bt_scbd(rtwdev, false);
+ bt->scbd_c2h = ((buf[3] << 24) | (buf[2] << 16) |
+ (buf[1] << 8) | (buf[0]));
+ bt->scbd_rb = bt->scbd_c2h;
+ rtw89_debug(rtwdev, RTW89_DBG_BTC,
+ "[BTC], handle C2H BT%d SCBD with data 0x%08x\n",
+ bid, bt->scbd_c2h);
+ _update_bt_scbd(rtwdev, bid);
+ _run_coex(rtwdev, BTC_RSN_UPDATE_BT_SCBD);
break;
case BTF_EVNT_BT_PSD:
break;
@@ -9300,7 +9407,7 @@ void rtw89_btc_c2h_handle(struct rtw89_dev *rtwdev, struct sk_buff *skb,
btc->dm.cnt_dm[BTC_DCNT_CX_RUNINFO]++;
break;
case BTF_EVNT_BT_QUERY_TXPWR:
- bt->bcnt[BTC_BCNT_BTTXPWR_UPDATE]++;
+ bt->bcnt[BTC_BCNT_TXPWR_UPDATE]++;
_update_bt_txpwr_info(rtwdev, buf, len);
}
}
@@ -9680,7 +9787,7 @@ static int _show_bt_info(struct rtw89_dev *rtwdev, char *buf, size_t bufsz)
bt->bcnt[BTC_BCNT_HIPRI_TX],
bt->bcnt[BTC_BCNT_LOPRI_RX],
bt->bcnt[BTC_BCNT_LOPRI_TX],
- bt->bcnt[BTC_BCNT_POLUT]);
+ bt->bcnt[BTC_BCNT_POLLUTED]);
if (!bt->scan_info_update) {
rtw89_btc_fw_en_rpt(rtwdev, RPT_EN_BT_SCAN_INFO, true);
@@ -9716,7 +9823,7 @@ static int _show_bt_info(struct rtw89_dev *rtwdev, char *buf, size_t bufsz)
else
rtw89_btc_fw_en_rpt(rtwdev, RPT_EN_BT_TX_PWR_LVL, false);
- if (bt->bcnt[BTC_BCNT_BTTXPWR_UPDATE]) {
+ if (bt->bcnt[BTC_BCNT_TXPWR_UPDATE]) {
p += scnprintf(p, end - p,
" %-15s : br_index:0x%x, le_index:0x%x",
"[bt_txpwr_lvl]",
@@ -10127,7 +10234,7 @@ static int _show_dm_info(struct rtw89_dev *rtwdev, char *buf, size_t bufsz)
p += scnprintf(p, end - p,
" %-15s : wl_only:%d, bt_only:%d, igno_bt:%d, free_run:%d, wl_ps_ctrl:%d, wl_mimo_ps:%d, ",
"[dm_flag]", dm->wl_only, dm->bt_only, igno_bt,
- dm->freerun, btc->lps, dm->wl_mimo_ps);
+ dm->freerun, btc->btc_ctrl_lps, dm->wl_mimo_ps);
p += scnprintf(p, end - p, "leak_ap:%d, fw_offload:%s%s\n",
dm->leak_ap,
@@ -11353,10 +11460,11 @@ static int _show_mreg_v1(struct rtw89_dev *rtwdev, char *buf, size_t bufsz)
const struct rtw89_chip_info *chip = rtwdev->chip;
struct rtw89_btc *btc = &rtwdev->btc;
struct rtw89_btc_btf_fwinfo *pfwinfo = &btc->fwinfo;
- struct rtw89_btc_rpt_cmn_info *pcinfo = NULL;
struct rtw89_btc_fbtc_mreg_val_v1 *pmreg = NULL;
+ struct rtw89_btc_bt_info *bt0 = &btc->cx.bt0;
+ struct rtw89_btc_bt_info *bt1 = &btc->cx.bt1;
+ struct rtw89_btc_rpt_cmn_info *pcinfo = NULL;
struct rtw89_btc_wl_info *wl = &btc->cx.wl;
- struct rtw89_btc_bt_info *bt = &btc->cx.bt0;
struct rtw89_mac_ax_coex_gnt gnt_cfg = {};
struct rtw89_mac_ax_gnt gnt;
char *p = buf, *end = buf + bufsz;
@@ -11369,11 +11477,20 @@ static int _show_mreg_v1(struct rtw89_dev *rtwdev, char *buf, size_t bufsz)
p += scnprintf(p, end - p, "========== [HW Status] ==========\n");
p += scnprintf(p, end - p,
- " %-15s : WL->BT:0x%08x(cnt:%d), BT->WL:0x%08x(total:%d, bt_update:%d)\n",
- "[scoreboard]", wl->scbd,
+ " %-15s : WL->BT0:0x%08x(cnt:%d), BT0->WL:0x%08x(total:%d, bt_update:%d)\n",
+ "[scoreboard]", wl->scbd[BTC_BT_1ST],
wl->wcnt[BTC_WCNT_SCBDUPDATE],
- bt->scbd, bt->bcnt[BTC_BCNT_SCBDREAD],
- bt->bcnt[BTC_BCNT_SCBDUPDATE]);
+ bt0->scbd, bt0->bcnt[BTC_BCNT_SCBDREAD],
+ bt0->bcnt[BTC_BCNT_SCBDUPDATE]);
+
+ if (rtwdev->chip->para_ver & BTC_FEAT_DUAL_BT) {
+ p += scnprintf(p, end - p,
+ " %-15s : WL->BT1:0x%08x(cnt:%d), BT1->WL:0x%08x(total:%d, bt_update:%d)\n",
+ "[scoreboard]", wl->scbd[BTC_BT_2ND],
+ wl->wcnt[BTC_WCNT_SCBDUPDATE2],
+ bt1->scbd, bt1->bcnt[BTC_BCNT_SCBDREAD],
+ bt1->bcnt[BTC_BCNT_SCBDUPDATE]);
+ }
btc->dm.pta_owner = rtw89_mac_get_ctrl_path(rtwdev);
_get_gnt(rtwdev, &gnt_cfg);
@@ -11437,10 +11554,11 @@ static int _show_mreg_v2(struct rtw89_dev *rtwdev, char *buf, size_t bufsz)
const struct rtw89_chip_info *chip = rtwdev->chip;
struct rtw89_btc *btc = &rtwdev->btc;
struct rtw89_btc_btf_fwinfo *pfwinfo = &btc->fwinfo;
- struct rtw89_btc_rpt_cmn_info *pcinfo = NULL;
struct rtw89_btc_fbtc_mreg_val_v2 *pmreg = NULL;
+ struct rtw89_btc_bt_info *bt0 = &btc->cx.bt0;
+ struct rtw89_btc_bt_info *bt1 = &btc->cx.bt1;
+ struct rtw89_btc_rpt_cmn_info *pcinfo = NULL;
struct rtw89_btc_wl_info *wl = &btc->cx.wl;
- struct rtw89_btc_bt_info *bt = &btc->cx.bt0;
struct rtw89_mac_ax_coex_gnt gnt_cfg = {};
struct rtw89_mac_ax_gnt gnt;
char *p = buf, *end = buf + bufsz;
@@ -11453,11 +11571,20 @@ static int _show_mreg_v2(struct rtw89_dev *rtwdev, char *buf, size_t bufsz)
p += scnprintf(p, end - p, "========== [HW Status] ==========\n");
p += scnprintf(p, end - p,
- " %-15s : WL->BT:0x%08x(cnt:%d), BT->WL:0x%08x(total:%d, bt_update:%d)\n",
- "[scoreboard]", wl->scbd,
+ " %-15s : WL->BT0:0x%08x(cnt:%d), BT0->WL:0x%08x(total:%d, bt_update:%d)\n",
+ "[scoreboard]", wl->scbd[BTC_BT_1ST],
wl->wcnt[BTC_WCNT_SCBDUPDATE],
- bt->scbd, bt->bcnt[BTC_BCNT_SCBDREAD],
- bt->bcnt[BTC_BCNT_SCBDUPDATE]);
+ bt0->scbd, bt0->bcnt[BTC_BCNT_SCBDREAD],
+ bt0->bcnt[BTC_BCNT_SCBDUPDATE]);
+
+ if (rtwdev->chip->para_ver & BTC_FEAT_DUAL_BT) {
+ p += scnprintf(p, end - p,
+ " %-15s : WL->BT1:0x%08x(cnt:%d), BT1->WL:0x%08x(total:%d, bt_update:%d)\n",
+ "[scoreboard]", wl->scbd[BTC_BT_2ND],
+ wl->wcnt[BTC_WCNT_SCBDUPDATE2],
+ bt1->scbd, bt1->bcnt[BTC_BCNT_SCBDREAD],
+ bt1->bcnt[BTC_BCNT_SCBDUPDATE]);
+ }
btc->dm.pta_owner = rtw89_mac_get_ctrl_path(rtwdev);
_get_gnt(rtwdev, &gnt_cfg);
@@ -11524,8 +11651,9 @@ static int _show_mreg_v7(struct rtw89_dev *rtwdev, char *buf, size_t bufsz)
struct rtw89_btc_fbtc_mreg_val_v7 *pmreg = NULL;
struct rtw89_btc_rpt_cmn_info *pcinfo = NULL;
struct rtw89_btc_cx *cx = &btc->cx;
+ struct rtw89_btc_bt_info *bt0 = &cx->bt0;
+ struct rtw89_btc_bt_info *bt1 = &cx->bt1;
struct rtw89_btc_wl_info *wl = &cx->wl;
- struct rtw89_btc_bt_info *bt = &cx->bt0;
struct rtw89_mac_ax_gnt *gnt = NULL;
struct rtw89_btc_dm *dm = &btc->dm;
char *p = buf, *end = buf + bufsz;
@@ -11538,11 +11666,20 @@ static int _show_mreg_v7(struct rtw89_dev *rtwdev, char *buf, size_t bufsz)
p += scnprintf(p, end - p, "\n\r========== [HW Status] ==========");
p += scnprintf(p, end - p,
- "\n\r %-15s : WL->BT:0x%08x(cnt:%d), BT->WL:0x%08x(total:%d, bt_update:%d)",
- "[scoreboard]", wl->scbd,
+ " %-15s : WL->BT0:0x%08x(cnt:%d), BT0->WL:0x%08x(total:%d, bt_update:%d)\n",
+ "[scoreboard]", wl->scbd[BTC_BT_1ST],
wl->wcnt[BTC_WCNT_SCBDUPDATE],
- bt->scbd, bt->bcnt[BTC_BCNT_SCBDREAD],
- bt->bcnt[BTC_BCNT_SCBDUPDATE]);
+ bt0->scbd, bt0->bcnt[BTC_BCNT_SCBDREAD],
+ bt0->bcnt[BTC_BCNT_SCBDUPDATE]);
+
+ if (rtwdev->chip->para_ver & BTC_FEAT_DUAL_BT) {
+ p += scnprintf(p, end - p,
+ " %-15s : WL->BT1:0x%08x(cnt:%d), BT1->WL:0x%08x(total:%d, bt_update:%d)\n",
+ "[scoreboard]", wl->scbd[BTC_BT_2ND],
+ wl->wcnt[BTC_WCNT_SCBDUPDATE2],
+ bt1->scbd, bt1->bcnt[BTC_BCNT_SCBDREAD],
+ bt1->bcnt[BTC_BCNT_SCBDUPDATE]);
+ }
/* To avoid I/O if WL LPS or power-off */
dm->pta_owner = rtw89_mac_get_ctrl_path(rtwdev);
diff --git a/drivers/net/wireless/realtek/rtw89/coex.h b/drivers/net/wireless/realtek/rtw89/coex.h
index fb151f68eb64..74027ca4eccc 100644
--- a/drivers/net/wireless/realtek/rtw89/coex.h
+++ b/drivers/net/wireless/realtek/rtw89/coex.h
@@ -391,4 +391,13 @@ void _slot_set_tbl(struct rtw89_btc *btc, u8 sid, u32 tbl)
btc->dm.slot.v7[sid].cxtbl = cpu_to_le32(tbl);
}
+static inline
+void btc_dw2b(u8 *buf, size_t idx, u32 val)
+{
+ buf[idx] = u32_get_bits(val, MASKBYTE0);
+ buf[idx + 1] = u32_get_bits(val, MASKBYTE1);
+ buf[idx + 2] = u32_get_bits(val, MASKBYTE2);
+ buf[idx + 3] = u32_get_bits(val, MASKBYTE3);
+}
+
#endif
diff --git a/drivers/net/wireless/realtek/rtw89/core.c b/drivers/net/wireless/realtek/rtw89/core.c
index 85aeb9e90812..b3376fadf593 100644
--- a/drivers/net/wireless/realtek/rtw89/core.c
+++ b/drivers/net/wireless/realtek/rtw89/core.c
@@ -5417,7 +5417,7 @@ static void rtw89_track_ps_work(struct wiphy *wiphy, struct wiphy_work *work)
if (rtwdev->scanning)
return;
- if (rtwdev->lps_enabled && !rtwdev->btc.lps)
+ if (rtwdev->lps_enabled && !rtwdev->btc.btc_ctrl_lps)
rtw89_enter_lps_track(rtwdev, RTW89_TFC_INTERVAL_100MS);
}
@@ -5465,7 +5465,7 @@ static void rtw89_track_work(struct wiphy *wiphy, struct wiphy_work *work)
rtw89_core_rfkill_poll(rtwdev, false);
rtw89_core_mlo_track(rtwdev);
- if (rtwdev->lps_enabled && !rtwdev->btc.lps)
+ if (rtwdev->lps_enabled && !rtwdev->btc.btc_ctrl_lps)
rtw89_enter_lps_track(rtwdev, RTW89_TFC_INTERVAL_2SEC);
}
diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h
index eb814425f536..8646a13bfd79 100644
--- a/drivers/net/wireless/realtek/rtw89/core.h
+++ b/drivers/net/wireless/realtek/rtw89/core.h
@@ -1415,6 +1415,7 @@ enum rtw89_btc_wl_state_cnt {
BTC_WCNT_RX_ERR_LAST,
BTC_WCNT_RX_ERR_LAST2S,
BTC_WCNT_RX_LAST,
+ BTC_WCNT_SCBDUPDATE2,
BTC_WCNT_NUM
};
@@ -1431,17 +1432,25 @@ enum rtw89_btc_bt_state_cnt {
BTC_BCNT_ROLESW,
BTC_BCNT_AFH,
BTC_BCNT_INFOUPDATE,
+ BTC_BCNT_LEAUDIO_INFOUPDATE,
BTC_BCNT_INFOSAME,
+ BTC_BCNT_LEAUDIO_INFOSAME,
BTC_BCNT_SCBDUPDATE,
BTC_BCNT_HIPRI_TX,
BTC_BCNT_HIPRI_RX,
BTC_BCNT_LOPRI_TX,
BTC_BCNT_LOPRI_RX,
- BTC_BCNT_POLUT,
BTC_BCNT_POLUT_NOW,
BTC_BCNT_POLUT_DIFF,
BTC_BCNT_RATECHG,
- BTC_BCNT_BTTXPWR_UPDATE,
+ BTC_BCNT_AFH_CONFLICT,
+ BTC_BCNT_AFH_LE_CONFLICT,
+ BTC_BCNT_AFH_UPDATE,
+ BTC_BCNT_AFH_LE_UPDATE,
+ BTC_BCNT_AFH_CHN,
+ BTC_BCNT_AFH_LE_CHN,
+ BTC_BCNT_TXPWR_UPDATE,
+ BTC_BCNT_PROTECT,
BTC_BCNT_NUM,
};
@@ -2188,12 +2197,13 @@ struct rtw89_btc_wl_info {
bool pta_reg_mac_chg;
bool bg_mode;
bool he_mode;
- bool scbd_change;
+ bool scbd_chg[BTC_ALL_BT];
bool fw_ver_mismatch;
bool client_cnt_inc_2g;
bool link_mode_chg;
bool dbcc_chg;
- u32 scbd;
+ u32 scbd[BTC_ALL_BT];
+ u32 scbd_rb[BTC_ALL_BT];
u32 wcnt[BTC_WCNT_NUM];
};
@@ -2323,6 +2333,15 @@ enum rtw89_btc_ble_scan_type {
CXSCAN_MAX
};
+enum rtw89_btc_bt_func_type {
+ BTC_BTF_NONE = 0,
+ BTC_BTF_BT = BIT(0),
+ BTC_BTF_ZB = BIT(1),
+ BTC_BTF_THREAD = BIT(2),
+ BTC_BTF_24GPRO = BIT(3), /* 2.4GHz Proprietary */
+ BTC_BTF_ULL = BIT(4),
+};
+
#define RTW89_BTC_BTC_SCAN_V1_FLAG_ENABLE BIT(0)
#define RTW89_BTC_BTC_SCAN_V1_FLAG_INTERLACE BIT(1)
@@ -2394,6 +2413,8 @@ struct rtw89_btc_bt_info {
u8 rsvd: 6;
u32 scbd;
+ u32 scbd_rb;
+ u32 scbd_c2h;
u32 feature;
u32 mbx_avl: 1;
@@ -3338,6 +3359,8 @@ struct rtw89_btc_dm {
u8 lps_ctrl_scbd: 1;
u8 lps_ctrl_scbd_last: 1;
u8 lps_ctrl_change: 1;
+ u8 scbd_write_instant;
+ bool scbd_b2w_update;
};
struct rtw89_btc_ctrl {
@@ -3585,7 +3608,7 @@ struct rtw89_btc {
u32 hubmsg_cnt;
bool bt_req_en;
bool update_policy_force;
- bool lps;
+ bool btc_ctrl_lps;
bool manual_ctrl;
bool cli_h2c_cmd;
};
--
2.25.1
^ permalink raw reply related
* [PATCH rtw-next v2 7/9] wifi: rtw89: coex: Add TDMA binding for dual MAC
From: Ping-Ke Shih @ 2026-07-06 2:54 UTC (permalink / raw)
To: linux-wireless; +Cc: ku920601
In-Reply-To: <20260706025445.18428-1-pkshih@realtek.com>
From: Ching-Te Ku <ku920601@realtek.com>
Because the two MAC should have their own individual using, they will
need different TDMA mechanism. This patch will bind TDMA with MAC index,
and also the corresponding antenna, hardware grant signal setting.
Signed-off-by: Ching-Te Ku <ku920601@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
---
drivers/net/wireless/realtek/rtw89/coex.c | 381 +++++++++-------------
drivers/net/wireless/realtek/rtw89/core.h | 11 +-
2 files changed, 158 insertions(+), 234 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtw89/coex.c b/drivers/net/wireless/realtek/rtw89/coex.c
index 15f929d60f94..efa177f8b231 100644
--- a/drivers/net/wireless/realtek/rtw89/coex.c
+++ b/drivers/net/wireless/realtek/rtw89/coex.c
@@ -494,7 +494,7 @@ enum btc_ant_phase {
BTC_ANT_FREERUN,
BTC_ANT_WRFK,
BTC_ANT_WRFK2,
- BTC_ANT_BRFK,
+ BTC_ANT_PTA, /* for Multi-PTA, each hw-band has its own PTA */
BTC_ANT_MAX
};
@@ -3894,6 +3894,41 @@ static void _set_policy(struct rtw89_dev *rtwdev, u16 policy_type,
_fw_set_policy(rtwdev, policy_type, action);
}
+static void _set_tdma_bind(struct rtw89_dev *rtwdev, bool tdma_on)
+{
+ struct rtw89_btc_dm *dm = &rtwdev->btc.dm;
+ struct rtw89_btc_bind_info *bind;
+ u8 null_role = RTW89_WIFI_ROLE_STATION;
+
+ if (dm->tdd_en)
+ bind = &dm->tdd_bind; /* tdd = 1 && fdd = 0 or 1 */
+ else
+ bind = &dm->fdd_bind; /* tdd = 0 && fdd = 1 */
+
+ /* notify BT TDMA on/off by scoreboard for ACL/Scan schedule */
+ _write_scbd(rtwdev, BTC_WSCB_TDMA, tdma_on);
+
+ /*
+ * set hwb/bt bind to TDMA policy parameter
+ * FW-BTC will setup related hwbx vs. BTx coex tables by slot toggle
+ * ex: HWb0 + BT0 + BT1, HWB0-BT0/HWB0-BT1 coex by WL/BT slot toggle
+ */
+ dm->tdma.bind = ((bind->bt_sel & 0xf) << 4) + (bind->wl_hwb_sel & 0x3);
+ if (dm->tdd_en)
+ dm->tdma.bind |= BIT(2);
+ if (dm->fdd_en)
+ dm->tdma.bind |= BIT(3);
+ if (rtwdev->btc.ver->fcxtdma != 8)
+ dm->tdma.bind |= 0;
+
+ /* set Null-tx role for 2 HW-BAND TDMA (MLMR) */
+ if (!dm->eslot_ctrl.en && dm->tdma.rxflctrl &&
+ (bind->wl_hwb_sel == (BIT(RTW89_PHY_1) | BIT(RTW89_PHY_0)))) {
+ null_role = (null_role << 4) + null_role;
+ _tdma_set_flctrl_role(&rtwdev->btc, null_role);
+ }
+}
+
#define BTC_B1_MAX 250 /* unit ms */
void rtw89_btc_set_policy(struct rtw89_dev *rtwdev, u16 policy_type)
{
@@ -3903,6 +3938,7 @@ void rtw89_btc_set_policy(struct rtw89_dev *rtwdev, u16 policy_type)
struct rtw89_btc_fbtc_slot *s = dm->slot.v1;
u8 type;
u32 tbl_w1, tbl_b1, tbl_b4;
+ bool tdma_on = false;
if (btc->ant_type == BTC_ANT_SHARED) {
if (btc->cx.wl.status.map._4way)
@@ -3928,7 +3964,7 @@ void rtw89_btc_set_policy(struct rtw89_dev *rtwdev, u16 policy_type)
btc->update_policy_force = true;
break;
case BTC_CXP_OFF: /* TDMA off */
- _write_scbd(rtwdev, BTC_WSCB_TDMA, false);
+ tdma_on = false;
*t = t_def[CXTD_OFF];
s[CXST_OFF] = s_def[CXST_OFF];
@@ -3963,7 +3999,7 @@ void rtw89_btc_set_policy(struct rtw89_dev *rtwdev, u16 policy_type)
}
break;
case BTC_CXP_OFFB: /* TDMA off + beacon protect */
- _write_scbd(rtwdev, BTC_WSCB_TDMA, false);
+ tdma_on = false;
*t = t_def[CXTD_OFF_B2];
s[CXST_OFF] = s_def[CXST_OFF];
switch (policy_type) {
@@ -3974,7 +4010,7 @@ void rtw89_btc_set_policy(struct rtw89_dev *rtwdev, u16 policy_type)
break;
case BTC_CXP_OFFE: /* TDMA off + beacon protect + Ext_control */
btc->bt_req_en = true;
- _write_scbd(rtwdev, BTC_WSCB_TDMA, true);
+ tdma_on = true;
*t = t_def[CXTD_OFF_EXT];
switch (policy_type) {
case BTC_CXP_OFFE_DEF:
@@ -3992,7 +4028,7 @@ void rtw89_btc_set_policy(struct rtw89_dev *rtwdev, u16 policy_type)
}
break;
case BTC_CXP_FIX: /* TDMA Fix-Slot */
- _write_scbd(rtwdev, BTC_WSCB_TDMA, true);
+ tdma_on = true;
*t = t_def[CXTD_FIX];
switch (policy_type) {
case BTC_CXP_FIX_TD3030:
@@ -4048,7 +4084,7 @@ void rtw89_btc_set_policy(struct rtw89_dev *rtwdev, u16 policy_type)
}
break;
case BTC_CXP_PFIX: /* PS-TDMA Fix-Slot */
- _write_scbd(rtwdev, BTC_WSCB_TDMA, true);
+ tdma_on = true;
*t = t_def[CXTD_PFIX];
if (btc->cx.wl.role_info.role_map.role.ap)
_tdma_set_flctrl(btc, CXFLC_QOSNULL);
@@ -4081,7 +4117,7 @@ void rtw89_btc_set_policy(struct rtw89_dev *rtwdev, u16 policy_type)
}
break;
case BTC_CXP_AUTO: /* TDMA Auto-Slot */
- _write_scbd(rtwdev, BTC_WSCB_TDMA, true);
+ tdma_on = true;
*t = t_def[CXTD_AUTO];
switch (policy_type) {
case BTC_CXP_AUTO_TD50B1:
@@ -4105,7 +4141,7 @@ void rtw89_btc_set_policy(struct rtw89_dev *rtwdev, u16 policy_type)
}
break;
case BTC_CXP_PAUTO: /* PS-TDMA Auto-Slot */
- _write_scbd(rtwdev, BTC_WSCB_TDMA, true);
+ tdma_on = true;
*t = t_def[CXTD_PAUTO];
switch (policy_type) {
case BTC_CXP_PAUTO_TD50B1:
@@ -4129,7 +4165,7 @@ void rtw89_btc_set_policy(struct rtw89_dev *rtwdev, u16 policy_type)
}
break;
case BTC_CXP_AUTO2: /* TDMA Auto-Slot2 */
- _write_scbd(rtwdev, BTC_WSCB_TDMA, true);
+ tdma_on = true;
*t = t_def[CXTD_AUTO2];
switch (policy_type) {
case BTC_CXP_AUTO2_TD3050:
@@ -4166,7 +4202,7 @@ void rtw89_btc_set_policy(struct rtw89_dev *rtwdev, u16 policy_type)
}
break;
case BTC_CXP_PAUTO2: /* PS-TDMA Auto-Slot2 */
- _write_scbd(rtwdev, BTC_WSCB_TDMA, true);
+ tdma_on = true;
*t = t_def[CXTD_PAUTO2];
switch (policy_type) {
case BTC_CXP_PAUTO2_TD3050:
@@ -4203,6 +4239,7 @@ void rtw89_btc_set_policy(struct rtw89_dev *rtwdev, u16 policy_type)
}
break;
}
+ _set_tdma_bind(rtwdev, tdma_on);
}
EXPORT_SYMBOL(rtw89_btc_set_policy);
@@ -4211,14 +4248,14 @@ void rtw89_btc_set_policy_v1(struct rtw89_dev *rtwdev, u16 policy_type)
struct rtw89_btc *btc = &rtwdev->btc;
struct rtw89_btc_dm *dm = &btc->dm;
struct rtw89_btc_fbtc_tdma *t = &dm->tdma;
- struct rtw89_btc_wl_role_info_v1 *wl_rinfo = &btc->cx.wl.role_info_v1;
struct rtw89_btc_bt_a2dp_desc *a2dp = &btc->cx.bt0.link_info.a2dp_desc;
struct rtw89_btc_bt_hid_desc *hid = &btc->cx.bt0.link_info.hid_desc;
struct rtw89_btc_bt_hfp_desc *hfp = &btc->cx.bt0.link_info.hfp_desc;
struct rtw89_btc_wl_info *wl = &btc->cx.wl;
u8 type, null_role;
u32 tbl_w1, tbl_b1, tbl_b4;
- u16 dur_2;
+ bool tdma_on = false;
+ u16 dur_1 = 0, dur_2;
if (wl->status.map.lps) {
_slot_set_le(btc, CXST_E2G, s_def[CXST_E2G].dur,
@@ -4272,7 +4309,7 @@ void rtw89_btc_set_policy_v1(struct rtw89_dev *rtwdev, u16 policy_type)
_slot_set_tbl(btc, CXST_OFF, cxtbl[2]);
break;
case BTC_CXP_OFF: /* TDMA off */
- _write_scbd(rtwdev, BTC_WSCB_TDMA, false);
+ tdma_on = false;
*t = t_def[CXTD_OFF];
_slot_set_le(btc, CXST_OFF, s_def[CXST_OFF].dur,
s_def[CXST_OFF].cxtbl, s_def[CXST_OFF].cxtype);
@@ -4324,7 +4361,7 @@ void rtw89_btc_set_policy_v1(struct rtw89_dev *rtwdev, u16 policy_type)
}
break;
case BTC_CXP_OFFB: /* TDMA off + beacon protect */
- _write_scbd(rtwdev, BTC_WSCB_TDMA, false);
+ tdma_on = false;
*t = t_def[CXTD_OFF_B2];
_slot_set_le(btc, CXST_OFF, s_def[CXST_OFF].dur,
s_def[CXST_OFF].cxtbl, s_def[CXST_OFF].cxtype);
@@ -4338,24 +4375,35 @@ void rtw89_btc_set_policy_v1(struct rtw89_dev *rtwdev, u16 policy_type)
}
break;
case BTC_CXP_OFFE: /* TDMA off + beacon protect + Ext_control */
- _write_scbd(rtwdev, BTC_WSCB_TDMA, true);
+ tdma_on = true;
*t = t_def[CXTD_OFF_EXT];
/* To avoid wl-s0 tx break by hid/hfp tx */
if (hid->exist || hfp->exist)
tbl_w1 = cxtbl[16];
+ if (dm->eslot_ctrl.en) {
+ null_role = u8_encode_bits(dm->eslot_ctrl.nulltx_role1, 0x0f) |
+ u8_encode_bits(dm->eslot_ctrl.nulltx_role2, 0xf0);
+ _tdma_set_flctrl_role(btc, null_role);
+ _tdma_set_rxflctrl(btc, 1);
+ _tdma_set_txflctrl(btc, 1);
+ /* Set Null-Tx time-tick by E2G duration */
+ dm->eslot_ctrl.nulltx_pre_time = 5; /* TODO: BIS COEX */
+ dur_1 = dm->eslot_ctrl.nulltx_pre_time;
+ }
+
dur_2 = dm->e2g_slot_limit;
switch (policy_type) {
case BTC_CXP_OFFE_2GBWISOB: /* for normal-case */
- _slot_set(btc, CXST_E2G, 5, tbl_w1, SLOT_ISO);
+ _slot_set(btc, CXST_E2G, dur_1, tbl_w1, SLOT_ISO);
_slot_set_le(btc, CXST_EBT, s_def[CXST_EBT].dur,
s_def[CXST_EBT].cxtbl, s_def[CXST_EBT].cxtype);
_slot_set_dur(btc, CXST_EBT, dur_2);
break;
case BTC_CXP_OFFE_2GISOB: /* for bt no-link */
- _slot_set(btc, CXST_E2G, 5, cxtbl[1], SLOT_ISO);
+ _slot_set(btc, CXST_E2G, dur_1, cxtbl[1], SLOT_ISO);
_slot_set_le(btc, CXST_EBT, s_def[CXST_EBT].dur,
s_def[CXST_EBT].cxtbl, s_def[CXST_EBT].cxtype);
_slot_set_dur(btc, CXST_EBT, dur_2);
@@ -4383,16 +4431,16 @@ void rtw89_btc_set_policy_v1(struct rtw89_dev *rtwdev, u16 policy_type)
break;
case BTC_CXP_OFFE_2GBWMIXB:
if (a2dp->exist)
- _slot_set(btc, CXST_E2G, 5, cxtbl[2], SLOT_MIX);
+ _slot_set(btc, CXST_E2G, dur_1, cxtbl[2], SLOT_MIX);
else
- _slot_set(btc, CXST_E2G, 5, tbl_w1, SLOT_MIX);
+ _slot_set(btc, CXST_E2G, dur_1, tbl_w1, SLOT_MIX);
_slot_set_le(btc, CXST_EBT, cpu_to_le16(40),
s_def[CXST_EBT].cxtbl, s_def[CXST_EBT].cxtype);
_slot_set_dur(btc, CXST_EBT, dur_2);
break;
case BTC_CXP_OFFE_WL: /* for 4-way */
- _slot_set(btc, CXST_E2G, 5, cxtbl[1], SLOT_MIX);
- _slot_set(btc, CXST_EBT, 5, cxtbl[1], SLOT_MIX);
+ _slot_set(btc, CXST_E2G, dur_1, cxtbl[1], SLOT_MIX);
+ _slot_set(btc, CXST_EBT, dur_1, cxtbl[1], SLOT_MIX);
break;
default:
break;
@@ -4403,7 +4451,7 @@ void rtw89_btc_set_policy_v1(struct rtw89_dev *rtwdev, u16 policy_type)
s_def[CXST_OFF].cxtbl, s_def[CXST_OFF].cxtype);
break;
case BTC_CXP_FIX: /* TDMA Fix-Slot */
- _write_scbd(rtwdev, BTC_WSCB_TDMA, true);
+ tdma_on = true;
*t = t_def[CXTD_FIX];
switch (policy_type) {
@@ -4462,7 +4510,7 @@ void rtw89_btc_set_policy_v1(struct rtw89_dev *rtwdev, u16 policy_type)
}
break;
case BTC_CXP_PFIX: /* PS-TDMA Fix-Slot */
- _write_scbd(rtwdev, BTC_WSCB_TDMA, true);
+ tdma_on = true;
*t = t_def[CXTD_PFIX];
switch (policy_type) {
@@ -4501,7 +4549,7 @@ void rtw89_btc_set_policy_v1(struct rtw89_dev *rtwdev, u16 policy_type)
}
break;
case BTC_CXP_AUTO: /* TDMA Auto-Slot */
- _write_scbd(rtwdev, BTC_WSCB_TDMA, true);
+ tdma_on = true;
*t = t_def[CXTD_AUTO];
switch (policy_type) {
@@ -4528,7 +4576,7 @@ void rtw89_btc_set_policy_v1(struct rtw89_dev *rtwdev, u16 policy_type)
}
break;
case BTC_CXP_PAUTO: /* PS-TDMA Auto-Slot */
- _write_scbd(rtwdev, BTC_WSCB_TDMA, true);
+ tdma_on = true;
*t = t_def[CXTD_PAUTO];
switch (policy_type) {
@@ -4555,7 +4603,7 @@ void rtw89_btc_set_policy_v1(struct rtw89_dev *rtwdev, u16 policy_type)
}
break;
case BTC_CXP_AUTO2: /* TDMA Auto-Slot2 */
- _write_scbd(rtwdev, BTC_WSCB_TDMA, true);
+ tdma_on = true;
*t = t_def[CXTD_AUTO2];
switch (policy_type) {
@@ -4597,7 +4645,7 @@ void rtw89_btc_set_policy_v1(struct rtw89_dev *rtwdev, u16 policy_type)
}
break;
case BTC_CXP_PAUTO2: /* PS-TDMA Auto-Slot2 */
- _write_scbd(rtwdev, BTC_WSCB_TDMA, true);
+ tdma_on = true;
*t = t_def[CXTD_PAUTO2];
switch (policy_type) {
@@ -4640,20 +4688,22 @@ void rtw89_btc_set_policy_v1(struct rtw89_dev *rtwdev, u16 policy_type)
break;
}
- if (wl_rinfo->link_mode == BTC_WLINK_2G_SCC && dm->tdma.rxflctrl) {
- null_role = FIELD_PREP(0x0f, dm->wl_scc.null_role1) |
- FIELD_PREP(0xf0, dm->wl_scc.null_role2);
- _tdma_set_flctrl_role(btc, null_role);
- }
-
/* enter leak_slot after each null-1 */
if (dm->leak_ap && dm->tdma.leak_n > 1)
_tdma_set_lek(btc, 1);
- if (dm->tdma_instant_excute || dm->lps_ctrl_change) {
+ if (dm->tdma_instant_excute ||
+ dm->error.map.tdma_no_sync ||
+ dm->error.map.slot_no_sync ||
+ dm->lps_ctrl_change) {
btc->dm.tdma.option_ctrl |= BIT(0);
btc->update_policy_force = true;
}
+
+ if (btc->cli_h2c_cmd)
+ btc->update_policy_force = true;
+
+ _set_tdma_bind(rtwdev, tdma_on);
}
EXPORT_SYMBOL(rtw89_btc_set_policy_v1);
@@ -4697,20 +4747,29 @@ static void _set_ant_v0(struct rtw89_dev *rtwdev, bool force_exec,
struct rtw89_btc_wl_info *wl = &btc->cx.wl;
struct rtw89_btc_bt_info *bt = &cx->bt0;
struct rtw89_btc_wl_dbcc_info *wl_dinfo = &wl->dbcc_info;
- u8 gnt_wl_ctrl, gnt_bt_ctrl, plt_ctrl, i, b2g = 0;
- bool dbcc_chg = false;
+ u8 gwl, gwl0, gwl1, gbt, plt_ctrl, i, dbcc_2g_phy, b2g = 0;
+ bool dbcc_chg = false, dbcc_en = false;
u32 ant_path_type;
ant_path_type = ((phy_map << 8) + type);
- if (btc->ver->fwlrole == 1)
+ if (btc->ver->fwlrole == 1) {
dbcc_chg = wl->role_info_v1.dbcc_chg;
- else if (btc->ver->fwlrole == 2)
+ dbcc_en = wl->role_info_v1.dbcc_en;
+ dbcc_2g_phy = wl->role_info_v1.dbcc_2g_phy;
+ } else if (btc->ver->fwlrole == 2) {
dbcc_chg = wl->role_info_v2.dbcc_chg;
- else if (btc->ver->fwlrole == 7)
+ dbcc_en = wl->role_info_v2.dbcc_en;
+ dbcc_2g_phy = wl->role_info_v2.dbcc_2g_phy;
+ } else if (btc->ver->fwlrole == 7) {
dbcc_chg = wl->role_info_v7.dbcc_chg;
- else if (btc->ver->fwlrole == 8)
+ dbcc_en = wl->role_info_v7.dbcc_en;
+ dbcc_2g_phy = wl->role_info_v7.dbcc_2g_phy;
+ } else if (btc->ver->fwlrole == 8) {
dbcc_chg = wl->role_info_v8.dbcc_chg;
+ dbcc_en = wl->role_info_v8.dbcc_en;
+ dbcc_2g_phy = wl->role_info_v8.dbcc_2g_phy;
+ }
if (btc->dm.run_reason == BTC_RSN_NTFY_POWEROFF ||
btc->dm.run_reason == BTC_RSN_NTFY_RADIO_STATE ||
@@ -4768,14 +4827,14 @@ static void _set_ant_v0(struct rtw89_dev *rtwdev, bool force_exec,
for (i = 0; i < RTW89_PHY_NUM; i++) {
b2g = (wl_dinfo->real_band[i] == RTW89_BAND_2G);
- gnt_wl_ctrl = b2g ? BTC_GNT_HW : BTC_GNT_SW_HI;
- gnt_bt_ctrl = b2g ? BTC_GNT_HW : BTC_GNT_SW_HI;
+ gwl = b2g ? BTC_GNT_HW : BTC_GNT_SW_HI;
+ gbt = b2g ? BTC_GNT_HW : BTC_GNT_SW_HI;
/* BT should control by GNT_BT if WL_2G at S0 */
if (i == 1 &&
wl_dinfo->real_band[0] == RTW89_BAND_2G &&
wl_dinfo->real_band[1] == RTW89_BAND_5G)
- gnt_bt_ctrl = BTC_GNT_HW;
- _set_gnt(rtwdev, BIT(i), gnt_wl_ctrl, gnt_bt_ctrl);
+ gbt = BTC_GNT_HW;
+ _set_gnt(rtwdev, BIT(i), gwl, gbt);
plt_ctrl = b2g ? BTC_PLT_BT : BTC_PLT_NONE;
_set_bt_plut(rtwdev, BIT(i),
plt_ctrl, plt_ctrl);
@@ -4808,12 +4867,27 @@ static void _set_ant_v0(struct rtw89_dev *rtwdev, bool force_exec,
_set_gnt(rtwdev, phy_map, BTC_GNT_SW_HI, BTC_GNT_SW_LO);
_set_bt_plut(rtwdev, phy_map, BTC_PLT_NONE, BTC_PLT_NONE);
break;
- case BTC_ANT_BRFK:
- rtw89_chip_cfg_ctrl_path(rtwdev, BTC_CTRL_BY_BT);
- _set_gnt(rtwdev, phy_map, BTC_GNT_SW_LO, BTC_GNT_SW_HI);
- _set_bt_plut(rtwdev, phy_map, BTC_PLT_NONE, BTC_PLT_NONE);
- break;
+ case BTC_ANT_PTA:
default:
+ gbt = BTC_GNT_HW;
+ if ((rtwdev->chip->para_ver & BTC_FEAT_MULTI_PTA) ||
+ !dbcc_en) {
+ gwl = BTC_GNT_HW;
+ _set_gnt(rtwdev, BTC_PHY_ALL, gwl, gbt);
+ } else {
+ /* for DBCC Only-1-PTA */
+ if (dbcc_2g_phy == RTW89_PHY_0) {
+ gwl0 = BTC_GNT_HW;
+ gwl1 = BTC_GNT_SW_HI;
+ } else {
+ gwl0 = BTC_GNT_SW_HI;
+ gwl1 = BTC_GNT_HW;
+ }
+ _set_gnt(rtwdev, BTC_PHY_0, gwl0, gbt);
+ _set_gnt(rtwdev, BTC_PHY_1, gwl1, gbt);
+ }
+ rtw89_chip_cfg_ctrl_path(rtwdev, BTC_CTRL_BY_WL);
+ _set_bt_plut(rtwdev, phy_map, BTC_PLT_NONE, BTC_PLT_NONE);
break;
}
}
@@ -4828,7 +4902,7 @@ static void _set_ant_v1(struct rtw89_dev *rtwdev, bool force_exec,
u32 ant_path_type = rtw89_get_antpath_type(phy_map, type);
struct rtw89_btc_wl_dbcc_info *wl_dinfo = &wl->dbcc_info;
struct rtw89_btc_dm *dm = &btc->dm;
- u8 gwl = BTC_GNT_HW;
+ u8 gwl = BTC_GNT_HW, gwl0, gwl1, gbt;
if (btc->dm.run_reason == BTC_RSN_NTFY_POWEROFF ||
btc->dm.run_reason == BTC_RSN_NTFY_RADIO_STATE ||
@@ -4913,8 +4987,26 @@ static void _set_ant_v1(struct rtw89_dev *rtwdev, bool force_exec,
_set_gnt_v1(rtwdev, phy_map, BTC_GNT_SW_HI, BTC_GNT_SW_LO,
BTC_WLACT_SW_HI); /* no BT-Tx */
break;
+ case BTC_ANT_PTA:
default:
- return;
+ gbt = BTC_GNT_HW;
+ if ((rtwdev->chip->para_ver & BTC_FEAT_MULTI_PTA) ||
+ !wl_rinfo->dbcc_en) {
+ gwl = BTC_GNT_HW;
+ _set_gnt_v1(rtwdev, BTC_PHY_ALL, gwl, gbt, BTC_WLACT_HW);
+ } else {
+ /* for DBCC Only-1-PTA */
+ if (wl_rinfo->dbcc_2g_phy == RTW89_PHY_0) {
+ gwl0 = BTC_GNT_HW;
+ gwl1 = BTC_GNT_SW_HI;
+ } else {
+ gwl0 = BTC_GNT_SW_HI;
+ gwl1 = BTC_GNT_HW;
+ }
+ _set_gnt_v1(rtwdev, BTC_PHY_0, gwl0, gbt, BTC_WLACT_HW);
+ _set_gnt_v1(rtwdev, BTC_PHY_1, gwl1, gbt, BTC_WLACT_HW);
+ }
+ break;
}
_set_bt_plut(rtwdev, phy_map, BTC_PLT_GNT_WL, BTC_PLT_GNT_WL);
@@ -6017,178 +6109,15 @@ static void _action_wl_2g_mcc(struct rtw89_dev *rtwdev)
static void _action_wl_2g_scc(struct rtw89_dev *rtwdev)
{
struct rtw89_btc *btc = &rtwdev->btc;
-
- _set_ant(rtwdev, NM_EXEC, BTC_PHY_ALL, BTC_ANT_W2G);
-
- if (btc->ant_type == BTC_ANT_SHARED) { /* shared-antenna */
- if (btc->cx.bt0.link_info.link_cnt.now == 0)
- _set_policy(rtwdev,
- BTC_CXP_OFFE_DEF2, BTC_ACT_WL_2G_SCC);
- else
- _set_policy(rtwdev,
- BTC_CXP_OFFE_DEF, BTC_ACT_WL_2G_SCC);
- } else { /* dedicated-antenna */
- _set_policy(rtwdev, BTC_CXP_OFF_EQ0, BTC_ACT_WL_2G_SCC);
- }
-}
-
-static void _action_wl_2g_scc_v1(struct rtw89_dev *rtwdev)
-{
- struct rtw89_btc *btc = &rtwdev->btc;
- struct rtw89_btc_wl_info *wl = &btc->cx.wl;
- struct rtw89_btc_bt_info *bt = &btc->cx.bt0;
struct rtw89_btc_dm *dm = &btc->dm;
- struct rtw89_btc_wl_role_info_v1 *wl_rinfo = &wl->role_info_v1;
- u16 policy_type = BTC_CXP_OFF_BT;
- u32 dur;
+ u16 policy_type;
- if (btc->ant_type == BTC_ANT_DEDICATED) {
- policy_type = BTC_CXP_OFF_EQ0;
- } else {
- /* shared-antenna */
- switch (wl_rinfo->mrole_type) {
- case BTC_WLMROLE_STA_GC:
- dm->wl_scc.null_role1 = RTW89_WIFI_ROLE_STATION;
- dm->wl_scc.null_role2 = RTW89_WIFI_ROLE_P2P_CLIENT;
- dm->wl_scc.ebt_null = 0; /* no ext-slot-control */
- _action_by_bt(rtwdev);
- return;
- case BTC_WLMROLE_STA_STA:
- dm->wl_scc.null_role1 = RTW89_WIFI_ROLE_STATION;
- dm->wl_scc.null_role2 = RTW89_WIFI_ROLE_STATION;
- dm->wl_scc.ebt_null = 0; /* no ext-slot-control */
- _action_by_bt(rtwdev);
- return;
- case BTC_WLMROLE_STA_GC_NOA:
- case BTC_WLMROLE_STA_GO:
- case BTC_WLMROLE_STA_GO_NOA:
- dm->wl_scc.null_role1 = RTW89_WIFI_ROLE_STATION;
- dm->wl_scc.null_role2 = RTW89_WIFI_ROLE_NONE;
- dur = wl_rinfo->mrole_noa_duration;
-
- if (wl->status.map._4way) {
- dm->wl_scc.ebt_null = 0;
- policy_type = BTC_CXP_OFFE_WL;
- } else if (bt->link_info.status.map.connect == 0) {
- dm->wl_scc.ebt_null = 0;
- policy_type = BTC_CXP_OFFE_2GISOB;
- } else if (bt->link_info.a2dp_desc.exist &&
- dur < btc->bt_req_len[RTW89_PHY_0]) {
- dm->wl_scc.ebt_null = 1; /* tx null at EBT */
- policy_type = BTC_CXP_OFFE_2GBWMIXB2;
- } else if (bt->link_info.a2dp_desc.exist ||
- bt->link_info.pan_desc.exist) {
- dm->wl_scc.ebt_null = 1; /* tx null at EBT */
- policy_type = BTC_CXP_OFFE_2GBWISOB;
- } else {
- dm->wl_scc.ebt_null = 0;
- policy_type = BTC_CXP_OFFE_2GBWISOB;
- }
- break;
- default:
- break;
- }
- }
-
- _set_ant(rtwdev, NM_EXEC, BTC_PHY_ALL, BTC_ANT_W2G);
- _set_policy(rtwdev, policy_type, BTC_ACT_WL_2G_SCC);
-}
-
-static void _action_wl_2g_scc_v2(struct rtw89_dev *rtwdev)
-{
- struct rtw89_btc *btc = &rtwdev->btc;
- struct rtw89_btc_wl_info *wl = &btc->cx.wl;
- struct rtw89_btc_bt_info *bt = &btc->cx.bt0;
- struct rtw89_btc_dm *dm = &btc->dm;
- struct rtw89_btc_wl_role_info_v2 *rinfo_v2 = &wl->role_info_v2;
- struct rtw89_btc_wl_role_info_v7 *rinfo_v7 = &wl->role_info_v7;
- u32 dur, mrole_type, mrole_noa_duration;
- u16 policy_type = BTC_CXP_OFF_BT;
-
- if (btc->ver->fwlrole == 2) {
- mrole_type = rinfo_v2->mrole_type;
- mrole_noa_duration = rinfo_v2->mrole_noa_duration;
- } else if (btc->ver->fwlrole == 7) {
- mrole_type = rinfo_v7->mrole_type;
- mrole_noa_duration = rinfo_v7->mrole_noa_duration;
- } else {
- return;
- }
-
- if (btc->ant_type == BTC_ANT_DEDICATED) {
- policy_type = BTC_CXP_OFF_EQ0;
- } else {
- /* shared-antenna */
- switch (mrole_type) {
- case BTC_WLMROLE_STA_GC:
- dm->wl_scc.null_role1 = RTW89_WIFI_ROLE_STATION;
- dm->wl_scc.null_role2 = RTW89_WIFI_ROLE_P2P_CLIENT;
- dm->wl_scc.ebt_null = 0; /* no ext-slot-control */
- _action_by_bt(rtwdev);
- return;
- case BTC_WLMROLE_STA_STA:
- dm->wl_scc.null_role1 = RTW89_WIFI_ROLE_STATION;
- dm->wl_scc.null_role2 = RTW89_WIFI_ROLE_STATION;
- dm->wl_scc.ebt_null = 0; /* no ext-slot-control */
- _action_by_bt(rtwdev);
- return;
- case BTC_WLMROLE_STA_GC_NOA:
- case BTC_WLMROLE_STA_GO:
- case BTC_WLMROLE_STA_GO_NOA:
- dm->wl_scc.null_role1 = RTW89_WIFI_ROLE_STATION;
- dm->wl_scc.null_role2 = RTW89_WIFI_ROLE_NONE;
- dur = mrole_noa_duration;
-
- if (wl->status.map._4way) {
- dm->wl_scc.ebt_null = 0;
- policy_type = BTC_CXP_OFFE_WL;
- } else if (bt->link_info.status.map.connect == 0) {
- dm->wl_scc.ebt_null = 0;
- policy_type = BTC_CXP_OFFE_2GISOB;
- } else if (bt->link_info.a2dp_desc.exist &&
- dur < btc->bt_req_len[RTW89_PHY_0]) {
- dm->wl_scc.ebt_null = 1; /* tx null at EBT */
- policy_type = BTC_CXP_OFFE_2GBWMIXB2;
- } else if (bt->link_info.a2dp_desc.exist ||
- bt->link_info.pan_desc.exist) {
- dm->wl_scc.ebt_null = 1; /* tx null at EBT */
- policy_type = BTC_CXP_OFFE_2GBWISOB;
- } else {
- dm->wl_scc.ebt_null = 0;
- policy_type = BTC_CXP_OFFE_2GBWISOB;
- }
- break;
- default:
- break;
- }
- }
-
- _set_ant(rtwdev, NM_EXEC, BTC_PHY_ALL, BTC_ANT_W2G);
- _set_policy(rtwdev, policy_type, BTC_ACT_WL_2G_SCC);
-}
-
-static void _action_wl_2g_scc_v8(struct rtw89_dev *rtwdev)
-{
- struct rtw89_btc *btc = &rtwdev->btc;
- struct rtw89_btc_wl_info *wl = &btc->cx.wl;
- struct rtw89_btc_bt_info *bt = &btc->cx.bt0;
- struct rtw89_btc_dm *dm = &btc->dm;
- u16 policy_type = BTC_CXP_OFF_BT;
-
- if (btc->ant_type == BTC_ANT_SHARED) {
- if (wl->status.map._4way)
- policy_type = BTC_CXP_OFFE_WL;
- else if (bt->link_info.status.map.connect == 0)
- policy_type = BTC_CXP_OFFE_2GISOB;
- else
- policy_type = BTC_CXP_OFFE_2GBWISOB;
- } else {
- policy_type = BTC_CXP_OFF_EQ0;
- }
-
- dm->e2g_slot_limit = BTC_E2G_LIMIT_DEF;
+ if (!dm->tdd_bind.bt_smap.connect)
+ policy_type = BTC_CXP_OFFE_2GISOB;
+ else
+ policy_type = BTC_CXP_OFFE_2GBWISOB;
- _set_ant(rtwdev, NM_EXEC, BTC_PHY_ALL, BTC_ANT_W2G);
+ _set_ant(rtwdev, NM_EXEC, BTC_PHY_ALL, BTC_ANT_PTA);
_set_policy(rtwdev, policy_type, BTC_ACT_WL_2G_SCC);
}
@@ -8180,14 +8109,7 @@ void _run_coex(struct rtw89_dev *rtwdev, enum btc_reason_and_action reason)
break;
case BTC_WLINK_2G_SCC:
bt->scan_rx_low_pri = true;
- if (ver->fwlrole == 0)
- _action_wl_2g_scc(rtwdev);
- else if (ver->fwlrole == 1)
- _action_wl_2g_scc_v1(rtwdev);
- else if (ver->fwlrole == 2 || ver->fwlrole == 7)
- _action_wl_2g_scc_v2(rtwdev);
- else if (ver->fwlrole == 8)
- _action_wl_2g_scc_v8(rtwdev);
+ _action_wl_2g_scc(rtwdev);
break;
case BTC_WLINK_2G_MCC:
bt->scan_rx_low_pri = true;
@@ -10115,7 +10037,8 @@ static const char *id_to_ant(u32 id)
CASE_BTC_ANTPATH_STR(W25G);
CASE_BTC_ANTPATH_STR(FREERUN);
CASE_BTC_ANTPATH_STR(WRFK);
- CASE_BTC_ANTPATH_STR(BRFK);
+ CASE_BTC_ANTPATH_STR(WRFK2);
+ CASE_BTC_ANTPATH_STR(PTA);
CASE_BTC_ANTPATH_STR(MAX);
default:
return "unknown";
diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h
index 21bdf229723c..eb814425f536 100644
--- a/drivers/net/wireless/realtek/rtw89/core.h
+++ b/drivers/net/wireless/realtek/rtw89/core.h
@@ -1832,10 +1832,11 @@ struct rtw89_btc_wl_role_info_bpos {
u16 nan: 1;
};
-struct rtw89_btc_wl_scc_ctrl {
- u8 null_role1;
- u8 null_role2;
- u8 ebt_null; /* if tx null at EBT slot */
+struct rtw89_btc_eslot_ctrl {
+ u8 en; /* 1: toggle tx-flow-ctrl (null 0/1), tx-pause by Ext-slot */
+ u8 nulltx_role1;
+ u8 nulltx_role2;
+ u8 nulltx_pre_time; /* null-tx time prior to EBT-start (from E2G-end) */
};
union rtw89_btc_wl_role_info_map {
@@ -3275,7 +3276,7 @@ struct rtw89_btc_dm {
struct rtw89_btc_rf_trx_para_v9 rf_trx_para;
struct rtw89_btc_wl_tx_limit_para wl_tx_limit;
struct rtw89_btc_dm_step dm_step;
- struct rtw89_btc_wl_scc_ctrl wl_scc;
+ struct rtw89_btc_eslot_ctrl eslot_ctrl;
struct rtw89_btc_trx_info trx_info;
union rtw89_btc_dm_error_map error;
struct rtw89_btc_bind_info tdd_bind;
--
2.25.1
^ permalink raw reply related
* [PATCH rtw-next v2 6/9] wifi: rtw89: coex: Add WiFi/Bluetooth adapter binding info
From: Ping-Ke Shih @ 2026-07-06 2:54 UTC (permalink / raw)
To: linux-wireless; +Cc: ku920601
In-Reply-To: <20260706025445.18428-1-pkshih@realtek.com>
From: Ching-Te Ku <ku920601@realtek.com>
To bind Wi-Fi/Bluetooth with which adapter, in which band.
Signed-off-by: Ching-Te Ku <ku920601@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
---
v2:
- fix wrong compare logic, which should be && instead of ||
found by kernel test robot.
https://lore.kernel.org/oe-kbuild-all/202607032153.rVIyuBbI-lkp@intel.com/T/#u
---
drivers/net/wireless/realtek/rtw89/coex.c | 309 ++++++++++++++++++++--
drivers/net/wireless/realtek/rtw89/core.h | 121 ++++++++-
2 files changed, 396 insertions(+), 34 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtw89/coex.c b/drivers/net/wireless/realtek/rtw89/coex.c
index ff3c05101ab3..15f929d60f94 100644
--- a/drivers/net/wireless/realtek/rtw89/coex.c
+++ b/drivers/net/wireless/realtek/rtw89/coex.c
@@ -3349,7 +3349,7 @@ static void _set_rf_trx_para(struct rtw89_dev *rtwdev)
/* decide trx_para_level */
if (btc->ant_type == BTC_ANT_SHARED) {
/* fix LNA2 + TIA gain not change by GNT_BT */
- if ((btc->dm.wl_btg_rx && b->profile_cnt.now != 0) ||
+ if ((btc->dm.wl_btg_rx && b->link_cnt.now != 0) ||
dm->bt_only == 1)
dm->trx_para_level = 1; /* for better BT ACI issue */
else
@@ -3357,7 +3357,7 @@ static void _set_rf_trx_para(struct rtw89_dev *rtwdev)
} else { /* non-shared antenna */
dm->trx_para_level = 5;
/* modify trx_para if WK 2.4G-STA-DL + bt link */
- if (b->profile_cnt.now != 0 &&
+ if (b->link_cnt.now != 0 &&
link_mode == BTC_WLINK_2G_STA &&
wl->status.map.traffic_dir & BIT(RTW89_TFC_UL)) { /* uplink */
if (wl->rssi_level == 4 && bt->rssi_level > 2)
@@ -3606,7 +3606,7 @@ static void _set_bt_afh_info_v0(struct rtw89_dev *rtwdev)
if (wl->afh_info.en == en &&
wl->afh_info.ch == ch &&
wl->afh_info.bw == bw &&
- b->profile_cnt.last == b->profile_cnt.now) {
+ b->link_cnt.last == b->link_cnt.now) {
rtw89_debug(rtwdev, RTW89_DBG_BTC,
"[BTC], %s(): return because no change!\n",
__func__);
@@ -3777,7 +3777,7 @@ static bool _check_freerun(struct rtw89_dev *rtwdev)
return true;
}
- if (bt_linfo->profile_cnt.now == 0) {
+ if (bt_linfo->link_cnt.now == 0) {
btc->dm.trx_para_level = 5;
return true;
}
@@ -5497,7 +5497,7 @@ static void _set_wl_preagc_ctrl(struct rtw89_dev *rtwdev)
} else if (link_mode == BTC_WLINK_5G) {
is_preagc = BTC_PREAGC_DISABLE;
} else if (link_mode == BTC_WLINK_NOLINK ||
- btc->cx.bt0.link_info.profile_cnt.now == 0) {
+ btc->cx.bt0.link_info.link_cnt.now == 0) {
is_preagc = BTC_PREAGC_DISABLE;
} else if (dm->tdma_now.type != CXTDMA_OFF &&
!bt_linfo->hfp_desc.exist &&
@@ -5683,7 +5683,7 @@ static void _set_wl_tx_limit(struct rtw89_dev *rtwdev)
else
igno_bt = btc->ctrl.ctrl.igno_bt;
- if (btc->dm.freerun || igno_bt || b->profile_cnt.now == 0 ||
+ if (btc->dm.freerun || igno_bt || b->link_cnt.now == 0 ||
mode == BTC_WLINK_5G || mode == BTC_WLINK_NOLINK) {
enable = 0;
tx_time = BTC_MAX_TX_TIME_DEF;
@@ -6003,7 +6003,7 @@ static void _action_wl_2g_mcc(struct rtw89_dev *rtwdev)
_set_ant(rtwdev, NM_EXEC, BTC_PHY_ALL, BTC_ANT_W2G);
if (btc->ant_type == BTC_ANT_SHARED) { /* shared-antenna */
- if (btc->cx.bt0.link_info.profile_cnt.now == 0)
+ if (btc->cx.bt0.link_info.link_cnt.now == 0)
_set_policy(rtwdev, BTC_CXP_OFFE_DEF2,
BTC_ACT_WL_2G_MCC);
else
@@ -6021,7 +6021,7 @@ static void _action_wl_2g_scc(struct rtw89_dev *rtwdev)
_set_ant(rtwdev, NM_EXEC, BTC_PHY_ALL, BTC_ANT_W2G);
if (btc->ant_type == BTC_ANT_SHARED) { /* shared-antenna */
- if (btc->cx.bt0.link_info.profile_cnt.now == 0)
+ if (btc->cx.bt0.link_info.link_cnt.now == 0)
_set_policy(rtwdev,
BTC_CXP_OFFE_DEF2, BTC_ACT_WL_2G_SCC);
else
@@ -6199,7 +6199,7 @@ static void _action_wl_2g_ap(struct rtw89_dev *rtwdev)
_set_ant(rtwdev, NM_EXEC, BTC_PHY_ALL, BTC_ANT_W2G);
if (btc->ant_type == BTC_ANT_SHARED) {
- if (btc->cx.bt0.link_info.profile_cnt.now == 0)
+ if (btc->cx.bt0.link_info.link_cnt.now == 0)
_set_policy(rtwdev, BTC_CXP_OFFE_DEF2,
BTC_ACT_WL_2G_AP);
else
@@ -6216,7 +6216,7 @@ static void _action_wl_2g_go(struct rtw89_dev *rtwdev)
_set_ant(rtwdev, NM_EXEC, BTC_PHY_ALL, BTC_ANT_W2G);
if (btc->ant_type == BTC_ANT_SHARED) { /* shared-antenna */
- if (btc->cx.bt0.link_info.profile_cnt.now == 0)
+ if (btc->cx.bt0.link_info.link_cnt.now == 0)
_set_policy(rtwdev,
BTC_CXP_OFFE_DEF2, BTC_ACT_WL_2G_GO);
else
@@ -6247,7 +6247,7 @@ static void _action_wl_2g_nan(struct rtw89_dev *rtwdev)
_set_ant(rtwdev, NM_EXEC, BTC_PHY_ALL, BTC_ANT_W2G);
if (btc->ant_type == BTC_ANT_SHARED) { /* shared-antenna */
- if (btc->cx.bt0.link_info.profile_cnt.now == 0)
+ if (btc->cx.bt0.link_info.link_cnt.now == 0)
_set_policy(rtwdev,
BTC_CXP_OFFE_DEF2, BTC_ACT_WL_2G_NAN);
else
@@ -7742,6 +7742,273 @@ static bool _chk_wl_rfk_request(struct rtw89_dev *rtwdev)
return false;
}
+static void _set_bind_info(struct rtw89_btc *btc, u8 type)
+{
+ struct rtw89_btc_cx *cx = &btc->cx;
+ struct rtw89_btc_dm *dm = &btc->dm;
+ struct rtw89_btc_wl_info *wl = &cx->wl;
+ struct rtw89_btc_bt_info *bt = &cx->bt0;
+ struct rtw89_btc_bt_link_info *b;
+ struct rtw89_btc_bind_info *bd;
+ u8 path_hwb[BTC_RF_NUM] = {RTW89_PHY_0, RTW89_PHY_1};
+ u8 link_weight[BTC_ALL_BT_EZL][BTC_BT_BMAX];
+ u8 map[BTC_RF_NUM][BTC_ALL_BT_EZL];
+ u8 b2g_score = 0, b5g_score = 0;
+ u8 i, j, rf_band_map, thres;
+ u8 weight[BTC_BT_BMAX] = {};
+
+ if (type == BTC_MECH_TDD) {
+ bd = &dm->tdd_bind;
+ memcpy(map, dm->tdd_map, sizeof(map));
+ thres = 30; /* BT profile score threshold for TDMA */
+ } else {
+ bd = &dm->fdd_bind;
+ memcpy(map, dm->fdd_map, sizeof(map));
+ thres = 5;
+ }
+
+ memset(bd, 0, sizeof(*bd));
+ /* compare BT 2GHz/5GHz profile by link-weighting */
+ for (i = 0; i < BTC_BT_BMAX; i++) {
+ link_weight[BTC_BT_1ST][i] = cx->bt0.link_weight[i];
+ link_weight[BTC_BT_2ND][i] = cx->bt1.link_weight[i];
+ link_weight[BTC_BT_EXT][i] = cx->bt_ext.link_weight[i];
+ }
+
+ /*
+ * get 2GHz/5GHz link weight score by "band-overlap" map
+ * link_weight from _update_bt_link_cnt(),
+ * if link_weight >30 --> TDMA-required
+ */
+ for (j = 0; j < BTC_ALL_BT_EZL; j++) {
+ rf_band_map = map[BTC_RF_S0][j] | map[BTC_RF_S1][j];
+ if (rf_band_map & BIT(RTW89_BAND_2G))
+ b2g_score += link_weight[j][BTC_BT_B2G];
+ if (rf_band_map & BIT(RTW89_BAND_5G))
+ b5g_score += link_weight[j][BTC_BT_B5G];
+ }
+
+ /* rf-band bound by comparing link weight */
+ if (b2g_score == 0 && b5g_score == 0) /* no-rf-band overlap */
+ bd->rf_band = 0;
+ else if (b5g_score > b2g_score)
+ bd->rf_band = BIT(BTC_BT_B5G);
+ else
+ bd->rf_band = BIT(BTC_BT_B2G);
+
+ /*
+ * if MR_WTYPE_MLD2L1R_NONMLD, FW will change 2+0/0+2/1+1
+ * Therefore, BTC_MLO_RF_xxx is not real-time state.
+ * In this case, RF_S0->HWB0, RF_S1->HWB1
+ * If link-mode change by _ntfy_generic(BTC_GNTFY_MRCX_INFO)
+ * HW-Band is decided by wl->mlo_info.mrcx_act_hwb_map
+ */
+ if (wl->mlo_info.wtype == RTW89_MR_WTYPE_MLD2L1R_NONMLD) {
+ /* TODO: Should patched WiFi mode & WiFi role patch */
+ } else {
+ /*
+ * Dual-RF_band(HWB)TDMA if BT-profile is TDMA-type at both
+ * 2GHz and 5GHz.
+ * ex: 1+1: HWB0 5GHz + BT0 5GHz (BIS, HDT)
+ * && HWB1 2.4GHz + BT1 2.4GHz(PAN)
+ * for TDD: the link score must > 30 (from _bt_link_cnt)
+ * for FDD: the link score must > 5 (bt enable)
+ */
+ if ((wl->mlo_info.rf_combination == BTC_MLO_RF_1_PLUS_1 ||
+ wl->mlo_info.rf_combination == BTC_MLO_RF_2_PLUS_2) &&
+ (b2g_score >= thres && b5g_score >= thres)) {
+ bd->rf_band = BIT(BTC_BT_B2G) | BIT(BTC_BT_B5G);
+ }
+
+ if (wl->mlo_info.rf_combination == BTC_MLO_RF_2_PLUS_0)
+ path_hwb[BTC_RF_S1] = RTW89_PHY_0; /* 2+0 RF-S0/1->HWB0 */
+ else if (wl->mlo_info.rf_combination == BTC_MLO_RF_0_PLUS_2)
+ path_hwb[BTC_RF_S0] = RTW89_PHY_1; /* 2+0 RF-S0/1->HWB1 */
+ }
+
+ /* Get HWB-sel and BT-sel by rf-band-binding */
+ for (i = 0; i < BTC_RF_NUM; i++) {
+ for (j = 0; j < BTC_ALL_BT_EZL; j++) {
+ if (!(map[i][j] & bd->rf_band)) /* no-overlap */
+ continue;
+
+ bd->wl_hwb_sel |= BIT(path_hwb[i]);
+ bd->bt_sel |= BIT(j);
+ }
+ }
+
+ /* TODO: Should patched WiFi mode & WiFi role patch */
+
+ /* update Bind-BT status map for BT0/BT1 */
+ for (i = BTC_BT_1ST; i < BTC_ALL_BT_EZL; i++) {
+ if (!(bd->bt_sel & BIT(i)))
+ continue;
+
+ for (j = BTC_BT_B2G; j <= BTC_BT_B5G; j++) {
+ if (!(bd->rf_band & BIT(j)))
+ continue;
+
+ if (i == BTC_BT_EXT) {
+ bd->bt_profile |= cx->bt_ext.profile_map[j];
+ weight[j] = cx->bt_ext.link_weight[j];
+ if (weight[j] > bd->bt_link_weight) /* max */
+ bd->bt_link_weight = weight[j];
+ continue;
+ } else if (i == BTC_BT_1ST) {
+ bt = &cx->bt0;
+ } else {
+ bt = &cx->bt1;
+ }
+
+ if (j == BTC_BT_B2G)
+ b = &bt->link_info;
+ else
+ b = &bt->link_info_56g;
+
+ bd->bt_profile |= b->status.map.profile_map;
+ bd->bt_smap.a2dp_active |= b->a2dp_desc.active;
+ bd->bt_smap.a2dp_sink |= b->a2dp_desc.sink;
+ bd->bt_smap.pan_active |= b->pan_desc.active;
+ bd->bt_smap.connect |= b->status.map.connect;
+ bd->bt_smap.hid_cnt += (u8)b->hid_desc.pair_cnt;
+ bd->bt_smap.hid_type |= b->hid_desc.type;
+ bd->bt_smap.cis_cnt += (u8)b->leaudio_desc.cis_cnt;
+ bd->bt_smap.link_cnt += b->link_cnt.now;
+ bd->bt_smap.inq_page |= b->status.map.inq_pag;
+ bd->bt_smap.page |= b->pag;
+
+ if (bt->link_weight[j] > bd->bt_link_weight) /* max */
+ bd->bt_link_weight = bt->link_weight[j];
+
+ if (b->slave_role)
+ bd->bt_smap.slave_role = b->slave_role;
+
+ if (b->a2dp_desc.vendor_id != 0)
+ bd->bt_smap.a2dp_vendor_id =
+ b->a2dp_desc.vendor_id;
+ }
+ }
+
+ if (bd->bt_profile & BTC_BT_HFP)
+ bd->bt_smap.hfp_exist = 1;
+ if (bd->bt_profile & BTC_BT_HID)
+ bd->bt_smap.hid_exist = 1;
+ if (bd->bt_profile & BTC_BT_A2DP)
+ bd->bt_smap.a2dp_exist = 1;
+ if (bd->bt_profile & BTC_BT_PAN)
+ bd->bt_smap.pan_exist = 1;
+ if (bd->bt_profile & BTC_BT_BIS)
+ bd->bt_smap.bis_exist = 1;
+ if (bd->bt_profile & BTC_BT_CIS)
+ bd->bt_smap.cis_exist = 1;
+ if (bd->bt_profile & BTC_BT_THREAD)
+ bd->bt_smap.thread_exist = 1;
+ if (bd->bt_profile & BTC_BT_ULL)
+ bd->bt_smap.ull_exist = 1;
+}
+
+#define _bind_is_btonly 0x7
+static void _set_coex_binding(struct rtw89_btc *btc)
+{
+ struct rtw89_btc_cx *cx = &btc->cx;
+ struct rtw89_btc_extsoc_info *bt2 = &cx->bt_ext;
+ struct rtw89_btc_bt_info *bt0 = &cx->bt0;
+ struct rtw89_btc_bt_info *bt1 = &cx->bt1;
+ struct rtw89_btc_wl_info *wl = &cx->wl;
+ struct rtw89_btc_dm *dm = &btc->dm;
+ u8 path_hwb[BTC_RF_NUM] = {RTW89_PHY_0, RTW89_PHY_1};
+ u8 wl_rf_band[RTW89_BAND_NUM] = {};
+ u8 i, j, val = 0;
+
+ /*
+ * sit_xmap(Space-Interaction) = ant_xmap | xtk_xmap
+ * 1: WL-BT space-interference, always 1 if BTG/BTA/SPDT = 1
+ * if dedicated-ant, it may be 1 if BT-Tx is bigger than WL-Rx(xtk_xmap)
+ *
+ * ant_xmap(ANT-Division-Multiplexing)
+ * ==> dedicated-ant->0, BTG/BTA/SPDT->1
+ *
+ * xtk_xmap(Cross-talk map)-> calculate WL/BT interference by SIR
+ * ==> 1: interference, 0: no-interference
+ *
+ * fdm_map(Frequency-Division-Multiplexing): WL/BT RF_Band overlap-map
+ * 2bit-map: bit[1]:5GHz/6GHz, bit[0]:2.4GHz
+ */
+ for (i = 0; i < RTW89_PHY_NUM; i++) {
+ if (wl->rf_band_map[i] & BIT(RTW89_BAND_2G))
+ wl_rf_band[i] |= BIT(RTW89_BAND_2G);
+
+ if (wl->rf_band_map[i] & (BIT(RTW89_BAND_5G) | BIT(RTW89_BAND_6G)))
+ wl_rf_band[i] |= BIT(RTW89_BAND_5G);
+
+ dm->fit_xmap[i][BTC_BT_1ST] = wl_rf_band[i] & bt0->rf_band_map;
+ dm->fit_xmap[i][BTC_BT_2ND] = wl_rf_band[i] & bt1->rf_band_map;
+ dm->fit_xmap[i][BTC_BT_EXT] = wl_rf_band[i] & bt2->rf_band_map;
+ }
+
+ /*
+ * if MR_WTYPE_MLD2L1R_NONMLD, FW will change 2+0/0+2/1+1
+ * Therefore, BTC_MLO_RF_xxx is not real-time state.
+ * if link mode change by _ntfy_generic(BTC_GNTFY_MRCX_INFO)
+ * the HW-BAND is decided by wl->mlo_info.mrcx_act_hwb_map
+ * In this case, BTC_RF_S0->HWB0, BTC_RF_S1->HWB1
+ */
+ if (wl->mlo_info.wtype == RTW89_MR_WTYPE_MLD2L1R_NONMLD) {
+ if (wl->role_info.link_mode != BTC_WLINK_2G_MCC &&
+ wl->role_info.link_mode != BTC_WLINK_25G_MCC &&
+ wl->role_info.link_mode != BTC_WLINK_25G_DBCC) {/* mode chg */
+ if (wl->mlo_info.mrcx_act_hwb_map == BIT(RTW89_PHY_1))
+ path_hwb[BTC_RF_S0] = RTW89_PHY_1;/* S0/1->HWB1 */
+ else
+ path_hwb[BTC_RF_S1] = RTW89_PHY_0;/* S0/1->HWB0 */
+ }
+ } else {
+ if (wl->mlo_info.rf_combination == BTC_MLO_RF_2_PLUS_0)
+ path_hwb[BTC_RF_S1] = RTW89_PHY_0; /* 2+0 RF-S0/1->HWB0 */
+ else if (wl->mlo_info.rf_combination == BTC_MLO_RF_0_PLUS_2)
+ path_hwb[BTC_RF_S0] = RTW89_PHY_1; /* 2+0 RF-S0/1->HWB1 */
+ }
+
+ /*
+ * tdd_map = sit_xmap * fdm_map, 1: WL-RF-Sx vs. BTx take TDD-Action
+ * fdd_map =(!sit_xmap) * fdm_map, 1: WL-RF-Sx vs.BTx take FDD-Action
+ * co-rx map = ant_xmap * fdm_map 1:WL/BT co-rx (for halbb-btg-ctrl)
+ * sit_xmap,ant_xmap = 0 or 1, so tdd/fdd use multiplication (*)
+ */
+
+ for (i = 0; i < BTC_RF_NUM; i++)
+ for (j = 0; j < BTC_ALL_BT_EZL; j++) {
+ dm->tdd_map[i][j] = dm->sit_xmap[i][j] *
+ dm->fit_xmap[path_hwb[i]][j];
+ dm->fdd_map[i][j] = !dm->sit_xmap[i][j] *
+ dm->fit_xmap[path_hwb[i]][j];
+ dm->corx_map[i][j] = dm->ant_xmap[i][j] *
+ dm->fit_xmap[path_hwb[i]][j];
+ }
+
+ /* TDD-Binding */
+ _set_bind_info(btc, BTC_MECH_TDD);
+
+ /* FDD-Binding */
+ _set_bind_info(btc, BTC_MECH_FDD);
+
+ dm->out_of_band = !dm->tdd_bind.rf_band && !dm->fdd_bind.rf_band;
+ dm->fdd_en = !!dm->fdd_bind.rf_band;
+ dm->tdd_en = !!dm->tdd_bind.rf_band;
+
+ /* set BT on/off state for GNT_WL Combined-MUX control */
+ if (bt0->enable.now)
+ val |= BIT(0);
+
+ if (bt1->enable.now)
+ val |= BIT(1);
+
+ if (bt2->func_type)
+ val |= BIT(2);
+
+ dm->ost_info.bt_enable_state = dm->bt_only ? _bind_is_btonly : val;
+}
+
static
void _run_coex(struct rtw89_dev *rtwdev, enum btc_reason_and_action reason)
{
@@ -7842,6 +8109,8 @@ void _run_coex(struct rtw89_dev *rtwdev, enum btc_reason_and_action reason)
bt->scan_rx_low_pri = false;
igno_bt = false;
+ _set_coex_binding(btc);
+
dm->freerun_chk = _check_freerun(rtwdev); /* check if meet freerun */
if (always_freerun) {
@@ -8370,8 +8639,8 @@ static void _update_bt_info(struct rtw89_dev *rtwdev, u8 *buf, u32 len)
"[BTC], %s(): bt_info[2]=0x%02x\n",
__func__, bt->raw_info[2]);
- b->profile_cnt.last = b->profile_cnt.now;
- b->profile_cnt.now = 0;
+ b->link_cnt.last = b->link_cnt.now;
+ b->link_cnt.now = 0;
hid->type = 0;
/* parse raw info low-Byte2 */
@@ -8384,13 +8653,13 @@ static void _update_bt_info(struct rtw89_dev *rtwdev, u8 *buf, u32 len)
bt->bcnt[BTC_BCNT_INQPAG] += !!(bt->inq_pag.now && !bt->inq_pag.last);
hfp->exist = btinfo.lb2.hfp;
- b->profile_cnt.now += (u8)hfp->exist;
+ b->link_cnt.now += (u8)hfp->exist;
hid->exist = btinfo.lb2.hid;
- b->profile_cnt.now += (u8)hid->exist;
+ b->link_cnt.now += (u8)hid->exist;
a2dp->exist = btinfo.lb2.a2dp;
- b->profile_cnt.now += (u8)a2dp->exist;
+ b->link_cnt.now += (u8)a2dp->exist;
pan->exist = btinfo.lb2.pan;
- b->profile_cnt.now += (u8)pan->exist;
+ b->link_cnt.now += (u8)pan->exist;
btc->dm.trx_info.bt_profile = u32_get_bits(btinfo.val, BT_PROFILE_PROTOCOL_MASK);
/* parse raw info low-Byte3 */
@@ -9418,7 +9687,7 @@ static int _show_bt_info(struct rtw89_dev *rtwdev, char *buf, size_t bufsz)
p += scnprintf(p, end - p, " %-15s : profile:%s%s%s%s%s ",
"[profile]",
- (bt_linfo->profile_cnt.now == 0) ? "None," : "",
+ (bt_linfo->link_cnt.now == 0) ? "None," : "",
bt_linfo->hfp_desc.exist ? "HFP," : "",
bt_linfo->hid_desc.exist ? "HID," : "",
bt_linfo->a2dp_desc.exist ?
@@ -9520,7 +9789,7 @@ static int _show_bt_info(struct rtw89_dev *rtwdev, char *buf, size_t bufsz)
p += scnprintf(p, end - p, "\n");
}
- if (ver_main >= 9 && bt_linfo->profile_cnt.now)
+ if (ver_main >= 9 && bt_linfo->link_cnt.now)
rtw89_btc_fw_en_rpt(rtwdev, RPT_EN_BT_TX_PWR_LVL, true);
else
rtw89_btc_fw_en_rpt(rtwdev, RPT_EN_BT_TX_PWR_LVL, false);
@@ -9542,7 +9811,7 @@ static int _show_bt_info(struct rtw89_dev *rtwdev, char *buf, size_t bufsz)
}
p += scnprintf(p, end - p, "\n");
- if (bt_linfo->profile_cnt.now || bt_linfo->status.map.ble_connect)
+ if (bt_linfo->link_cnt.now || bt_linfo->status.map.ble_connect)
rtw89_btc_fw_en_rpt(rtwdev, RPT_EN_BT_AFH_MAP, true);
else
rtw89_btc_fw_en_rpt(rtwdev, RPT_EN_BT_AFH_MAP, false);
diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h
index 3f77707e2733..21bdf229723c 100644
--- a/drivers/net/wireless/realtek/rtw89/core.h
+++ b/drivers/net/wireless/realtek/rtw89/core.h
@@ -1445,6 +1445,11 @@ enum rtw89_btc_bt_state_cnt {
BTC_BCNT_NUM,
};
+enum rtw89_btc_bt_mech_type {
+ BTC_MECH_TDD = 0,
+ BTC_MECH_FDD = 1,
+};
+
enum rtw89_btc_bt_rf_band {
BTC_BT_B2G = 0x0, /* 2.4GHz */
BTC_BT_B5G = 0x1, /* 5GHz or 6GHz */
@@ -1463,6 +1468,12 @@ enum rtw89_btc_bt_profile {
BTC_BT_HID = BIT(1),
BTC_BT_A2DP = BIT(2),
BTC_BT_PAN = BIT(3),
+ BTC_BT_BIS = BIT(4),
+ BTC_BT_CIS = BIT(5),
+ BTC_BT_THREAD = BIT(6),
+ BTC_BT_ULL = BIT(7),
+ BTC_BT_LEGACY = 0xf,
+ BTC_BT_FULL = 0x3f,
BTC_PROFILE_MAX = 4,
};
@@ -1688,16 +1699,16 @@ struct rtw89_btc_bt_ver_info {
};
struct rtw89_btc_bool_sta_chg {
- u32 now: 1;
- u32 last: 1;
- u32 remain: 1;
- u32 srvd: 29;
+ u8 now: 1;
+ u8 last: 1;
+ u8 remain: 1;
+ u8 srvd: 5;
};
struct rtw89_btc_u8_sta_chg {
u8 now;
u8 last;
- u8 remain;
+ u8 chg;
u8 rsvd;
};
@@ -1956,6 +1967,8 @@ struct rtw89_btc_bt_smap {
u32 sco_busy: 1;
u32 mesh_busy: 1;
u32 inq_pag: 1;
+ u32 profile_map: 8;
+ u32 rsvd: 18;
};
union rtw89_btc_bt_state_map {
@@ -1974,14 +1987,30 @@ struct rtw89_btc_bt_txpwr_desc {
u8 le_gain_index;
};
+struct rtw89_btc_bt_leaudio_desc {
+ u32 bis_exist: 1;
+ u32 bis_exist_last: 1;
+ u32 cis_exist: 1;
+ u32 cis_exist_last: 1;
+ u32 bis_cnt: 3;
+ u32 cis_cnt: 3;
+ u32 rssi: 8;
+ u32 bis_cnt_last: 3;
+ u32 cis_cnt_last: 3;
+ u32 rsvd: 8;
+
+ u16 diff_t;
+};
+
struct rtw89_btc_bt_link_info {
- struct rtw89_btc_u8_sta_chg profile_cnt;
+ struct rtw89_btc_u8_sta_chg link_cnt;
struct rtw89_btc_bool_sta_chg multi_link;
struct rtw89_btc_bool_sta_chg relink;
struct rtw89_btc_bt_hfp_desc hfp_desc;
struct rtw89_btc_bt_hid_desc hid_desc;
struct rtw89_btc_bt_a2dp_desc a2dp_desc;
struct rtw89_btc_bt_pan_desc pan_desc;
+ struct rtw89_btc_bt_leaudio_desc leaudio_desc;
union rtw89_btc_bt_state_map status;
struct rtw89_btc_bt_txpwr_desc bt_txpwr_desc;
@@ -1990,14 +2019,59 @@ struct rtw89_btc_bt_link_info {
u8 rssi_state[BTC_BT_RSSI_THMAX];
u8 afh_map[BTC_BT_AFH_GROUP];
u8 afh_map_le[BTC_BT_AFH_LE_GROUP];
+ u8 rssi;
+
+ u8 role_sw: 1;
+ u8 slave_role: 1;
+ u8 afh_update: 1;
+ u8 cqddr: 1;
+ u8 tx_3m: 1;
+ u8 inq: 1;
+ u8 pag: 1;
+ u8 igno_wl: 1;
+
+ u8 ble_scan_en: 1;
+ u8 reinit: 1;
+ u8 rsvd: 6;
+};
- u32 role_sw: 1;
- u32 slave_role: 1;
- u32 afh_update: 1;
- u32 cqddr: 1;
- u32 rssi: 8;
- u32 tx_3m: 1;
- u32 rsvd: 19;
+struct rtw89_btc_bind_bt_status {
+ u8 a2dp_active: 1;
+ u8 a2dp_sink: 1;
+ u8 pan_active: 1;
+ u8 connect: 1;
+ u8 inq_page: 1;
+ u8 multi_link: 1;
+ u8 slave_role: 1;
+ u8 page: 1;
+
+ u8 hfp_exist: 1;
+ u8 hid_exist: 1;
+ u8 a2dp_exist: 1;
+ u8 pan_exist: 1;
+ u8 bis_exist: 1;
+ u8 cis_exist: 1;
+ u8 thread_exist: 1;
+ u8 ull_exist: 1;
+
+ u8 hid_cnt;
+ u8 hid_type;
+ u8 cis_cnt;
+ u8 link_cnt;
+
+ u16 a2dp_vendor_id;
+};
+
+struct rtw89_btc_bind_info {
+ u8 wl_hwb_sel; /* map */
+ u8 wl_link_mode;
+ u8 wl_bg_mode;
+ u8 rf_band; /* map, 0: no any rf-band bind */
+ u8 bt_sel; /* map */
+ u8 bt_link_weight; /* select the highest weight between bt/rf-band */
+
+ u32 bt_profile; /* map */
+ struct rtw89_btc_bind_bt_status bt_smap;
};
struct rtw89_btc_extsoc_info {
@@ -2105,6 +2179,7 @@ struct rtw89_btc_wl_info {
u8 coex_mode;
u8 pta_req_mac;
u8 bt_polut_type[RTW89_PHY_NUM]; /* BT polluted WL-Tx type for phy0/1 */
+ u8 rf_band_map[RTW89_PHY_NUM]; /* rf_band bit-map */
bool is_5g_hi_channel;
bool go_client_exist;
@@ -2291,6 +2366,7 @@ union rtw89_btc_fbtc_btscan {
struct rtw89_btc_bt_info {
struct rtw89_btc_bt_link_info link_info;
+ struct rtw89_btc_bt_link_info link_info_56g;
struct rtw89_btc_bt_scan_info_v1 scan_info_v1[BTC_SCAN_MAX1];
struct rtw89_btc_bt_scan_info_v2 scan_info_v2[CXSCAN_MAX];
struct rtw89_btc_bt_ver_info ver_info;
@@ -2301,6 +2377,7 @@ struct rtw89_btc_bt_info {
u8 raw_info[BTC_BTINFO_MAX]; /* raw bt info from mailbox */
u8 txpwr_info[BTC_BTINFO_MAX];
+ u8 link_weight[BTC_BT_BMAX]; /* Link Weight for RF-band/HWB selection */
u8 rssi_level;
u8 rf_band_map;
u8 func_type;
@@ -3178,6 +3255,7 @@ struct rtw89_btc_fbtc_outsrc_set_info {
u8 pta_req_hw_band;
u8 rf_gbt_source;
+ u8 bt_enable_state;
} __packed;
union rtw89_btc_fbtc_slot_u {
@@ -3200,8 +3278,20 @@ struct rtw89_btc_dm {
struct rtw89_btc_wl_scc_ctrl wl_scc;
struct rtw89_btc_trx_info trx_info;
union rtw89_btc_dm_error_map error;
+ struct rtw89_btc_bind_info tdd_bind;
+ struct rtw89_btc_bind_info fdd_bind;
u32 cnt_dm[BTC_DCNT_NUM];
u32 cnt_notify[BTC_NCNT_NUM];
+ u8 ant_xmap[BTC_RF_NUM][BTC_ALL_BT_EZL]; /* WL-BT ANT interact-map */
+ u8 xtk_xmap[BTC_RF_NUM][BTC_ALL_BT_EZL]; /* 1: If RSSI<(BT-Pin -SIR) */
+ u8 sit_xmap[BTC_RF_NUM][BTC_ALL_BT_EZL]; /* WL-BT space interact-map */
+ u8 fit_xmap[RTW89_PHY_NUM][BTC_ALL_BT_EZL]; /* HWB-BT freq interact-map */
+ u8 tdd_map[BTC_RF_NUM][BTC_ALL_BT_EZL]; /* WL-BT tdd-map */
+ u8 fdd_map[BTC_RF_NUM][BTC_ALL_BT_EZL]; /* WL-BT fdd-map */
+ u8 corx_map[BTC_RF_NUM][BTC_ALL_BT_EZL]; /* WL-BT Co-Rx */
+
+ u8 sit_xmap_last[BTC_RF_NUM][BTC_ALL_BT_EZL];
+ u8 fit_xmap_last[RTW89_PHY_NUM][BTC_ALL_BT_EZL];
u32 update_slot_map;
u32 set_ant_path;
@@ -3239,9 +3329,12 @@ struct rtw89_btc_dm {
u8 freerun_chk: 1;
u8 wl_pre_agc_rb: 2;
u8 bt_select: 2; /* 0:s0, 1:s1, 2:s0 & s1, refer to enum btc_bt_index */
+
u8 slot_req_more: 1;
+ u8 out_of_band: 1;
+ u8 fdd_en: 1;
+ u8 tdd_en: 1;
u8 lps_ctrl_scbd: 1;
-
u8 lps_ctrl_scbd_last: 1;
u8 lps_ctrl_change: 1;
};
--
2.25.1
^ permalink raw reply related
* [PATCH rtw-next v2 5/9] wifi: rtw89: coex: Add Bluetooth binding for Bluetooth RX gain setting
From: Ping-Ke Shih @ 2026-07-06 2:54 UTC (permalink / raw)
To: linux-wireless; +Cc: ku920601
In-Reply-To: <20260706025445.18428-1-pkshih@realtek.com>
From: Ching-Te Ku <ku920601@realtek.com>
Dual Bluetooth the each of Bluetooth may use different RX gain by their
condition.
Signed-off-by: Ching-Te Ku <ku920601@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
---
drivers/net/wireless/realtek/rtw89/coex.c | 86 ++++++++++++++++++-----
1 file changed, 68 insertions(+), 18 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtw89/coex.c b/drivers/net/wireless/realtek/rtw89/coex.c
index 2080253559a7..ff3c05101ab3 100644
--- a/drivers/net/wireless/realtek/rtw89/coex.c
+++ b/drivers/net/wireless/realtek/rtw89/coex.c
@@ -730,6 +730,7 @@ enum btc_w2b_scoreboard {
BTC_WSCB_SCAN = BIT(2),
BTC_WSCB_UNDERTEST = BIT(3),
BTC_WSCB_RXGAIN = BIT(4),
+ BTC_WSCB_5GHICH = BIT(6),
BTC_WSCB_WLBUSY = BIT(7),
BTC_WSCB_EXTFEM = BIT(8),
BTC_WSCB_TDMA = BIT(9),
@@ -738,6 +739,9 @@ enum btc_w2b_scoreboard {
BTC_WSCB_RXSCAN_PRI = BIT(12),
BTC_WSCB_BT_HILNA = BIT(13),
BTC_WSCB_BTLOG = BIT(14),
+ BTC_WSCB_CTCODE = BIT(15),
+ BTC_WSCB_RXGAIN_56G = BIT(16),
+ BTC_WSCB_BT_HILNA_56G = BIT(17),
BTC_WSCB_ALL = GENMASK(23, 0),
};
@@ -3224,33 +3228,79 @@ static void _set_bt_tx_power(struct rtw89_dev *rtwdev, bool force_exec, u8 bid,
}
#define BTC_BT_RX_NORMAL_LVL 7
-
-static void _set_bt_rx_gain(struct rtw89_dev *rtwdev, u8 level)
+static void _set_bt_rx_gain(struct rtw89_dev *rtwdev, bool force_exec, u8 bid,
+ u8 rf_band, u8 level)
{
struct rtw89_btc *btc = &rtwdev->btc;
- struct rtw89_btc_bt_info *bt = &btc->cx.bt0;
+ struct rtw89_btc_cx *cx = &btc->cx;
+ struct rtw89_btc_bt_info *bt = &cx->bt0;
+ u8 h2c_func = SET_BT_LNA_CONSTRAIN;
+ u8 i, id_start, id_stop;
+ bool state = false;
+ u32 scbd_bit = 0;
+ u8 buf[2] = {};
+ u8 len = sizeof(*buf);
- if (bt->bcnt[BTC_BCNT_INFOUPDATE] == 0)
+ if (bt->bcnt[BTC_BCNT_INFOUPDATE] == 0 || !rf_band)
return;
- if ((bt->rf_para.rx_gain_freerun == level ||
- level > BTC_BT_RX_NORMAL_LVL) &&
- (!rtwdev->chip->scbd || bt->lna_constrain == level))
+ if (bt->rf_para.rx_gain_freerun == level ||
+ level > BTC_BT_RX_NORMAL_LVL || !rtwdev->chip->scbd ||
+ bid > BTC_ALL_BT)
return;
- bt->rf_para.rx_gain_freerun = level;
- btc->dm.rf_trx_para.bt_rx_gain[BTC_BT_1ST] = level;
-
- rtw89_debug(rtwdev, RTW89_DBG_BTC,
- "[BTC], %s(): level = %d\n",
- __func__, level);
+ if (bid == BTC_ALL_BT) {
+ id_start = BTC_BT_1ST;
+ id_stop = BTC_BT_2ND;
+ } else {
+ id_start = bid;
+ id_stop = bid;
+ }
- if (level == BTC_BT_RX_NORMAL_LVL)
- _write_scbd(rtwdev, BTC_WSCB_RXGAIN, false);
+ if (rf_band == RTW89_BAND_2G)
+ scbd_bit |= BTC_WSCB_RXGAIN;
else
- _write_scbd(rtwdev, BTC_WSCB_RXGAIN, true);
+ scbd_bit |= BTC_WSCB_RXGAIN_56G;
+
+ for (i = id_start; i <= id_stop; i++) {
+ if (i == BTC_BT_2ND) {
+ if (!(rtwdev->chip->para_ver & BTC_FEAT_DUAL_BT))
+ continue;
+
+ bt = &cx->bt1;
+ h2c_func |= BT_H2C_FUNC_BT2ND;
+ }
+
+ /* return if same setup */
+ if (!force_exec && !btc->cli_h2c_cmd) {
+ if (rf_band == RTW89_BAND_2G &&
+ bt->lna_constrain == level)
+ continue;
+ else if (rf_band != RTW89_BAND_2G &&
+ bt->lna_constrain_6g == level)
+ continue;
+ }
+
+ buf[0] = level;
+ buf[1] = rf_band;
+
+ if (rtwdev->chip->chip_gen == RTW89_CHIP_AX)
+ len = SET_RF_PARA_AX_LEN;
+
+ if (_send_fw_cmd(rtwdev, BTFC_SET, h2c_func, buf, len)) {
+ rtw89_debug(rtwdev, RTW89_DBG_BTC,
+ "[BTC], %s(): bt%d_rx_gain_level = %d\n",
+ __func__, i, level);
+ }
+
+ btc->dm.rf_trx_para.bt_rx_gain[i] = level;
+
+ if (buf[0] != BTC_BT_RX_NORMAL_LVL)
+ state = true;
+
+ _write_scbd(rtwdev, scbd_bit, state);
+ }
- _send_fw_cmd(rtwdev, BTFC_SET, SET_BT_LNA_CONSTRAIN, &level, sizeof(level));
}
static void _set_rf_trx_para(struct rtw89_dev *rtwdev)
@@ -3361,7 +3411,7 @@ static void _set_rf_trx_para(struct rtw89_dev *rtwdev)
_set_wl_tx_power(rtwdev, para.wl_tx_power[RTW89_PHY_0], RTW89_PHY_0);
_set_wl_rx_gain(rtwdev, para.wl_rx_gain[RTW89_PHY_0], RTW89_PHY_0);
_set_bt_tx_power(rtwdev, true, bid, rf_band, para.bt_tx_power[BTC_BT_1ST]);
- _set_bt_rx_gain(rtwdev, para.bt_rx_gain[BTC_BT_1ST]);
+ _set_bt_rx_gain(rtwdev, true, bid, rf_band, para.bt_rx_gain[BTC_BT_1ST]);
}
next:
--
2.25.1
^ permalink raw reply related
* [PATCH rtw-next v2 4/9] wifi: rtw89: coex: Add Bluetooth binding for Bluetooth TX power setting
From: Ping-Ke Shih @ 2026-07-06 2:54 UTC (permalink / raw)
To: linux-wireless; +Cc: ku920601
In-Reply-To: <20260706025445.18428-1-pkshih@realtek.com>
From: Ching-Te Ku <ku920601@realtek.com>
Dual Bluetooth the each of Bluetooth may use different TX power by their
condition.
Signed-off-by: Ching-Te Ku <ku920601@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
---
drivers/net/wireless/realtek/rtw89/coex.c | 65 ++++++++++++++++++-----
drivers/net/wireless/realtek/rtw89/core.h | 15 ++++--
drivers/net/wireless/realtek/rtw89/fw.h | 3 ++
3 files changed, 67 insertions(+), 16 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtw89/coex.c b/drivers/net/wireless/realtek/rtw89/coex.c
index 14cc62cf399d..2080253559a7 100644
--- a/drivers/net/wireless/realtek/rtw89/coex.c
+++ b/drivers/net/wireless/realtek/rtw89/coex.c
@@ -3078,6 +3078,7 @@ static void _set_bt_ignore_wlan_act(struct rtw89_dev *rtwdev, u8 enable)
#define WL_TX_POWER_FRA_PART GENMASK(1, 0)
#define B_BTC_WL_TX_POWER_SIGN BIT(7)
#define B_TSSI_WL_TX_POWER_SIGN BIT(8)
+#define SET_RF_PARA_AX_LEN 1
static void _set_wl_tx_power(struct rtw89_dev *rtwdev, u32 level, u8 phy_map)
{
@@ -3161,28 +3162,64 @@ static void _set_wl_rx_gain(struct rtw89_dev *rtwdev, u32 level, u8 phy_map)
chip->ops->btc_set_wl_rx_gain(rtwdev, level);
}
-static void _set_bt_tx_power(struct rtw89_dev *rtwdev, u8 level)
+static void _set_bt_tx_power(struct rtw89_dev *rtwdev, bool force_exec, u8 bid,
+ u8 rf_band, u8 level)
{
struct rtw89_btc *btc = &rtwdev->btc;
struct rtw89_btc_bt_info *bt = &btc->cx.bt0;
- int ret;
- u8 buf;
+ u8 h2c_func = SET_BT_TX_PWR;
+ u8 i, id_start, id_stop;
+ u8 buf[2] = {};
+ u8 len = sizeof(*buf);
- if (bt->bcnt[BTC_BCNT_INFOUPDATE] == 0)
+ if (bt->bcnt[BTC_BCNT_INFOUPDATE] == 0 || !rf_band)
return;
if (bt->rf_para.tx_pwr_freerun == level)
return;
- rtw89_debug(rtwdev, RTW89_DBG_BTC,
- "[BTC], %s(): level = %d\n",
- __func__, level);
+ if (bid == BTC_ALL_BT) {
+ id_start = BTC_BT_1ST;
+ id_stop = BTC_BT_2ND;
+ } else {
+ id_start = bid;
+ id_stop = bid;
+ }
- buf = (s8)(-level);
- ret = _send_fw_cmd(rtwdev, BTFC_SET, SET_BT_TX_PWR, &buf, 1);
- if (!ret) {
- bt->rf_para.tx_pwr_freerun = level;
- btc->dm.rf_trx_para.bt_tx_power[BTC_BT_1ST] = level;
+ for (i = id_start; i <= id_stop; i++) {
+ if (i == BTC_BT_2ND) {
+ if (!(rtwdev->chip->para_ver & BTC_FEAT_DUAL_BT))
+ continue;
+
+ bt = &btc->cx.bt1;
+ h2c_func |= BT_H2C_FUNC_BT2ND;
+ }
+
+ buf[0] = (s8)(-level);
+ buf[1] = rf_band; /* bit-map: bit1->5GHz/6Ghz, bit0->2.4GHz */
+
+ if (!force_exec && !btc->cli_h2c_cmd) {
+ if (rf_band == RTW89_BAND_2G &&
+ bt->tx_power_now == level)
+ continue;
+ else if (rf_band != RTW89_BAND_2G &&
+ bt->tx_power_now_6g == level)
+ continue;
+ }
+
+ if (rtwdev->chip->chip_gen == RTW89_CHIP_AX)
+ len = SET_RF_PARA_AX_LEN;
+
+ if (_send_fw_cmd(rtwdev, BTFC_SET, h2c_func, buf, len)) {
+ btc->dm.rf_trx_para.bt_tx_power[i] = level;
+ if (rf_band == RTW89_BAND_2G)
+ bt->tx_power_now = level;
+ else
+ bt->tx_power_now_6g = level;
+ rtw89_debug(rtwdev, RTW89_DBG_BTC,
+ "[BTC], %s(): bt%d_tx_power_level = %d\n",
+ __func__, i, level);
+ }
}
}
@@ -3229,6 +3266,8 @@ static void _set_rf_trx_para(struct rtw89_dev *rtwdev)
struct rtw89_btc_rf_trx_para_v9 para;
u8 lv, link_mode = 0, i, dbcc_2g_phy = 0;
u8 ul_para_num, dl_para_num;
+ u8 rf_band = RTW89_BAND_2G;
+ u8 bid = BTC_BT_1ST;
u32 wl_stb_chg = 0;
if (ver->fwlrole == 0) {
@@ -3321,7 +3360,7 @@ static void _set_rf_trx_para(struct rtw89_dev *rtwdev)
} else {
_set_wl_tx_power(rtwdev, para.wl_tx_power[RTW89_PHY_0], RTW89_PHY_0);
_set_wl_rx_gain(rtwdev, para.wl_rx_gain[RTW89_PHY_0], RTW89_PHY_0);
- _set_bt_tx_power(rtwdev, para.bt_tx_power[BTC_BT_1ST]);
+ _set_bt_tx_power(rtwdev, true, bid, rf_band, para.bt_tx_power[BTC_BT_1ST]);
_set_bt_rx_gain(rtwdev, para.bt_rx_gain[BTC_BT_1ST]);
}
diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h
index a0f6929873ab..3f77707e2733 100644
--- a/drivers/net/wireless/realtek/rtw89/core.h
+++ b/drivers/net/wireless/realtek/rtw89/core.h
@@ -2302,7 +2302,18 @@ struct rtw89_btc_bt_info {
u8 raw_info[BTC_BTINFO_MAX]; /* raw bt info from mailbox */
u8 txpwr_info[BTC_BTINFO_MAX];
u8 rssi_level;
+ u8 rf_band_map;
u8 func_type;
+ u8 tx_power_now;
+ u8 tx_power_now_6g;
+
+ u8 fw_ver_mismatch: 1;
+ u8 band_56G_support: 1;
+ u8 hi_lna_rx: 1;
+ u8 lna_constrain: 3;
+ u8 hi_lna_rx_6g: 1;
+ u8 lna_constrain_6g: 3;
+ u8 rsvd: 6;
u32 scbd;
u32 feature;
@@ -2316,11 +2327,9 @@ struct rtw89_btc_bt_info {
u32 inq: 1;
u32 pag: 1;
u32 run_patch_code: 1;
- u32 hi_lna_rx: 1;
u32 scan_rx_low_pri: 1;
u32 scan_info_update: 1;
- u32 lna_constrain: 3;
- u32 rsvd: 17;
+ u32 rsvd1: 22;
u32 bcnt[BTC_BCNT_NUM];
};
diff --git a/drivers/net/wireless/realtek/rtw89/fw.h b/drivers/net/wireless/realtek/rtw89/fw.h
index de8b77de8705..a6f3b28b9e33 100644
--- a/drivers/net/wireless/realtek/rtw89/fw.h
+++ b/drivers/net/wireless/realtek/rtw89/fw.h
@@ -2337,6 +2337,9 @@ struct rtw89_h2c_arp_offload {
#define RTW89_H2C_ARP_OFFLOAD_W0_PKT_ID GENMASK(31, 24)
#define RTW89_H2C_ARP_OFFLOAD_W1_CONTENT GENMASK(31, 0)
+#define BT_H2C_FUNC_BT2ND 0x80
+#define BT_C2H_FUNC_BT2ND 0x80
+
enum rtw89_btc_btf_h2c_class {
BTFC_SET = 0x10,
BTFC_GET = 0x11,
--
2.25.1
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox