From: Kalle Valo <kvalo@qca.qualcomm.com> To: <ath10k@lists.infradead.org> Cc: <linux-wireless@vger.kernel.org> Subject: [PATCH v3 1/7] ath10k: create ath10k_core_init_features() Date: Mon, 1 Dec 2014 16:44:58 +0200 [thread overview] Message-ID: <20141201144458.18248.28568.stgit@potku.adurom.net> (raw) In-Reply-To: <20141201144400.18248.62714.stgit@potku.adurom.net> 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 <kvalo@qca.qualcomm.com> --- drivers/net/wireless/ath/ath10k/core.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) 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);
WARNING: multiple messages have this Message-ID (diff)
From: Kalle Valo <kvalo@qca.qualcomm.com> To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org Subject: [PATCH v3 1/7] ath10k: create ath10k_core_init_features() Date: Mon, 1 Dec 2014 16:44:58 +0200 [thread overview] Message-ID: <20141201144458.18248.28568.stgit@potku.adurom.net> (raw) In-Reply-To: <20141201144400.18248.62714.stgit@potku.adurom.net> 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 <kvalo@qca.qualcomm.com> --- drivers/net/wireless/ath/ath10k/core.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) 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); _______________________________________________ ath10k mailing list ath10k@lists.infradead.org http://lists.infradead.org/mailman/listinfo/ath10k
next prev parent reply other threads:[~2014-12-01 14:45 UTC|newest] Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-12-01 14:44 [PATCH v3 0/7] ath10k: add support for new wmi-tlv backend Kalle Valo 2014-12-01 14:44 ` Kalle Valo 2014-12-01 14:44 ` Kalle Valo [this message] 2014-12-01 14:44 ` [PATCH v3 1/7] ath10k: create ath10k_core_init_features() Kalle Valo 2014-12-02 6:58 ` Michal Kazior 2014-12-02 6:58 ` Michal Kazior 2014-12-02 7:09 ` Kalle Valo 2014-12-02 7:09 ` Kalle Valo 2014-12-01 14:45 ` [PATCH v3 2/7] ath10k: add ATH10K_FW_IE_WMI_OP_VERSION Kalle Valo 2014-12-01 14:45 ` Kalle Valo 2014-12-02 8:28 ` Michal Kazior 2014-12-02 8:28 ` Michal Kazior 2014-12-02 8:48 ` Kalle Valo 2014-12-02 8:48 ` Kalle Valo 2014-12-02 11:51 ` Michal Kazior 2014-12-02 11:51 ` Michal Kazior 2014-12-03 6:32 ` Kalle Valo 2014-12-03 6:32 ` Kalle Valo 2014-12-02 12:16 ` Michal Kazior 2014-12-02 12:16 ` Michal Kazior 2014-12-03 6:30 ` Kalle Valo 2014-12-03 6:30 ` Kalle Valo 2014-12-01 14:45 ` [PATCH v3 3/7] ath10k: set max_num_pending_tx in ath10k_core_init_firmware_features() Kalle Valo 2014-12-01 14:45 ` Kalle Valo 2014-12-01 14:45 ` [PATCH v3 4/7] ath10k: implement intermediate event args Kalle Valo 2014-12-01 14:45 ` Kalle Valo 2014-12-01 14:46 ` [PATCH v3 5/7] ath10k: introduce wmi ops Kalle Valo 2014-12-01 14:46 ` Kalle Valo 2014-12-01 14:46 ` [PATCH v3 6/7] ath10k: make some wmi functions public Kalle Valo 2014-12-01 14:46 ` Kalle Valo 2014-12-01 14:46 ` [PATCH v3 7/7] ath10k: implement wmi-tlv backend Kalle Valo 2014-12-01 14:46 ` Kalle Valo 2014-12-02 6:38 ` Michal Kazior 2014-12-02 6:38 ` Michal Kazior
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20141201144458.18248.28568.stgit@potku.adurom.net \ --to=kvalo@qca.qualcomm.com \ --cc=ath10k@lists.infradead.org \ --cc=linux-wireless@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.