Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 266627
b: refs/heads/master
c: 6bc3643
h: refs/heads/master
i:
  266625: 8c8a3a3
  266623: ec94e2f
v: v3
  • Loading branch information
Kalle Valo committed Sep 28, 2011
1 parent 8903b52 commit dc50530
Show file tree
Hide file tree
Showing 3 changed files with 64 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f7325b85efe1395b52ef1006dafe3c0d4ff79f15
refs/heads/master: 6bc364315aac6ab256ce3cdc00aa90cb57279a1f
1 change: 1 addition & 0 deletions trunk/drivers/net/wireless/ath/ath6kl/debug.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ enum ATH6K_DEBUG_MASK {
ATH6KL_DBG_AGGR = BIT(15), /* aggregation */
ATH6KL_DBG_SDIO = BIT(16),
ATH6KL_DBG_SDIO_DUMP = BIT(17),
ATH6KL_DBG_BOOT = BIT(18), /* driver init and fw boot */
ATH6KL_DBG_ANY = 0xffffffff /* enable all logs */
};

Expand Down
71 changes: 62 additions & 9 deletions trunk/drivers/net/wireless/ath/ath6kl/init.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -958,6 +958,9 @@ static int ath6kl_fetch_fw_api2(struct ath6kl *ar)

switch (ie_id) {
case ATH6KL_FW_IE_OTP_IMAGE:
ath6kl_dbg(ATH6KL_DBG_BOOT, "found otp image ie (%d B)\n",
ie_len);

ar->fw_otp = kmemdup(data, ie_len, GFP_KERNEL);

if (ar->fw_otp == NULL) {
Expand All @@ -968,6 +971,9 @@ static int ath6kl_fetch_fw_api2(struct ath6kl *ar)
ar->fw_otp_len = ie_len;
break;
case ATH6KL_FW_IE_FW_IMAGE:
ath6kl_dbg(ATH6KL_DBG_BOOT, "found fw image ie (%d B)\n",
ie_len);

ar->fw = kmemdup(data, ie_len, GFP_KERNEL);

if (ar->fw == NULL) {
Expand All @@ -978,6 +984,9 @@ static int ath6kl_fetch_fw_api2(struct ath6kl *ar)
ar->fw_len = ie_len;
break;
case ATH6KL_FW_IE_PATCH_IMAGE:
ath6kl_dbg(ATH6KL_DBG_BOOT, "found patch image ie (%d B)\n",
ie_len);

ar->fw_patch = kmemdup(data, ie_len, GFP_KERNEL);

if (ar->fw_patch == NULL) {
Expand All @@ -990,25 +999,41 @@ static int ath6kl_fetch_fw_api2(struct ath6kl *ar)
case ATH6KL_FW_IE_RESERVED_RAM_SIZE:
val = (__le32 *) data;
ar->hw.reserved_ram_size = le32_to_cpup(val);

ath6kl_dbg(ATH6KL_DBG_BOOT,
"found reserved ram size ie 0x%d\n",
ar->hw.reserved_ram_size);
break;
case ATH6KL_FW_IE_CAPABILITIES:
ath6kl_dbg(ATH6KL_DBG_BOOT,
"found firmware capabilities ie (%d B)\n",
ie_len);

for (i = 0; i < ATH6KL_FW_CAPABILITY_MAX; i++) {
index = ALIGN(i, 8) / 8;
bit = i % 8;

if (data[index] & (1 << bit))
__set_bit(i, ar->fw_capabilities);
}

ath6kl_dbg_dump(ATH6KL_DBG_BOOT, "capabilities", "",
ar->fw_capabilities,
sizeof(ar->fw_capabilities));
break;
case ATH6KL_FW_IE_PATCH_ADDR:
if (ie_len != sizeof(*val))
break;

val = (__le32 *) data;
ar->hw.dataset_patch_addr = le32_to_cpup(val);

ath6kl_dbg(ATH6KL_DBG_BOOT,
"found patch address ie 0x%d\n",
ar->hw.dataset_patch_addr);
break;
default:
ath6kl_dbg(ATH6KL_DBG_TRC, "Unknown fw ie: %u\n",
ath6kl_dbg(ATH6KL_DBG_BOOT, "Unknown fw ie: %u\n",
le32_to_cpup(&hdr->id));
break;
}
Expand All @@ -1033,14 +1058,17 @@ static int ath6kl_fetch_firmwares(struct ath6kl *ar)
return ret;

ret = ath6kl_fetch_fw_api2(ar);
if (ret == 0)
/* fw api 2 found, use it */
if (ret == 0) {
ath6kl_dbg(ATH6KL_DBG_BOOT, "using fw api 2\n");
return 0;
}

ret = ath6kl_fetch_fw_api1(ar);
if (ret)
return ret;

ath6kl_dbg(ATH6KL_DBG_BOOT, "using fw api 1\n");

return 0;
}

Expand Down Expand Up @@ -1071,18 +1099,12 @@ static int ath6kl_upload_board_file(struct ath6kl *ar)
(u8 *) &board_address, 4);
}

ath6kl_dbg(ATH6KL_DBG_TRC, "board data download addr: 0x%x\n",
board_address);

/* determine where in target ram to write extended board data */
ath6kl_bmi_read(ar,
ath6kl_get_hi_item_addr(ar,
HI_ITEM(hi_board_ext_data)),
(u8 *) &board_ext_address, 4);

ath6kl_dbg(ATH6KL_DBG_TRC, "board file download addr: 0x%x\n",
board_ext_address);

if (board_ext_address == 0) {
ath6kl_err("Failed to get board file target address.\n");
return -EINVAL;
Expand All @@ -1107,6 +1129,10 @@ static int ath6kl_upload_board_file(struct ath6kl *ar)
board_ext_data_size)) {

/* write extended board data */
ath6kl_dbg(ATH6KL_DBG_BOOT,
"writing extended board data to 0x%x (%d B)\n",
board_ext_address, board_ext_data_size);

ret = ath6kl_bmi_write(ar, board_ext_address,
ar->fw_board + board_data_size,
board_ext_data_size);
Expand All @@ -1131,6 +1157,9 @@ static int ath6kl_upload_board_file(struct ath6kl *ar)
return ret;
}

ath6kl_dbg(ATH6KL_DBG_BOOT, "writing board file to 0x%x (%d B)\n",
board_address, board_data_size);

ret = ath6kl_bmi_write(ar, board_address, ar->fw_board,
board_data_size);

Expand Down Expand Up @@ -1159,6 +1188,9 @@ static int ath6kl_upload_otp(struct ath6kl *ar)

address = ar->hw.app_load_addr;

ath6kl_dbg(ATH6KL_DBG_BOOT, "writing otp to 0x%x (%d B)\n", address,
ar->fw_otp_len);

ret = ath6kl_bmi_fast_download(ar, address, ar->fw_otp,
ar->fw_otp_len);
if (ret) {
Expand All @@ -1179,7 +1211,11 @@ static int ath6kl_upload_otp(struct ath6kl *ar)

ar->hw.app_start_override_addr = address;

ath6kl_dbg(ATH6KL_DBG_BOOT, "app_start_override_addr 0x%x\n",
ar->hw.app_start_override_addr);

/* execute the OTP code */
ath6kl_dbg(ATH6KL_DBG_BOOT, "executing OTP at 0x%x\n", address);
param = 0;
ath6kl_bmi_execute(ar, address, &param);

Expand All @@ -1196,6 +1232,9 @@ static int ath6kl_upload_firmware(struct ath6kl *ar)

address = ar->hw.app_load_addr;

ath6kl_dbg(ATH6KL_DBG_BOOT, "writing firmware to 0x%x (%d B)\n",
address, ar->fw_len);

ret = ath6kl_bmi_fast_download(ar, address, ar->fw, ar->fw_len);

if (ret) {
Expand Down Expand Up @@ -1224,6 +1263,9 @@ static int ath6kl_upload_patch(struct ath6kl *ar)

address = ar->hw.dataset_patch_addr;

ath6kl_dbg(ATH6KL_DBG_BOOT, "writing patch to 0x%x (%d B)\n",
address, ar->fw_patch_len);

ret = ath6kl_bmi_write(ar, address, ar->fw_patch, ar->fw_patch_len);
if (ret) {
ath6kl_err("Failed to write patch file: %d\n", ret);
Expand Down Expand Up @@ -1396,6 +1438,15 @@ static int ath6kl_init_hw_params(struct ath6kl *ar)
return -EINVAL;
}

ath6kl_dbg(ATH6KL_DBG_BOOT,
"target_ver 0x%x target_type 0x%x dataset_patch 0x%x app_load_addr 0x%x\n",
ar->version.target_ver, ar->target_type,
ar->hw.dataset_patch_addr, ar->hw.app_load_addr);
ath6kl_dbg(ATH6KL_DBG_BOOT,
"app_start_override_addr 0x%x board_ext_data_addr 0x%x reserved_ram_size 0x%x",
ar->hw.app_start_override_addr, ar->hw.board_ext_data_addr,
ar->hw.reserved_ram_size);

return 0;
}

Expand Down Expand Up @@ -1472,6 +1523,8 @@ static int ath6kl_init(struct net_device *dev)
&ar->flag),
WMI_TIMEOUT);

ath6kl_dbg(ATH6KL_DBG_BOOT, "firmware booted\n");

if (ar->version.abi_ver != ATH6KL_ABI_VERSION) {
ath6kl_err("abi version mismatch: host(0x%x), target(0x%x)\n",
ATH6KL_ABI_VERSION, ar->version.abi_ver);
Expand Down

0 comments on commit dc50530

Please sign in to comment.