Message ID | 1470257023-6747-1-git-send-email-dan.kephart@lairdtech.com (mailing list archive) |
---|---|
State | Accepted |
Commit | f3fa63144482d6dffd26d8b0a94b06a55d22d940 |
Delegated to: | Kalle Valo |
Headers | show |
On Wed, Aug 3, 2016 at 1:43 PM, <engineering@keppy.com> wrote: > From: Dan Kephart <dan.kephart@lairdtech.com> > > The firmware crash dumps on the 6004 are the same as the 6003. Remove the > statement guarding it from dumping on the 6004. Renamed the > REG_DUMP_COUNT_AR6003 to reflect support on both chips. > > Signed-off-by: Dan Kephart <dan.kephart@lairdtech.com> Since ath6kl only supports the 6003 and 6004, this looks fine to me and works OK on my platforms. Reviewed-by: Steve deRosier <steve.derosier@lairdtech.com> -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
engineering@keppy.com wrote: > From: Dan Kephart <dan.kephart@lairdtech.com> > > The firmware crash dumps on the 6004 are the same as the 6003. Remove the > statement guarding it from dumping on the 6004. Renamed the > REG_DUMP_COUNT_AR6003 to reflect support on both chips. > > Signed-off-by: Dan Kephart <dan.kephart@lairdtech.com> > Reviewed-by: Steve deRosier <steve.derosier@lairdtech.com> Thanks, 1 patch applied to ath-next branch of ath.git: f3fa63144482 ath6kl: enable firmware crash dumps on the AR6004
diff --git a/drivers/net/wireless/ath/ath6kl/hif.c b/drivers/net/wireless/ath/ath6kl/hif.c index 18c0708..d194253 100644 --- a/drivers/net/wireless/ath/ath6kl/hif.c +++ b/drivers/net/wireless/ath/ath6kl/hif.c @@ -64,7 +64,7 @@ int ath6kl_hif_rw_comp_handler(void *context, int status) } EXPORT_SYMBOL(ath6kl_hif_rw_comp_handler); -#define REG_DUMP_COUNT_AR6003 60 +#define REGISTER_DUMP_COUNT 60 #define REGISTER_DUMP_LEN_MAX 60 static void ath6kl_hif_dump_fw_crash(struct ath6kl *ar) @@ -73,9 +73,6 @@ static void ath6kl_hif_dump_fw_crash(struct ath6kl *ar) u32 i, address, regdump_addr = 0; int ret; - if (ar->target_type != TARGET_TYPE_AR6003) - return; - /* the reg dump pointer is copied to the host interest area */ address = ath6kl_get_hi_item_addr(ar, HI_ITEM(hi_failure_state)); address = TARG_VTOP(ar->target_type, address); @@ -95,7 +92,7 @@ static void ath6kl_hif_dump_fw_crash(struct ath6kl *ar) /* fetch register dump data */ ret = ath6kl_diag_read(ar, regdump_addr, (u8 *)®dump_val[0], - REG_DUMP_COUNT_AR6003 * (sizeof(u32))); + REGISTER_DUMP_COUNT * (sizeof(u32))); if (ret) { ath6kl_warn("failed to get register dump: %d\n", ret); return; @@ -105,9 +102,9 @@ static void ath6kl_hif_dump_fw_crash(struct ath6kl *ar) ath6kl_info("hw 0x%x fw %s\n", ar->wiphy->hw_version, ar->wiphy->fw_version); - BUILD_BUG_ON(REG_DUMP_COUNT_AR6003 % 4); + BUILD_BUG_ON(REGISTER_DUMP_COUNT % 4); - for (i = 0; i < REG_DUMP_COUNT_AR6003; i += 4) { + for (i = 0; i < REGISTER_DUMP_COUNT; i += 4) { ath6kl_info("%d: 0x%8.8x 0x%8.8x 0x%8.8x 0x%8.8x\n", i, le32_to_cpu(regdump_val[i]),