Skip to contentSkip to conversation

Resolve RF Type mismatch

PATCH In review Kangmin Park 3 participants 5 messages Feb 6, 2018 – Feb 7, 2018 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Resolve RF Type mismatch

From: pr0gr4m <[email protected]>

---
 drivers/staging/rtl8723bs/hal/odm.h               | 17 +++++++++--------
 drivers/staging/rtl8723bs/hal/rtl8723b_dm.c       | 16 ++++++++++++++--
 drivers/staging/rtl8723bs/include/rtw_rf.h        | 15 ++++++++++-----
 drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 12 ++++++++++--
 4 files changed, 43 insertions(+), 17 deletions(-)
drivers/staging/rtl8723bs/hal/odm.h +9 -8
index 87a76ba..dbb78fe 100644
@@ -511,14 +511,15 @@ typedef enum tag_ODM_RF_Path_Bit_Definition {
 
 
 typedef enum tag_ODM_RF_Type_Definition {
-	ODM_1T1R	=	0,
-	ODM_1T2R	=	1,
-	ODM_2T2R	=	2,
-	ODM_2T3R	=	3,
-	ODM_2T4R	=	4,
-	ODM_3T3R	=	5,
-	ODM_3T4R	=	6,
-	ODM_4T4R	=	7,
+	ODM_1T1R		=	0,
+	ODM_1T2R		=	1,
+	ODM_2T2R		=	2,
+	ODM_2T2R_GREEN	=	3,
+	ODM_2T3R		=	4,
+	ODM_2T4R		=	5,
+	ODM_3T3R		=	6,
+	ODM_3T4R		=	7,
+	ODM_4T4R		=	8,
 } ODM_RF_TYPE_E;
 
 
drivers/staging/rtl8723bs/hal/rtl8723b_dm.c +14 -2
index b162559..20dcdcd 100644
@@ -64,10 +64,22 @@ static void Init_ODM_ComInfo_8723b(struct adapter *Adapter)
 
 	if (pHalData->rf_type == RF_1T1R) {
 		ODM_CmnInfoUpdate(pDM_Odm, ODM_CMNINFO_RF_TYPE, ODM_1T1R);
-	} else if (pHalData->rf_type == RF_2T2R) {
-		ODM_CmnInfoUpdate(pDM_Odm, ODM_CMNINFO_RF_TYPE, ODM_2T2R);
 	} else if (pHalData->rf_type == RF_1T2R) {
 		ODM_CmnInfoUpdate(pDM_Odm, ODM_CMNINFO_RF_TYPE, ODM_1T2R);
+	} else if (pHalData->rf_type == RF_2T2R) {
+		ODM_CmnInfoUpdate(pDM_Odm, ODM_CMNINFO_RF_TYPE, ODM_2T2R);
+	} else if (pHalData->rf_type == RF_2T2R_GREEN) {
+		ODM_CmnInfoUpdate(pDM_Odm, ODM_CMNINFO_RF_TYPE, ODM_2T2R_GREEN);
+	} else if (pHalData->rf_type == RF_2T3R) {
+		ODM_CmnInfoUpdate(pDM_Odm, ODM_CMNINFO_RF_TYPE, ODM_2T3R);
+	} else if (pHalData->rf_type == RF_2T4R) {
+		ODM_CmnInfoUpdate(pDM_Odm, ODM_CMNINFO_RF_TYPE, ODM_2T4R);
+	} else if (pHalData->rf_type == RF_3T3R) {
+		ODM_CmnInfoUpdate(pDM_Odm, ODM_CMNINFO_RF_TYPE, ODM_3T3R);
+	} else if (pHalData->rf_type == RF_3T4R) {
+		ODM_CmnInfoUpdate(pDM_Odm, ODM_CMNINFO_RF_TYPE, ODM_3T4R);
+	} else if (pHalData->rf_type == RF_4T4R) {
+		ODM_CmnInfoUpdate(pDM_Odm, ODM_CMNINFO_RF_TYPE, ODM_4T4R);
 	}
 
 	pdmpriv->InitODMFlag = ODM_RF_CALIBRATION|ODM_RF_TX_PWR_TRACK;
drivers/staging/rtl8723bs/include/rtw_rf.h +10 -5
index f9becab..7ef113d1 100644
@@ -146,12 +146,17 @@ enum PROTECTION_MODE {
 
 /* 2007/11/15 MH Define different RF type. */
 enum RT_RF_TYPE_DEFINITION {
-	RF_1T2R = 0,
-	RF_2T4R = 1,
+	RF_1T1R = 0,
+	RF_1T2R = 1,
 	RF_2T2R = 2,
-	RF_1T1R = 3,
-	RF_2T2R_GREEN = 4,
-	RF_MAX_TYPE = 5,
+	RF_2T2R_GREEN = 3,
+	RF_2T3R = 4,
+	RF_2T4R = 5,
+	RF_3T3R = 6,
+	RF_3T4R = 7,
+	RF_4T4R = 8,
+
+	RF_MAX_TYPE = 0xF
 };
 
 u32 rtw_ch2freq(u32 ch);
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +10 -2
index 51d48de..520d2f6 100644
@@ -3299,7 +3299,7 @@ static int cfg80211_rtw_sched_scan_stop(struct wiphy *wiphy,
 
 static void rtw_cfg80211_init_ht_capab(struct ieee80211_sta_ht_cap *ht_cap, enum nl80211_band band, u8 rf_type)
 {
-
+#define MAX_BIT_RATE_40MHZ_MCS23	450	/* Mbps */
 #define MAX_BIT_RATE_40MHZ_MCS15	300	/* Mbps */
 #define MAX_BIT_RATE_40MHZ_MCS7		150	/* Mbps */
 
@@ -3338,7 +3338,7 @@ static void rtw_cfg80211_init_ht_capab(struct ieee80211_sta_ht_cap *ht_cap, enum
 
 		ht_cap->mcs.rx_highest = cpu_to_le16(MAX_BIT_RATE_40MHZ_MCS7);
 	}
-	else if ((rf_type == RF_1T2R) || (rf_type ==RF_2T2R))
+	else if ((rf_type == RF_1T2R) || (rf_type == RF_2T2R) || (rf_type == RF_2T2R_GREEN))
 	{
 		ht_cap->mcs.rx_mask[0] = 0xFF;
 		ht_cap->mcs.rx_mask[1] = 0xFF;
@@ -3346,6 +3346,14 @@ static void rtw_cfg80211_init_ht_capab(struct ieee80211_sta_ht_cap *ht_cap, enum
 
 		ht_cap->mcs.rx_highest = cpu_to_le16(MAX_BIT_RATE_40MHZ_MCS15);
 	}
+	else if ((rf_type == RF_2T3R) || (rf_type == RF_3T3R))
+	{
+		ht_cap->mcs.rx_mask[0] = 0xFF;
+		ht_cap->mcs.rx_mask[1] = 0xFF;
+		ht_cap->mcs.rx_mask[2] = 0xFF;
+
+		ht_cap->mcs.rx_highest = cpu_to_le16(MAX_BIT_RATE_40MHZ_MCS23);
+	}
 	else
 	{
 		DBG_8192C("%s, error rf_type =%d\n", __func__, rf_type);
Signature · 6 lines
2.7.4

_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
#2 lore raw

Oops, Sorry for being stupid cuz of first time to use git email. RF_TYPE and ODM_RF_TYPE on staging/rtl8723bs is different from staging/rtlwifi 's - updated from v 4.14 -
So, I try to update code on staging/rtl8723bs in comparison with staging/rtlwifi.
commit message is "Update rf_type and odm_rf_type in comparison with drivers/staging/rtlwifi"

2018-02-07 1:08 GMT+09:00 Bastien Nocera <[email protected]>:

Quoted 5 lines · Kangmin Park
Quoted 1 line

From: pr0gr4m <[email protected]>

This needs a commit message. I don't understand what the code is trying to do.

_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

#3 lore raw

Also the patch prefix is wrong in the email subject. It should say,

[PATCH] staging: rtl8723bs: Resolve RF Type mismatch

Quoted 1 line · Kangmin Park

Oops, Sorry for being stupid cuz of first time to use git email.

No problem. We were all newbies once. Send the email to yourself first and try applying it with git am, then review the patch with git log -p.

Quoted 6 lines

RF_TYPE and ODM_RF_TYPE on staging/rtl8723bs is different from staging/rtlwifi 's - updated from v 4.14 -
So, I try to update code on staging/rtl8723bs in comparison with staging/rtlwifi.
commit message is "Update rf_type and odm_rf_type in comparison with drivers/staging/rtlwifi"

It needs a longer commit message than this. Also it probably needs to be tested. I tried for about 10 seconds to find which patch you were referring that updated staging/rtlwifi but I gave up. What is the git hash and subject?

regards,
dan carpenter

_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

#4 lore raw
In reply to Kangmin Park
Quoted 1 line · Kangmin Park

From: pr0gr4m <[email protected]>

No changelog, no sign-off. Changelogs are required but especially in this case, it's not immediately obvious what this patch is about.

This patch has unrelated white space changes as well. Here is how the rules work:

drivers/staging/rtl8723bs/hal/odm.h typedef enum tag_ODM_RF_Path_Bit_Definition { · line 514

Quoted 2 lines
drivers/staging/rtl8723bs/hal/odm.h +1 -1
-	ODM_1T1R	=	0,
+	ODM_1T1R		=	0,

This are unrelated.

This white space change is on the same line so that's fine (it's related).

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c static void rtw_cfg80211_init_ht_capab(struct ieee80211_sta_ht_cap *ht_cap, enum · line 3341

Quoted 2 lines
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +1 -1
-	else if ((rf_type == RF_1T2R) || (rf_type ==RF_2T2R))
+	else if ((rf_type == RF_1T2R) || (rf_type == RF_2T2R) || (rf_type == RF_2T2R_GREEN))

regards,
dan carpenter

_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel