| Message ID | 1445575816-4500-1-git-send-email-yanbol@qca.qualcomm.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
Yanbo Li <yanbol@qca.qualcomm.com> writes: > The QCA99X0 4 addresses RX packets pad 2 bytes at the beginning of > MSDU instead the end of ieee80211 header to keep align. The currently > RX data path can't parse the header correctly in this case. This > patch fixes it for QCA99X0 > > Signed-off-by: Yanbo Li <yanbol@qca.qualcomm.com> > > diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c > index 13de3617d5ab..3c1d07c191d5 100644 > --- a/drivers/net/wireless/ath/ath10k/core.c > +++ b/drivers/net/wireless/ath/ath10k/core.c > @@ -58,6 +58,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { > .otp_exe_param = 0, > .channel_counters_freq_hz = 88000, > .max_probe_resp_desc_thres = 0, > + .loc_4addr_pad = ATH10K_4ADDR_PAD_AFT, > .fw = { > .dir = QCA988X_HW_2_0_FW_DIR, > .fw = QCA988X_HW_2_0_FW_FILE, > @@ -75,6 +76,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { > .otp_exe_param = 0, > .channel_counters_freq_hz = 88000, > .max_probe_resp_desc_thres = 0, > + .loc_4addr_pad = ATH10K_4ADDR_PAD_AFT, > .fw = { > .dir = QCA6174_HW_2_1_FW_DIR, > .fw = QCA6174_HW_2_1_FW_FILE, > @@ -92,6 +94,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { > .otp_exe_param = 0, > .channel_counters_freq_hz = 88000, > .max_probe_resp_desc_thres = 0, > + .loc_4addr_pad = ATH10K_4ADDR_PAD_AFT, > .fw = { > .dir = QCA6174_HW_3_0_FW_DIR, > .fw = QCA6174_HW_3_0_FW_FILE, > @@ -109,6 +112,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { > .otp_exe_param = 0, > .channel_counters_freq_hz = 88000, > .max_probe_resp_desc_thres = 0, > + .loc_4addr_pad = ATH10K_4ADDR_PAD_AFT, > .fw = { > /* uses same binaries as hw3.0 */ > .dir = QCA6174_HW_3_0_FW_DIR, > @@ -128,6 +132,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { > .continuous_frag_desc = true, > .channel_counters_freq_hz = 150000, > .max_probe_resp_desc_thres = 24, > + .loc_4addr_pad = ATH10K_4ADDR_PAD_PRE, > .fw = { > .dir = QCA99X0_HW_2_0_FW_DIR, > .fw = QCA99X0_HW_2_0_FW_FILE, > diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h > index 7cc7cdd56c95..b4db8bbf85ce 100644 > --- a/drivers/net/wireless/ath/ath10k/core.h > +++ b/drivers/net/wireless/ath/ath10k/core.h > @@ -646,6 +646,9 @@ struct ath10k { > */ > u32 max_probe_resp_desc_thres; > > + /* The padding bytes's location is different on various chips */ > + enum ath10k_loc_4addr_pad loc_4addr_pad; I think that loc prefix is a bit misleading, it reminds me of locationing/positioning etc. What about ath10k_hw_4addr_pad?
> -----Original Message----- > From: Valo, Kalle > Sent: Thursday, October 22, 2015 10:25 PM > To: Li, Yanbo > Cc: dreamfly281@gmail.com; ath10k@lists.infradead.org; linux- > wireless@vger.kernel.org > Subject: Re: [PATCH] ath10k: Adjust the RX packet pad offset at QCA99X0 > 4addr mode > > Yanbo Li <yanbol@qca.qualcomm.com> writes: > > > The QCA99X0 4 addresses RX packets pad 2 bytes at the beginning of > > MSDU instead the end of ieee80211 header to keep align. The currently > > RX data path can't parse the header correctly in this case. This patch > > fixes it for QCA99X0 > > > > Signed-off-by: Yanbo Li <yanbol@qca.qualcomm.com> > > > > diff --git a/drivers/net/wireless/ath/ath10k/core.c > > b/drivers/net/wireless/ath/ath10k/core.c > > index 13de3617d5ab..3c1d07c191d5 100644 > > --- a/drivers/net/wireless/ath/ath10k/core.c > > +++ b/drivers/net/wireless/ath/ath10k/core.c > > @@ -58,6 +58,7 @@ static const struct ath10k_hw_params > ath10k_hw_params_list[] = { > > .otp_exe_param = 0, > > .channel_counters_freq_hz = 88000, > > .max_probe_resp_desc_thres = 0, > > + .loc_4addr_pad = ATH10K_4ADDR_PAD_AFT, > > .fw = { > > .dir = QCA988X_HW_2_0_FW_DIR, > > .fw = QCA988X_HW_2_0_FW_FILE, > > @@ -75,6 +76,7 @@ static const struct ath10k_hw_params > ath10k_hw_params_list[] = { > > .otp_exe_param = 0, > > .channel_counters_freq_hz = 88000, > > .max_probe_resp_desc_thres = 0, > > + .loc_4addr_pad = ATH10K_4ADDR_PAD_AFT, > > .fw = { > > .dir = QCA6174_HW_2_1_FW_DIR, > > .fw = QCA6174_HW_2_1_FW_FILE, > > @@ -92,6 +94,7 @@ static const struct ath10k_hw_params > ath10k_hw_params_list[] = { > > .otp_exe_param = 0, > > .channel_counters_freq_hz = 88000, > > .max_probe_resp_desc_thres = 0, > > + .loc_4addr_pad = ATH10K_4ADDR_PAD_AFT, > > .fw = { > > .dir = QCA6174_HW_3_0_FW_DIR, > > .fw = QCA6174_HW_3_0_FW_FILE, > > @@ -109,6 +112,7 @@ static const struct ath10k_hw_params > ath10k_hw_params_list[] = { > > .otp_exe_param = 0, > > .channel_counters_freq_hz = 88000, > > .max_probe_resp_desc_thres = 0, > > + .loc_4addr_pad = ATH10K_4ADDR_PAD_AFT, > > .fw = { > > /* uses same binaries as hw3.0 */ > > .dir = QCA6174_HW_3_0_FW_DIR, > > @@ -128,6 +132,7 @@ static const struct ath10k_hw_params > ath10k_hw_params_list[] = { > > .continuous_frag_desc = true, > > .channel_counters_freq_hz = 150000, > > .max_probe_resp_desc_thres = 24, > > + .loc_4addr_pad = ATH10K_4ADDR_PAD_PRE, > > .fw = { > > .dir = QCA99X0_HW_2_0_FW_DIR, > > .fw = QCA99X0_HW_2_0_FW_FILE, > > diff --git a/drivers/net/wireless/ath/ath10k/core.h > > b/drivers/net/wireless/ath/ath10k/core.h > > index 7cc7cdd56c95..b4db8bbf85ce 100644 > > --- a/drivers/net/wireless/ath/ath10k/core.h > > +++ b/drivers/net/wireless/ath/ath10k/core.h > > @@ -646,6 +646,9 @@ struct ath10k { > > */ > > u32 max_probe_resp_desc_thres; > > > > + /* The padding bytes's location is different on various chips */ > > + enum ath10k_loc_4addr_pad loc_4addr_pad; > > I think that loc prefix is a bit misleading, it reminds me of > locationing/positioning etc. What about ath10k_hw_4addr_pad? > There is already a FW feature defined as "ATH10K_FW_FEATURE_NO_NWIFI_DECAP_4ADDR_PADDIND" and the relative string is "no-4addr-pad", if we just remove the "loc" prefix, it may be confuse with this FW feature. How about we change the loc to offset in this case or any better suggestion? Thanks BR /Yanbo
"Li, Yanbo" <yanbol@qca.qualcomm.com> writes: >> > + /* The padding bytes's location is different on various chips */ >> > + enum ath10k_loc_4addr_pad loc_4addr_pad; >> >> I think that loc prefix is a bit misleading, it reminds me of >> locationing/positioning etc. What about ath10k_hw_4addr_pad? >> > > > There is already a FW feature defined as > "ATH10K_FW_FEATURE_NO_NWIFI_DECAP_4ADDR_PADDIND" and the relative > string is "no-4addr-pad", if we just remove the "loc" prefix, it may > be confuse with this FW feature. > > How about we change the loc to offset in this case or any better suggestion? I did some naming changes in the pending branch: https://git.kernel.org/cgit/linux/kernel/git/kvalo/ath.git/commit/?h=pending&id=42cd3832cd7c78bfeabb639a4086c7838fda5b57 Please review and let me know what you think.
Hi Kalle\Yanbo, On Mon, Nov 16, 2015 at 10:57:44PM +0200, Kalle Valo wrote: > "Li, Yanbo" <yanbol@qca.qualcomm.com> writes: > > >> > + /* The padding bytes's location is different on various chips */ > >> > + enum ath10k_loc_4addr_pad loc_4addr_pad; > >> > >> I think that loc prefix is a bit misleading, it reminds me of > >> locationing/positioning etc. What about ath10k_hw_4addr_pad? > >> > > > > > > There is already a FW feature defined as > > "ATH10K_FW_FEATURE_NO_NWIFI_DECAP_4ADDR_PADDIND" and the relative > > string is "no-4addr-pad", if we just remove the "loc" prefix, it may > > be confuse with this FW feature. > > > > How about we change the loc to offset in this case or any better suggestion? > > I did some naming changes in the pending branch: > > https://git.kernel.org/cgit/linux/kernel/git/kvalo/ath.git/commit/?h=pending&id=42cd3832cd7c78bfeabb639a4086c7838fda5b57 > > Please review and let me know what you think. Please merge this change, as this is a critical fix (I hope Yanbo is fine with the change in naming convention). I went through the change, it looks good to me and I had tested the earlier version and it fixed a Repeater mode bug. regards, shafi > > -- > Kalle Valo > -- > To unsubscribe from this list: send the line "unsubscribe linux-wireless" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
> -----Original Message----- > From: Shajakhan, Mohammed Shafi (Mohammed Shafi) > Sent: Friday, November 20, 2015 5:32 AM > To: Valo, Kalle > Cc: Li, Yanbo; linux-wireless@vger.kernel.org; ath10k@lists.infradead.org > Subject: Re: [PATCH] ath10k: Adjust the RX packet pad offset at QCA99X0 > 4addr mode > > Hi Kalle\Yanbo, > > On Mon, Nov 16, 2015 at 10:57:44PM +0200, Kalle Valo wrote: > > "Li, Yanbo" <yanbol@qca.qualcomm.com> writes: > > > > >> > + /* The padding bytes's location is different on various > chips */ > > >> > + enum ath10k_loc_4addr_pad loc_4addr_pad; > > >> > > >> I think that loc prefix is a bit misleading, it reminds me of > > >> locationing/positioning etc. What about ath10k_hw_4addr_pad? > > >> > > > > > > > > > There is already a FW feature defined as > > > "ATH10K_FW_FEATURE_NO_NWIFI_DECAP_4ADDR_PADDIND" and the > relative > > > string is "no-4addr-pad", if we just remove the "loc" prefix, it may > > > be confuse with this FW feature. > > > > > > How about we change the loc to offset in this case or any better > suggestion? > > > > I did some naming changes in the pending branch: > > > > https://git.kernel.org/cgit/linux/kernel/git/kvalo/ath.git/commit/?h=p > > ending&id=42cd3832cd7c78bfeabb639a4086c7838fda5b57 > > > > Please review and let me know what you think. Looks good to me, thanks Kalle. BR /Yanbo
Yanbo Li <yanbol@qca.qualcomm.com> writes: > The QCA99X0 4 addresses RX packets pad 2 bytes at the beginning of > MSDU instead the end of ieee80211 header to keep align. The currently > RX data path can't parse the header correctly in this case. This > patch fixes it for QCA99X0 > > Signed-off-by: Yanbo Li <yanbol@qca.qualcomm.com> Applied, thanks.
diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c index 13de3617d5ab..3c1d07c191d5 100644 --- a/drivers/net/wireless/ath/ath10k/core.c +++ b/drivers/net/wireless/ath/ath10k/core.c @@ -58,6 +58,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .otp_exe_param = 0, .channel_counters_freq_hz = 88000, .max_probe_resp_desc_thres = 0, + .loc_4addr_pad = ATH10K_4ADDR_PAD_AFT, .fw = { .dir = QCA988X_HW_2_0_FW_DIR, .fw = QCA988X_HW_2_0_FW_FILE, @@ -75,6 +76,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .otp_exe_param = 0, .channel_counters_freq_hz = 88000, .max_probe_resp_desc_thres = 0, + .loc_4addr_pad = ATH10K_4ADDR_PAD_AFT, .fw = { .dir = QCA6174_HW_2_1_FW_DIR, .fw = QCA6174_HW_2_1_FW_FILE, @@ -92,6 +94,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .otp_exe_param = 0, .channel_counters_freq_hz = 88000, .max_probe_resp_desc_thres = 0, + .loc_4addr_pad = ATH10K_4ADDR_PAD_AFT, .fw = { .dir = QCA6174_HW_3_0_FW_DIR, .fw = QCA6174_HW_3_0_FW_FILE, @@ -109,6 +112,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .otp_exe_param = 0, .channel_counters_freq_hz = 88000, .max_probe_resp_desc_thres = 0, + .loc_4addr_pad = ATH10K_4ADDR_PAD_AFT, .fw = { /* uses same binaries as hw3.0 */ .dir = QCA6174_HW_3_0_FW_DIR, @@ -128,6 +132,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { .continuous_frag_desc = true, .channel_counters_freq_hz = 150000, .max_probe_resp_desc_thres = 24, + .loc_4addr_pad = ATH10K_4ADDR_PAD_PRE, .fw = { .dir = QCA99X0_HW_2_0_FW_DIR, .fw = QCA99X0_HW_2_0_FW_FILE, diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h index 7cc7cdd56c95..b4db8bbf85ce 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -646,6 +646,9 @@ struct ath10k { */ u32 max_probe_resp_desc_thres; + /* The padding bytes's location is different on various chips */ + enum ath10k_loc_4addr_pad loc_4addr_pad; + struct ath10k_hw_params_fw { const char *dir; const char *fw; diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c index 6060dda4e910..f25f1d7a3edf 100644 --- a/drivers/net/wireless/ath/ath10k/htt_rx.c +++ b/drivers/net/wireless/ath/ath10k/htt_rx.c @@ -1114,7 +1114,19 @@ static void ath10k_htt_rx_h_undecap_nwifi(struct ath10k *ar, */ /* pull decapped header and copy SA & DA */ - hdr = (struct ieee80211_hdr *)msdu->data; + if ((ar->hw_params.loc_4addr_pad == ATH10K_4ADDR_PAD_PRE) && + ieee80211_has_a4(((struct ieee80211_hdr *)first_hdr)->frame_control)) { + /* The QCA99X0 4 address mode pad 2 bytes at the + * beginning of MSDU + */ + hdr = (struct ieee80211_hdr *)(msdu->data + 2); + /* The skb length need be extended 2 as the 2 bytes at the tail + * be excluded due to the padding + */ + skb_put(msdu, 2); + } else + hdr = (struct ieee80211_hdr *)(msdu->data); + hdr_len = ath10k_htt_rx_nwifi_hdrlen(ar, hdr); ether_addr_copy(da, ieee80211_get_DA(hdr)); ether_addr_copy(sa, ieee80211_get_SA(hdr)); diff --git a/drivers/net/wireless/ath/ath10k/hw.h b/drivers/net/wireless/ath/ath10k/hw.h index 2d87737e35ff..efbe6fa1f356 100644 --- a/drivers/net/wireless/ath/ath10k/hw.h +++ b/drivers/net/wireless/ath/ath10k/hw.h @@ -282,6 +282,11 @@ enum ath10k_hw_rate_cck { ATH10K_HW_RATE_CCK_SP_2M, }; +enum ath10k_loc_4addr_pad { + ATH10K_4ADDR_PAD_AFT, + ATH10K_4ADDR_PAD_PRE, +}; + /* Target specific defines for MAIN firmware */ #define TARGET_NUM_VDEVS 8 #define TARGET_NUM_PEER_AST 2
The QCA99X0 4 addresses RX packets pad 2 bytes at the beginning of MSDU instead the end of ieee80211 header to keep align. The currently RX data path can't parse the header correctly in this case. This patch fixes it for QCA99X0 Signed-off-by: Yanbo Li <yanbol@qca.qualcomm.com>