2014-01-21 09:21:36

by Chun-Yeow Yeoh

Subject: [PATCH] ath10k: fix the printing of 10.x FW version when FW crashed

10.x FW has no structure member sw_version_1. Thus,
both fw_version_release and fw_version_build are not
available. The provided fw_version_major is also wrong.
Fix this by using the fw_version from struct wiphy.

Signed-off-by: Chun-Yeow Yeoh <[email protected]>
---
drivers/net/wireless/ath/ath10k/pci.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c
index 29fd197..9179c88 100644
--- a/drivers/net/wireless/ath/ath10k/pci.c
+++ b/drivers/net/wireless/ath/ath10k/pci.c
@@ -833,9 +833,7 @@ static void ath10k_pci_hif_dump_area(struct ath10k *ar)
ath10k_err("firmware crashed!\n");
ath10k_err("hardware name %s version 0x%x\n",
ar->hw_params.name, ar->target_version);
- ath10k_err("firmware version: %u.%u.%u.%u\n", ar->fw_version_major,
- ar->fw_version_minor, ar->fw_version_release,
- ar->fw_version_build);
+ ath10k_err("firmware version: %s\n", ar->hw->wiphy->fw_version);

host_addr = host_interest_item_address(HI_ITEM(hi_failure_state));
ret = ath10k_pci_diag_read_mem(ar, host_addr,
--
1.7.9.5

2014-01-23 12:57:28

by Kalle Valo

Subject: Re: [PATCH] ath10k: fix the printing of 10.x FW version when FW crashed

Chun-Yeow Yeoh <[email protected]> writes:

> 10.x FW has no structure member sw_version_1. Thus,
> both fw_version_release and fw_version_build are not
> available. The provided fw_version_major is also wrong.
> Fix this by using the fw_version from struct wiphy.
>
> Signed-off-by: Chun-Yeow Yeoh <[email protected]>

Thanks, applied.

--
Kalle Valo