[ath9k-devel] [PATCH 0/2] ath10k: firmware version related changes

[ath9k-devel] [PATCH 0/2] ath10k: firmware version related changes

[Kalle Valo]

Few simple changes how we handle firmware versions.

---

Kalle Valo (2):
      ath10k: print firmware version string during boot
      ath10k: only warn about incompatible firmware versions


 drivers/net/wireless/ath/ath10k/core.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

[ath9k-devel] [PATCH 1/2] ath10k: print firmware version string during boot

[Kalle Valo]

Currently we don't print firmware version at all. Move the
current "firmware dowloaded" message later once firmware
has booted and include firmware version in the message.

Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
---
 drivers/net/wireless/ath/ath10k/core.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index 13ffe78..a511aaf 100644
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -375,7 +375,6 @@ static int ath10k_init_download_firmware(struct ath10k *ar)
 	if (ret)
 		return ret;
 
-	ath10k_info("firmware downloaded\n");
 	return ret;
 }
 
@@ -569,6 +568,8 @@ int ath10k_core_register(struct ath10k *ar)
 	if (status)
 		goto err_htt_detach;
 
+	ath10k_info("firmware %s booted\n", ar->hw->wiphy->fw_version);
+
 	status = ath10k_check_fw_version(ar);
 	if (status)
 		goto err_disconnect_htc;

[ath9k-devel] [PATCH 2/2] ath10k: only warn about incompatible firmware versions

[Kalle Valo]

Most of the time it does more harm than good to halt the
driver initialisation if the firmware version is not
supported. For example, sometimes it's good to test
something from older versions etc. So just change the
check to a warning.

Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
---
 drivers/net/wireless/ath/ath10k/core.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index a511aaf..475ca1a 100644
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -84,10 +84,11 @@ static int ath10k_check_fw_version(struct ath10k *ar)
 		 SUPPORTED_FW_MAJOR, SUPPORTED_FW_MINOR,
 		 SUPPORTED_FW_RELEASE, SUPPORTED_FW_BUILD);
 
-	ath10k_err("Firmware %s is not supported. Please use version %s (or newer)\n",
-		   ar->hw->wiphy->fw_version, version);
+	ath10k_warn("WARNING: Firmware version %s is not officially supported.\n",
+		    ar->hw->wiphy->fw_version);
+	ath10k_warn("Please upgrade to version %s (or newer)\n", version);
 
-	return -EINVAL;
+	return 0;
 }
 
 static int ath10k_init_connect_htc(struct ath10k *ar)

[ath9k-devel] [PATCH 2/2] ath10k: only warn about incompatible firmware versions

[Michal Kazior]

On 02/05/13 11:02, Kalle Valo wrote:
> Most of the time it does more harm than good to halt the
> driver initialisation if the firmware version is not
> supported. For example, sometimes it's good to test
> something from older versions etc. So just change the
> check to a warning.
>
> Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
> ---
>   drivers/net/wireless/ath/ath10k/core.c |    7 ++++---
>   1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
> index a511aaf..475ca1a 100644
> --- a/drivers/net/wireless/ath/ath10k/core.c
> +++ b/drivers/net/wireless/ath/ath10k/core.c
> @@ -84,10 +84,11 @@ static int ath10k_check_fw_version(struct ath10k *ar)
>   		 SUPPORTED_FW_MAJOR, SUPPORTED_FW_MINOR,
>   		 SUPPORTED_FW_RELEASE, SUPPORTED_FW_BUILD);
>
> -	ath10k_err("Firmware %s is not supported. Please use version %s (or newer)\n",
> -		   ar->hw->wiphy->fw_version, version);
> +	ath10k_warn("WARNING: Firmware version %s is not officially supported.\n",
> +		    ar->hw->wiphy->fw_version);
> +	ath10k_warn("Please upgrade to version %s (or newer)\n", version);
>
> -	return -EINVAL;
> +	return 0;
>   }

Perhaps we should also be taking the abi_version (from 
wmi_service_ready_event) into account. I'm not sure if FW really fills 
that one out though.

The "or newer" doesn't seem to suit here either. If new FW has ABI 
changes we're screwed.


-- Pozdrawiam / Best regards, Michal Kazior.

[ath9k-devel] [PATCH 2/2] ath10k: only warn about incompatible firmware versions

[Kalle Valo]

Michal Kazior <michal.kazior@tieto.com> writes:

> On 02/05/13 11:02, Kalle Valo wrote:
>> Most of the time it does more harm than good to halt the
>> driver initialisation if the firmware version is not
>> supported. For example, sometimes it's good to test
>> something from older versions etc. So just change the
>> check to a warning.
>>
>> Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
>> ---

[...]

>> -	ath10k_err("Firmware %s is not supported. Please use version %s (or newer)\n",
>> -		   ar->hw->wiphy->fw_version, version);
>> +	ath10k_warn("WARNING: Firmware version %s is not officially supported.\n",
>> +		    ar->hw->wiphy->fw_version);
>> +	ath10k_warn("Please upgrade to version %s (or newer)\n", version);
>>
>> -	return -EINVAL;
>> +	return 0;
>>   }
>
> Perhaps we should also be taking the abi_version (from 
> wmi_service_ready_event) into account. I'm not sure if FW really fills 
> that one out though.

AFAIK the firmware team doesn't use the abi_version for anything.

> The "or newer" doesn't seem to suit here either. If new FW has ABI 
> changes we're screwed.

You are right but we need to revisit the firmware version handling
anyway in the near future anyway so I'll just keep the warning as is for
now.

-- 
Kalle Valo

[ath9k-devel] [PATCH 0/2] ath10k: firmware version related changes

[Kalle Valo]

Kalle Valo <kvalo@qca.qualcomm.com> writes:

> Few simple changes how we handle firmware versions.
>
> ---
>
> Kalle Valo (2):
>       ath10k: print firmware version string during boot
>       ath10k: only warn about incompatible firmware versions

Applied.

-- 
Kalle Valo