releases/3.0.1/ath6kl-cache-firmware.patch

   1 From b42a7b1bc7c0f535dfe35b2c934f239c60bb8d30 Mon Sep 17 00:00:00 2001
   2 From: Kalle Valo <kvalo@qca.qualcomm.com>
   3 Date: Mon, 13 Jun 2011 11:54:18 +0300
   4 Subject: ath6kl: cache firmware
   5
   6 From: Kalle Valo <kvalo@qca.qualcomm.com>
   7
   8 commit b42a7b1bc7c0f535dfe35b2c934f239c60bb8d30 upstream.
   9
  10 Drivers should not request firmware during resume. Fix ath6kl to
  11 cache the firmware instead.
  12
  13 Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
  14 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  15
  16 ---
  17  drivers/staging/ath6kl/os/linux/ar6000_drv.c         |   49 +++++++++++++------
  18  drivers/staging/ath6kl/os/linux/include/ar6000_drv.h |    9 +++
  19  2 files changed, 43 insertions(+), 15 deletions(-)
  20
  21 --- a/drivers/staging/ath6kl/os/linux/ar6000_drv.c
  22 +++ b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
  23 @@ -954,9 +954,13 @@ ar6000_transfer_bin_file(struct ar6_soft
  24      const char *filename;
  25      const struct firmware *fw_entry;
  26      u32 fw_entry_size;
  27 +    u8 **buf;
  28 +    size_t *buf_len;
  29
  30      switch (file) {
  31          case AR6K_OTP_FILE:
  32 +               buf = &ar->fw_otp;
  33 +               buf_len = &ar->fw_otp_len;
  34              if (ar->arVersion.target_ver == AR6003_REV1_VERSION) {
  35                  filename = AR6003_REV1_OTP_FILE;
  36              } else if (ar->arVersion.target_ver == AR6003_REV2_VERSION) {
  37 @@ -970,6 +974,8 @@ ar6000_transfer_bin_file(struct ar6_soft
  38              break;
  39
  40          case AR6K_FIRMWARE_FILE:
  41 +               buf = &ar->fw;
  42 +               buf_len = &ar->fw_len;
  43              if (ar->arVersion.target_ver == AR6003_REV1_VERSION) {
  44                  filename = AR6003_REV1_FIRMWARE_FILE;
  45              } else if (ar->arVersion.target_ver == AR6003_REV2_VERSION) {
  46 @@ -1028,6 +1034,8 @@ ar6000_transfer_bin_file(struct ar6_soft
  47              break;
  48
  49          case AR6K_PATCH_FILE:
  50 +               buf = &ar->fw_patch;
  51 +               buf_len = &ar->fw_patch_len;
  52              if (ar->arVersion.target_ver == AR6003_REV1_VERSION) {
  53                  filename = AR6003_REV1_PATCH_FILE;
  54              } else if (ar->arVersion.target_ver == AR6003_REV2_VERSION) {
  55 @@ -1041,6 +1049,8 @@ ar6000_transfer_bin_file(struct ar6_soft
  56              break;
  57
  58          case AR6K_BOARD_DATA_FILE:
  59 +               buf = &ar->fw_data;
  60 +               buf_len = &ar->fw_data_len;
  61              if (ar->arVersion.target_ver == AR6003_REV1_VERSION) {
  62                  filename = AR6003_REV1_BOARD_DATA_FILE;
  63              } else if (ar->arVersion.target_ver == AR6003_REV2_VERSION) {
  64 @@ -1057,23 +1067,29 @@ ar6000_transfer_bin_file(struct ar6_soft
  65              AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unknown file type: %d\n", file));
  66              return A_ERROR;
  67      }
  68 -    if ((A_REQUEST_FIRMWARE(&fw_entry, filename, ((struct device *)ar->osDevInfo.pOSDevice))) != 0)
  69 -    {
  70 -        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Failed to get %s\n", filename));
  71 -        return A_ENOENT;
  72 +
  73 +    if (*buf == NULL) {
  74 +           if ((A_REQUEST_FIRMWARE(&fw_entry, filename, ((struct device *)ar->osDevInfo.pOSDevice))) != 0) {
  75 +                   AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Failed to get %s\n", filename));
  76 +                   return A_ENOENT;
  77 +           }
  78 +
  79 +           *buf = kmemdup(fw_entry->data, fw_entry->size, GFP_KERNEL);
  80 +           *buf_len = fw_entry->size;
  81 +           A_RELEASE_FIRMWARE(fw_entry);
  82      }
  83
  84  #ifdef SOFTMAC_FILE_USED
  85 -    if (file==AR6K_BOARD_DATA_FILE && fw_entry->data) {
  86 -        ar6000_softmac_update(ar, (u8 *)fw_entry->data, fw_entry->size);
  87 +    if (file==AR6K_BOARD_DATA_FILE && *buf_len) {
  88 +        ar6000_softmac_update(ar, *buf, *buf_len);
  89      }
  90  #endif
  91
  92
  93 -    fw_entry_size = fw_entry->size;
  94 +    fw_entry_size = *buf_len;
  95
  96      /* Load extended board data for AR6003 */
  97 -    if ((file==AR6K_BOARD_DATA_FILE) && (fw_entry->data)) {
  98 +    if ((file==AR6K_BOARD_DATA_FILE) && *buf) {
  99          u32 board_ext_address;
 100          u32 board_ext_data_size;
 101          u32 board_data_size;
 102 @@ -1089,14 +1105,13 @@ ar6000_transfer_bin_file(struct ar6_soft
 103          AR_DEBUG_PRINTF(ATH_DEBUG_INFO, ("Board extended Data download address: 0x%x\n", board_ext_address));
 104
 105          /* check whether the target has allocated memory for extended board data and file contains extended board data */
 106 -        if ((board_ext_address) && (fw_entry->size == (board_data_size + board_ext_data_size))) {
 107 +        if ((board_ext_address) && (*buf_len == (board_data_size + board_ext_data_size))) {
 108              u32 param;
 109
 110 -            status = BMIWriteMemory(ar->arHifDevice, board_ext_address, (u8 *)(fw_entry->data + board_data_size), board_ext_data_size);
 111 +            status = BMIWriteMemory(ar->arHifDevice, board_ext_address, (u8 *)(*buf + board_data_size), board_ext_data_size);
 112
 113              if (status) {
 114                  AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("BMI operation failed: %d\n", __LINE__));
 115 -                A_RELEASE_FIRMWARE(fw_entry);
 116                  return A_ERROR;
 117              }
 118
 119 @@ -1110,17 +1125,16 @@ ar6000_transfer_bin_file(struct ar6_soft
 120      }
 121
 122      if (compressed) {
 123 -        status = BMIFastDownload(ar->arHifDevice, address, (u8 *)fw_entry->data, fw_entry_size);
 124 +        status = BMIFastDownload(ar->arHifDevice, address, *buf, fw_entry_size);
 125      } else {
 126 -        status = BMIWriteMemory(ar->arHifDevice, address, (u8 *)fw_entry->data, fw_entry_size);
 127 +        status = BMIWriteMemory(ar->arHifDevice, address, *buf, fw_entry_size);
 128      }
 129
 130      if (status) {
 131          AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("BMI operation failed: %d\n", __LINE__));
 132 -        A_RELEASE_FIRMWARE(fw_entry);
 133          return A_ERROR;
 134      }
 135 -    A_RELEASE_FIRMWARE(fw_entry);
 136 +
 137      return 0;
 138  }
 139
 140 @@ -2088,6 +2102,11 @@ ar6000_destroy(struct net_device *dev, u
 141      ar6000_remove_ap_interface();
 142  #endif /*CONFIG_AP_VIRTUAL_ADAPTER_SUPPORT */
 143
 144 +    kfree(ar->fw_otp);
 145 +    kfree(ar->fw);
 146 +    kfree(ar->fw_patch);
 147 +    kfree(ar->fw_data);
 148 +
 149      AR_DEBUG_PRINTF(ATH_DEBUG_INFO,("-ar6000_destroy \n"));
 150  }
 151
 152 --- a/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
 153 +++ b/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
 154 @@ -651,6 +651,15 @@ struct ar6_softc {
 155      void                    *arApDev;
 156  #endif
 157      u8 arAutoAuthStage;
 158 +
 159 +       u8 *fw_otp;
 160 +       size_t fw_otp_len;
 161 +       u8 *fw;
 162 +       size_t fw_len;
 163 +       u8 *fw_patch;
 164 +       size_t fw_patch_len;
 165 +       u8 *fw_data;
 166 +       size_t fw_data_len;
 167  };
 168
 169  #ifdef CONFIG_AP_VIRTUAL_ADAPTER_SUPPORT