[kvalo-ath:ath-qca] BUILD SUCCESS 48f30a42d008c85b29a860cda3aa266942409519
tree/branch: https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git ath-qca branch HEAD: 48f30a42d008c85b29a860cda3aa266942409519 Merge branch 'ath-next' into ath-qca elapsed time: 6575m configs tested: 206 configs skipped: 4 The following configs have been built successfully. More configs may be tested in the coming days. gcc tested configs: arm64 defconfig arm64allyesconfig arm allmodconfig arm defconfig arm allyesconfig i386 randconfig-c001 ia64zx1_defconfig powerpc ppc64_defconfig arm imx_v6_v7_defconfig sh se7705_defconfig xtensa cadence_csp_defconfig arm stm32_defconfig riscv nommu_k210_sdcard_defconfig powerpc tqm8555_defconfig arm iop32x_defconfig arm h3600_defconfig arm cm_x300_defconfig powerpc eiger_defconfig mips ci20_defconfig sh se7721_defconfig m68k m5275evb_defconfig h8300 h8s-sim_defconfig sparcalldefconfig powerpc maple_defconfig arm viper_defconfig sparc sparc32_defconfig powerpc mgcoge_defconfig armpleb_defconfig sh secureedge5410_defconfig mips decstation_defconfig sh sdk7780_defconfig sh ecovec24_defconfig sh sh03_defconfig arcvdk_hs38_defconfig riscv defconfig powerpc holly_defconfig mipsar7_defconfig powerpcmpc7448_hpc2_defconfig armcerfcube_defconfig powerpc stx_gp3_defconfig arm64alldefconfig m68k sun3x_defconfig arc axs103_smp_defconfig armkeystone_defconfig parisc alldefconfig powerpc makalu_defconfig sh r7785rp_defconfig shapsh4ad0a_defconfig sh rts7751r2dplus_defconfig powerpc pcm030_defconfig pariscgeneric-32bit_defconfig s390 zfcpdump_defconfig armshmobile_defconfig sh alldefconfig mips maltasmvp_eva_defconfig shsh7763rdp_defconfig powerpc mpc837x_mds_defconfig m68kmvme147_defconfig powerpccell_defconfig ia64defconfig m68k alldefconfig openriscdefconfig sh lboxre2_defconfig powerpcsam440ep_defconfig powerpc chrp32_defconfig ia64 gensparse_defconfig powerpc mpc834x_mds_defconfig m68k m5208evb_defconfig arm omap2plus_defconfig arm assabet_defconfig sh se7751_defconfig armzeus_defconfig mipsgpr_defconfig armtrizeps4_defconfig sh apsh4a3a_defconfig sh defconfig arm corgi_defconfig shsh7785lcr_defconfig m68k m5249evb_defconfig arc tb10x_defconfig archsdk_defconfig arcnsim_700_defconfig ia64 bigsur_defconfig m68k atari_defconfig arm lpc18xx_defconfig sh se7343_defconfig arc haps_hs_smp_defconfig arm s3c6400_defconfig mips mpc30x_defconfig x86_64 randconfig-c001-20220509 i386 randconfig-c001-20220509 arm randconfig-c002-20220509 x86_64randconfig-c001 arm randconfig-c002-20220512 ia64 allmodconfig ia64 allyesconfig m68k allyesconfig m68k allmodconfig m68kdefconfig nios2 defconfig arc
[kvalo-ath:ath-next] BUILD SUCCESS 25c321e8534e9efe1869b548e7912faffed1f5be
tree/branch: https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git ath-next branch HEAD: 25c321e8534e9efe1869b548e7912faffed1f5be ath11k: remove redundant assignment to variables vht_mcs and he_mcs elapsed time: 6748m configs tested: 302 configs skipped: 5 The following configs have been built successfully. More configs may be tested in the coming days. gcc tested configs: arm64allyesconfig arm allmodconfig arm defconfig arm allyesconfig arm64 defconfig i386 randconfig-c001-20220509 i386 randconfig-c001 sh j2_defconfig sh ap325rxa_defconfig sh rts7751r2d1_defconfig arm imx_v6_v7_defconfig powerpc ppc64_defconfig xtensa cadence_csp_defconfig sh se7705_defconfig ia64zx1_defconfig mips capcella_defconfig sh rsk7269_defconfig xtensa virt_defconfig um defconfig m68k m5249evb_defconfig sh urquell_defconfig powerpc eiger_defconfig mips xway_defconfig powerpc pasemi_defconfig armmini2440_defconfig armmulti_v7_defconfig m68km5272c3_defconfig sh rsk7201_defconfig arm at91_dt_defconfig arm omap2plus_defconfig ia64 alldefconfig sh rsk7203_defconfig armspear6xx_defconfig h8300allyesconfig arm h3600_defconfig arm iop32x_defconfig arm cm_x300_defconfig parisc64 alldefconfig m68kmac_defconfig powerpcwarp_defconfig powerpc taishan_defconfig sh r7785rp_defconfig sh defconfig powerpc storcenter_defconfig mips ci20_defconfig sh se7721_defconfig m68k m5275evb_defconfig arm stm32_defconfig arm aspeed_g5_defconfig powerpcsam440ep_defconfig sh se7619_defconfig h8300 h8s-sim_defconfig sparcalldefconfig powerpc maple_defconfig arm viper_defconfig sparc64 defconfig nios2alldefconfig armzeus_defconfig sh sh2007_defconfig i386defconfig m68k allmodconfig sparc sparc32_defconfig powerpc mgcoge_defconfig armpleb_defconfig powerpc sequoia_defconfig sh polaris_defconfig shhp6xx_defconfig arc haps_hs_defconfig mips decstation_defconfig sh sdk7780_defconfig sh ecovec24_defconfig armkeystone_defconfig openriscdefconfig arm pxa910_defconfig riscv nommu_k210_sdcard_defconfig shsh7763rdp_defconfig sh sh7724_generic_defconfig powerpcmpc7448_hpc2_defconfig h8300h8300h-sim_defconfig nios2allyesconfig sparc sparc64_defconfig m68k multi_defconfig s390 allyesconfig arm lpc18xx_defconfig powerpc mpc8540_ads_defconfig nios2 10m50_defconfig armcerfcube_defconfig powerpc stx_gp3_defconfig arm64alldefconfig m68k sun3x_defconfig s390defconfig arm lubbock_defconfig openrisc simple_smp_defconfig cskydefconfig s390 zfcpdump_defconfig arc axs103_defconfig sh se7751_defconfig parisc alldefconfig arc axs103_smp_defconfig m68k m5208evb_defconfig powerpc
[kvalo-ath:pending] BUILD SUCCESS d62054b3b309b9c2a8a32207fe41cccf445c0ca3
tree/branch: https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git pending branch HEAD: d62054b3b309b9c2a8a32207fe41cccf445c0ca3 ath11k: update missing MU-MIMO and OFDMA stats elapsed time: 6705m configs tested: 380 configs skipped: 6 The following configs have been built successfully. More configs may be tested in the coming days. gcc tested configs: arm64 defconfig arm64allyesconfig arm allmodconfig arm defconfig arm allyesconfig i386 randconfig-c001-20220509 i386 randconfig-c001 sh j2_defconfig sh ap325rxa_defconfig sh rts7751r2d1_defconfig arm stm32_defconfig cskydefconfig riscv nommu_k210_sdcard_defconfig powerpc tqm8555_defconfig arm simpad_defconfig armcerfcube_defconfig sh r7785rp_defconfig sh urquell_defconfig mips capcella_defconfig sh rsk7269_defconfig um defconfig xtensa virt_defconfig m68k m5249evb_defconfig xtensa audio_kc705_defconfig xtensa alldefconfig m68k m5275evb_defconfig ia64 gensparse_defconfig xtensaxip_kc705_defconfig h8300 edosk2674_defconfig armhisi_defconfig mipsbcm47xx_defconfig sh ul2_defconfig sh se7712_defconfig powerpc eiger_defconfig mips xway_defconfig armmini2440_defconfig armmulti_v7_defconfig m68km5272c3_defconfig sh rsk7201_defconfig arm at91_dt_defconfig mips allyesconfig mips tb0226_defconfig arm omap2plus_defconfig ia64 alldefconfig sh rsk7203_defconfig armspear6xx_defconfig arm iop32x_defconfig arm cm_x300_defconfig arm h3600_defconfig shsh7763rdp_defconfig arm axm55xx_defconfig powerpc sequoia_defconfig powerpc mpc8540_ads_defconfig parisc64 alldefconfig m68kmac_defconfig powerpcwarp_defconfig powerpc taishan_defconfig sh defconfig powerpc storcenter_defconfig mips ci20_defconfig sh se7721_defconfig arm aspeed_g5_defconfig powerpcsam440ep_defconfig sh se7619_defconfig powerpc pasemi_defconfig h8300 h8s-sim_defconfig sparcalldefconfig powerpc maple_defconfig arm viper_defconfig sparc64 defconfig nios2alldefconfig armzeus_defconfig sh sh2007_defconfig i386defconfig sparc sparc32_defconfig powerpc mgcoge_defconfig armpleb_defconfig sh polaris_defconfig shhp6xx_defconfig arc haps_hs_defconfig m68kq40_defconfig armkeystone_defconfig powerpc mpc85xx_cds_defconfig pariscgeneric-64bit_defconfig sh secureedge5410_defconfig arm imx_v6_v7_defconfig mips decstation_defconfig sh sdk7780_defconfig sh ecovec24_defconfig ia64zx1_defconfig ia64 tiger_defconfig m68k sun3_defconfig openriscdefconfig arm pxa910_defconfig sh sh03_defconfig arcvdk_hs38_defconfig riscv defconfig powerpc holly_defconfig sh sh7724_generic_defconfig powerpcmpc7448_hpc2_defconfig h8300
[kvalo-ath:master-pending] BUILD SUCCESS e07fc768e2dc215bcbedc82cbae38401fdf9f727
tree/branch: https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git master-pending branch HEAD: e07fc768e2dc215bcbedc82cbae38401fdf9f727 Merge branch 'pending' into master-pending elapsed time: 6757m configs tested: 323 configs skipped: 6 The following configs have been built successfully. More configs may be tested in the coming days. gcc tested configs: arm64allyesconfig arm allmodconfig arm defconfig arm allyesconfig arm64 defconfig i386 randconfig-c001-20220509 i386 randconfig-c001 sh j2_defconfig sh ap325rxa_defconfig sh rts7751r2d1_defconfig arm imx_v6_v7_defconfig powerpc ppc64_defconfig xtensa cadence_csp_defconfig sh se7705_defconfig ia64zx1_defconfig arm stm32_defconfig cskydefconfig riscv nommu_k210_sdcard_defconfig powerpc tqm8555_defconfig arm simpad_defconfig armcerfcube_defconfig sh r7785rp_defconfig sh urquell_defconfig xtensa audio_kc705_defconfig xtensa alldefconfig m68k m5275evb_defconfig ia64 gensparse_defconfig xtensaxip_kc705_defconfig h8300 edosk2674_defconfig armhisi_defconfig mipsbcm47xx_defconfig sh ul2_defconfig sh se7712_defconfig powerpc eiger_defconfig mips xway_defconfig powerpc pasemi_defconfig mips allyesconfig mips tb0226_defconfig arm omap2plus_defconfig ia64 alldefconfig sh rsk7203_defconfig armspear6xx_defconfig h8300allyesconfig arm h3600_defconfig arm iop32x_defconfig arm cm_x300_defconfig shsh7763rdp_defconfig arm axm55xx_defconfig powerpc sequoia_defconfig powerpc mpc8540_ads_defconfig parisc64 alldefconfig m68kmac_defconfig powerpcwarp_defconfig powerpc taishan_defconfig sh defconfig powerpc storcenter_defconfig mips ci20_defconfig sh se7721_defconfig h8300 h8s-sim_defconfig sparcalldefconfig powerpc maple_defconfig arm viper_defconfig sparc64 defconfig nios2alldefconfig armzeus_defconfig sparc sparc32_defconfig powerpc mgcoge_defconfig armpleb_defconfig xtensa virt_defconfig m68kq40_defconfig armkeystone_defconfig powerpc mpc85xx_cds_defconfig pariscgeneric-64bit_defconfig sh secureedge5410_defconfig arc defconfig mips allmodconfig mips decstation_defconfig sh sdk7780_defconfig sh ecovec24_defconfig ia64 tiger_defconfig m68k sun3_defconfig openriscdefconfig arm pxa910_defconfig sparc64 alldefconfig sh sh7724_generic_defconfig powerpcmpc7448_hpc2_defconfig h8300h8300h-sim_defconfig nios2allyesconfig sparc sparc64_defconfig m68k multi_defconfig mipsar7_defconfig powerpc holly_defconfig armtrizeps4_defconfig powerpc stx_gp3_defconfig arm64alldefconfig m68k sun3x_defconfig riscv defconfig arc haps_hs_smp_defconfig m68kmvme16x_defconfig powerpc makalu_defconfig m68k
[kvalo-ath:master] BUILD SUCCESS 14c24bc11b43da59fe41d79d3c1b29decc3d21f3
tree/branch: https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git master branch HEAD: 14c24bc11b43da59fe41d79d3c1b29decc3d21f3 Add localversion-wireless-testing-ath elapsed time: 6899m configs tested: 412 configs skipped: 6 The following configs have been built successfully. More configs may be tested in the coming days. gcc tested configs: arm64allyesconfig arm allmodconfig arm defconfig arm allyesconfig arm64 defconfig i386 randconfig-c001-20220509 i386 randconfig-c001 sh j2_defconfig sh ap325rxa_defconfig sh rts7751r2d1_defconfig arm lpc18xx_defconfig sh rsk7269_defconfig mips rb532_defconfig powerpc mpc834x_mds_defconfig s390defconfig powerpc storcenter_defconfig arm nhk8815_defconfig arm stm32_defconfig cskydefconfig riscv nommu_k210_sdcard_defconfig powerpc tqm8555_defconfig arc nsimosci_hs_smp_defconfig mips bmips_be_defconfig powerpc64 defconfig shedosk7760_defconfig arc axs101_defconfig h8300 h8s-sim_defconfig xtensageneric_kc705_defconfig powerpc arches_defconfig mips ip32_defconfig arm simpad_defconfig armcerfcube_defconfig sh r7785rp_defconfig sh urquell_defconfig mips capcella_defconfig xtensa virt_defconfig um defconfig m68k m5249evb_defconfig ia64 bigsur_defconfig armpleb_defconfig xtensa iss_defconfig xtensa audio_kc705_defconfig xtensa alldefconfig m68k m5275evb_defconfig ia64 gensparse_defconfig xtensaxip_kc705_defconfig h8300 edosk2674_defconfig armhisi_defconfig mipsbcm47xx_defconfig sh ul2_defconfig sh se7712_defconfig powerpc eiger_defconfig mips xway_defconfig powerpc pasemi_defconfig armmini2440_defconfig armmulti_v7_defconfig m68km5272c3_defconfig sh rsk7201_defconfig arm at91_dt_defconfig arcnsim_700_defconfig powerpc linkstation_defconfig mips allyesconfig mips tb0226_defconfig arm omap2plus_defconfig ia64 alldefconfig sh rsk7203_defconfig armspear6xx_defconfig arm iop32x_defconfig arm cm_x300_defconfig arm h3600_defconfig um alldefconfig xtensa cadence_csp_defconfig shsh7763rdp_defconfig arm axm55xx_defconfig powerpc sequoia_defconfig powerpc mpc8540_ads_defconfig parisc64 alldefconfig m68kmac_defconfig powerpcwarp_defconfig powerpc taishan_defconfig sh defconfig sparc sparc64_defconfig arm aspeed_g5_defconfig ia64generic_defconfig xtensa nommu_kc705_defconfig mips ci20_defconfig sh se7721_defconfig powerpcsam440ep_defconfig sh se7619_defconfig sparcalldefconfig powerpc maple_defconfig arm viper_defconfig sparc64 defconfig nios2alldefconfig armzeus_defconfig sh sh2007_defconfig i386defconfig sparc sparc32_defconfig powerpc mgcoge_defconfig sh polaris_defconfig sh
[PATCH 2/4] ath10k: htt_tx: do not interpret Eth frames as WiFi
The xmit path for the Ethernet encapsulated frames become more or less
usable since d740d8fd2439 ("ath10k: unify tx mode and dispatch"). This
change reorganize the xmit path in a manageable way to properly support
various tx modes, but misses that the Ethernet encapsulated frame is a
special case. We do not have an IEEE 802.11 header at the begining of
them. But the HTT Tx handler still interprets first bytes of each frame
as an IEEE 802.11 Frame Control field.
Than this code was copied by e62ee5c381c5 ("ath10k: Add support for
htt_data_tx_desc_64 descriptor") and a2097d6444c3 ("ath10k: htt: High
latency TX support") to another handlers. In fact the issue in the high
latency (HL) handler was introduced by 83ac260151e7 ("ath10k: add mic
bytes for pmf management packet").
Ethernet encapsulated frame tx mode stay unused until 75d85fd9993c
("ath10k: introduce basic tdls functionality") started using it for TDLS
frames to avoid key selection issue in some firmwares.
Trying to interpret the begining of an Ethernet encapsulated frame as an
IEEE 802.11 header was not hurt us noticeably since we need to meet two
conditions: (1) xmit should be performed towards a TDLS peer, and (2)
the TDLS peer should have a specific OUI part of its MAC address. Looks
like that the rareness in TDLS communications of OUIs that can be
interpreted as an 802.11 management frame saves users from facing this
issue earlier.
Improve Ethernet tx mode support in the HTT Tx handler by avoiding
interpreting its first bytes as an IEEE 802.11 header. While at it, make
the ieee80211_hdr variable local to the code block that is guarded by
!is_eth check. In this way, we clarify in which cases a frame can be
interpreted as IEEE 802.11, and saves us from similar issues in the
future.
Credits: this change as part of xmit encapsulation offloading support
was originally made by QCA and then submitted for inclusion by John
Crispin [1]. But the whole work was not accepted due to the lack of a
part for 64-bits descriptors [2]. Zhijun You then pointed this out to me
in a reply to my initial RFC patch series. And I made this slightly
reworked version that covered all the HTT Tx handler variants.
1. https://lore.kernel.org/all/20191216092207.31032-1-j...@phrozen.org/
2.
https://patchwork.kernel.org/project/linux-wireless/patch/20191216092207.31032-1-j...@phrozen.org/
Reported-by: Zhijun You
Signed-off-by: Vasanthakumar Thiagarajan
Signed-off-by: John Crispin
Signed-off-by: Sergey Ryazanov
---
Changes since RFC:
* new patch
drivers/net/wireless/ath/ath10k/htt_tx.c | 61 ++--
1 file changed, 35 insertions(+), 26 deletions(-)
diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c
b/drivers/net/wireless/ath/ath10k/htt_tx.c
index 9842a4b2f78f..a19b0795c86d 100644
--- a/drivers/net/wireless/ath/ath10k/htt_tx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_tx.c
@@ -1275,7 +1275,6 @@ static int ath10k_htt_tx_hl(struct ath10k_htt *htt, enum
ath10k_hw_txrx_mode txm
struct ath10k *ar = htt->ar;
int res, data_len;
struct htt_cmd_hdr *cmd_hdr;
- struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)msdu->data;
struct htt_data_tx_desc *tx_desc;
struct ath10k_skb_cb *skb_cb = ATH10K_SKB_CB(msdu);
struct sk_buff *tmp_skb;
@@ -1286,11 +1285,15 @@ static int ath10k_htt_tx_hl(struct ath10k_htt *htt,
enum ath10k_hw_txrx_mode txm
u16 flags1 = 0;
u16 msdu_id = 0;
- if ((ieee80211_is_action(hdr->frame_control) ||
-ieee80211_is_deauth(hdr->frame_control) ||
-ieee80211_is_disassoc(hdr->frame_control)) &&
-ieee80211_has_protected(hdr->frame_control)) {
- skb_put(msdu, IEEE80211_CCMP_MIC_LEN);
+ if (!is_eth) {
+ struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)msdu->data;
+
+ if ((ieee80211_is_action(hdr->frame_control) ||
+ieee80211_is_deauth(hdr->frame_control) ||
+ieee80211_is_disassoc(hdr->frame_control)) &&
+ieee80211_has_protected(hdr->frame_control)) {
+ skb_put(msdu, IEEE80211_CCMP_MIC_LEN);
+ }
}
data_len = msdu->len;
@@ -1387,7 +1390,6 @@ static int ath10k_htt_tx_32(struct ath10k_htt *htt,
{
struct ath10k *ar = htt->ar;
struct device *dev = ar->dev;
- struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)msdu->data;
struct ieee80211_tx_info *info = IEEE80211_SKB_CB(msdu);
struct ath10k_skb_cb *skb_cb = ATH10K_SKB_CB(msdu);
struct ath10k_hif_sg_item sg_items[2];
@@ -1419,15 +1421,19 @@ static int ath10k_htt_tx_32(struct ath10k_htt *htt,
txbuf_paddr = htt->txbuf.paddr +
(sizeof(struct ath10k_htt_txbuf_32) * msdu_id);
- if ((ieee80211_is_action(hdr->frame_control) ||
-ieee80211_is_deauth(hdr->frame_control) ||
-ieee80211_is_disassoc(hdr->frame_control)) &&
-
[PATCH 0/4] ath10k: add encapsulation offloading support
Hello, this series introduces driver support for hardware encapsulation offloading feature. The main goal of the series is an overall improvement of system performance. On a QCA9563+QCA9888-based access point in bridged mode, encapsulation offloading increases TCP 16-streams DL throughput from 365 to 396 mbps (+8%) and UDP DL throughput from 436 to 483 mbps (+11%). The series consist of four patches, the first three prepare the code, and the last one introduces the offloading support itself. The first patch reworks transmission status reporting to make it flexible enough to support 802.11 and Ethernet encapsulated frames reporting. The second patch reworks improves Ethernet encapsulated frames handling in the HTT Tx layer. The third patch reworks the module parameter that configures the main encapsulation format of frames that are passed from the driver to the hardware. It makes it possible to configure more encapsulation methods than just raw or not-raw. And, as stated before, the fourth patch actually introduces offloading support. It changes a couple of frame analysis places along the xmit path and starts reporting offloading support to mac80211 via the corresponding hw attribute. The new feature has been extensively tested with QCA9888. It works well and introduces a measurable performance increase on platforms with not so fast CPU (e.g. QCA9563). Tests with MT7621+QCA6174 show no regression. I was unable to observe any measurable throughput increase in tests with QCA6174 due to the poor perfomance the SISO client and OTA testing. Only slight downlink rate stability increase with slight reducing of the SIRQ load on the AP side. Tests with QCA9880, QCA9980, QCA9984, QCA9377 revealed no regression [1]. No specific throughput tests have been performed. In OTA tests with a regular load, there is a slight increase in througput stability. In tests of the QCA9377 in Sta mode, Edward Matijevic noticed a possible regression in the Ethernet tx mode compared to the Native WiFi tx mode: > There might be a regression in download bandwidth under ETHERNET mode > but I didn't do enough tests to see if was my PC or the adapter as the > upload bandwidth was similar to other tests. > NATIVE_WIFI performs the same as without the patch. Credits: thanks to OpenWrt folks Oldřich Jedlička and Edward Matijevic who helped me a lot to perform extensive testing with various chips after a RFC/RFT post in the OpenWrt development mailing list [1]. Thanks to Zhijun You who helped with the testing, pointed me to the previous work (see below) and the missed parts in the HTT Tx layer [1]. Prior work: similar patches were independently developed by QCA and then submitted for inclusion by John Crispin [2] and latter by Zhijun You [3]. The work was not merged due to the lack of a part for 64-bits descriptors [4]. The idea of HTT Tx layer change from this work was adopted for the series in patch #2. 1. https://www.mail-archive.com/openwrt-devel@lists.openwrt.org/msg62013.html 2. https://lore.kernel.org/all/20191216092207.31032-1-j...@phrozen.org/ 3. https://lore.kernel.org/all/20210524103130.66693-1-hujy...@gmail.com/ 4. https://patchwork.kernel.org/project/linux-wireless/patch/20191216092207.31032-1-j...@phrozen.org/ CC: Edward Matijevic CC: John Crispin CC: Oldřich Jedlička CC: Tom Psyborg CC: Vasanthakumar Thiagarajan CC: Zhijun You Changes since RFC: * new Tested-on and Tested-by tags * new patch #2 for better Ethernet encapsulation support in the HTT Tx layer * rebased on top of latest ath-next Sergey Ryazanov (3): ath10k: improve tx status reporting ath10k: htt_tx: do not interpret Eth frames as WiFi ath10k: turn rawmode into frame_mode ath10k: add encapsulation offloading support drivers/net/wireless/ath/ath10k/core.c | 11 ++-- drivers/net/wireless/ath/ath10k/core.h | 1 + drivers/net/wireless/ath/ath10k/htt_tx.c | 61 - drivers/net/wireless/ath/ath10k/mac.c| 67 +++- drivers/net/wireless/ath/ath10k/txrx.c | 12 - 5 files changed, 108 insertions(+), 44 deletions(-) -- 2.35.1 ___ ath10k mailing list ath10k@lists.infradead.org http://lists.infradead.org/mailman/listinfo/ath10k
[PATCH 3/4] ath10k: turn rawmode into frame_mode
Turn boolean rawmode module param into integer frame_mode param that
contains value from ath10k_hw_txrx_mode enum. As earlier the default
param value is non-RAW (native Wi-Fi) encapsulation. The param name
is selected to be consistent with the similar ath11k param.
This is a preparation step for upcoming encapsulation offloading
support.
Signed-off-by: Sergey Ryazanov
---
Changes since RFC:
* changed position in series: #2 -> #3
* rebased on top of latest ath-next
drivers/net/wireless/ath/ath10k/core.c | 11 +++
drivers/net/wireless/ath/ath10k/core.h | 1 +
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/ath/ath10k/core.c
b/drivers/net/wireless/ath/ath10k/core.c
index 688177453b07..5654387acb4b 100644
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -33,9 +33,11 @@ EXPORT_SYMBOL(ath10k_debug_mask);
static unsigned int ath10k_cryptmode_param;
static bool uart_print;
static bool skip_otp;
-static bool rawmode;
static bool fw_diag_log;
+/* frame mode values are mapped as per enum ath10k_hw_txrx_mode */
+unsigned int ath10k_frame_mode = ATH10K_HW_TXRX_NATIVE_WIFI;
+
unsigned long ath10k_coredump_mask = BIT(ATH10K_FW_CRASH_DUMP_REGISTERS) |
BIT(ATH10K_FW_CRASH_DUMP_CE_DATA);
@@ -44,15 +46,16 @@ module_param_named(debug_mask, ath10k_debug_mask, uint,
0644);
module_param_named(cryptmode, ath10k_cryptmode_param, uint, 0644);
module_param(uart_print, bool, 0644);
module_param(skip_otp, bool, 0644);
-module_param(rawmode, bool, 0644);
module_param(fw_diag_log, bool, 0644);
+module_param_named(frame_mode, ath10k_frame_mode, uint, 0644);
module_param_named(coredump_mask, ath10k_coredump_mask, ulong, 0444);
MODULE_PARM_DESC(debug_mask, "Debugging mask");
MODULE_PARM_DESC(uart_print, "Uart target debugging");
MODULE_PARM_DESC(skip_otp, "Skip otp failure for calibration in testmode");
MODULE_PARM_DESC(cryptmode, "Crypto mode: 0-hardware, 1-software");
-MODULE_PARM_DESC(rawmode, "Use raw 802.11 frame datapath");
+MODULE_PARM_DESC(frame_mode,
+"Datapath frame mode (0: raw, 1: native wifi (default))");
MODULE_PARM_DESC(coredump_mask, "Bitfield of what to include in firmware crash
file");
MODULE_PARM_DESC(fw_diag_log, "Diag based fw log debugging");
@@ -2599,7 +2602,7 @@ static int ath10k_core_init_firmware_features(struct
ath10k *ar)
ar->htt.max_num_amsdu = ATH10K_HTT_MAX_NUM_AMSDU_DEFAULT;
ar->htt.max_num_ampdu = ATH10K_HTT_MAX_NUM_AMPDU_DEFAULT;
- if (rawmode) {
+ if (ath10k_frame_mode == ATH10K_HW_TXRX_RAW) {
if (!test_bit(ATH10K_FW_FEATURE_RAW_MODE_SUPPORT,
fw_file->fw_features)) {
ath10k_err(ar, "rawmode = 1 requires support from
firmware");
diff --git a/drivers/net/wireless/ath/ath10k/core.h
b/drivers/net/wireless/ath/ath10k/core.h
index 8bfabbcfdb14..d70d7d088a2b 100644
--- a/drivers/net/wireless/ath/ath10k/core.h
+++ b/drivers/net/wireless/ath/ath10k/core.h
@@ -1314,6 +1314,7 @@ static inline bool ath10k_peer_stats_enabled(struct
ath10k *ar)
return false;
}
+extern unsigned int ath10k_frame_mode;
extern unsigned long ath10k_coredump_mask;
void ath10k_core_napi_sync_disable(struct ath10k *ar);
--
2.35.1
___
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k
[PATCH 1/4] ath10k: improve tx status reporting
We use ieee80211_tx_status() to report each completed tx frame.
Internally, this function calls sta_info_get_by_addrs(), what has a
couple of drawbacks:
1. additional station lookup causes a performance degradation;
2. mac80211 can not properly account Ethernet encapsulated frames due
to the inability to properly determine the destination (station) MAC
address since ieee80211_tx_status() assumes the frame has a 802.11
header.
The latter is especially destructive if we want to use hardware frames
encapsulation.
To fix both of these issues, replace ieee80211_tx_status() with
ieee80211_tx_status_ext() call and feed it station pointer from the tx
queue associated with the transmitted frame.
Tested-on: QCA9888 hw 2.0 10.4-3.9.0.2-00131
Tested-on: QCA6174 hw 3.2 PCI WLAN.RM.4.4.1-00157-QCARMSWPZ-1
Signed-off-by: Sergey Ryazanov
Tested-by: Oldřich Jedlička # TP-Link Archer C7 v4 & v5
(QCA9563 + QCA9880)
Tested-by: Edward Matijevic # TP-Link Archer C2600 (IPQ8064
+ QCA9980 10.4.1.00030-1)
Tested-by: Edward Matijevic # QCA9377 PCI in Sta mode
Tested-by: Zhijun You # NETGEAR R7800 (QCA9984
10.4-3.9.0.2-00159)
---
Changes since RFC:
* new Tested-on and Tested-by tags
drivers/net/wireless/ath/ath10k/txrx.c | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/ath/ath10k/txrx.c
b/drivers/net/wireless/ath/ath10k/txrx.c
index 10123974c3da..72540434c75b 100644
--- a/drivers/net/wireless/ath/ath10k/txrx.c
+++ b/drivers/net/wireless/ath/ath10k/txrx.c
@@ -43,6 +43,7 @@ static void ath10k_report_offchan_tx(struct ath10k *ar,
struct sk_buff *skb)
int ath10k_txrx_tx_unref(struct ath10k_htt *htt,
const struct htt_tx_done *tx_done)
{
+ struct ieee80211_tx_status status;
struct ath10k *ar = htt->ar;
struct device *dev = ar->dev;
struct ieee80211_tx_info *info;
@@ -128,7 +129,16 @@ int ath10k_txrx_tx_unref(struct ath10k_htt *htt,
info->status.flags |= IEEE80211_TX_STATUS_ACK_SIGNAL_VALID;
}
- ieee80211_tx_status(htt->ar->hw, msdu);
+ memset(, 0, sizeof(status));
+ status.skb = msdu;
+ status.info = info;
+
+ rcu_read_lock();
+ if (txq && txq->sta)
+ status.sta = txq->sta;
+ ieee80211_tx_status_ext(htt->ar->hw, );
+ rcu_read_unlock();
+
/* we do not own the msdu anymore */
return 0;
--
2.35.1
___
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k
[PATCH 4/4] ath10k: add encapsulation offloading support
Frame encapsulation from Ethernet into the IEEE 802.11 frame format
takes a considerable host CPU time on the xmit path. The firmware is
able to do this operation for us, so enable encapsulation offloading for
AP and Sta interface types to improve overall system performance.
The driver is almost ready for encapsulation offloading support. There
are only a few places where the driver assumes the frame format is IEEE
802.11 that need to be fixed.
Encapsulation offloading is currently disabled by default and the driver
utilizes mac80211 encapsulation support. To activate offloading, the
frame_mode=2 parameter should be passed during module loading.
On a QCA9563+QCA9888-based access point in bridged mode, encapsulation
offloading increases TCP 16-streams DL throughput from 365 to 396 mbps
(+8%) and UDP DL throughput from 436 to 483 mbps (+11%).
Tested-on: QCA9888 hw 2.0 10.4-3.9.0.2-00131
Tested-on: QCA6174 hw 3.2 PCI WLAN.RM.4.4.1-00157-QCARMSWPZ-1
Signed-off-by: Sergey Ryazanov
Tested-by: Oldřich Jedlička # TP-Link Archer C7 v4 & v5
(QCA9563 + QCA9880)
Tested-by: Edward Matijevic # TP-Link Archer C2600 (IPQ8064
+ QCA9980 10.4.1.00030-1)
Tested-by: Edward Matijevic # QCA9377 PCI in Sta mode
Tested-by: Zhijun You # NETGEAR R7800 (QCA9984
10.4-3.9.0.2-00159)
---
Changes since RFC:
* new Tested-on and Tested-by tags
* changed position in series: #3 -> #4
* rebased on top of latest ath-next
drivers/net/wireless/ath/ath10k/core.c | 2 +-
drivers/net/wireless/ath/ath10k/mac.c | 67 +-
2 files changed, 55 insertions(+), 14 deletions(-)
diff --git a/drivers/net/wireless/ath/ath10k/core.c
b/drivers/net/wireless/ath/ath10k/core.c
index 5654387acb4b..276954b70d63 100644
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -55,7 +55,7 @@ MODULE_PARM_DESC(uart_print, "Uart target debugging");
MODULE_PARM_DESC(skip_otp, "Skip otp failure for calibration in testmode");
MODULE_PARM_DESC(cryptmode, "Crypto mode: 0-hardware, 1-software");
MODULE_PARM_DESC(frame_mode,
-"Datapath frame mode (0: raw, 1: native wifi (default))");
+"Datapath frame mode (0: raw, 1: native wifi (default), 2:
ethernet)");
MODULE_PARM_DESC(coredump_mask, "Bitfield of what to include in firmware crash
file");
MODULE_PARM_DESC(fw_diag_log, "Diag based fw log debugging");
diff --git a/drivers/net/wireless/ath/ath10k/mac.c
b/drivers/net/wireless/ath/ath10k/mac.c
index 3570a5895ea8..ebd5b9a8943e 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -3713,6 +3713,9 @@ ath10k_mac_tx_h_get_txmode(struct ath10k *ar,
const struct ath10k_skb_cb *skb_cb = ATH10K_SKB_CB(skb);
__le16 fc = hdr->frame_control;
+ if (IEEE80211_SKB_CB(skb)->flags & IEEE80211_TX_CTL_HW_80211_ENCAP)
+ return ATH10K_HW_TXRX_ETHERNET;
+
if (!vif || vif->type == NL80211_IFTYPE_MONITOR)
return ATH10K_HW_TXRX_RAW;
@@ -3873,6 +3876,12 @@ static void ath10k_mac_tx_h_fill_cb(struct ath10k *ar,
bool noack = false;
cb->flags = 0;
+
+ if (info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP) {
+ cb->flags |= ATH10K_SKB_F_QOS; /* Assume data frames are QoS */
+ goto finish_cb_fill;
+ }
+
if (!ath10k_tx_h_use_hwcrypto(vif, skb))
cb->flags |= ATH10K_SKB_F_NO_HWCRYPT;
@@ -3911,6 +3920,7 @@ static void ath10k_mac_tx_h_fill_cb(struct ath10k *ar,
cb->flags |= ATH10K_SKB_F_RAW_TX;
}
+finish_cb_fill:
cb->vif = vif;
cb->txq = txq;
cb->airtime_est = airtime;
@@ -4034,7 +4044,11 @@ static int ath10k_mac_tx(struct ath10k *ar,
ath10k_tx_h_seq_no(vif, skb);
break;
case ATH10K_HW_TXRX_ETHERNET:
- ath10k_tx_h_8023(skb);
+ /* Convert 802.11->802.3 header only if the frame was erlier
+* encapsulated to 802.11 by mac80211. Otherwise pass it as is.
+*/
+ if (!(info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP))
+ ath10k_tx_h_8023(skb);
break;
case ATH10K_HW_TXRX_RAW:
if (!test_bit(ATH10K_FLAG_RAW_MODE, >dev_flags) &&
@@ -4645,12 +4659,10 @@ static void ath10k_mac_op_tx(struct ieee80211_hw *hw,
struct ieee80211_vif *vif = info->control.vif;
struct ieee80211_sta *sta = control->sta;
struct ieee80211_txq *txq = NULL;
- struct ieee80211_hdr *hdr = (void *)skb->data;
enum ath10k_hw_txrx_mode txmode;
enum ath10k_mac_tx_path txpath;
bool is_htt;
bool is_mgmt;
- bool is_presp;
int ret;
u16 airtime;
@@ -4664,8 +4676,14 @@ static void ath10k_mac_op_tx(struct ieee80211_hw *hw,
is_mgmt = (txpath == ATH10K_MAC_TX_HTT_MGMT);
if (is_htt) {
+ bool is_presp = false;
+
