kernel-6.12.40
This commit is contained in:
Rmys
+28
@@ -0,0 +1,28 @@
|
||||
From cfa62868adc134623104a759902a95bc71790614 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Giuseppe=20Ghib=C3=B2?= <ghibo@mageia.org>
|
||||
Date: Sat, 16 Dec 2023 19:50:53 +0100
|
||||
Subject: [PATCH] Pull device 0x0821 from list of device supported by rtl8812au
|
||||
drivers
|
||||
|
||||
The Realtek device with ID 0x0821 seems better supported by upstream rtl8821ae
|
||||
kernel module (see bug https://bugs.mageia.org/show_bug.cgi?id=31965).
|
||||
|
||||
---
|
||||
drivers/staging/rtl8812au/os_dep/linux/usb_intf.c | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/staging/rtl8812au/os_dep/linux/usb_intf.c b/drivers/staging/rtl8812au/os_dep/linux/usb_intf.c
|
||||
index be0f654f0..c019fa82b 100644
|
||||
--- a/drivers/staging/rtl8812au/os_dep/linux/usb_intf.c
|
||||
+++ b/drivers/staging/rtl8812au/os_dep/linux/usb_intf.c
|
||||
@@ -185,7 +185,6 @@ static struct usb_device_id rtw_usb_id_tbl[] = {
|
||||
#ifdef CONFIG_RTL8821A
|
||||
/*=== Realtek demoboard ===*/
|
||||
{USB_DEVICE(USB_VENDER_ID_REALTEK, 0x0811), .driver_info = RTL8821}, /* Default ID */
|
||||
- {USB_DEVICE(USB_VENDER_ID_REALTEK, 0x0821), .driver_info = RTL8821}, /* Default ID */
|
||||
{USB_DEVICE(USB_VENDER_ID_REALTEK, 0x8822), .driver_info = RTL8821}, /* Default ID */
|
||||
{USB_DEVICE(USB_VENDER_ID_REALTEK, 0xA811) , .driver_info = RTL8821},/* Default ID */
|
||||
{USB_DEVICE_AND_INTERFACE_INFO(USB_VENDER_ID_REALTEK, 0x0820, 0xff, 0xff, 0xff), .driver_info = RTL8821}, /* 8821AU */
|
||||
--
|
||||
2.41.0
|
||||
|
||||
+6262
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,22 @@
|
||||
diff -up linux-6.12/drivers/staging/rtl8812au/core/rtw_mlme_ext.c.fixwarning linux-6.12/drivers/staging/rtl8812au/core/rtw_mlme_ext.c
|
||||
--- linux-6.12/drivers/staging/rtl8812au/core/rtw_mlme_ext.c.fixwarning 2024-11-20 22:55:13.263847617 +0100
|
||||
+++ linux-6.12/drivers/staging/rtl8812au/core/rtw_mlme_ext.c 2024-11-20 22:56:20.104794574 +0100
|
||||
@@ -2152,13 +2152,15 @@ unsigned int OnAuth(_adapter *padapter,
|
||||
if (rtw_is_list_empty(&pstat->asoc_list) == _FALSE) {
|
||||
rtw_list_delete(&pstat->asoc_list);
|
||||
pstapriv->asoc_list_cnt--;
|
||||
- if (pstat->expire_to > 0)
|
||||
- ;/* TODO: STA re_auth within expire_to */
|
||||
+ if (pstat->expire_to > 0) {
|
||||
+ ; /* TODO: STA re_auth within expire_to */
|
||||
+ }
|
||||
}
|
||||
_exit_critical_bh(&pstapriv->asoc_list_lock, &irqL);
|
||||
|
||||
- if (seq == 1)
|
||||
+ if (seq == 1) {
|
||||
; /* TODO: STA re_auth and auth timeout */
|
||||
+ }
|
||||
|
||||
}
|
||||
}
|
||||
+188
@@ -0,0 +1,188 @@
|
||||
From 61116d468dd551124c1ae2c01fff5da99d787fad Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Giuseppe=20Ghib=C3=B2?= <ghibo@mageia.org>
|
||||
Date: Thu, 21 Nov 2024 15:47:58 +0100
|
||||
Subject: [PATCH] rtl8812au: add missed prototypes
|
||||
|
||||
---
|
||||
drivers/staging/rtl8812au/core/rtw_br_ext.c | 2 ++
|
||||
drivers/staging/rtl8812au/core/rtw_p2p.c | 1 +
|
||||
drivers/staging/rtl8812au/core/rtw_xmit.c | 1 +
|
||||
.../hal/phydm/halrf/rtl8812a/halrf_8812a_ce.c | 7 +++++++
|
||||
.../hal/phydm/halrf/rtl8814a/halrf_8814a_ce.c | 21 ++++++++++++++++++-
|
||||
.../staging/rtl8812au/hal/phydm/phydm_ccx.c | 1 +
|
||||
.../rtl8812au/os_dep/linux/ioctl_cfg80211.c | 12 +++++++++++
|
||||
.../staging/rtl8812au/os_dep/linux/rtw_proc.c | 1 +
|
||||
.../staging/rtl8812au/os_dep/linux/usb_intf.c | 2 ++
|
||||
9 files changed, 47 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/staging/rtl8812au/core/rtw_br_ext.c b/drivers/staging/rtl8812au/core/rtw_br_ext.c
|
||||
index 955a50912..283676d36 100644
|
||||
--- a/drivers/staging/rtl8812au/core/rtw_br_ext.c
|
||||
+++ b/drivers/staging/rtl8812au/core/rtw_br_ext.c
|
||||
@@ -1369,6 +1369,8 @@ void dhcp_flag_bcast(_adapter *priv, struct sk_buff *skb)
|
||||
}
|
||||
|
||||
|
||||
+void *scdb_findEntry(_adapter *priv, unsigned char *macAddr,
|
||||
+ unsigned char *ipAddr);
|
||||
void *scdb_findEntry(_adapter *priv, unsigned char *macAddr,
|
||||
unsigned char *ipAddr)
|
||||
{
|
||||
diff --git a/drivers/staging/rtl8812au/core/rtw_p2p.c b/drivers/staging/rtl8812au/core/rtw_p2p.c
|
||||
index 167dd067f..c560d1712 100644
|
||||
--- a/drivers/staging/rtl8812au/core/rtw_p2p.c
|
||||
+++ b/drivers/staging/rtl8812au/core/rtw_p2p.c
|
||||
@@ -3898,6 +3898,7 @@ void rtw_xframe_chk_wfd_ie(struct xmit_frame *xframe)
|
||||
#endif
|
||||
}
|
||||
|
||||
+u8 *dump_p2p_attr_ch_list(u8 *p2p_ie, uint p2p_ielen, u8 *buf, u32 buf_len);
|
||||
u8 *dump_p2p_attr_ch_list(u8 *p2p_ie, uint p2p_ielen, u8 *buf, u32 buf_len)
|
||||
{
|
||||
uint attr_contentlen = 0;
|
||||
diff --git a/drivers/staging/rtl8812au/core/rtw_xmit.c b/drivers/staging/rtl8812au/core/rtw_xmit.c
|
||||
index 0b97e5099..e40c0aecc 100644
|
||||
--- a/drivers/staging/rtl8812au/core/rtw_xmit.c
|
||||
+++ b/drivers/staging/rtl8812au/core/rtw_xmit.c
|
||||
@@ -3766,6 +3766,7 @@ static struct xmit_frame *get_one_xmitframe(struct xmit_priv *pxmitpriv, struct
|
||||
return pxmitframe;
|
||||
}
|
||||
|
||||
+struct xmit_frame *rtw_get_xframe(struct xmit_priv *pxmitpriv, int *num_frame);
|
||||
struct xmit_frame *rtw_get_xframe(struct xmit_priv *pxmitpriv, int *num_frame)
|
||||
{
|
||||
_irqL irqL0;
|
||||
diff --git a/drivers/staging/rtl8812au/hal/phydm/halrf/rtl8812a/halrf_8812a_ce.c b/drivers/staging/rtl8812au/hal/phydm/halrf/rtl8812a/halrf_8812a_ce.c
|
||||
index a66721465..e2113e37a 100644
|
||||
--- a/drivers/staging/rtl8812au/hal/phydm/halrf/rtl8812a/halrf_8812a_ce.c
|
||||
+++ b/drivers/staging/rtl8812au/hal/phydm/halrf/rtl8812a/halrf_8812a_ce.c
|
||||
@@ -1334,6 +1334,13 @@ void phy_lc_calibrate_8812a(void *dm_void)
|
||||
_phy_lc_calibrate_8812a(dm, true);
|
||||
}
|
||||
|
||||
+void _phy_set_rf_path_switch_8812a(
|
||||
+#if ((DM_ODM_SUPPORT_TYPE & ODM_AP) || (DM_ODM_SUPPORT_TYPE == ODM_CE))
|
||||
+ struct dm_struct *dm,
|
||||
+#else
|
||||
+ void *adapter,
|
||||
+#endif
|
||||
+ boolean is_main, boolean is2T);
|
||||
void _phy_set_rf_path_switch_8812a(
|
||||
#if ((DM_ODM_SUPPORT_TYPE & ODM_AP) || (DM_ODM_SUPPORT_TYPE == ODM_CE))
|
||||
struct dm_struct *dm,
|
||||
diff --git a/drivers/staging/rtl8812au/hal/phydm/halrf/rtl8814a/halrf_8814a_ce.c b/drivers/staging/rtl8812au/hal/phydm/halrf/rtl8814a/halrf_8814a_ce.c
|
||||
index 41ce0a6dd..ae060a648 100644
|
||||
--- a/drivers/staging/rtl8812au/hal/phydm/halrf/rtl8814a/halrf_8814a_ce.c
|
||||
+++ b/drivers/staging/rtl8812au/hal/phydm/halrf/rtl8814a/halrf_8814a_ce.c
|
||||
@@ -450,7 +450,17 @@ _phy_lc_calibrate_8814a(
|
||||
|
||||
|
||||
VOID
|
||||
-phy_APCalibrate_8814A(
|
||||
+ phy_APCalibrate_8814A(
|
||||
+#if (DM_ODM_SUPPORT_TYPE & ODM_AP)
|
||||
+ IN struct dm_struct * pDM_Odm,
|
||||
+#else
|
||||
+ IN PADAPTER pAdapter,
|
||||
+#endif
|
||||
+ IN s1Byte delta,
|
||||
+ IN BOOLEAN is2T
|
||||
+ );
|
||||
+VOID
|
||||
+ phy_APCalibrate_8814A(
|
||||
#if (DM_ODM_SUPPORT_TYPE & ODM_AP)
|
||||
IN struct dm_struct * pDM_Odm,
|
||||
#else
|
||||
@@ -545,6 +555,15 @@ BOOLEAN PHY_QueryRFPathSwitch_8814A(
|
||||
}
|
||||
|
||||
|
||||
+VOID _phy_SetRFPathSwitch_8814A(
|
||||
+#if (DM_ODM_SUPPORT_TYPE & ODM_AP)
|
||||
+ IN struct dm_struct * pDM_Odm,
|
||||
+#else
|
||||
+ IN PADAPTER pAdapter,
|
||||
+#endif
|
||||
+ IN BOOLEAN bMain,
|
||||
+ IN BOOLEAN is2T
|
||||
+ );
|
||||
VOID _phy_SetRFPathSwitch_8814A(
|
||||
#if (DM_ODM_SUPPORT_TYPE & ODM_AP)
|
||||
IN struct dm_struct * pDM_Odm,
|
||||
diff --git a/drivers/staging/rtl8812au/hal/phydm/phydm_ccx.c b/drivers/staging/rtl8812au/hal/phydm/phydm_ccx.c
|
||||
index e0f42c0be..fe69c19b2 100644
|
||||
--- a/drivers/staging/rtl8812au/hal/phydm/phydm_ccx.c
|
||||
+++ b/drivers/staging/rtl8812au/hal/phydm/phydm_ccx.c
|
||||
@@ -26,6 +26,7 @@
|
||||
#include "mp_precomp.h"
|
||||
#include "phydm_precomp.h"
|
||||
|
||||
+void phydm_ccx_hw_restart(void *dm_void);
|
||||
void phydm_ccx_hw_restart(void *dm_void)
|
||||
/*@Will Restart NHM/CLM/FAHM simultaneously*/
|
||||
{
|
||||
diff --git a/drivers/staging/rtl8812au/os_dep/linux/ioctl_cfg80211.c b/drivers/staging/rtl8812au/os_dep/linux/ioctl_cfg80211.c
|
||||
index ae4202ad4..c0f563430 100644
|
||||
--- a/drivers/staging/rtl8812au/os_dep/linux/ioctl_cfg80211.c
|
||||
+++ b/drivers/staging/rtl8812au/os_dep/linux/ioctl_cfg80211.c
|
||||
@@ -534,6 +534,7 @@ void rtw_5g_rates_init(struct ieee80211_rate *rates)
|
||||
);
|
||||
}
|
||||
|
||||
+struct ieee80211_supported_band *rtw_spt_band_alloc(BAND_TYPE band);
|
||||
struct ieee80211_supported_band *rtw_spt_band_alloc(BAND_TYPE band)
|
||||
{
|
||||
struct ieee80211_supported_band *spt_band = NULL;
|
||||
@@ -2083,6 +2084,16 @@ static int cfg80211_rtw_del_key(struct wiphy *wiphy, struct net_device *ndev,
|
||||
return 0;
|
||||
}
|
||||
|
||||
+static int cfg80211_rtw_set_default_key(struct wiphy *wiphy,
|
||||
+ struct net_device *ndev,
|
||||
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
|
||||
+ int link_id,
|
||||
+#endif
|
||||
+ u8 key_index
|
||||
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)) || defined(COMPAT_KERNEL_RELEASE)
|
||||
+ , bool unicast, bool multicast
|
||||
+ #endif
|
||||
+);
|
||||
static int cfg80211_rtw_set_default_key(struct wiphy *wiphy,
|
||||
struct net_device *ndev,
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
|
||||
@@ -5956,6 +5967,7 @@ static int cfg80211_rtw_change_station(struct wiphy *wiphy, struct net_device *n
|
||||
return ret;
|
||||
}
|
||||
|
||||
+struct sta_info *rtw_sta_info_get_by_idx(struct sta_priv *pstapriv, const int idx, u8 *asoc_list_num);
|
||||
struct sta_info *rtw_sta_info_get_by_idx(struct sta_priv *pstapriv, const int idx, u8 *asoc_list_num)
|
||||
{
|
||||
_list *phead, *plist;
|
||||
diff --git a/drivers/staging/rtl8812au/os_dep/linux/rtw_proc.c b/drivers/staging/rtl8812au/os_dep/linux/rtw_proc.c
|
||||
index db1177c3a..3b9246bc9 100644
|
||||
--- a/drivers/staging/rtl8812au/os_dep/linux/rtw_proc.c
|
||||
+++ b/drivers/staging/rtl8812au/os_dep/linux/rtw_proc.c
|
||||
@@ -4446,6 +4446,7 @@ static const struct file_operations rtw_odm_proc_sseq_ops = {
|
||||
};
|
||||
#endif
|
||||
|
||||
+struct proc_dir_entry *rtw_odm_proc_init(struct net_device *dev);
|
||||
struct proc_dir_entry *rtw_odm_proc_init(struct net_device *dev)
|
||||
{
|
||||
struct proc_dir_entry *dir_odm = NULL;
|
||||
diff --git a/drivers/staging/rtl8812au/os_dep/linux/usb_intf.c b/drivers/staging/rtl8812au/os_dep/linux/usb_intf.c
|
||||
index 915ef6476..ae2a5a0b9 100644
|
||||
--- a/drivers/staging/rtl8812au/os_dep/linux/usb_intf.c
|
||||
+++ b/drivers/staging/rtl8812au/os_dep/linux/usb_intf.c
|
||||
@@ -1206,6 +1206,8 @@ extern void rtd2885_wlan_netlink_sendMsg(char *action_string, char *name);
|
||||
|
||||
_adapter *rtw_sw_export = NULL;
|
||||
|
||||
+_adapter *rtw_usb_primary_adapter_init(struct dvobj_priv *dvobj,
|
||||
+ struct usb_interface *pusb_intf);
|
||||
_adapter *rtw_usb_primary_adapter_init(struct dvobj_priv *dvobj,
|
||||
struct usb_interface *pusb_intf)
|
||||
{
|
||||
--
|
||||
2.41.1
|
||||
|
||||
+33
@@ -0,0 +1,33 @@
|
||||
From a9d9038b7a15077395013f1954665656959c81b8 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Giuseppe=20Ghib=C3=B2?= <ghibo@mageia.org>
|
||||
From: Your Name <you@example.com>
|
||||
Date: Thu, 21 Nov 2024 15:53:01 +0100
|
||||
Subject: [PATCH 6/8] rtl8812au: add suggested braces around empty body in an
|
||||
else statement
|
||||
|
||||
---
|
||||
drivers/staging/rtl8812au/os_dep/linux/recv_linux.c | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/staging/rtl8812au/os_dep/linux/recv_linux.c b/drivers/staging/rtl8812au/os_dep/linux/recv_linux.c
|
||||
index 5637e9970..051abba70 100644
|
||||
--- a/drivers/staging/rtl8812au/os_dep/linux/recv_linux.c
|
||||
+++ b/drivers/staging/rtl8812au/os_dep/linux/recv_linux.c
|
||||
@@ -531,10 +531,12 @@ void rtw_os_recv_indicate_pkt(_adapter *padapter, _pkt *pkt, union recv_frame *r
|
||||
#endif /* CONFIG_RTW_NAPI */
|
||||
|
||||
ret = rtw_netif_rx(padapter->pnetdev, pkt);
|
||||
- if (ret == NET_RX_SUCCESS)
|
||||
+ if (ret == NET_RX_SUCCESS) {
|
||||
DBG_COUNTER(padapter->rx_logs.os_netif_ok);
|
||||
- else
|
||||
+ }
|
||||
+ else {
|
||||
DBG_COUNTER(padapter->rx_logs.os_netif_err);
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
2.41.1
|
||||
|
||||
+45
@@ -0,0 +1,45 @@
|
||||
From e7f5d03d8bde8f104ed06ad0946e2e40eaf51094 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Giuseppe=20Ghib=C3=B2?= <ghibo@mageia.org>
|
||||
Date: Thu, 21 Nov 2024 16:06:25 +0100
|
||||
Subject: [PATCH 7/8] rtl8812au: add suggested braces around empty body in an
|
||||
else statement
|
||||
|
||||
---
|
||||
drivers/staging/rtl8812au/hal/phydm/phydm_debug.c | 9 ++++++---
|
||||
1 file changed, 6 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/drivers/staging/rtl8812au/hal/phydm/phydm_debug.c b/drivers/staging/rtl8812au/hal/phydm/phydm_debug.c
|
||||
index bab92632e..a3e8bc48e 100644
|
||||
--- a/drivers/staging/rtl8812au/hal/phydm/phydm_debug.c
|
||||
+++ b/drivers/staging/rtl8812au/hal/phydm/phydm_debug.c
|
||||
@@ -2222,10 +2222,12 @@ void phydm_basic_dbg_message(void *dm_void)
|
||||
PHYDM_DBG(dm, DBG_CMN, "[%s] System up time: ((%d sec))---->\n",
|
||||
__func__, dm->phydm_sys_up_time);
|
||||
|
||||
- if (dm->is_linked)
|
||||
+ if (dm->is_linked) {
|
||||
phydm_basic_dbg_msg_linked(dm);
|
||||
- else
|
||||
+ }
|
||||
+ else {
|
||||
PHYDM_DBG(dm, DBG_CMN, "No Link !!!\n");
|
||||
+ }
|
||||
|
||||
PHYDM_DBG(dm, DBG_CMN, "[CCA Cnt] {CCK, OFDM, Total} = {%d, %d, %d}\n",
|
||||
fa_t->cnt_cck_cca, fa_t->cnt_ofdm_cca, fa_t->cnt_cca_all);
|
||||
@@ -4491,10 +4493,11 @@ void phydm_fw_trace_handler_code(void *dm_void, u8 *buffer, u8 cmd_len)
|
||||
u16 content_3 = (((u16)buffer[9]) << 8) | ((u16)buffer[8]);
|
||||
u16 content_4 = (((u16)buffer[11]) << 8) | ((u16)buffer[10]);
|
||||
|
||||
- if (cmd_len > 12)
|
||||
+ if (cmd_len > 12) {
|
||||
PHYDM_DBG(dm, DBG_FW_TRACE,
|
||||
"[FW Msg] Invalid cmd length (( %d )) >12\n",
|
||||
cmd_len);
|
||||
+ }
|
||||
/*@--------------------------------------------*/
|
||||
#ifdef CONFIG_RA_FW_DBG_CODE
|
||||
if (function == RATE_DECISION) {
|
||||
--
|
||||
2.41.1
|
||||
|
||||
+311
@@ -0,0 +1,311 @@
|
||||
From 22b4d5685d828b85d9fc80bfa3d8c5e97b289224 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Giuseppe=20Ghib=C3=B2?= <ghibo@mageia.org>
|
||||
Date: Thu, 21 Nov 2024 16:27:10 +0100
|
||||
Subject: [PATCH 8/8] rtl8812au: add suggested braces around empty body in an
|
||||
else statement
|
||||
|
||||
---
|
||||
.../rtl8812au/hal/phydm/halrf/halphyrf_ce.c | 3 ++-
|
||||
.../staging/rtl8812au/hal/phydm/halrf/halrf.c | 3 ++-
|
||||
.../rtl8812au/hal/phydm/halrf/halrf_kfree.c | 18 ++++++++++++------
|
||||
.../hal/phydm/halrf/rtl8812a/halrf_8812a_ce.c | 3 ++-
|
||||
.../rtl8812au/hal/phydm/phydm_beamforming.c | 6 ++++--
|
||||
.../rtl8812au/hal/phydm/phydm_cfotracking.c | 6 ++++--
|
||||
.../staging/rtl8812au/hal/phydm/phydm_psd.c | 3 ++-
|
||||
.../staging/rtl8812au/hal/phydm/phydm_rainfo.c | 6 ++++--
|
||||
.../rtl8812au/hal/phydm/txbf/halcomtxbf.c | 15 ++++++++++-----
|
||||
.../rtl8812au/hal/phydm/txbf/haltxbfjaguar.c | 3 ++-
|
||||
10 files changed, 44 insertions(+), 22 deletions(-)
|
||||
|
||||
diff --git a/drivers/staging/rtl8812au/hal/phydm/halrf/halphyrf_ce.c b/drivers/staging/rtl8812au/hal/phydm/halrf/halphyrf_ce.c
|
||||
index 4443c7289..3b05d87c8 100644
|
||||
--- a/drivers/staging/rtl8812au/hal/phydm/halrf/halphyrf_ce.c
|
||||
+++ b/drivers/staging/rtl8812au/hal/phydm/halrf/halphyrf_ce.c
|
||||
@@ -478,9 +478,10 @@ void odm_txpowertracking_callback_thermal_meter(void *adapter)
|
||||
|
||||
/*@4 3. Initialize ThermalValues of rf_calibrate_info*/
|
||||
|
||||
- if (cali_info->is_reloadtxpowerindex)
|
||||
+ if (cali_info->is_reloadtxpowerindex) {
|
||||
RF_DBG(dm, DBG_RF_TX_PWR_TRACK,
|
||||
"reload ofdm index for band switch\n");
|
||||
+ }
|
||||
|
||||
/*@4 4. Calculate average thermal meter*/
|
||||
|
||||
diff --git a/drivers/staging/rtl8812au/hal/phydm/halrf/halrf.c b/drivers/staging/rtl8812au/hal/phydm/halrf/halrf.c
|
||||
index 09ab5bae9..609333db8 100644
|
||||
--- a/drivers/staging/rtl8812au/hal/phydm/halrf/halrf.c
|
||||
+++ b/drivers/staging/rtl8812au/hal/phydm/halrf/halrf.c
|
||||
@@ -2270,8 +2270,9 @@ boolean halrf_compare(void *dm_void, u32 value)
|
||||
else if (value < 0x200 && value > 0x64)
|
||||
fail = true;
|
||||
|
||||
- if (fail)
|
||||
+ if (fail) {
|
||||
RF_DBG(dm, DBG_RF_DACK, "[DACK]overflow!!!!!!!!!!!!!!!");
|
||||
+ }
|
||||
return fail;
|
||||
}
|
||||
|
||||
diff --git a/drivers/staging/rtl8812au/hal/phydm/halrf/halrf_kfree.c b/drivers/staging/rtl8812au/hal/phydm/halrf/halrf_kfree.c
|
||||
index 773364310..a4e3504a3 100644
|
||||
--- a/drivers/staging/rtl8812au/hal/phydm/halrf/halrf_kfree.c
|
||||
+++ b/drivers/staging/rtl8812au/hal/phydm/halrf/halrf_kfree.c
|
||||
@@ -148,9 +148,10 @@ void phydm_get_thermal_trim_offset_8821c(void *dm_void)
|
||||
RF_DBG(dm, DBG_RF_MP, "[kfree] 8821c thermal trim flag:0x%02x\n",
|
||||
power_trim_info->flag);
|
||||
|
||||
- if (power_trim_info->flag & KFREE_FLAG_THERMAL_K_ON)
|
||||
+ if (power_trim_info->flag & KFREE_FLAG_THERMAL_K_ON) {
|
||||
RF_DBG(dm, DBG_RF_MP, "[kfree] 8821c thermal:%d\n",
|
||||
power_trim_info->thermal);
|
||||
+ }
|
||||
}
|
||||
|
||||
void phydm_get_power_trim_offset_8821c(void *dm_void);
|
||||
@@ -281,9 +282,10 @@ void phydm_get_thermal_trim_offset_8822b(void *dm_void)
|
||||
RF_DBG(dm, DBG_RF_MP, "[kfree] 8822b thermal trim flag:0x%02x\n",
|
||||
power_trim_info->flag);
|
||||
|
||||
- if (power_trim_info->flag & KFREE_FLAG_THERMAL_K_ON)
|
||||
+ if (power_trim_info->flag & KFREE_FLAG_THERMAL_K_ON) {
|
||||
RF_DBG(dm, DBG_RF_MP, "[kfree] 8822b thermal:%d\n",
|
||||
power_trim_info->thermal);
|
||||
+ }
|
||||
}
|
||||
|
||||
void phydm_get_power_trim_offset_8822b(void *dm_void);
|
||||
@@ -532,9 +534,10 @@ void phydm_get_thermal_trim_offset_8710b(void *dm_void)
|
||||
RF_DBG(dm, DBG_RF_MP, "[kfree] 8710b thermal trim flag:0x%02x\n",
|
||||
power_trim_info->flag);
|
||||
|
||||
- if (power_trim_info->flag & KFREE_FLAG_THERMAL_K_ON)
|
||||
+ if (power_trim_info->flag & KFREE_FLAG_THERMAL_K_ON) {
|
||||
RF_DBG(dm, DBG_RF_MP, "[kfree] 8710b thermal:%d\n",
|
||||
power_trim_info->thermal);
|
||||
+ }
|
||||
}
|
||||
|
||||
void phydm_get_power_trim_offset_8710b(void *dm_void);
|
||||
@@ -559,10 +562,11 @@ void phydm_get_power_trim_offset_8710b(void *dm_void)
|
||||
RF_DBG(dm, DBG_RF_MP, "[kfree] 8710b power trim flag:0x%02x\n",
|
||||
power_trim_info->flag);
|
||||
|
||||
- if (power_trim_info->flag & KFREE_FLAG_ON)
|
||||
+ if (power_trim_info->flag & KFREE_FLAG_ON) {
|
||||
RF_DBG(dm, DBG_RF_MP,
|
||||
"[kfree] 8710b power_trim_data->bb_gain[0][0]=0x%X\n",
|
||||
power_trim_info->bb_gain[0][0]);
|
||||
+ }
|
||||
}
|
||||
|
||||
void phydm_set_kfree_to_rf_8710b(void *dm_void, u8 e_rf_path, u8 data);
|
||||
@@ -620,9 +624,10 @@ void phydm_get_thermal_trim_offset_8192f(void *dm_void)
|
||||
RF_DBG(dm, DBG_RF_MP, "[kfree] 8192f thermal trim flag:0x%02x\n",
|
||||
power_trim_info->flag);
|
||||
|
||||
- if (power_trim_info->flag & KFREE_FLAG_THERMAL_K_ON)
|
||||
+ if (power_trim_info->flag & KFREE_FLAG_THERMAL_K_ON) {
|
||||
RF_DBG(dm, DBG_RF_MP, "[kfree] 8192f thermal:%d\n",
|
||||
power_trim_info->thermal);
|
||||
+ }
|
||||
}
|
||||
|
||||
void phydm_get_power_trim_offset_8192f(void *dm_void);
|
||||
@@ -799,8 +804,9 @@ void phydm_get_thermal_trim_offset_8198f(void *dm_void)
|
||||
pg_therm = pg_therm & 0x1f;
|
||||
if ((pg_therm & BIT(0)) == 0)
|
||||
power_trim_info->thermal = (-1 * (pg_therm >> 1));
|
||||
- else
|
||||
+ else {
|
||||
power_trim_info->thermal = (pg_therm >> 1);
|
||||
+ }
|
||||
|
||||
power_trim_info->flag |= KFREE_FLAG_THERMAL_K_ON;
|
||||
}
|
||||
diff --git a/drivers/staging/rtl8812au/hal/phydm/halrf/rtl8812a/halrf_8812a_ce.c b/drivers/staging/rtl8812au/hal/phydm/halrf/rtl8812a/halrf_8812a_ce.c
|
||||
index e2113e37a..a006d7e74 100644
|
||||
--- a/drivers/staging/rtl8812au/hal/phydm/halrf/rtl8812a/halrf_8812a_ce.c
|
||||
+++ b/drivers/staging/rtl8812au/hal/phydm/halrf/rtl8812a/halrf_8812a_ce.c
|
||||
@@ -1323,8 +1323,9 @@ void phy_iq_calibrate_8812a(void *dm_void, boolean is_recovery)
|
||||
if (dm->rf_calibrate_info.is_iqk_in_progress)
|
||||
RF_DBG(dm, DBG_RF_IQK,
|
||||
"== FW IQK TIMEOUT (Still in progress after 500ms) ==\n");
|
||||
- } else
|
||||
+ } else {
|
||||
_phy_iq_calibrate_8812a(dm, *dm->channel);
|
||||
+ }
|
||||
}
|
||||
|
||||
void phy_lc_calibrate_8812a(void *dm_void)
|
||||
diff --git a/drivers/staging/rtl8812au/hal/phydm/phydm_beamforming.c b/drivers/staging/rtl8812au/hal/phydm/phydm_beamforming.c
|
||||
index 4a770aa72..952b5600b 100644
|
||||
--- a/drivers/staging/rtl8812au/hal/phydm/phydm_beamforming.c
|
||||
+++ b/drivers/staging/rtl8812au/hal/phydm/phydm_beamforming.c
|
||||
@@ -1337,10 +1337,11 @@ beamforming_init_entry(void *dm_void, u16 sta_idx, u8 *bfer_bfee_idx,
|
||||
|
||||
if (beamformer_entry == NULL) {
|
||||
beamformer_entry = beamforming_add_bfer_entry(dm, sta, beamform_cap, num_of_sounding_dim, &bfer_idx);
|
||||
- if (beamformer_entry == NULL)
|
||||
+ if (beamformer_entry == NULL) {
|
||||
PHYDM_DBG(dm, DBG_TXBF,
|
||||
"[%s]Not enough BFer entry!!!!!\n",
|
||||
__func__);
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1781,10 +1782,11 @@ void beamforming_timer_callback(
|
||||
#endif
|
||||
if (ret)
|
||||
ret = beamforming_start_sw(dm, sound_info->sound_idx, sound_info->sound_mode, sound_info->sound_bw);
|
||||
- else
|
||||
+ else {
|
||||
PHYDM_DBG(dm, DBG_TXBF,
|
||||
"%s, Error value return from BeamformingStart_V2\n",
|
||||
__func__);
|
||||
+ }
|
||||
|
||||
if (beam_info->beamformee_su_cnt != 0 || beam_info->beamformee_mu_cnt > 1) {
|
||||
if (sound_info->sound_mode == SOUNDING_SW_VHT_TIMER || sound_info->sound_mode == SOUNDING_SW_HT_TIMER)
|
||||
diff --git a/drivers/staging/rtl8812au/hal/phydm/phydm_cfotracking.c b/drivers/staging/rtl8812au/hal/phydm/phydm_cfotracking.c
|
||||
index 8aac6b094..d88d7a6c0 100644
|
||||
--- a/drivers/staging/rtl8812au/hal/phydm/phydm_cfotracking.c
|
||||
+++ b/drivers/staging/rtl8812au/hal/phydm/phydm_cfotracking.c
|
||||
@@ -213,11 +213,13 @@ void phydm_set_crystal_cap(void *dm_void, u8 crystal_cap)
|
||||
if (cfo_track->crystal_cap == crystal_cap)
|
||||
return;
|
||||
|
||||
- if (phydm_set_crystal_cap_reg(dm, crystal_cap))
|
||||
+ if (phydm_set_crystal_cap_reg(dm, crystal_cap)) {
|
||||
PHYDM_DBG(dm, DBG_CFO_TRK, "Set crystal_cap = 0x%x\n",
|
||||
cfo_track->crystal_cap);
|
||||
- else
|
||||
+ }
|
||||
+ else {
|
||||
PHYDM_DBG(dm, DBG_CFO_TRK, "Set fail\n");
|
||||
+ }
|
||||
}
|
||||
|
||||
boolean
|
||||
diff --git a/drivers/staging/rtl8812au/hal/phydm/phydm_psd.c b/drivers/staging/rtl8812au/hal/phydm/phydm_psd.c
|
||||
index 458677b59..33f715bcc 100644
|
||||
--- a/drivers/staging/rtl8812au/hal/phydm/phydm_psd.c
|
||||
+++ b/drivers/staging/rtl8812au/hal/phydm/phydm_psd.c
|
||||
@@ -199,9 +199,10 @@ u8 phydm_psd(void *dm_void, u32 igi, u16 start_point, u16 stop_point)
|
||||
if (dm->support_ic_type & ODM_IC_JGR3_SERIES)
|
||||
PHYDM_DBG(dm, ODM_COMP_API, "0x1d70=((0x%x))\n",
|
||||
odm_get_bb_reg(dm, R_0x1d70, MASKDWORD));
|
||||
- else
|
||||
+ else {
|
||||
PHYDM_DBG(dm, ODM_COMP_API, "0xc50=((0x%x))\n",
|
||||
odm_get_bb_reg(dm, R_0xc50, MASKDWORD));
|
||||
+ }
|
||||
|
||||
PHYDM_DBG(dm, ODM_COMP_API, "RF0x18=((0x%x))\n",
|
||||
odm_get_rf_reg(dm, RF_PATH_A, RF_0x18, RFREG_MASK));
|
||||
diff --git a/drivers/staging/rtl8812au/hal/phydm/phydm_rainfo.c b/drivers/staging/rtl8812au/hal/phydm/phydm_rainfo.c
|
||||
index 2c24b9be9..ca341c827 100644
|
||||
--- a/drivers/staging/rtl8812au/hal/phydm/phydm_rainfo.c
|
||||
+++ b/drivers/staging/rtl8812au/hal/phydm/phydm_rainfo.c
|
||||
@@ -443,8 +443,9 @@ void phydm_c2h_ra_report_handler(void *dm_void, u8 *cmd_buf, u8 cmd_len)
|
||||
PHYDM_DBG(dm, DBG_RA, "Rate Back\n");
|
||||
else if (cmd_buf[3] == 4)
|
||||
PHYDM_DBG(dm, DBG_RA, "Start rate by RSSI\n");
|
||||
- else if (cmd_buf[3] == 5)
|
||||
+ else if (cmd_buf[3] == 5) {
|
||||
PHYDM_DBG(dm, DBG_RA, "Try rate\n");
|
||||
+ }
|
||||
}
|
||||
phydm_print_rate_2_buff(dm, rate, dbg_buf, PHYDM_SNPRINT_SIZE);
|
||||
PHYDM_DBG(dm, DBG_RA, "Tx Rate=%s (%d)", dbg_buf, rate);
|
||||
@@ -829,8 +830,9 @@ u8 phydm_get_tx_stream_num(void *dm_void, enum rf_type type)
|
||||
tx_num = 3;
|
||||
else if (type == RF_4T4R)
|
||||
tx_num = 4;
|
||||
- else
|
||||
+ else {
|
||||
PHYDM_DBG(dm, DBG_RA, "[Warrning] no mimo_type is found\n");
|
||||
+ }
|
||||
|
||||
return tx_num;
|
||||
}
|
||||
diff --git a/drivers/staging/rtl8812au/hal/phydm/txbf/halcomtxbf.c b/drivers/staging/rtl8812au/hal/phydm/txbf/halcomtxbf.c
|
||||
index 4329dcaee..286105ec0 100644
|
||||
--- a/drivers/staging/rtl8812au/hal/phydm/txbf/halcomtxbf.c
|
||||
+++ b/drivers/staging/rtl8812au/hal/phydm/txbf/halcomtxbf.c
|
||||
@@ -43,8 +43,9 @@ void hal_com_txbf_config_gtab(
|
||||
{
|
||||
struct dm_struct *dm = (struct dm_struct *)dm_void;
|
||||
|
||||
- if (dm->support_ic_type & ODM_RTL8822B)
|
||||
+ if (dm->support_ic_type & ODM_RTL8822B) {
|
||||
hal_txbf_8822b_config_gtab(dm);
|
||||
+ }
|
||||
}
|
||||
|
||||
void phydm_beamform_set_sounding_enter(
|
||||
@@ -206,8 +207,9 @@ void hal_com_txbf_enter_work_item_callback(
|
||||
hal_txbf_8192e_enter(dm, idx);
|
||||
else if (dm->support_ic_type & ODM_RTL8814A)
|
||||
hal_txbf_8814a_enter(dm, idx);
|
||||
- else if (dm->support_ic_type & ODM_RTL8822B)
|
||||
+ else if (dm->support_ic_type & ODM_RTL8822B) {
|
||||
hal_txbf_8822b_enter(dm, idx);
|
||||
+ }
|
||||
}
|
||||
|
||||
void hal_com_txbf_leave_work_item_callback(
|
||||
@@ -236,8 +238,9 @@ void hal_com_txbf_leave_work_item_callback(
|
||||
hal_txbf_8192e_leave(dm, idx);
|
||||
else if (dm->support_ic_type & ODM_RTL8814A)
|
||||
hal_txbf_8814a_leave(dm, idx);
|
||||
- else if (dm->support_ic_type & ODM_RTL8822B)
|
||||
+ else if (dm->support_ic_type & ODM_RTL8822B) {
|
||||
hal_txbf_8822b_leave(dm, idx);
|
||||
+ }
|
||||
}
|
||||
|
||||
void hal_com_txbf_fw_ndpa_work_item_callback(
|
||||
@@ -265,8 +268,9 @@ void hal_com_txbf_fw_ndpa_work_item_callback(
|
||||
hal_txbf_8192e_fw_tx_bf(dm, idx);
|
||||
else if (dm->support_ic_type & ODM_RTL8814A)
|
||||
hal_txbf_8814a_fw_txbf(dm, idx);
|
||||
- else if (dm->support_ic_type & ODM_RTL8822B)
|
||||
+ else if (dm->support_ic_type & ODM_RTL8822B) {
|
||||
hal_txbf_8822b_fw_txbf(dm, idx);
|
||||
+ }
|
||||
}
|
||||
|
||||
void hal_com_txbf_clk_work_item_callback(
|
||||
@@ -363,8 +367,9 @@ void hal_com_txbf_status_work_item_callback(
|
||||
hal_txbf_8192e_status(dm, idx);
|
||||
else if (dm->support_ic_type & ODM_RTL8814A)
|
||||
hal_txbf_8814a_status(dm, idx);
|
||||
- else if (dm->support_ic_type & ODM_RTL8822B)
|
||||
+ else if (dm->support_ic_type & ODM_RTL8822B) {
|
||||
hal_txbf_8822b_status(dm, idx);
|
||||
+ }
|
||||
}
|
||||
|
||||
void hal_com_txbf_reset_tx_path_work_item_callback(
|
||||
diff --git a/drivers/staging/rtl8812au/hal/phydm/txbf/haltxbfjaguar.c b/drivers/staging/rtl8812au/hal/phydm/txbf/haltxbfjaguar.c
|
||||
index c42fa53a6..78bb399d9 100644
|
||||
--- a/drivers/staging/rtl8812au/hal/phydm/txbf/haltxbfjaguar.c
|
||||
+++ b/drivers/staging/rtl8812au/hal/phydm/txbf/haltxbfjaguar.c
|
||||
@@ -145,9 +145,10 @@ void hal_txbf_jaguar_download_ndpa(
|
||||
dl_bcn_count++;
|
||||
} while (!(bcn_valid_reg & BIT(0)) && dl_bcn_count < 5);
|
||||
|
||||
- if (!(bcn_valid_reg & BIT(0)))
|
||||
+ if (!(bcn_valid_reg & BIT(0))) {
|
||||
PHYDM_DBG(dm, DBG_TXBF, "%s Download RSVD page failed!\n",
|
||||
__func__);
|
||||
+ }
|
||||
|
||||
/*TDECTRL[15:8] 0x209[7:0] = 0xF6 Beacon Head for TXDMA*/
|
||||
odm_write_1byte(dm, REG_TDECTRL_8812A + 1, tx_page_bndy);
|
||||
--
|
||||
2.41.1
|
||||
|
||||
+96
@@ -0,0 +1,96 @@
|
||||
From f9a18119d2a8f5bd4c35197c89c60305d58d3abd Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Giuseppe=20Ghib=C3=B2?= <ghibo@mageia.org>
|
||||
Date: Thu, 21 Nov 2024 17:03:25 +0100
|
||||
Subject: [PATCH 09/10] rtl8812au: add suggested braces around empty body in an
|
||||
else statement
|
||||
|
||||
---
|
||||
drivers/staging/rtl8812au/core/rtw_recv.c | 3 ++-
|
||||
drivers/staging/rtl8812au/core/rtw_xmit.c | 3 ++-
|
||||
drivers/staging/rtl8812au/hal/phydm/halrf/halrf_kfree.c | 3 ++-
|
||||
.../rtl8812au/hal/phydm/halrf/rtl8812a/halrf_8812a_ce.c | 3 ++-
|
||||
drivers/staging/rtl8812au/hal/phydm/phydm_beamforming.c | 3 ++-
|
||||
5 files changed, 10 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/drivers/staging/rtl8812au/core/rtw_recv.c b/drivers/staging/rtl8812au/core/rtw_recv.c
|
||||
index ed2bf605c..bdbc146ca 100644
|
||||
--- a/drivers/staging/rtl8812au/core/rtw_recv.c
|
||||
+++ b/drivers/staging/rtl8812au/core/rtw_recv.c
|
||||
@@ -2404,8 +2404,9 @@ sint validate_recv_frame(_adapter *adapter, union recv_frame *precv_frame)
|
||||
dump_rx_packet(ptr);
|
||||
}
|
||||
#endif
|
||||
- } else
|
||||
+ } else {
|
||||
DBG_COUNTER(adapter->rx_logs.core_rx_pre_data_handled);
|
||||
+ }
|
||||
break;
|
||||
default:
|
||||
DBG_COUNTER(adapter->rx_logs.core_rx_pre_unknown);
|
||||
diff --git a/drivers/staging/rtl8812au/core/rtw_xmit.c b/drivers/staging/rtl8812au/core/rtw_xmit.c
|
||||
index e40c0aecc..12a2d5d79 100644
|
||||
--- a/drivers/staging/rtl8812au/core/rtw_xmit.c
|
||||
+++ b/drivers/staging/rtl8812au/core/rtw_xmit.c
|
||||
@@ -1374,8 +1374,9 @@ static s32 update_attrib(_adapter *padapter, _pkt *pkt, struct pkt_attrib *pattr
|
||||
_rtw_memcpy(pattrib->ra, pattrib->dst, ETH_ALEN);
|
||||
_rtw_memcpy(pattrib->ta, get_bssid(pmlmepriv), ETH_ALEN);
|
||||
DBG_COUNTER(padapter->tx_logs.core_tx_upd_attrib_ap);
|
||||
- } else
|
||||
+ } else {
|
||||
DBG_COUNTER(padapter->tx_logs.core_tx_upd_attrib_unknown);
|
||||
+ }
|
||||
|
||||
get_sta_info:
|
||||
bmcast = IS_MCAST(pattrib->ra);
|
||||
diff --git a/drivers/staging/rtl8812au/hal/phydm/halrf/halrf_kfree.c b/drivers/staging/rtl8812au/hal/phydm/halrf/halrf_kfree.c
|
||||
index a4e3504a3..c31566d70 100644
|
||||
--- a/drivers/staging/rtl8812au/hal/phydm/halrf/halrf_kfree.c
|
||||
+++ b/drivers/staging/rtl8812au/hal/phydm/halrf/halrf_kfree.c
|
||||
@@ -814,9 +814,10 @@ void phydm_get_thermal_trim_offset_8198f(void *dm_void)
|
||||
RF_DBG(dm, DBG_RF_MP, "[kfree] 8198f thermal trim flag:0x%02x\n",
|
||||
power_trim_info->flag);
|
||||
|
||||
- if (power_trim_info->flag & KFREE_FLAG_THERMAL_K_ON)
|
||||
+ if (power_trim_info->flag & KFREE_FLAG_THERMAL_K_ON) {
|
||||
RF_DBG(dm, DBG_RF_MP, "[kfree] 8198f thermal:%d\n",
|
||||
power_trim_info->thermal);
|
||||
+ }
|
||||
}
|
||||
|
||||
void phydm_get_power_trim_offset_8198f(void *dm_void);
|
||||
diff --git a/drivers/staging/rtl8812au/hal/phydm/halrf/rtl8812a/halrf_8812a_ce.c b/drivers/staging/rtl8812au/hal/phydm/halrf/rtl8812a/halrf_8812a_ce.c
|
||||
index a006d7e74..4f11b8223 100644
|
||||
--- a/drivers/staging/rtl8812au/hal/phydm/halrf/rtl8812a/halrf_8812a_ce.c
|
||||
+++ b/drivers/staging/rtl8812au/hal/phydm/halrf/rtl8812a/halrf_8812a_ce.c
|
||||
@@ -1320,9 +1320,10 @@ void phy_iq_calibrate_8812a(void *dm_void, boolean is_recovery)
|
||||
if (dm->fw_offload_ability & PHYDM_RF_IQK_OFFLOAD) {
|
||||
_phy_iq_calibrate_by_fw_8812a(dm);
|
||||
phydm_iqk_wait(dm, 500);
|
||||
- if (dm->rf_calibrate_info.is_iqk_in_progress)
|
||||
+ if (dm->rf_calibrate_info.is_iqk_in_progress) {
|
||||
RF_DBG(dm, DBG_RF_IQK,
|
||||
"== FW IQK TIMEOUT (Still in progress after 500ms) ==\n");
|
||||
+ }
|
||||
} else {
|
||||
_phy_iq_calibrate_8812a(dm, *dm->channel);
|
||||
}
|
||||
diff --git a/drivers/staging/rtl8812au/hal/phydm/phydm_beamforming.c b/drivers/staging/rtl8812au/hal/phydm/phydm_beamforming.c
|
||||
index 952b5600b..28ab2dd54 100644
|
||||
--- a/drivers/staging/rtl8812au/hal/phydm/phydm_beamforming.c
|
||||
+++ b/drivers/staging/rtl8812au/hal/phydm/phydm_beamforming.c
|
||||
@@ -1196,10 +1196,11 @@ void phydm_beamforming_notify(
|
||||
/*@if (sound_info->sound_mode == SOUNDING_SW_VHT_TIMER || sound_info->sound_mode == SOUNDING_SW_HT_TIMER)
|
||||
odm_set_timer(dm, &beam_info->beamforming_timer, sound_info->sound_period);*/
|
||||
odm_set_timer(dm, &beam_info->beamforming_timer, 1000); /*@Do MU sounding every 1sec*/
|
||||
- } else
|
||||
+ } else {
|
||||
PHYDM_DBG(dm, DBG_TXBF,
|
||||
"%s: Less or larger than 2 MU STAs, not to set timer\n",
|
||||
__func__);
|
||||
+ }
|
||||
break;
|
||||
|
||||
case BEAMFORMEE_NOTIFY_DELETE_MU:
|
||||
--
|
||||
2.41.1
|
||||
|
||||
+42
@@ -0,0 +1,42 @@
|
||||
From 18bb3090b6c0876842813ac10d1822412f51e97e Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Giuseppe=20Ghib=C3=B2?= <ghibo@mageia.org>
|
||||
Date: Thu, 21 Nov 2024 17:07:41 +0100
|
||||
Subject: [PATCH 10/10] rtl8812au: add missed prototypes
|
||||
|
||||
---
|
||||
drivers/staging/rtl8812au/os_dep/linux/ioctl_cfg80211.c | 7 +++++++
|
||||
drivers/staging/rtl8812au/os_dep/linux/usb_ops_linux.c | 1 +
|
||||
2 files changed, 8 insertions(+)
|
||||
|
||||
diff --git a/drivers/staging/rtl8812au/os_dep/linux/ioctl_cfg80211.c b/drivers/staging/rtl8812au/os_dep/linux/ioctl_cfg80211.c
|
||||
index c0f563430..72538365a 100644
|
||||
--- a/drivers/staging/rtl8812au/os_dep/linux/ioctl_cfg80211.c
|
||||
+++ b/drivers/staging/rtl8812au/os_dep/linux/ioctl_cfg80211.c
|
||||
@@ -2151,6 +2151,12 @@
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
|
||||
int link_id,
|
||||
#endif
|
||||
+ u8 key_index);
|
||||
+int cfg80211_rtw_set_default_mgmt_key(struct wiphy *wiphy,
|
||||
+ struct net_device *ndev,
|
||||
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
|
||||
+ int link_id,
|
||||
+#endif
|
||||
u8 key_index)
|
||||
{
|
||||
#define SET_DEF_KEY_PARAM_FMT " key_index=%d"
|
||||
diff --git a/drivers/staging/rtl8812au/os_dep/linux/usb_ops_linux.c b/drivers/staging/rtl8812au/os_dep/linux/usb_ops_linux.c
|
||||
index c7eb7ea40..9ced824fe 100644
|
||||
--- a/drivers/staging/rtl8812au/os_dep/linux/usb_ops_linux.c
|
||||
+++ b/drivers/staging/rtl8812au/os_dep/linux/usb_ops_linux.c
|
||||
@@ -898,6 +898,7 @@ void usb_recv_tasklet(unsigned long priv)
|
||||
}
|
||||
}
|
||||
|
||||
+void usb_read_port_complete(struct urb *purb, struct pt_regs *regs);
|
||||
void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
|
||||
{
|
||||
struct recv_buf *precvbuf = (struct recv_buf *)purb->context;
|
||||
--
|
||||
2.41.1
|
||||
|
||||
+33
@@ -0,0 +1,33 @@
|
||||
From c0d16813f5af3b464cdb6dd415c83d1f238e3548 Mon Sep 17 00:00:00 2001
|
||||
From: CamiKaseM7 <camilorivasramunni@gmail.com>
|
||||
Date: Tue, 16 Jan 2024 03:44:34 -0300
|
||||
Subject: [PATCH 122/132] Fix change_beacon for kernel 6.7
|
||||
|
||||
---
|
||||
os_dep/linux/ioctl_cfg80211.c | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/drivers/staging/rtl8812au/os_dep/linux/ioctl_cfg80211.c b/drivers/staging/rtl8812au/os_dep/linux/ioctl_cfg80211.c
|
||||
index 510fa45..a135804 100644
|
||||
--- a/drivers/staging/rtl8812au/os_dep/linux/ioctl_cfg80211.c
|
||||
+++ b/drivers/staging/rtl8812au/os_dep/linux/ioctl_cfg80211.c
|
||||
@@ -5283,9 +5283,16 @@ exit:
|
||||
return ret;
|
||||
}
|
||||
|
||||
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 7, 0))
|
||||
+static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *ndev,
|
||||
+ struct cfg80211_ap_update *params)
|
||||
+{
|
||||
+ struct cfg80211_beacon_data *info = ¶ms->beacon;
|
||||
+#else
|
||||
static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *ndev,
|
||||
struct cfg80211_beacon_data *info)
|
||||
{
|
||||
+#endif
|
||||
int ret = 0;
|
||||
_adapter *adapter = (_adapter *)rtw_netdev_priv(ndev);
|
||||
|
||||
--
|
||||
2.41.1
|
||||
|
||||
+27
@@ -0,0 +1,27 @@
|
||||
From d3feb6ae9398834d7778c0e43ebd1fa757eaecd8 Mon Sep 17 00:00:00 2001
|
||||
From: alium <info@aloisnespor.info>
|
||||
Date: Tue, 12 Mar 2024 07:11:35 +0100
|
||||
Subject: [PATCH 123/132] Update os_intfs.c for kernel 6.8
|
||||
|
||||
---
|
||||
os_dep/linux/os_intfs.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/drivers/staging/rtl8812au/os_dep/linux/os_intfs.c b/drivers/staging/rtl8812au/os_dep/linux/os_intfs.c
|
||||
index 2dadae0..f4f2ef9 100644
|
||||
--- a/drivers/staging/rtl8812au/os_dep/linux/os_intfs.c
|
||||
+++ b/drivers/staging/rtl8812au/os_dep/linux/os_intfs.c
|
||||
@@ -17,6 +17,10 @@
|
||||
#include <drv_types.h>
|
||||
#include <hal_data.h>
|
||||
|
||||
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 8, 0))
|
||||
+#define strlcpy strscpy
|
||||
+#endif
|
||||
+
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_DESCRIPTION("Realtek Wireless Lan Driver");
|
||||
MODULE_AUTHOR("Realtek Semiconductor Corp.");
|
||||
--
|
||||
2.41.1
|
||||
|
||||
+25
@@ -0,0 +1,25 @@
|
||||
From 88d0f5ca85cb8f6a7970ccca9d06a5aa424a18b2 Mon Sep 17 00:00:00 2001
|
||||
From: alium <info@aloisnespor.info>
|
||||
Date: Tue, 12 Mar 2024 07:14:38 +0100
|
||||
Subject: [PATCH 124/132] Update usb_intf.c for kernel 6.8
|
||||
|
||||
---
|
||||
os_dep/linux/usb_intf.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/staging/rtl8812au/os_dep/linux/usb_intf.c b/drivers/staging/rtl8812au/os_dep/linux/usb_intf.c
|
||||
index be0f654..709e935 100644
|
||||
--- a/drivers/staging/rtl8812au/os_dep/linux/usb_intf.c
|
||||
+++ b/drivers/staging/rtl8812au/os_dep/linux/usb_intf.c
|
||||
@@ -270,7 +270,7 @@ struct rtw_usb_drv usb_drv = {
|
||||
.usbdrv.supports_autosuspend = 1,
|
||||
#endif
|
||||
|
||||
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19))
|
||||
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19)) && (LINUX_VERSION_CODE < KERNEL_VERSION(6, 8, 0))
|
||||
.usbdrv.drvwrap.driver.shutdown = rtw_dev_shutdown,
|
||||
#else
|
||||
.usbdrv.driver.shutdown = rtw_dev_shutdown,
|
||||
--
|
||||
2.41.1
|
||||
|
||||
+35
@@ -0,0 +1,35 @@
|
||||
From 860ccf31655e160ec921190e443f0b532d8d3308 Mon Sep 17 00:00:00 2001
|
||||
From: alium <info@aloisnespor.info>
|
||||
Date: Sat, 30 Mar 2024 09:50:44 +0100
|
||||
Subject: [PATCH 128/132] Update ioctl_cfg80211.c - support for kernel 6.9
|
||||
|
||||
support for kernel 6.9
|
||||
---
|
||||
drivers/staging/rtl8812au/os_dep/linux/ioctl_cfg80211.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/staging/rtl8812au/os_dep/linux/ioctl_cfg80211.c b/drivers/staging/rtl8812au/os_dep/linux/ioctl_cfg80211.c
|
||||
index a135804..c1f20e9 100644
|
||||
--- a/drivers/staging/rtl8812au/os_dep/linux/ioctl_cfg80211.c
|
||||
+++ b/drivers/staging/rtl8812au/os_dep/linux/ioctl_cfg80211.c
|
||||
@@ -460,7 +460,7 @@ u8 rtw_cfg80211_ch_switch_notify(_adapter *adapter, u8 ch, u8 bw, u8 offset,
|
||||
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0))
|
||||
if (started) {
|
||||
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0))
|
||||
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(6, 9, 0))
|
||||
cfg80211_ch_switch_started_notify(adapter->pnetdev, &chdef, 0, 0, false, 0);
|
||||
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
|
||||
cfg80211_ch_switch_started_notify(adapter->pnetdev, &chdef, 0, 0, false);
|
||||
@@ -476,7 +476,7 @@ u8 rtw_cfg80211_ch_switch_notify(_adapter *adapter, u8 ch, u8 bw, u8 offset,
|
||||
if (!rtw_cfg80211_allow_ch_switch_notify(adapter))
|
||||
goto exit;
|
||||
|
||||
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0))
|
||||
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(6, 9, 0))
|
||||
cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0, 0);
|
||||
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 2))
|
||||
cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0);
|
||||
--
|
||||
2.41.1
|
||||
|
||||
+4
-6
@@ -30,13 +30,11 @@ diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/22000.c b/drivers/net/wirele
|
||||
index 3bdd6774716d..3c6dc3601784 100644
|
||||
--- a/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
|
||||
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
|
||||
@@ -1065,3 +1065,7 @@ MODULE_FIRMWARE(IWL_BNJ_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
|
||||
MODULE_FIRMWARE(IWL_BZ_A_FM4_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
|
||||
MODULE_FIRMWARE(IWL_GL_B_FM_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
|
||||
MODULE_FIRMWARE(IWL_BNJ_B_FM_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
|
||||
@@ -426,3 +426,7 @@
|
||||
MODULE_FIRMWARE(IWL_QUZ_A_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
|
||||
MODULE_FIRMWARE(IWL_QUZ_A_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
|
||||
MODULE_FIRMWARE(IWL_CC_A_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
|
||||
+
|
||||
+MODULE_FIRMWARE("iwlwifi-so-a0-gf4-a0.pnvm");
|
||||
+MODULE_FIRMWARE("iwlwifi-so-a0-gf-a0.pnvm");
|
||||
+MODULE_FIRMWARE("iwlwifi-ty-a0-gf-a0.pnvm");
|
||||
--
|
||||
2.35.3
|
||||
|
||||
+42
@@ -0,0 +1,42 @@
|
||||
From 09fcdbd28404b7e02cc9fc4862ae5b43b76867c0 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
|
||||
Date: Mon, 22 May 2023 22:24:24 +0200
|
||||
Subject: [PATCH] mmc: sdio: Add/rename SDIO ID of the RTL8723DS SDIO wifi
|
||||
cards
|
||||
|
||||
RTL8723DS comes in two variant and each of them has their own SDIO ID:
|
||||
- 0xd723 can connect two antennas. The WiFi part is still 1x1 so the
|
||||
second antenna can be dedicated to Bluetooth
|
||||
- 0xd724 can only connect one antenna so it's shared between WiFi and
|
||||
Bluetooth
|
||||
|
||||
Add a new entry for the single antenna RTL8723DS (0xd724) which can be
|
||||
found on the MangoPi MQ-Quad. Also rename the existing RTL8723DS entry
|
||||
(0xd723) so it's name reflects that it's the variant with support for
|
||||
two antennas.
|
||||
|
||||
Reviewed-by: Ping-Ke Shih <pkshih@realtek.com>
|
||||
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
|
||||
Signed-off-by: Kalle Valo <kvalo@kernel.org>
|
||||
Link: https://lore.kernel.org/r/20230522202425.1827005-4-martin.blumenstingl@googlemail.com
|
||||
---
|
||||
include/linux/mmc/sdio_ids.h | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h
|
||||
index c653accdc7fd..7fada7a714fe 100644
|
||||
--- a/include/linux/mmc/sdio_ids.h
|
||||
+++ b/include/linux/mmc/sdio_ids.h
|
||||
@@ -121,7 +121,8 @@
|
||||
#define SDIO_DEVICE_ID_REALTEK_RTW8822BS 0xb822
|
||||
#define SDIO_DEVICE_ID_REALTEK_RTW8821CS 0xc821
|
||||
#define SDIO_DEVICE_ID_REALTEK_RTW8822CS 0xc822
|
||||
-#define SDIO_DEVICE_ID_REALTEK_RTW8723DS 0xd723
|
||||
+#define SDIO_DEVICE_ID_REALTEK_RTW8723DS_2ANT 0xd723
|
||||
+#define SDIO_DEVICE_ID_REALTEK_RTW8723DS_1ANT 0xd724
|
||||
#define SDIO_DEVICE_ID_REALTEK_RTW8821DS 0xd821
|
||||
|
||||
#define SDIO_VENDOR_ID_SIANO 0x039a
|
||||
--
|
||||
2.41.0
|
||||
|
||||
+19
-19
@@ -6,9 +6,9 @@
|
||||
drivers/platform/x86/shuttle-wmi.c | 1297 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
5 files changed, 1393 insertions(+)
|
||||
|
||||
diff -Nurp linux-5.15.1/Documentation/ABI/testing/sysfs-platform-shuttle-wmi linux-5.15.1-shuttle/Documentation/ABI/testing/sysfs-platform-shuttle-wmi
|
||||
--- linux-5.15.1/Documentation/ABI/testing/sysfs-platform-shuttle-wmi 1970-01-01 02:00:00.000000000 +0200
|
||||
+++ linux-5.15.1-shuttle/Documentation/ABI/testing/sysfs-platform-shuttle-wmi 2021-11-08 23:24:45.468092228 +0200
|
||||
diff -up linux-6.11/Documentation/ABI/testing/sysfs-platform-shuttle-wmi.wmi linux-6.11/Documentation/ABI/testing/sysfs-platform-shuttle-wmi
|
||||
--- linux-6.11/Documentation/ABI/testing/sysfs-platform-shuttle-wmi.wmi 2024-11-18 10:43:15.072608505 +0100
|
||||
+++ linux-6.11/Documentation/ABI/testing/sysfs-platform-shuttle-wmi 2024-11-18 10:43:15.072608505 +0100
|
||||
@@ -0,0 +1,72 @@
|
||||
+What: /sys/devices/platform/shuttle_wmi/lcd_auto_adjust
|
||||
+Date: December 2010
|
||||
@@ -82,10 +82,10 @@ diff -Nurp linux-5.15.1/Documentation/ABI/testing/sysfs-platform-shuttle-wmi lin
|
||||
+ shuttle wmi documentation. It also starts an auto adjust and
|
||||
+ color adjust cycle. The function should only work in shuttle
|
||||
+ machines with LCD attached to an analog VGA connector.
|
||||
diff -Nurp linux-5.15.1/drivers/platform/x86/Kconfig linux-5.15.1-shuttle/drivers/platform/x86/Kconfig
|
||||
--- linux-5.15.1/drivers/platform/x86/Kconfig 2021-10-31 22:53:10.000000000 +0200
|
||||
+++ linux-5.15.1-shuttle/drivers/platform/x86/Kconfig 2021-11-08 23:24:45.469092275 +0200
|
||||
@@ -879,6 +879,21 @@ config PANASONIC_LAPTOP
|
||||
diff -up linux-6.11/drivers/platform/x86/Kconfig.wmi linux-6.11/drivers/platform/x86/Kconfig
|
||||
--- linux-6.11/drivers/platform/x86/Kconfig.wmi 2024-11-18 00:42:21.841340904 +0100
|
||||
+++ linux-6.11/drivers/platform/x86/Kconfig 2024-11-18 10:43:15.072608505 +0100
|
||||
@@ -947,6 +947,21 @@ config PANASONIC_LAPTOP
|
||||
If you have a Panasonic Let's note laptop (such as the R1(N variant),
|
||||
R2, R3, R5, T2, W2 and Y2 series), say Y.
|
||||
|
||||
@@ -107,10 +107,10 @@ diff -Nurp linux-5.15.1/drivers/platform/x86/Kconfig linux-5.15.1-shuttle/driver
|
||||
config SONY_LAPTOP
|
||||
tristate "Sony Laptop Extras"
|
||||
depends on ACPI
|
||||
diff -Nurp linux-5.15.1/drivers/platform/x86/Makefile linux-5.15.1-shuttle/drivers/platform/x86/Makefile
|
||||
--- linux-5.15.1/drivers/platform/x86/Makefile 2021-10-31 22:53:10.000000000 +0200
|
||||
+++ linux-5.15.1-shuttle/drivers/platform/x86/Makefile 2021-11-08 23:24:45.469092275 +0200
|
||||
@@ -84,6 +84,9 @@ obj-$(CONFIG_PCENGINES_APU2) += pcengine
|
||||
diff -up linux-6.11/drivers/platform/x86/Makefile.wmi linux-6.11/drivers/platform/x86/Makefile
|
||||
--- linux-6.11/drivers/platform/x86/Makefile.wmi 2024-09-15 16:57:56.000000000 +0200
|
||||
+++ linux-6.11/drivers/platform/x86/Makefile 2024-11-18 10:43:15.072608505 +0100
|
||||
@@ -98,6 +98,9 @@ obj-$(CONFIG_BARCO_P50_GPIO) += barco-p5
|
||||
obj-$(CONFIG_SAMSUNG_LAPTOP) += samsung-laptop.o
|
||||
obj-$(CONFIG_SAMSUNG_Q10) += samsung-q10.o
|
||||
|
||||
@@ -120,9 +120,9 @@ diff -Nurp linux-5.15.1/drivers/platform/x86/Makefile linux-5.15.1-shuttle/drive
|
||||
# Toshiba
|
||||
obj-$(CONFIG_TOSHIBA_BT_RFKILL) += toshiba_bluetooth.o
|
||||
obj-$(CONFIG_TOSHIBA_HAPS) += toshiba_haps.o
|
||||
diff -Nurp linux-5.15.1/drivers/platform/x86/shuttle-wmi.c linux-5.15.1-shuttle/drivers/platform/x86/shuttle-wmi.c
|
||||
--- linux-5.15.1/drivers/platform/x86/shuttle-wmi.c 1970-01-01 02:00:00.000000000 +0200
|
||||
+++ linux-5.15.1-shuttle/drivers/platform/x86/shuttle-wmi.c 2021-11-08 23:24:45.468092228 +0200
|
||||
diff -up linux-6.11/drivers/platform/x86/shuttle-wmi.c.wmi linux-6.11/drivers/platform/x86/shuttle-wmi.c
|
||||
--- linux-6.11/drivers/platform/x86/shuttle-wmi.c.wmi 2024-11-18 10:43:15.072608505 +0100
|
||||
+++ linux-6.11/drivers/platform/x86/shuttle-wmi.c 2024-11-18 10:43:15.072608505 +0100
|
||||
@@ -0,0 +1,1297 @@
|
||||
+/*
|
||||
+ * ACPI-WMI driver for Shuttle WMI interface
|
||||
@@ -1421,10 +1421,10 @@ diff -Nurp linux-5.15.1/drivers/platform/x86/shuttle-wmi.c linux-5.15.1-shuttle/
|
||||
+
|
||||
+module_init(shuttle_wmi_init);
|
||||
+module_exit(shuttle_wmi_exit);
|
||||
diff -Nurp linux-5.18/MAINTAINERS.orig linux-5.18/MAINTAINERS
|
||||
--- linux-5.18/MAINTAINERS.orig
|
||||
+++ linux-5.18/MAINTAINERS
|
||||
@@ -17888,6 +17888,12 @@
|
||||
diff -up linux-6.11/MAINTAINERS.wmi linux-6.11/MAINTAINERS
|
||||
--- linux-6.11/MAINTAINERS.wmi 2024-11-18 00:42:21.251332731 +0100
|
||||
+++ linux-6.11/MAINTAINERS 2024-11-18 10:43:15.076608549 +0100
|
||||
@@ -20958,6 +20958,12 @@ S: Orphan
|
||||
F: drivers/media/platform/renesas/sh_vou.c
|
||||
F: include/media/drv-intf/sh_vou.h
|
||||
|
||||
@@ -1435,5 +1435,5 @@ diff -Nurp linux-5.18/MAINTAINERS.orig linux-5.18/MAINTAINERS
|
||||
+F: drivers/platform/x86/shuttle-wmi.c
|
||||
+
|
||||
SI2157 MEDIA DRIVER
|
||||
M: Antti Palosaari <crope@iki.fi>
|
||||
L: linux-media@vger.kernel.org
|
||||
S: Orphan
|
||||
|
||||
+105
@@ -0,0 +1,105 @@
|
||||
From a3b125ceb45e1acd21c9bcb6d3a5c52897d536e6 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
|
||||
Date: Mon, 22 May 2023 22:24:25 +0200
|
||||
Subject: [PATCH] wifi: rtw88: Add support for the SDIO based RTL8723DS chipset
|
||||
|
||||
Wire up RTL8723DS chipset support using the rtw88 SDIO HCI code as well
|
||||
as the existing RTL8723D chipset code.
|
||||
|
||||
Reviewed-by: Ping-Ke Shih <pkshih@realtek.com>
|
||||
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
|
||||
Signed-off-by: Kalle Valo <kvalo@kernel.org>
|
||||
Link: https://lore.kernel.org/r/20230522202425.1827005-5-martin.blumenstingl@googlemail.com
|
||||
---
|
||||
drivers/net/wireless/realtek/rtw88/Kconfig | 11 +++++
|
||||
drivers/net/wireless/realtek/rtw88/Makefile | 3 ++
|
||||
.../net/wireless/realtek/rtw88/rtw8723ds.c | 41 +++++++++++++++++++
|
||||
3 files changed, 55 insertions(+)
|
||||
create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8723ds.c
|
||||
|
||||
diff --git a/drivers/net/wireless/realtek/rtw88/Kconfig b/drivers/net/wireless/realtek/rtw88/Kconfig
|
||||
index 29eb2f8e0eb7..cffad1c01249 100644
|
||||
--- a/drivers/net/wireless/realtek/rtw88/Kconfig
|
||||
+++ b/drivers/net/wireless/realtek/rtw88/Kconfig
|
||||
@@ -111,6 +111,17 @@ config RTW88_8723DE
|
||||
|
||||
802.11n PCIe wireless network adapter
|
||||
|
||||
+config RTW88_8723DS
|
||||
+ tristate "Realtek 8723DS SDIO wireless network adapter"
|
||||
+ depends on MMC
|
||||
+ select RTW88_CORE
|
||||
+ select RTW88_SDIO
|
||||
+ select RTW88_8723D
|
||||
+ help
|
||||
+ Select this option will enable support for 8723DS chipset
|
||||
+
|
||||
+ 802.11n SDIO wireless network adapter
|
||||
+
|
||||
config RTW88_8723DU
|
||||
tristate "Realtek 8723DU USB wireless network adapter"
|
||||
depends on USB
|
||||
diff --git a/drivers/net/wireless/realtek/rtw88/Makefile b/drivers/net/wireless/realtek/rtw88/Makefile
|
||||
index 82979b30ae8d..fd212c09d88a 100644
|
||||
--- a/drivers/net/wireless/realtek/rtw88/Makefile
|
||||
+++ b/drivers/net/wireless/realtek/rtw88/Makefile
|
||||
@@ -50,6 +50,9 @@ rtw88_8723d-objs := rtw8723d.o rtw8723d_table.o
|
||||
obj-$(CONFIG_RTW88_8723DE) += rtw88_8723de.o
|
||||
rtw88_8723de-objs := rtw8723de.o
|
||||
|
||||
+obj-$(CONFIG_RTW88_8723DS) += rtw88_8723ds.o
|
||||
+rtw88_8723ds-objs := rtw8723ds.o
|
||||
+
|
||||
obj-$(CONFIG_RTW88_8723DU) += rtw88_8723du.o
|
||||
rtw88_8723du-objs := rtw8723du.o
|
||||
|
||||
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8723ds.c b/drivers/net/wireless/realtek/rtw88/rtw8723ds.c
|
||||
new file mode 100644
|
||||
index 000000000000..e5b6960ba0a0
|
||||
--- /dev/null
|
||||
+++ b/drivers/net/wireless/realtek/rtw88/rtw8723ds.c
|
||||
@@ -0,0 +1,41 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
|
||||
+/* Copyright(c) Martin Blumenstingl <martin.blumenstingl@googlemail.com>
|
||||
+ */
|
||||
+
|
||||
+#include <linux/mmc/sdio_func.h>
|
||||
+#include <linux/mmc/sdio_ids.h>
|
||||
+#include <linux/module.h>
|
||||
+#include "main.h"
|
||||
+#include "rtw8723d.h"
|
||||
+#include "sdio.h"
|
||||
+
|
||||
+static const struct sdio_device_id rtw_8723ds_id_table[] = {
|
||||
+ {
|
||||
+ SDIO_DEVICE(SDIO_VENDOR_ID_REALTEK,
|
||||
+ SDIO_DEVICE_ID_REALTEK_RTW8723DS_1ANT),
|
||||
+ .driver_data = (kernel_ulong_t)&rtw8723d_hw_spec,
|
||||
+ },
|
||||
+ {
|
||||
+ SDIO_DEVICE(SDIO_VENDOR_ID_REALTEK,
|
||||
+ SDIO_DEVICE_ID_REALTEK_RTW8723DS_2ANT),
|
||||
+ .driver_data = (kernel_ulong_t)&rtw8723d_hw_spec,
|
||||
+ },
|
||||
+ {}
|
||||
+};
|
||||
+MODULE_DEVICE_TABLE(sdio, rtw_8723ds_id_table);
|
||||
+
|
||||
+static struct sdio_driver rtw_8723ds_driver = {
|
||||
+ .name = "rtw_8723ds",
|
||||
+ .probe = rtw_sdio_probe,
|
||||
+ .remove = rtw_sdio_remove,
|
||||
+ .id_table = rtw_8723ds_id_table,
|
||||
+ .drv = {
|
||||
+ .pm = &rtw_sdio_pm_ops,
|
||||
+ .shutdown = rtw_sdio_shutdown,
|
||||
+ }
|
||||
+};
|
||||
+module_sdio_driver(rtw_8723ds_driver);
|
||||
+
|
||||
+MODULE_AUTHOR("Martin Blumenstingl <martin.blumenstingl@googlemail.com>");
|
||||
+MODULE_DESCRIPTION("Realtek 802.11n wireless 8723ds driver");
|
||||
+MODULE_LICENSE("Dual BSD/GPL");
|
||||
--
|
||||
2.41.0
|
||||
|
||||
+73
@@ -0,0 +1,73 @@
|
||||
From 9be20a82232779c59979527dfc8febca3182fee2 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
|
||||
Date: Mon, 22 May 2023 22:24:23 +0200
|
||||
Subject: [PATCH] wifi: rtw88: rtw8723d: Implement RTL8723DS (SDIO) efuse
|
||||
parsing
|
||||
|
||||
The efuse of the SDIO RTL8723DS chip has only one known member: the mac
|
||||
address is at offset 0x11a. Add a struct rtw8723ds_efuse describing this
|
||||
and use it for copying the mac address when the SDIO bus is used.
|
||||
|
||||
Reviewed-by: Ping-Ke Shih <pkshih@realtek.com>
|
||||
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
|
||||
Signed-off-by: Kalle Valo <kvalo@kernel.org>
|
||||
Link: https://lore.kernel.org/r/20230522202425.1827005-3-martin.blumenstingl@googlemail.com
|
||||
---
|
||||
drivers/net/wireless/realtek/rtw88/rtw8723d.c | 9 +++++++++
|
||||
drivers/net/wireless/realtek/rtw88/rtw8723d.h | 6 ++++++
|
||||
2 files changed, 15 insertions(+)
|
||||
|
||||
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8723d.c b/drivers/net/wireless/realtek/rtw88/rtw8723d.c
|
||||
index 06e7454c9ca6..cadf66f4e854 100644
|
||||
--- a/drivers/net/wireless/realtek/rtw88/rtw8723d.c
|
||||
+++ b/drivers/net/wireless/realtek/rtw88/rtw8723d.c
|
||||
@@ -216,6 +216,12 @@ static void rtw8723du_efuse_parsing(struct rtw_efuse *efuse,
|
||||
ether_addr_copy(efuse->addr, map->u.mac_addr);
|
||||
}
|
||||
|
||||
+static void rtw8723ds_efuse_parsing(struct rtw_efuse *efuse,
|
||||
+ struct rtw8723d_efuse *map)
|
||||
+{
|
||||
+ ether_addr_copy(efuse->addr, map->s.mac_addr);
|
||||
+}
|
||||
+
|
||||
static int rtw8723d_read_efuse(struct rtw_dev *rtwdev, u8 *log_map)
|
||||
{
|
||||
struct rtw_efuse *efuse = &rtwdev->efuse;
|
||||
@@ -248,6 +254,9 @@ static int rtw8723d_read_efuse(struct rtw_dev *rtwdev, u8 *log_map)
|
||||
case RTW_HCI_TYPE_USB:
|
||||
rtw8723du_efuse_parsing(efuse, map);
|
||||
break;
|
||||
+ case RTW_HCI_TYPE_SDIO:
|
||||
+ rtw8723ds_efuse_parsing(efuse, map);
|
||||
+ break;
|
||||
default:
|
||||
/* unsupported now */
|
||||
return -ENOTSUPP;
|
||||
diff --git a/drivers/net/wireless/realtek/rtw88/rtw8723d.h b/drivers/net/wireless/realtek/rtw88/rtw8723d.h
|
||||
index a356318a5c15..3642a2c7f80c 100644
|
||||
--- a/drivers/net/wireless/realtek/rtw88/rtw8723d.h
|
||||
+++ b/drivers/net/wireless/realtek/rtw88/rtw8723d.h
|
||||
@@ -49,6 +49,11 @@ struct rtw8723du_efuse {
|
||||
u8 mac_addr[ETH_ALEN]; /* 0x107 */
|
||||
};
|
||||
|
||||
+struct rtw8723ds_efuse {
|
||||
+ u8 res4[0x4a]; /* 0xd0 */
|
||||
+ u8 mac_addr[ETH_ALEN]; /* 0x11a */
|
||||
+};
|
||||
+
|
||||
struct rtw8723d_efuse {
|
||||
__le16 rtl_id;
|
||||
u8 rsvd[2];
|
||||
@@ -80,6 +85,7 @@ struct rtw8723d_efuse {
|
||||
union {
|
||||
struct rtw8723de_efuse e;
|
||||
struct rtw8723du_efuse u;
|
||||
+ struct rtw8723ds_efuse s;
|
||||
};
|
||||
};
|
||||
|
||||
--
|
||||
2.41.0
|
||||
|
||||
Reference in New Issue
Block a user