324-ath9k-add-new-function-ath9k_hw_read_array.patch 2.1 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869
  1. From: Oleksij Rempel <[email protected]>
  2. Date: Sun, 22 Mar 2015 19:29:51 +0100
  3. Subject: [PATCH] ath9k: add new function ath9k_hw_read_array
  4. REG_READ generate most overhead on usb bus. It send and read micro packages
  5. and reduce usb bandwidth. To reduce this overhead we should read in batches.
  6. Signed-off-by: Oleksij Rempel <[email protected]>
  7. Signed-off-by: Kalle Valo <[email protected]>
  8. ---
  9. --- a/drivers/net/wireless/ath/ath9k/hw.c
  10. +++ b/drivers/net/wireless/ath/ath9k/hw.c
  11. @@ -121,6 +121,36 @@ void ath9k_hw_write_array(struct ath_hw
  12. REGWRITE_BUFFER_FLUSH(ah);
  13. }
  14. +void ath9k_hw_read_array(struct ath_hw *ah, u32 array[][2], int size)
  15. +{
  16. + u32 *tmp_reg_list, *tmp_data;
  17. + int i;
  18. +
  19. + tmp_reg_list = kmalloc(size * sizeof(u32), GFP_KERNEL);
  20. + if (!tmp_reg_list) {
  21. + dev_err(ah->dev, "%s: tmp_reg_list: alloc filed\n", __func__);
  22. + return;
  23. + }
  24. +
  25. + tmp_data = kmalloc(size * sizeof(u32), GFP_KERNEL);
  26. + if (!tmp_data) {
  27. + dev_err(ah->dev, "%s tmp_data: alloc filed\n", __func__);
  28. + goto error_tmp_data;
  29. + }
  30. +
  31. + for (i = 0; i < size; i++)
  32. + tmp_reg_list[i] = array[i][0];
  33. +
  34. + REG_READ_MULTI(ah, tmp_reg_list, tmp_data, size);
  35. +
  36. + for (i = 0; i < size; i++)
  37. + array[i][1] = tmp_data[i];
  38. +
  39. + kfree(tmp_data);
  40. +error_tmp_data:
  41. + kfree(tmp_reg_list);
  42. +}
  43. +
  44. u32 ath9k_hw_reverse_bits(u32 val, u32 n)
  45. {
  46. u32 retval;
  47. --- a/drivers/net/wireless/ath/ath9k/hw.h
  48. +++ b/drivers/net/wireless/ath/ath9k/hw.h
  49. @@ -138,6 +138,8 @@
  50. #define REG_WRITE_ARRAY(iniarray, column, regWr) \
  51. ath9k_hw_write_array(ah, iniarray, column, &(regWr))
  52. +#define REG_READ_ARRAY(ah, array, size) \
  53. + ath9k_hw_read_array(ah, array, size)
  54. #define AR_GPIO_OUTPUT_MUX_AS_OUTPUT 0
  55. #define AR_GPIO_OUTPUT_MUX_AS_PCIE_ATTENTION_LED 1
  56. @@ -1020,6 +1022,7 @@ void ath9k_hw_synth_delay(struct ath_hw
  57. bool ath9k_hw_wait(struct ath_hw *ah, u32 reg, u32 mask, u32 val, u32 timeout);
  58. void ath9k_hw_write_array(struct ath_hw *ah, const struct ar5416IniArray *array,
  59. int column, unsigned int *writecnt);
  60. +void ath9k_hw_read_array(struct ath_hw *ah, u32 array[][2], int size);
  61. u32 ath9k_hw_reverse_bits(u32 val, u32 n);
  62. u16 ath9k_hw_computetxtime(struct ath_hw *ah,
  63. u8 phy, int kbps,