[next,v2] wifi: mt76: mt7921: fix 6GHz disabled by the missing default CLC config

Commit Message

Deren Wu Oct. 30, 2023, 7:17 a.m. UTC

From: Ming Yen Hsieh <[e-mail]>

No matter CLC is enabled or disabled, the driver should initialize
the default value 0xff for channel configuration of CLC. Otherwise,
the zero value would disable channels.

Reported-and-tested-by: Ben Greear <[e-mail]>
Closes: https://lore.kernel.org/all/[e-mail]/
Fixes: 09382d8f8641 ("mt7921: update the channel usage when the regd domain changed")
Signed-off-by: Ming Yen Hsieh <[e-mail]>
Signed-off-by: Deren Wu <[e-mail]>

---
v2:
  * v1 is missing in wireless patchwork and lore.kernel.org.
  * update title and message to make issue description clear
---
 drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Kalle Valo Nov. 8, 2023, 5:58 p.m. UTC | #1

Deren Wu <[e-mail]> wrote:

> From: Ming Yen Hsieh <[e-mail]>
> 
> No matter CLC is enabled or disabled, the driver should initialize
> the default value 0xff for channel configuration of CLC. Otherwise,
> the zero value would disable channels.
> 
> Reported-and-tested-by: Ben Greear <[e-mail]>
> Closes: https://lore.kernel.org/all/[e-mail]/
> Fixes: 09382d8f8641 ("wifi: mt76: mt7921: update the channel usage when the regd domain changed")
> Signed-off-by: Ming Yen Hsieh <[e-mail]>
> Signed-off-by: Deren Wu <[e-mail]>

Patch applied to wireless.git, thanks.

7a934b5cc3f4 wifi: mt76: mt7921: fix 6GHz disabled by the missing default CLC config

Kalle Valo Nov. 8, 2023, 6:10 p.m. UTC | #2

Kalle Valo <[e-mail]> writes:

> Deren Wu <[e-mail]> wrote:
>
>> From: Ming Yen Hsieh <[e-mail]>
>> 
>> No matter CLC is enabled or disabled, the driver should initialize
>> the default value 0xff for channel configuration of CLC. Otherwise,
>> the zero value would disable channels.
>> 
>> Reported-and-tested-by: Ben Greear <[e-mail]>
>> Closes: https://lore.kernel.org/all/[e-mail]/
>> Fixes: 09382d8f8641 ("wifi: mt76: mt7921: update the channel usage when the regd domain changed")
>> Signed-off-by: Ming Yen Hsieh <[e-mail]>
>> Signed-off-by: Deren Wu <[e-mail]>
>
> Patch applied to wireless.git, thanks.
>
> 7a934b5cc3f4 wifi: mt76: mt7921: fix 6GHz disabled by the missing default CLC config

BTW the fixes tag didn't use correct title and I fixed it during commit.

Patch

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
index 63f3d4a5c9aa..2cc2d2788f83 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
@@ -375,6 +375,7 @@  static int mt7921_load_clc(struct mt792x_dev *dev, const char *fw_name)
 	int ret, i, len, offset = 0;
 	u8 *clc_base = NULL, hw_encap = 0;
 
+	dev->phy.clc_chan_conf = 0xff;
 	if (mt7921_disable_clc ||
 	    mt76_is_usb(&dev->mt76))
 		return 0;