mirror of
https://github.com/armbian/build.git
synced 2025-08-09 12:46:58 +02:00
58b77e1cfd
* sunxi-6.0: update upstream megous patches to tag orange-pi-6.0-20221105-1830 * sunxi-6.0: rebase to v6.0.8 * sunxi-6.0: switch to v6.0.8
128 lines
4.7 KiB
Diff
128 lines
4.7 KiB
Diff
From d976d7139d5510251ed63b9bd83fe3d7e959c5a2 Mon Sep 17 00:00:00 2001
|
|
From: Zong-Zhe Yang <kevin_yang@realtek.com>
|
|
Date: Tue, 9 Aug 2022 18:49:48 +0800
|
|
Subject: [PATCH 400/484] wifi: rtw89: initialize entity and configure default
|
|
chandef
|
|
|
|
While idle, we need a default chandef to set channel for things,
|
|
such as scan. Before support of mac80211 chanctx, mac80211 would
|
|
configure a default one on ieee80211_hw::conf::chandef. And we
|
|
just queried it whenever we did set channel. However, after support
|
|
of mac80211 chanctx, the flow won't work like before.
|
|
|
|
Besides, we don't now query chandef from ieee80211_hw::conf::chandef
|
|
either. So, similar to mac80211 without using chanctx, we configure
|
|
the default chandef with ieee80211_channel of index 0 in 2GHz.
|
|
|
|
Although we have not added the support of mac80211 chanctx here,
|
|
this configuration should be compatible before that. So, we commit
|
|
this ahead.
|
|
|
|
Signed-off-by: Zong-Zhe Yang <kevin_yang@realtek.com>
|
|
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
|
|
Signed-off-by: Kalle Valo <kvalo@kernel.org>
|
|
Link: https://lore.kernel.org/r/20220809104952.61355-10-pkshih@realtek.com
|
|
---
|
|
drivers/net/wireless/realtek/rtw89/chan.c | 16 ++++++++++++++++
|
|
drivers/net/wireless/realtek/rtw89/chan.h | 1 +
|
|
drivers/net/wireless/realtek/rtw89/core.c | 7 +++++++
|
|
drivers/net/wireless/realtek/rtw89/core.h | 1 +
|
|
drivers/net/wireless/realtek/rtw89/ser.c | 2 ++
|
|
5 files changed, 27 insertions(+)
|
|
|
|
diff --git a/drivers/net/wireless/realtek/rtw89/chan.c b/drivers/net/wireless/realtek/rtw89/chan.c
|
|
index a9f0133f8..e0f1c89bb 100644
|
|
--- a/drivers/net/wireless/realtek/rtw89/chan.c
|
|
+++ b/drivers/net/wireless/realtek/rtw89/chan.c
|
|
@@ -138,3 +138,19 @@ void rtw89_config_entity_chandef(struct rtw89_dev *rtwdev,
|
|
{
|
|
__rtw89_config_entity_chandef(rtwdev, idx, chandef, true);
|
|
}
|
|
+
|
|
+static void rtw89_config_default_chandef(struct rtw89_dev *rtwdev)
|
|
+{
|
|
+ struct cfg80211_chan_def chandef = {0};
|
|
+
|
|
+ rtw89_get_default_chandef(&chandef);
|
|
+ __rtw89_config_entity_chandef(rtwdev, RTW89_SUB_ENTITY_0, &chandef, false);
|
|
+}
|
|
+
|
|
+void rtw89_entity_init(struct rtw89_dev *rtwdev)
|
|
+{
|
|
+ struct rtw89_hal *hal = &rtwdev->hal;
|
|
+
|
|
+ bitmap_zero(hal->entity_map, NUM_OF_RTW89_SUB_ENTITY);
|
|
+ rtw89_config_default_chandef(rtwdev);
|
|
+}
|
|
diff --git a/drivers/net/wireless/realtek/rtw89/chan.h b/drivers/net/wireless/realtek/rtw89/chan.h
|
|
index b2022bb0a..9c714f00c 100644
|
|
--- a/drivers/net/wireless/realtek/rtw89/chan.h
|
|
+++ b/drivers/net/wireless/realtek/rtw89/chan.h
|
|
@@ -29,5 +29,6 @@ bool rtw89_assign_entity_chan(struct rtw89_dev *rtwdev,
|
|
void rtw89_config_entity_chandef(struct rtw89_dev *rtwdev,
|
|
enum rtw89_sub_entity_idx idx,
|
|
const struct cfg80211_chan_def *chandef);
|
|
+void rtw89_entity_init(struct rtw89_dev *rtwdev);
|
|
|
|
#endif
|
|
diff --git a/drivers/net/wireless/realtek/rtw89/core.c b/drivers/net/wireless/realtek/rtw89/core.c
|
|
index 58ca93776..cb4a18c5f 100644
|
|
--- a/drivers/net/wireless/realtek/rtw89/core.c
|
|
+++ b/drivers/net/wireless/realtek/rtw89/core.c
|
|
@@ -225,6 +225,12 @@ static void rtw89_traffic_stats_accu(struct rtw89_dev *rtwdev,
|
|
}
|
|
}
|
|
|
|
+void rtw89_get_default_chandef(struct cfg80211_chan_def *chandef)
|
|
+{
|
|
+ cfg80211_chandef_create(chandef, &rtw89_channels_2ghz[0],
|
|
+ NL80211_CHAN_NO_HT);
|
|
+}
|
|
+
|
|
static void rtw89_get_channel_params(const struct cfg80211_chan_def *chandef,
|
|
struct rtw89_chan *chan)
|
|
{
|
|
@@ -2936,6 +2942,7 @@ int rtw89_core_init(struct rtw89_dev *rtwdev)
|
|
return ret;
|
|
}
|
|
rtw89_ser_init(rtwdev);
|
|
+ rtw89_entity_init(rtwdev);
|
|
|
|
return 0;
|
|
}
|
|
diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h
|
|
index afec9b035..80c15c2b8 100644
|
|
--- a/drivers/net/wireless/realtek/rtw89/core.h
|
|
+++ b/drivers/net/wireless/realtek/rtw89/core.h
|
|
@@ -3956,6 +3956,7 @@ void rtw89_core_deinit(struct rtw89_dev *rtwdev);
|
|
int rtw89_core_register(struct rtw89_dev *rtwdev);
|
|
void rtw89_core_unregister(struct rtw89_dev *rtwdev);
|
|
void rtw89_core_set_chip_txpwr(struct rtw89_dev *rtwdev);
|
|
+void rtw89_get_default_chandef(struct cfg80211_chan_def *chandef);
|
|
void rtw89_set_channel(struct rtw89_dev *rtwdev);
|
|
u8 rtw89_core_acquire_bit_map(unsigned long *addr, unsigned long size);
|
|
void rtw89_core_release_bit_map(unsigned long *addr, u8 bit);
|
|
diff --git a/drivers/net/wireless/realtek/rtw89/ser.c b/drivers/net/wireless/realtek/rtw89/ser.c
|
|
index 7240364e8..1f919854b 100644
|
|
--- a/drivers/net/wireless/realtek/rtw89/ser.c
|
|
+++ b/drivers/net/wireless/realtek/rtw89/ser.c
|
|
@@ -5,6 +5,7 @@
|
|
#include <linux/devcoredump.h>
|
|
|
|
#include "cam.h"
|
|
+#include "chan.h"
|
|
#include "debug.h"
|
|
#include "fw.h"
|
|
#include "mac.h"
|
|
@@ -604,6 +605,7 @@ static void ser_l2_reset_st_pre_hdl(struct rtw89_ser *ser)
|
|
|
|
ser_reset_mac_binding(rtwdev);
|
|
rtw89_core_stop(rtwdev);
|
|
+ rtw89_entity_init(rtwdev);
|
|
INIT_LIST_HEAD(&rtwdev->rtwvifs_list);
|
|
}
|
|
|
|
--
|
|
2.35.3
|
|
|