Home Explore Help
Register Sign In
wareck
/
openwrt-archive
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: 2f76d8f3a7
Branches Tags
openwrt-archive
/
package
/
kernel
/
mac80211
/
patches
/
951-ath10k-fix-get-rx_status-from-htt-context.patch

951-ath10k-fix-get-rx_status-from-htt-context.patch 4.0 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475 
  1. From e809ea07e9edefc3678ad0b356a95f0c4c7f27e7 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Ashok Raj Nagarajan <arnagara@qti.qualcomm.com>
    3. 

  3. Date: Tue, 26 Jul 2016 22:15:52 +0530
    4. 

  4. Subject: ath10k: fix get rx_status from htt context
    5. 

  5. 

  6. On handling amsdu on rx path, get the rx_status from htt context. Without this
    7. 

  7. fix, we are seeing warnings when running DBDC traffic like this.
    8. 

  8. 

  9. WARNING: CPU: 0 PID: 0 at net/mac80211/rx.c:4105 ieee80211_rx_napi+0x88/0x7d8 [mac80211]()
    10. 

  10. 

  11. [ 1715.878248] CPU: 0 PID: 0 Comm: swapper/0 Tainted: G W 3.18.21 #1
    12. 

  12. [ 1715.878273] [<c001d3f4>] (unwind_backtrace) from [<c001a4b0>] (show_stack+0x10/0x14)
    13. 

  13. [ 1715.878293] [<c001a4b0>] (show_stack) from [<c01bee64>] (dump_stack+0x70/0xbc)
    14. 

  14. [ 1715.878315] [<c01bee64>] (dump_stack) from [<c002a61c>] (warn_slowpath_common+0x64/0x88)
    15. 

  15. [ 1715.878339] [<c002a61c>] (warn_slowpath_common) from [<c002a6d0>] (warn_slowpath_null+0x18/0x20)
    16. 

  16. [ 1715.878395] [<c002a6d0>] (warn_slowpath_null) from [<bf4caa98>] (ieee80211_rx_napi+0x88/0x7d8 [mac80211])
    17. 

  17. [ 1715.878474] [<bf4caa98>] (ieee80211_rx_napi [mac80211]) from [<bf568658>] (ath10k_htt_t2h_msg_handler+0xb48/0xbfc [ath10k_core])
    18. 

  18. [ 1715.878535] [<bf568658>] (ath10k_htt_t2h_msg_handler [ath10k_core]) from [<bf568708>] (ath10k_htt_t2h_msg_handler+0xbf8/0xbfc [ath10k_core])
    19. 

  19. [ 1715.878597] [<bf568708>] (ath10k_htt_t2h_msg_handler [ath10k_core]) from [<bf569160>] (ath10k_htt_txrx_compl_task+0xa54/0x1170 [ath10k_core])
    20. 

  20. [ 1715.878639] [<bf569160>] (ath10k_htt_txrx_compl_task [ath10k_core]) from [<c002db14>] (tasklet_action+0xb4/0x130)
    21. 

  21. [ 1715.878659] [<c002db14>] (tasklet_action) from [<c002d110>] (__do_softirq+0xe0/0x210)
    22. 

  22. [ 1715.878678] [<c002d110>] (__do_softirq) from [<c002d4b4>] (irq_exit+0x84/0xe0)
    23. 

  23. [ 1715.878700] [<c002d4b4>] (irq_exit) from [<c005a544>] (__handle_domain_irq+0x98/0xd0)
    24. 

  24. [ 1715.878722] [<c005a544>] (__handle_domain_irq) from [<c00085f4>] (gic_handle_irq+0x38/0x5c)
    25. 

  25. [ 1715.878741] [<c00085f4>] (gic_handle_irq) from [<c0009680>] (__irq_svc+0x40/0x74)
    26. 

  26. [ 1715.878753] Exception stack(0xc05f9f50 to 0xc05f9f98)
    27. 

  27. [ 1715.878767] 9f40: ffffffed 00000000 00399e1e c000a220
    28. 

  28. [ 1715.878786] 9f60: 00000000 c05f6780 c05f8000 00000000 c05f5db8 ffffffed c05f8000 c04d1980
    29. 

  29. [ 1715.878802] 9f80: 00000000 c05f9f98 c0018110 c0018114 60000013 ffffffff
    30. 

  30. [ 1715.878822] [<c0009680>] (__irq_svc) from [<c0018114>] (arch_cpu_idle+0x2c/0x50)
    31. 

  31. [ 1715.878844] [<c0018114>] (arch_cpu_idle) from [<c00530d4>] (cpu_startup_entry+0x108/0x234)
    32. 

  32. [ 1715.878866] [<c00530d4>] (cpu_startup_entry) from [<c05c7be0>] (start_kernel+0x33c/0x3b8)
    33. 

  33. [ 1715.878879] ---[ end trace 6d5e1cc0fef8ed6a ]---
    34. 

  34. [ 1715.878899] ------------[ cut here ]------------
    35. 

  35. 

  36. Fixes: 18235664e7f9 ("ath10k: cleanup amsdu processing for rx indication")
    37. 

  37. Signed-off-by: Ashok Raj Nagarajan <arnagara@qti.qualcomm.com>
    38. 

  38. Patchwork-Id: 9248457
    39. 

  39. Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
    40. 

  40. ---
    41. 

  41.  drivers/net/wireless/ath/ath10k/htt_rx.c | 10 +++++-----
    42. 

  42.  1 file changed, 5 insertions(+), 5 deletions(-)
    43. 

  43. 

  44. diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c
    45. 

  45. index 78db5d6..24c8d65 100644
    46. 

  46. --- a/drivers/net/wireless/ath/ath10k/htt_rx.c
    47. 

  47. +++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
    48. 

  48. @@ -1525,7 +1525,7 @@ static void ath10k_htt_rx_h_filter(struct ath10k *ar,
    49. 

  49.  static int ath10k_htt_rx_handle_amsdu(struct ath10k_htt *htt)
    50. 

  50.  {
    51. 

  51.  	struct ath10k *ar = htt->ar;
    52. 

  52. -	static struct ieee80211_rx_status rx_status;
    53. 

  53. +	struct ieee80211_rx_status *rx_status = &htt->rx_status;
    54. 

  54.  	struct sk_buff_head amsdu;
    55. 

  55.  	int ret;
    56. 

  56.  
    57. 

  57. @@ -1549,11 +1549,11 @@ static int ath10k_htt_rx_handle_amsdu(struct ath10k_htt *htt)
    58. 

  58.  		return ret;
    59. 

  59.  	}
    60. 

  60.  
    61. 

  61. -	ath10k_htt_rx_h_ppdu(ar, &amsdu, &rx_status, 0xffff);
    62. 

  62. +	ath10k_htt_rx_h_ppdu(ar, &amsdu, rx_status, 0xffff);
    63. 

  63.  	ath10k_htt_rx_h_unchain(ar, &amsdu, ret > 0);
    64. 

  64. -	ath10k_htt_rx_h_filter(ar, &amsdu, &rx_status);
    65. 

  65. -	ath10k_htt_rx_h_mpdu(ar, &amsdu, &rx_status);
    66. 

  66. -	ath10k_htt_rx_h_deliver(ar, &amsdu, &rx_status);
    67. 

  67. +	ath10k_htt_rx_h_filter(ar, &amsdu, rx_status);
    68. 

  68. +	ath10k_htt_rx_h_mpdu(ar, &amsdu, rx_status);
    69. 

  69. +	ath10k_htt_rx_h_deliver(ar, &amsdu, rx_status);
    70. 

  70.  
    71. 

  71.  	return 0;
    72. 

  72.  }
    73. 

  73. -- 
    74. 

  74. cgit v0.12
    75. 

  75.