[v3,1/7] ath10k: create ath10k_core_init_features()

Commit Message

Kalle Valo Dec. 1, 2014, 2:44 p.m. UTC

It's easier to manage firmware version differences when we configure them in
one place. Rename ath10k_core_init_max_sta_count() to
ath10k_core_init_firmware_features() and start moving most of the firmware
version ("features") handling to that function.

Signed-off-by: Kalle Valo <[e-mail]>
---
 drivers/net/wireless/ath/ath10k/core.c |   24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

Comments

Michal Kazior Dec. 2, 2014, 6:58 a.m. UTC | #1

On 1 December 2014 at 15:44, Kalle Valo <[e-mail]> wrote:
[...]
>  int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode)
> @@ -1046,7 +1047,12 @@ static int ath10k_core_probe_fw(struct ath10k *ar)
>                 return ret;
>         }
>
> -       ath10k_core_init_max_sta_count(ar);
> +       ret = ath10k_core_init_firmware_features(ar);
> +       if (ret) {
> +               ath10k_err(ar, "fatal problem with firmware features: %d\n",
> +                          ret);
> +               return ret;

I think you should call ath10k_core_free_firmware_files() and
ath10k_hif_power_down() before returning (similar to how
ath10k_core_start() failure is handled).


Micha?

Kalle Valo Dec. 2, 2014, 7:09 a.m. UTC | #2

Michal Kazior <[e-mail]> writes:

> On 1 December 2014 at 15:44, Kalle Valo <[e-mail]> wrote:
> [...]
>>  int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode)
>> @@ -1046,7 +1047,12 @@ static int ath10k_core_probe_fw(struct ath10k *ar)
>>                 return ret;
>>         }
>>
>> -       ath10k_core_init_max_sta_count(ar);
>> +       ret = ath10k_core_init_firmware_features(ar);
>> +       if (ret) {
>> +               ath10k_err(ar, "fatal problem with firmware features: %d\n",
>> +                          ret);
>> +               return ret;
>
> I think you should call ath10k_core_free_firmware_files() and
> ath10k_hif_power_down() before returning (similar to how
> ath10k_core_start() failure is handled).

Indeed. I'll fix that in v4.

Patch

diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index 7762061a1944..bd6315952ad0 100644
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -582,13 +582,6 @@  static int ath10k_core_fetch_firmware_api_n(struct ath10k *ar, const char *name)
 		goto err;
 	}
 
-	if (test_bit(ATH10K_FW_FEATURE_WMI_10_2, ar->fw_features) &&
-	    !test_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features)) {
-		ath10k_err(ar, "feature bits corrupted: 10.2 feature requires 10.x feature to be set as well");
-		ret = -EINVAL;
-		goto err;
-	}
-
 	/* now fetch the board file */
 	if (ar->hw_params.fw.board == NULL) {
 		ath10k_err(ar, "board data file not defined");
@@ -799,8 +792,14 @@  static void ath10k_core_restart(struct work_struct *work)
 	mutex_unlock(&ar->conf_mutex);
 }
 
-static void ath10k_core_init_max_sta_count(struct ath10k *ar)
+static int ath10k_core_init_firmware_features(struct ath10k *ar)
 {
+	if (test_bit(ATH10K_FW_FEATURE_WMI_10_2, ar->fw_features) &&
+	    !test_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features)) {
+		ath10k_err(ar, "feature bits corrupted: 10.2 feature requires 10.x feature to be set as well");
+		return -EINVAL;
+	}
+
 	if (test_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features)) {
 		ar->max_num_peers = TARGET_10X_NUM_PEERS;
 		ar->max_num_stations = TARGET_10X_NUM_STATIONS;
@@ -808,6 +807,8 @@  static void ath10k_core_init_max_sta_count(struct ath10k *ar)
 		ar->max_num_peers = TARGET_NUM_PEERS;
 		ar->max_num_stations = TARGET_NUM_STATIONS;
 	}
+
+	return 0;
 }
 
 int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode)
@@ -1046,7 +1047,12 @@  static int ath10k_core_probe_fw(struct ath10k *ar)
 		return ret;
 	}
 
-	ath10k_core_init_max_sta_count(ar);
+	ret = ath10k_core_init_firmware_features(ar);
+	if (ret) {
+		ath10k_err(ar, "fatal problem with firmware features: %d\n",
+			   ret);
+		return ret;
+	}
 
 	mutex_lock(&ar->conf_mutex);