wifi: rtw88: usb: Further limit the TX aggregation
PATCH 1/1 wifi: rtw88: usb: Further limit the TX aggregation
Currently the number of frames sent to the chip in a single USB Request Block is limited only by the size of the TX buffer, which is 20 KiB. Testing reveals that as many as 13 frames get aggregated. This is more than what any of the chips would like to receive. RTL8822CU, RTL8822BU, and RTL8821CU want at most 3 frames, and RTL8723DU wants only 1 frame per URB.
RTL8723DU in particular reliably malfunctions during a speed test. All traffic seems to stop. Pinging the AP no longer works.
Fix this problem by limiting the number of frames sent to the chip in a single URB according to what each chip likes.
Also configure RTL8822CU, RTL8822BU, and RTL8821CU to expect 3 frames per URB.
RTL8703B may or may not be found in USB devices. Declare that it wants only 1 frame per URB, just in case.
Tested with RTL8723DU and RTL8811CU.
--- drivers/net/wireless/realtek/rtw88/mac.c | 12 ++++++++++++ drivers/net/wireless/realtek/rtw88/main.h | 2 ++ drivers/net/wireless/realtek/rtw88/reg.h | 1 + drivers/net/wireless/realtek/rtw88/rtw8703b.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8723d.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 1 + drivers/net/wireless/realtek/rtw88/usb.c | 4 +++- 9 files changed, 23 insertions(+), 1 deletion(-)
drivers/net/wireless/realtek/rtw88/mac.c +12 -0
@@ -1186,6 +1186,7 @@ static int __priority_queue_cfg(struct rtw_dev *rtwdev, {const struct rtw_chip_info *chip = rtwdev->chip;struct rtw_fifo_conf *fifo = &rtwdev->fifo; +u8 val8;rtw_write16 (rtwdev,REG_FIFOPAGE_INFO_1 , pg_tbl->hq_num);rtw_write16 (rtwdev,REG_FIFOPAGE_INFO_2 , pg_tbl->lq_num);
@@ -1201,6 +1202,17 @@ static int __priority_queue_cfg(struct rtw_dev *rtwdev,rtw_write16 (rtwdev,REG_FIFOPAGE_CTRL_2 +2 , fifo->rsvd_boundary);rtw_write16 (rtwdev,REG_BCNQ1_BDNY_V1 , fifo->rsvd_boundary);rtw_write32 (rtwdev,REG_RXFF_BNDY , chip->rxff_size -C2H_PKT_BUF -1 ); + +if (rtwdev->hci.type ==RTW_HCI_TYPE_USB ) { + val8 =rtw_read8 (rtwdev,REG_AUTO_LLT_V1 ); +u8p_replace_bits (&val8, chip->usb_tx_agg_desc_num, +BIT_MASK_BLK_DESC_NUM ); +rtw_write8 (rtwdev,REG_AUTO_LLT_V1 , val8); + +rtw_write8 (rtwdev,REG_AUTO_LLT_V1 +3 , chip->usb_tx_agg_desc_num); +rtw_write8_set (rtwdev,REG_TXDMA_OFFSET_CHK +1 ,BIT (1 )); + } +rtw_write8_set (rtwdev,REG_AUTO_LLT_V1 ,BIT_AUTO_INIT_LLT_V1 );if (!check_hw_ready (rtwdev,REG_AUTO_LLT_V1 ,BIT_AUTO_INIT_LLT_V1 ,0 ))
drivers/net/wireless/realtek/rtw88/main.h +2 -0
@@ -1197,6 +1197,8 @@ struct rtw_chip_info {u16 fw_fifo_addr[RTW_FW_FIFO_MAX ];const struct rtw_fwcd_segs *fwcd_segs; +u8 usb_tx_agg_desc_num; +u8 default_1ss_tx_path;bool path_div_supported;
drivers/net/wireless/realtek/rtw88/reg.h +1 -0
@@ -270,6 +270,7 @@#define BIT_MASK_BCN_HEAD_1_V1 0xfff#define REG_AUTO_LLT_V1 0x0208#define BIT_AUTO_INIT_LLT_V1 BIT(0) +#define BIT_MASK_BLK_DESC_NUM 0xf0#define REG_DWBCN0_CTRL 0x0208#define BIT_BCN_VALID BIT(16)#define REG_TXDMA_OFFSET_CHK 0x020C
drivers/net/wireless/realtek/rtw88/rtw8703b.c +1 -0
@@ -2013,6 +2013,7 @@ const struct rtw_chip_info rtw8703b_hw_spec = { .tx_stbc = false, .max_power_index = 0x3f, .ampdu_density = IEEE80211_HT_MPDU_DENSITY_16, + .usb_tx_agg_desc_num = 1, /* Not sure if this chip has USB interface */ .path_div_supported = false, .ht_supported = true,
drivers/net/wireless/realtek/rtw88/rtw8723d.c +1 -0
@@ -2194,6 +2194,7 @@ const struct rtw_chip_info rtw8723d_hw_spec = { .rfe_defs = rtw8723d_rfe_defs, .rfe_defs_size = ARRAY_SIZE(rtw8723d_rfe_defs), .rx_ldpc = false, + .usb_tx_agg_desc_num = 1, .pwr_track_tbl = &rtw8723d_rtw_pwr_track_tbl, .iqk_threshold = 8, .ampdu_density = IEEE80211_HT_MPDU_DENSITY_16,
drivers/net/wireless/realtek/rtw88/rtw8821c.c +1 -0
@@ -2029,6 +2029,7 @@ const struct rtw_chip_info rtw8821c_hw_spec = { .rfe_defs = rtw8821c_rfe_defs, .rfe_defs_size = ARRAY_SIZE(rtw8821c_rfe_defs), .rx_ldpc = false, + .usb_tx_agg_desc_num = 3, .pwr_track_tbl = &rtw8821c_rtw_pwr_track_tbl, .iqk_threshold = 8, .bfer_su_max_num = 2,
drivers/net/wireless/realtek/rtw88/rtw8822b.c +1 -0
@@ -2574,6 +2574,7 @@ const struct rtw_chip_info rtw8822b_hw_spec = { .bfer_su_max_num = 2, .bfer_mu_max_num = 1, .rx_ldpc = true, + .usb_tx_agg_desc_num = 3, .edcca_th = rtw8822b_edcca_th, .l2h_th_ini_cs = 10 + EDCCA_IGI_BASE, .l2h_th_ini_ad = -14 + EDCCA_IGI_BASE,
drivers/net/wireless/realtek/rtw88/rtw8822c.c +1 -0
@@ -5399,6 +5399,7 @@ const struct rtw_chip_info rtw8822c_hw_spec = { .bfer_mu_max_num = 1, .rx_ldpc = true, .tx_stbc = true, + .usb_tx_agg_desc_num = 3, .edcca_th = rtw8822c_edcca_th, .l2h_th_ini_cs = 60, .l2h_th_ini_ad = 45,
drivers/net/wireless/realtek/rtw88/usb.c +3 -1
@@ -379,7 +379,9 @@ static bool rtw_usb_tx_agg_skb(struct rtw_usb *rtwusb, struct sk_buff_head *list skb_iter =skb_peek (list); -if (skb_iter && skb_iter->len + skb_head->len <=RTW_USB_MAX_XMITBUF_SZ ) +if (skb_iter && + skb_iter->len + skb_head->len <=RTW_USB_MAX_XMITBUF_SZ && + agg_num < rtwdev->chip->usb_tx_agg_desc_num)__skb_unlink (skb_iter, list);else skb_iter =NULL ;
Signature · 1 line
2.45.1
Ping-Ke Shih
maintainerQuoted 48 lines · Bitterblue Smith
Currently the number of frames sent to the chip in a single USB Request Block is limited only by the size of the TX buffer, which is 20 KiB. Testing reveals that as many as 13 frames get aggregated. This is more than what any of the chips would like to receive. RTL8822CU, RTL8822BU, and RTL8821CU want at most 3 frames, and RTL8723DU wants only 1 frame per URB.
RTL8723DU in particular reliably malfunctions during a speed test. All traffic seems to stop. Pinging the AP no longer works.
Fix this problem by limiting the number of frames sent to the chip in a single URB according to what each chip likes.
Also configure RTL8822CU, RTL8822BU, and RTL8821CU to expect 3 frames per URB.
RTL8703B may or may not be found in USB devices. Declare that it wants only 1 frame per URB, just in case.
Tested with RTL8723DU and RTL8811CU.
Signed-off-by Bitterblue Smith <[email protected]>--- drivers/net/wireless/realtek/rtw88/mac.c | 12 ++++++++++++ drivers/net/wireless/realtek/rtw88/main.h | 2 ++ drivers/net/wireless/realtek/rtw88/reg.h | 1 + drivers/net/wireless/realtek/rtw88/rtw8703b.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8723d.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 1 + drivers/net/wireless/realtek/rtw88/usb.c | 4 +++- 9 files changed, 23 insertions(+), 1 deletion(-)drivers/net/wireless/realtek/rtw88/mac.c +1
-0@@ -1186,6 +1186,7 @@ static int __priority_queue_cfg(struct rtw_dev *rtwdev, {const struct rtw_chip_info *chip = rtwdev->chip;struct rtw_fifo_conf *fifo = &rtwdev->fifo; +u8 val8;rtw_write16 (rtwdev,REG_FIFOPAGE_INFO_1 , pg_tbl->hq_num);rtw_write16 (rtwdev,REG_FIFOPAGE_INFO_2 , pg_tbl->lq_num);
drivers/net/wireless/realtek/rtw88/mac.c static int __priority_queue_cfg(struct rtw_dev *rtwdev, · line 1210
Quoted 9 lines
drivers/net/wireless/realtek/rtw88/mac.c +6
-0@@ -1201,6 +1202,17 @@ static int __priority_queue_cfg(struct rtw_dev *rtwdev,rtw_write16 (rtwdev,REG_FIFOPAGE_CTRL_2 +2 , fifo->rsvd_boundary);rtw_write16 (rtwdev,REG_BCNQ1_BDNY_V1 , fifo->rsvd_boundary);rtw_write32 (rtwdev,REG_RXFF_BNDY , chip->rxff_size -C2H_PKT_BUF -1 ); + +if (rtwdev->hci.type ==RTW_HCI_TYPE_USB ) { + val8 =rtw_read8 (rtwdev,REG_AUTO_LLT_V1 ); +u8p_replace_bits (&val8, chip->usb_tx_agg_desc_num, +BIT_MASK_BLK_DESC_NUM ); +rtw_write8 (rtwdev,REG_AUTO_LLT_V1 , val8);
rtw_write8_mask(rtwdev, REG_AUTO_LLT_V1, BIT_MASK_BLK_DESC_NUM, chip->usb_tx_agg_desc_num);
Quoted 13 lines
drivers/net/wireless/realtek/rtw88/mac.c +5
-0+ +rtw_write8 (rtwdev,REG_AUTO_LLT_V1 +3 , chip->usb_tx_agg_desc_num); +rtw_write8_set (rtwdev,REG_TXDMA_OFFSET_CHK +1 ,BIT (1 )); + } +rtw_write8_set (rtwdev,REG_AUTO_LLT_V1 ,BIT_AUTO_INIT_LLT_V1 );if (!check_hw_ready (rtwdev,REG_AUTO_LLT_V1 ,BIT_AUTO_INIT_LLT_V1 ,0 ))drivers/net/wireless/realtek/rtw88/main.h +0
-0
drivers/net/wireless/realtek/rtw88/main.h struct rtw_chip_info { · line 1201
Quoted 5 lines
drivers/net/wireless/realtek/rtw88/main.h +2
-0@@ -1197,6 +1197,8 @@ struct rtw_chip_info {u16 fw_fifo_addr[RTW_FW_FIFO_MAX ];const struct rtw_fwcd_segs *fwcd_segs; +u8 usb_tx_agg_desc_num; +
Please keep order of field and instance declaration, like rtw8703b_hw_spec.
drivers/net/wireless/realtek/rtw88/reg.h line 273
Quoted 12 lines
drivers/net/wireless/realtek/rtw88/main.h +0
-0u8 default_1ss_tx_path;bool path_div_supported;drivers/net/wireless/realtek/rtw88/reg.h +1
-0@@ -270,6 +270,7 @@#define BIT_MASK_BCN_HEAD_1_V1 0xfff#define REG_AUTO_LLT_V1 0x0208#define BIT_AUTO_INIT_LLT_V1 BIT(0) +#define BIT_MASK_BLK_DESC_NUM 0xf0
0xf0 --> GENMASK(7, 4)
drivers/net/wireless/realtek/rtw88/rtw8703b.c const struct rtw_chip_info rtw8703b_hw_spec = { · line 2016
Quoted 13 lines
drivers/net/wireless/realtek/rtw88/reg.h +0
-0#define REG_DWBCN0_CTRL 0x0208#define BIT_BCN_VALID BIT(16)#define REG_TXDMA_OFFSET_CHK 0x020Cdrivers/net/wireless/realtek/rtw88/rtw8703b.c +1
-0@@ -2013,6 +2013,7 @@ const struct rtw_chip_info rtw8703b_hw_spec = { .tx_stbc = false, .max_power_index = 0x3f, .ampdu_density = IEEE80211_HT_MPDU_DENSITY_16, + .usb_tx_agg_desc_num = 1, /* Not sure if this chip has USB interface */
The position to declare this field is very different from others.
Not sure when we messed up the order, but please don't feel free to add one, keep the order.
If you have time, could you help to align all of them across chips? If not, I will take my time to do that after your patch.
Quoted 113 lines · Ping-Ke Shih
Quoted 48 lines · Bitterblue Smith
Currently the number of frames sent to the chip in a single USB Request Block is limited only by the size of the TX buffer, which is 20 KiB. Testing reveals that as many as 13 frames get aggregated. This is more than what any of the chips would like to receive. RTL8822CU, RTL8822BU, and RTL8821CU want at most 3 frames, and RTL8723DU wants only 1 frame per URB.
RTL8723DU in particular reliably malfunctions during a speed test. All traffic seems to stop. Pinging the AP no longer works.
Fix this problem by limiting the number of frames sent to the chip in a single URB according to what each chip likes.
Also configure RTL8822CU, RTL8822BU, and RTL8821CU to expect 3 frames per URB.
RTL8703B may or may not be found in USB devices. Declare that it wants only 1 frame per URB, just in case.
Tested with RTL8723DU and RTL8811CU.
Signed-off-by Bitterblue Smith <[email protected]>--- drivers/net/wireless/realtek/rtw88/mac.c | 12 ++++++++++++ drivers/net/wireless/realtek/rtw88/main.h | 2 ++ drivers/net/wireless/realtek/rtw88/reg.h | 1 + drivers/net/wireless/realtek/rtw88/rtw8703b.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8723d.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 1 + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 1 + drivers/net/wireless/realtek/rtw88/usb.c | 4 +++- 9 files changed, 23 insertions(+), 1 deletion(-)drivers/net/wireless/realtek/rtw88/mac.c +1
-0@@ -1186,6 +1186,7 @@ static int __priority_queue_cfg(struct rtw_dev *rtwdev, {const struct rtw_chip_info *chip = rtwdev->chip;struct rtw_fifo_conf *fifo = &rtwdev->fifo; +u8 val8;rtw_write16 (rtwdev,REG_FIFOPAGE_INFO_1 , pg_tbl->hq_num);rtw_write16 (rtwdev,REG_FIFOPAGE_INFO_2 , pg_tbl->lq_num);drivers/net/wireless/realtek/rtw88/mac.c static int __priority_queue_cfg(struct rtw_dev *rtwdev, · line 1210
Quoted 9 lines
drivers/net/wireless/realtek/rtw88/mac.c +6
-0@@ -1201,6 +1202,17 @@ static int __priority_queue_cfg(struct rtw_dev *rtwdev,rtw_write16 (rtwdev,REG_FIFOPAGE_CTRL_2 +2 , fifo->rsvd_boundary);rtw_write16 (rtwdev,REG_BCNQ1_BDNY_V1 , fifo->rsvd_boundary);rtw_write32 (rtwdev,REG_RXFF_BNDY , chip->rxff_size -C2H_PKT_BUF -1 ); + +if (rtwdev->hci.type ==RTW_HCI_TYPE_USB ) { + val8 =rtw_read8 (rtwdev,REG_AUTO_LLT_V1 ); +u8p_replace_bits (&val8, chip->usb_tx_agg_desc_num, +BIT_MASK_BLK_DESC_NUM ); +rtw_write8 (rtwdev,REG_AUTO_LLT_V1 , val8);
rtw_write8_mask(rtwdev, REG_AUTO_LLT_V1, BIT_MASK_BLK_DESC_NUM, chip->usb_tx_agg_desc_num);Quoted 13 lines
drivers/net/wireless/realtek/rtw88/mac.c +5
-0+ +rtw_write8 (rtwdev,REG_AUTO_LLT_V1 +3 , chip->usb_tx_agg_desc_num); +rtw_write8_set (rtwdev,REG_TXDMA_OFFSET_CHK +1 ,BIT (1 )); + } +rtw_write8_set (rtwdev,REG_AUTO_LLT_V1 ,BIT_AUTO_INIT_LLT_V1 );if (!check_hw_ready (rtwdev,REG_AUTO_LLT_V1 ,BIT_AUTO_INIT_LLT_V1 ,0 ))drivers/net/wireless/realtek/rtw88/main.h +0
-0drivers/net/wireless/realtek/rtw88/main.h struct rtw_chip_info { · line 1201
Quoted 5 lines
drivers/net/wireless/realtek/rtw88/main.h +2
-0@@ -1197,6 +1197,8 @@ struct rtw_chip_info {u16 fw_fifo_addr[RTW_FW_FIFO_MAX ];const struct rtw_fwcd_segs *fwcd_segs; +u8 usb_tx_agg_desc_num; +Please keep order of field and instance declaration, like
rtw8703b_hw_spec.drivers/net/wireless/realtek/rtw88/reg.h line 273
Quoted 12 lines
drivers/net/wireless/realtek/rtw88/main.h +0
-0u8 default_1ss_tx_path;bool path_div_supported;drivers/net/wireless/realtek/rtw88/reg.h +1
-0@@ -270,6 +270,7 @@#define BIT_MASK_BCN_HEAD_1_V1 0xfff#define REG_AUTO_LLT_V1 0x0208#define BIT_AUTO_INIT_LLT_V1 BIT(0) +#define BIT_MASK_BLK_DESC_NUM 0xf0
0xf0-->GENMASK(7, 4)drivers/net/wireless/realtek/rtw88/rtw8703b.c const struct rtw_chip_info rtw8703b_hw_spec = { · line 2016
Quoted 13 lines
drivers/net/wireless/realtek/rtw88/reg.h +0
-0#define REG_DWBCN0_CTRL 0x0208#define BIT_BCN_VALID BIT(16)#define REG_TXDMA_OFFSET_CHK 0x020Cdrivers/net/wireless/realtek/rtw88/rtw8703b.c +1
-0@@ -2013,6 +2013,7 @@ const struct rtw_chip_info rtw8703b_hw_spec = { .tx_stbc = false, .max_power_index = 0x3f, .ampdu_density = IEEE80211_HT_MPDU_DENSITY_16, + .usb_tx_agg_desc_num = 1, /* Not sure if this chip has USB interface */The position to declare this field is very different from others.
Quoted 6 lines
Not sure when we messed up the order, but please don't feel free to add one, keep the order.
If you have time, could you help to align all of them across chips? If not, I will take my time to do that after your patch.
Sure, I will do that.
PATCH v2 1/1 wifi: rtw88: usb: Further limit the TX aggregation
In reply to Bitterblue SmithCurrently the number of frames sent to the chip in a single USB Request Block is limited only by the size of the TX buffer, which is 20 KiB. Testing reveals that as many as 13 frames get aggregated. This is more than what any of the chips would like to receive. RTL8822CU, RTL8822BU, and RTL8821CU want at most 3 frames, and RTL8723DU wants only 1 frame per URB.
RTL8723DU in particular reliably malfunctions during a speed test. All traffic seems to stop. Pinging the AP no longer works.
Fix this problem by limiting the number of frames sent to the chip in a single URB according to what each chip likes.
Also configure RTL8822CU, RTL8822BU, and RTL8821CU to expect 3 frames per URB.
RTL8703B may or may not be found in USB devices. Declare that it wants only 1 frame per URB, just in case.
Also, since we're touching these, initialise the members of rtw{8703b,8723d,8821c,8822b,8822c}_hw_spec in the same order they are declared.
Tested with RTL8723DU and RTL8811CU.
---
v2:
- Use rtw_write8_mask and GENMASK.
- Initialise the members of rtw{8703b,8723d,8821c,8822b,8822c}_hw_spec in the same order they are declared.
--- drivers/net/wireless/realtek/rtw88/mac.c | 9 ++++ drivers/net/wireless/realtek/rtw88/main.h | 2 + drivers/net/wireless/realtek/rtw88/reg.h | 1 + drivers/net/wireless/realtek/rtw88/rtw8703b.c | 21 ++++----- drivers/net/wireless/realtek/rtw88/rtw8723d.c | 38 ++++++++-------- drivers/net/wireless/realtek/rtw88/rtw8821c.c | 38 ++++++++-------- drivers/net/wireless/realtek/rtw88/rtw8822b.c | 39 ++++++++-------- drivers/net/wireless/realtek/rtw88/rtw8822c.c | 45 ++++++++++--------- drivers/net/wireless/realtek/rtw88/usb.c | 4 +- 9 files changed, 107 insertions(+), 90 deletions(-)
drivers/net/wireless/realtek/rtw88/mac.c +9 -0
@@ -1201,6 +1201,15 @@ static int __priority_queue_cfg(struct rtw_dev *rtwdev,rtw_write16 (rtwdev,REG_FIFOPAGE_CTRL_2 +2 , fifo->rsvd_boundary);rtw_write16 (rtwdev,REG_BCNQ1_BDNY_V1 , fifo->rsvd_boundary);rtw_write32 (rtwdev,REG_RXFF_BNDY , chip->rxff_size -C2H_PKT_BUF -1 ); + +if (rtwdev->hci.type ==RTW_HCI_TYPE_USB ) { +rtw_write8_mask (rtwdev,REG_AUTO_LLT_V1 ,BIT_MASK_BLK_DESC_NUM , + chip->usb_tx_agg_desc_num); + +rtw_write8 (rtwdev,REG_AUTO_LLT_V1 +3 , chip->usb_tx_agg_desc_num); +rtw_write8_set (rtwdev,REG_TXDMA_OFFSET_CHK +1 ,BIT (1 )); + } +rtw_write8_set (rtwdev,REG_AUTO_LLT_V1 ,BIT_AUTO_INIT_LLT_V1 );if (!check_hw_ready (rtwdev,REG_AUTO_LLT_V1 ,BIT_AUTO_INIT_LLT_V1 ,0 ))
drivers/net/wireless/realtek/rtw88/main.h +2 -0
@@ -1197,6 +1197,8 @@ struct rtw_chip_info {u16 fw_fifo_addr[RTW_FW_FIFO_MAX ];const struct rtw_fwcd_segs *fwcd_segs; +u8 usb_tx_agg_desc_num; +u8 default_1ss_tx_path;bool path_div_supported;
drivers/net/wireless/realtek/rtw88/reg.h +1 -0
@@ -270,6 +270,7 @@#define BIT_MASK_BCN_HEAD_1_V1 0xfff#define REG_AUTO_LLT_V1 0x0208#define BIT_AUTO_INIT_LLT_V1 BIT(0) +#define BIT_MASK_BLK_DESC_NUM GENMASK(7, 4)#define REG_DWBCN0_CTRL 0x0208#define BIT_BCN_VALID BIT(16)#define REG_TXDMA_OFFSET_CHK 0x020C
drivers/net/wireless/realtek/rtw88/rtw8703b.c +11 -10
@@ -2013,6 +2013,7 @@ const struct rtw_chip_info rtw8703b_hw_spec = { .tx_stbc = false, .max_power_index = 0x3f, .ampdu_density = IEEE80211_HT_MPDU_DENSITY_16, + .usb_tx_agg_desc_num = 1, /* Not sure if this chip has USB interface */ .path_div_supported = false, .ht_supported = true,
@@ -2065,25 +2066,26 @@ const struct rtw_chip_info rtw8703b_hw_spec = { .bt_rssi_type = COEX_BTRSSI_RATIO, .ant_isolation = 15, .rssi_tolerance = 2, - .bt_rssi_step = bt_rssi_step_8703b, - .wl_rssi_step = wl_rssi_step_8703b,/* sant -> shared antenna, nsant -> non-shared antenna * Not sure if 8703b versions with non-shard antenna even exist. */ .table_sant_num = ARRAY_SIZE(table_sant_8703b), - .table_sant = table_sant_8703b, .table_nsant_num = 0, - .table_nsant = NULL, .tdma_sant_num = ARRAY_SIZE(tdma_sant_8703b), - .tdma_sant = tdma_sant_8703b, .tdma_nsant_num = 0, - .tdma_nsant = NULL, - .wl_rf_para_num = ARRAY_SIZE(rf_para_tx_8703b), - .wl_rf_para_tx = rf_para_tx_8703b, - .wl_rf_para_rx = rf_para_rx_8703b, .bt_afh_span_bw20 = 0x20, .bt_afh_span_bw40 = 0x30, .afh_5g_num = ARRAY_SIZE(afh_5g_8703b), + .wl_rf_para_num = ARRAY_SIZE(rf_para_tx_8703b), + .coex_info_hw_regs_num = 0, + .bt_rssi_step = bt_rssi_step_8703b, + .wl_rssi_step = wl_rssi_step_8703b, + .table_nsant = NULL, + .table_sant = table_sant_8703b, + .tdma_sant = tdma_sant_8703b, + .tdma_nsant = NULL, + .wl_rf_para_tx = rf_para_tx_8703b, + .wl_rf_para_rx = rf_para_rx_8703b, .afh_5g = afh_5g_8703b,/* REG_BTG_SEL doesn't seem to have a counterpart in the * vendor driver. Mathematically it's REG_PAD_CTRL1 + 3.
@@ -2096,7 +2098,6 @@ const struct rtw_chip_info rtw8703b_hw_spec = {/* These registers are used to read (and print) from if * CONFIG_RTW88_DEBUGFS is enabled. */ - .coex_info_hw_regs_num = 0, .coex_info_hw_regs = NULL, };EXPORT_SYMBOL (rtw8703b_hw_spec);
drivers/net/wireless/realtek/rtw88/rtw8723d.c +19 -19
@@ -2164,22 +2164,25 @@ const struct rtw_chip_info rtw8723d_hw_spec = { .txff_size = 32768, .rxff_size = 16384, .rsvd_drv_pg_num = 8, - .txgi_factor = 1, - .is_pwr_by_rate_dec = true, - .max_power_index = 0x3f, - .csi_buf_pg_num = 0, .band = RTW_BAND_2G, .page_size = TX_PAGE_SIZE, + .csi_buf_pg_num = 0, .dig_min = 0x20, + .txgi_factor = 1, + .is_pwr_by_rate_dec = true, + .rx_ldpc = false, + .max_power_index = 0x3f, + .ampdu_density = IEEE80211_HT_MPDU_DENSITY_16, + .usb_tx_agg_desc_num = 1, .ht_supported = true, .vht_supported = false, .lps_deep_mode_supported = 0, .sys_func_en = 0xFD, .pwr_on_seq = card_enable_flow_8723d, .pwr_off_seq = card_disable_flow_8723d, - .page_table = page_table_8723d, .rqpn_table = rqpn_table_8723d, .prioq_addrs = &rtw8723x_common.prioq_addrs, + .page_table = page_table_8723d, .intf_table = &phy_para_table_8723d, .dig = rtw8723x_common.dig, .dig_cck = rtw8723x_common.dig_cck,
@@ -2193,10 +2196,8 @@ const struct rtw_chip_info rtw8723d_hw_spec = { .rf_tbl = {&rtw8723d_rf_a_tbl}, .rfe_defs = rtw8723d_rfe_defs, .rfe_defs_size = ARRAY_SIZE(rtw8723d_rfe_defs), - .rx_ldpc = false, - .pwr_track_tbl = &rtw8723d_rtw_pwr_track_tbl, .iqk_threshold = 8, - .ampdu_density = IEEE80211_HT_MPDU_DENSITY_16, + .pwr_track_tbl = &rtw8723d_rtw_pwr_track_tbl, .max_scan_ie_len = IEEE80211_MAX_DATA_LEN, .coex_para_ver = 0x2007022f,
@@ -2209,26 +2210,25 @@ const struct rtw_chip_info rtw8723d_hw_spec = { .bt_rssi_type = COEX_BTRSSI_RATIO, .ant_isolation = 15, .rssi_tolerance = 2, - .wl_rssi_step = wl_rssi_step_8723d, - .bt_rssi_step = bt_rssi_step_8723d, .table_sant_num = ARRAY_SIZE(table_sant_8723d), - .table_sant = table_sant_8723d, .table_nsant_num = ARRAY_SIZE(table_nsant_8723d), - .table_nsant = table_nsant_8723d, .tdma_sant_num = ARRAY_SIZE(tdma_sant_8723d), - .tdma_sant = tdma_sant_8723d, .tdma_nsant_num = ARRAY_SIZE(tdma_nsant_8723d), - .tdma_nsant = tdma_nsant_8723d, - .wl_rf_para_num = ARRAY_SIZE(rf_para_tx_8723d), - .wl_rf_para_tx = rf_para_tx_8723d, - .wl_rf_para_rx = rf_para_rx_8723d, .bt_afh_span_bw20 = 0x20, .bt_afh_span_bw40 = 0x30, .afh_5g_num = ARRAY_SIZE(afh_5g_8723d), + .wl_rf_para_num = ARRAY_SIZE(rf_para_tx_8723d), + .coex_info_hw_regs_num = ARRAY_SIZE(coex_info_hw_regs_8723d), + .bt_rssi_step = bt_rssi_step_8723d, + .wl_rssi_step = wl_rssi_step_8723d, + .table_nsant = table_nsant_8723d, + .table_sant = table_sant_8723d, + .tdma_sant = tdma_sant_8723d, + .tdma_nsant = tdma_nsant_8723d, + .wl_rf_para_tx = rf_para_tx_8723d, + .wl_rf_para_rx = rf_para_rx_8723d, .afh_5g = afh_5g_8723d, .btg_reg = &btg_reg_8723d, - - .coex_info_hw_regs_num = ARRAY_SIZE(coex_info_hw_regs_8723d), .coex_info_hw_regs = coex_info_hw_regs_8723d, };EXPORT_SYMBOL (rtw8723d_hw_spec);
drivers/net/wireless/realtek/rtw88/rtw8821c.c +19 -19
@@ -2001,22 +2001,25 @@ const struct rtw_chip_info rtw8821c_hw_spec = { .txff_size = 65536, .rxff_size = 16384, .rsvd_drv_pg_num = 8, - .txgi_factor = 1, - .is_pwr_by_rate_dec = true, - .max_power_index = 0x3f, - .csi_buf_pg_num = 0, .band = RTW_BAND_2G | RTW_BAND_5G, .page_size = TX_PAGE_SIZE, + .csi_buf_pg_num = 0, .dig_min = 0x1c, + .txgi_factor = 1, + .is_pwr_by_rate_dec = true, + .rx_ldpc = false, + .max_power_index = 0x3f, + .ampdu_density = IEEE80211_HT_MPDU_DENSITY_2, + .usb_tx_agg_desc_num = 3, .ht_supported = true, .vht_supported = true, .lps_deep_mode_supported = BIT(LPS_DEEP_MODE_LCLK), .sys_func_en = 0xD8, .pwr_on_seq = card_enable_flow_8821c, .pwr_off_seq = card_disable_flow_8821c, - .page_table = page_table_8821c, .rqpn_table = rqpn_table_8821c, .prioq_addrs = &prioq_addrs_8821c, + .page_table = page_table_8821c, .intf_table = &phy_para_table_8821c, .dig = rtw8821c_dig, .rf_base_addr = {0x2800, 0x2c00},
@@ -2028,12 +2031,10 @@ const struct rtw_chip_info rtw8821c_hw_spec = { .rf_tbl = {&rtw8821c_rf_a_tbl}, .rfe_defs = rtw8821c_rfe_defs, .rfe_defs_size = ARRAY_SIZE(rtw8821c_rfe_defs), - .rx_ldpc = false, - .pwr_track_tbl = &rtw8821c_rtw_pwr_track_tbl, .iqk_threshold = 8, + .pwr_track_tbl = &rtw8821c_rtw_pwr_track_tbl, .bfer_su_max_num = 2, .bfer_mu_max_num = 1, - .ampdu_density = IEEE80211_HT_MPDU_DENSITY_2, .max_scan_ie_len = IEEE80211_MAX_DATA_LEN, .coex_para_ver = 0x19092746,
@@ -2046,25 +2047,24 @@ const struct rtw_chip_info rtw8821c_hw_spec = { .bt_rssi_type = COEX_BTRSSI_RATIO, .ant_isolation = 15, .rssi_tolerance = 2, - .wl_rssi_step = wl_rssi_step_8821c, - .bt_rssi_step = bt_rssi_step_8821c, .table_sant_num = ARRAY_SIZE(table_sant_8821c), - .table_sant = table_sant_8821c, .table_nsant_num = ARRAY_SIZE(table_nsant_8821c), - .table_nsant = table_nsant_8821c, .tdma_sant_num = ARRAY_SIZE(tdma_sant_8821c), - .tdma_sant = tdma_sant_8821c, .tdma_nsant_num = ARRAY_SIZE(tdma_nsant_8821c), - .tdma_nsant = tdma_nsant_8821c, - .wl_rf_para_num = ARRAY_SIZE(rf_para_tx_8821c), - .wl_rf_para_tx = rf_para_tx_8821c, - .wl_rf_para_rx = rf_para_rx_8821c, .bt_afh_span_bw20 = 0x24, .bt_afh_span_bw40 = 0x36, .afh_5g_num = ARRAY_SIZE(afh_5g_8821c), - .afh_5g = afh_5g_8821c, - + .wl_rf_para_num = ARRAY_SIZE(rf_para_tx_8821c), .coex_info_hw_regs_num = ARRAY_SIZE(coex_info_hw_regs_8821c), + .bt_rssi_step = bt_rssi_step_8821c, + .wl_rssi_step = wl_rssi_step_8821c, + .table_nsant = table_nsant_8821c, + .table_sant = table_sant_8821c, + .tdma_sant = tdma_sant_8821c, + .tdma_nsant = tdma_nsant_8821c, + .wl_rf_para_tx = rf_para_tx_8821c, + .wl_rf_para_rx = rf_para_rx_8821c, + .afh_5g = afh_5g_8821c, .coex_info_hw_regs = coex_info_hw_regs_8821c, };EXPORT_SYMBOL (rtw8821c_hw_spec);
drivers/net/wireless/realtek/rtw88/rtw8822b.c +20 -19
@@ -2541,22 +2541,26 @@ const struct rtw_chip_info rtw8822b_hw_spec = { .rxff_size = 24576, .fw_rxff_size = 12288, .rsvd_drv_pg_num = 8, - .txgi_factor = 1, - .is_pwr_by_rate_dec = true, - .max_power_index = 0x3f, - .csi_buf_pg_num = 0, .band = RTW_BAND_2G | RTW_BAND_5G, .page_size = TX_PAGE_SIZE, + .csi_buf_pg_num = 0, .dig_min = 0x1c, + .txgi_factor = 1, + .is_pwr_by_rate_dec = true, + .rx_ldpc = true, + .max_power_index = 0x3f, + .ampdu_density = IEEE80211_HT_MPDU_DENSITY_2, + .fw_fifo_addr = {0x780, 0x700, 0x780, 0x660, 0x650, 0x680}, + .usb_tx_agg_desc_num = 3, .ht_supported = true, .vht_supported = true, .lps_deep_mode_supported = BIT(LPS_DEEP_MODE_LCLK), .sys_func_en = 0xDC, .pwr_on_seq = card_enable_flow_8822b, .pwr_off_seq = card_disable_flow_8822b, - .page_table = page_table_8822b, .rqpn_table = rqpn_table_8822b, .prioq_addrs = &prioq_addrs_8822b, + .page_table = page_table_8822b, .intf_table = &phy_para_table_8822b, .dig = rtw8822b_dig, .dig_cck = NULL,
@@ -2569,15 +2573,13 @@ const struct rtw_chip_info rtw8822b_hw_spec = { .rf_tbl = {&rtw8822b_rf_a_tbl, &rtw8822b_rf_b_tbl}, .rfe_defs = rtw8822b_rfe_defs, .rfe_defs_size = ARRAY_SIZE(rtw8822b_rfe_defs), - .pwr_track_tbl = &rtw8822b_rtw_pwr_track_tbl, .iqk_threshold = 8, + .pwr_track_tbl = &rtw8822b_rtw_pwr_track_tbl, .bfer_su_max_num = 2, .bfer_mu_max_num = 1, - .rx_ldpc = true, .edcca_th = rtw8822b_edcca_th, .l2h_th_ini_cs = 10 + EDCCA_IGI_BASE, .l2h_th_ini_ad = -14 + EDCCA_IGI_BASE, - .ampdu_density = IEEE80211_HT_MPDU_DENSITY_2, .max_scan_ie_len = IEEE80211_MAX_DATA_LEN, .coex_para_ver = 0x20070206,
@@ -2590,28 +2592,27 @@ const struct rtw_chip_info rtw8822b_hw_spec = { .bt_rssi_type = COEX_BTRSSI_RATIO, .ant_isolation = 15, .rssi_tolerance = 2, - .wl_rssi_step = wl_rssi_step_8822b, - .bt_rssi_step = bt_rssi_step_8822b, .table_sant_num = ARRAY_SIZE(table_sant_8822b), - .table_sant = table_sant_8822b, .table_nsant_num = ARRAY_SIZE(table_nsant_8822b), - .table_nsant = table_nsant_8822b, .tdma_sant_num = ARRAY_SIZE(tdma_sant_8822b), - .tdma_sant = tdma_sant_8822b, .tdma_nsant_num = ARRAY_SIZE(tdma_nsant_8822b), - .tdma_nsant = tdma_nsant_8822b, - .wl_rf_para_num = ARRAY_SIZE(rf_para_tx_8822b), - .wl_rf_para_tx = rf_para_tx_8822b, - .wl_rf_para_rx = rf_para_rx_8822b, .bt_afh_span_bw20 = 0x24, .bt_afh_span_bw40 = 0x36, .afh_5g_num = ARRAY_SIZE(afh_5g_8822b), + .wl_rf_para_num = ARRAY_SIZE(rf_para_tx_8822b), + .coex_info_hw_regs_num = ARRAY_SIZE(coex_info_hw_regs_8822b), + .bt_rssi_step = bt_rssi_step_8822b, + .wl_rssi_step = wl_rssi_step_8822b, + .table_nsant = table_nsant_8822b, + .table_sant = table_sant_8822b, + .tdma_sant = tdma_sant_8822b, + .tdma_nsant = tdma_nsant_8822b, + .wl_rf_para_tx = rf_para_tx_8822b, + .wl_rf_para_rx = rf_para_rx_8822b, .afh_5g = afh_5g_8822b, - .coex_info_hw_regs_num = ARRAY_SIZE(coex_info_hw_regs_8822b), .coex_info_hw_regs = coex_info_hw_regs_8822b, - .fw_fifo_addr = {0x780, 0x700, 0x780, 0x660, 0x650, 0x680}, };EXPORT_SYMBOL (rtw8822b_hw_spec);
drivers/net/wireless/realtek/rtw88/rtw8822c.c +23 -22
97 lines not on this page · raw message
drivers/net/wireless/realtek/rtw88/usb.c +3 -1
@@ -379,7 +379,9 @@ static bool rtw_usb_tx_agg_skb(struct rtw_usb *rtwusb, struct sk_buff_head *list skb_iter =skb_peek (list); -if (skb_iter && skb_iter->len + skb_head->len <=RTW_USB_MAX_XMITBUF_SZ ) +if (skb_iter && + skb_iter->len + skb_head->len <=RTW_USB_MAX_XMITBUF_SZ && + agg_num < rtwdev->chip->usb_tx_agg_desc_num)__skb_unlink (skb_iter, list);else skb_iter =NULL ;
Signature · 1 line
2.45.1
Ping-Ke Shih
maintainerdrivers/net/wireless/realtek/rtw88/rtw8703b.c const struct rtw_chip_info rtw8703b_hw_spec = { · line 2074
Quoted 11 lines · Bitterblue Smith
drivers/net/wireless/realtek/rtw88/rtw8703b.c +0
-3@@ -2065,25 +2066,26 @@ const struct rtw_chip_info rtw8703b_hw_spec = { .bt_rssi_type = COEX_BTRSSI_RATIO, .ant_isolation = 15, .rssi_tolerance = 2, - .bt_rssi_step = bt_rssi_step_8703b, - .wl_rssi_step = wl_rssi_step_8703b,/* sant -> shared antenna, nsant -> non-shared antenna * Not sure if 8703b versions with non-shard antenna even exist. */ .table_sant_num = ARRAY_SIZE(table_sant_8703b), - .table_sant = table_sant_8703b,
Not sure why you move array and array size apart. No need to churn this as well as other similar stuffs.
This patch can only change things required by what subject mention. Align these fields by another patch, or do it later. Both are fine to me.
Quoted 33 lines
drivers/net/wireless/realtek/rtw88/rtw8703b.c +10
-7.table_nsant_num = 0, - .table_nsant = NULL, .tdma_sant_num = ARRAY_SIZE(tdma_sant_8703b), - .tdma_sant = tdma_sant_8703b, .tdma_nsant_num = 0, - .tdma_nsant = NULL, - .wl_rf_para_num = ARRAY_SIZE(rf_para_tx_8703b), - .wl_rf_para_tx = rf_para_tx_8703b, - .wl_rf_para_rx = rf_para_rx_8703b, .bt_afh_span_bw20 = 0x20, .bt_afh_span_bw40 = 0x30, .afh_5g_num = ARRAY_SIZE(afh_5g_8703b), + .wl_rf_para_num = ARRAY_SIZE(rf_para_tx_8703b), + .coex_info_hw_regs_num = 0, + .bt_rssi_step = bt_rssi_step_8703b, + .wl_rssi_step = wl_rssi_step_8703b, + .table_nsant = NULL, + .table_sant = table_sant_8703b, + .tdma_sant = tdma_sant_8703b, + .tdma_nsant = NULL, + .wl_rf_para_tx = rf_para_tx_8703b, + .wl_rf_para_rx = rf_para_rx_8703b, .afh_5g = afh_5g_8703b,/* REG_BTG_SEL doesn't seem to have a counterpart in the * vendor driver. Mathematically it's REG_PAD_CTRL1 + 3. @@ -2096,7 +2098,6 @@ const struct rtw_chip_info rtw8703b_hw_spec = {/* These registers are used to read (and print) from if * CONFIG_RTW88_DEBUGFS is enabled. */ - .coex_info_hw_regs_num = 0, .coex_info_hw_regs = NULL, };EXPORT_SYMBOL (rtw8703b_hw_spec);
Quoted 16 lines · Ping-Ke Shih
drivers/net/wireless/realtek/rtw88/rtw8703b.c const struct rtw_chip_info rtw8703b_hw_spec = { · line 2074
Quoted 11 lines · Bitterblue Smith
drivers/net/wireless/realtek/rtw88/rtw8703b.c +0
-3@@ -2065,25 +2066,26 @@ const struct rtw_chip_info rtw8703b_hw_spec = { .bt_rssi_type = COEX_BTRSSI_RATIO, .ant_isolation = 15, .rssi_tolerance = 2, - .bt_rssi_step = bt_rssi_step_8703b, - .wl_rssi_step = wl_rssi_step_8703b,/* sant -> shared antenna, nsant -> non-shared antenna * Not sure if 8703b versions with non-shard antenna even exist. */ .table_sant_num = ARRAY_SIZE(table_sant_8703b), - .table_sant = table_sant_8703b,Not sure why you move array and array size apart. No need to churn this as well as other similar stuffs.
I thought you wanted the members initialised in the same order they appear in struct rtw_chip_info in main.h. Maybe I misunderstood.
Quoted 3 lines
This patch can only change things required by what subject mention. Align these fields by another patch, or do it later. Both are fine to me.
Ah, it should be done in a different patch, okay.
I'm still not sure what you meant here:
Quoted 8 lines
Quoted 8 lines
drivers/net/wireless/realtek/rtw88/main.h +0
-0@@ -1197,6 +1197,8 @@ struct rtw_chip_info {u16 fw_fifo_addr[RTW_FW_FIFO_MAX ];const struct rtw_fwcd_segs *fwcd_segs;
Quoted 4 lines
drivers/net/wireless/realtek/rtw88/main.h struct rtw_chip_info { · line 1201
Quoted 2 lines
drivers/net/wireless/realtek/rtw88/main.h +2
-0+u8 usb_tx_agg_desc_num; +Please keep order of field and instance declaration, like
rtw8703b_hw_spec.
and here:
Quoted 18 lines
drivers/net/wireless/realtek/rtw88/rtw8703b.c const struct rtw_chip_info rtw8703b_hw_spec = { · line 2016
Quoted 13 lines
drivers/net/wireless/realtek/rtw88/main.h +0
-0#define REG_DWBCN0_CTRL 0x0208#define BIT_BCN_VALID BIT(16)#define REG_TXDMA_OFFSET_CHK 0x020Cdrivers/net/wireless/realtek/rtw88/rtw8703b.c +1
-0@@ -2013,6 +2013,7 @@ const struct rtw_chip_info rtw8703b_hw_spec = { .tx_stbc = false, .max_power_index = 0x3f, .ampdu_density = IEEE80211_HT_MPDU_DENSITY_16, + .usb_tx_agg_desc_num = 1, /* Not sure if this chip has USB interface */The position to declare this field is very different from others.
Not sure when we messed up the order, but please don't feel free to add one, keep the order.
Ping-Ke Shih
maintainerQuoted 18 lines · Bitterblue Smith
Quoted 16 lines · Ping-Ke Shih
drivers/net/wireless/realtek/rtw88/rtw8703b.c const struct rtw_chip_info rtw8703b_hw_spec = { · line 2074
Quoted 11 lines · Bitterblue Smith
drivers/net/wireless/realtek/rtw88/rtw8703b.c +0
-3@@ -2065,25 +2066,26 @@ const struct rtw_chip_info rtw8703b_hw_spec = { .bt_rssi_type = COEX_BTRSSI_RATIO, .ant_isolation = 15, .rssi_tolerance = 2, - .bt_rssi_step = bt_rssi_step_8703b, - .wl_rssi_step = wl_rssi_step_8703b,/* sant -> shared antenna, nsant -> non-shared antenna * Not sure if 8703b versions with non-shard antenna even exist. */ .table_sant_num = ARRAY_SIZE(table_sant_8703b), - .table_sant = table_sant_8703b,Not sure why you move array and array size apart. No need to churn this as well as other similar stuffs.
Quoted 2 lines
I thought you wanted the members initialised in the same order they appear in struct
rtw_chip_infoinmain.h. Maybe I misunderstood.
My bad, you didn't misunderstand. I didn't look into definition of struct rtw_chip_info, which put the same data type together to save some space because compiler can align fields:
u8 table_sant_num; u8 table_nsant_num; u8 tdma_sant_num; u8 tdma_nsant_num; u8 afh_5g_num; u8 wl_rf_para_num; u8 coex_info_hw_regs_num; const u8 *bt_rssi_step; const u8 *wl_rssi_step; const struct coex_table_para *table_nsant; const struct coex_table_para *table_sant; const struct coex_tdma_para *tdma_sant; const struct coex_tdma_para *tdma_nsant; const struct coex_rf_para *wl_rf_para_tx; const struct coex_rf_para *wl_rf_para_rx; const struct coex_5g_afh_map *afh_5g; const struct rtw_hw_reg *btg_reg; const struct rtw_reg_domain *coex_info_hw_regs;
But in this table I would like to treat these as exceptions putting them together, because each of them are related.
.table_sant_num = ARRAY_SIZE(table_sant_8703b), .table_sant = table_sant_8703b,
Or if members of BT-coexistence part in tables across chips are in the same order, just keep it as it was.
What do you think?
Quoted 6 lines
Quoted 4 lines
This patch can only change things required by what subject mention. Align these fields by another patch, or do it later. Both are fine to me.
Ah, it should be done in a different patch, okay.
Yes. One patch is like v1, and the other one just changes the order, no logic change.