From: Michal Kazior <michal.kazior@tieto.com> To: Kalle Valo <kvalo@qca.qualcomm.com> Cc: "ath10k@lists.infradead.org" <ath10k@lists.infradead.org>, linux-wireless <linux-wireless@vger.kernel.org> Subject: Re: [PATCH v4 6/8] ath10k: introduce wmi ops Date: Wed, 3 Dec 2014 13:59:59 +0100 [thread overview] Message-ID: <CA+BoTQmEG2UQdp=42qHMMQDE04xm2Xnss4su0TNav1Z_RQEX3Q@mail.gmail.com> (raw) In-Reply-To: <20141203081054.31187.10953.stgit@potku.adurom.net> On 3 December 2014 at 09:10, Kalle Valo <kvalo@qca.qualcomm.com> wrote: [...] > diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h > index e0999cdaa18f..8c839f68beac 100644 > --- a/drivers/net/wireless/ath/ath10k/core.h > +++ b/drivers/net/wireless/ath/ath10k/core.h [...] > @@ -612,6 +613,7 @@ struct ath10k { > /* protected by conf_mutex */ > const struct firmware *utf; > DECLARE_BITMAP(orig_fw_features, ATH10K_FW_FEATURE_COUNT); > + enum ath10k_fw_wmi_op_version orig_wmi_op_version; > > /* protected by data_lock */ > bool utf_monitor; [...] > diff --git a/drivers/net/wireless/ath/ath10k/testmode.c b/drivers/net/wireless/ath/ath10k/testmode.c > index 483db9cb8c96..b084f88da102 100644 > --- a/drivers/net/wireless/ath/ath10k/testmode.c > +++ b/drivers/net/wireless/ath/ath10k/testmode.c > @@ -187,13 +187,14 @@ static int ath10k_tm_cmd_utf_start(struct ath10k *ar, struct nlattr *tb[]) > > memcpy(ar->testmode.orig_fw_features, ar->fw_features, > sizeof(ar->fw_features)); > + ar->testmode.orig_wmi_op_version = ar->wmi.op_version; > > /* utf.bin firmware image does not advertise firmware features. Do > * an ugly hack where we force the firmware features so that wmi.c > * will use the correct WMI interface. > */ > memset(ar->fw_features, 0, sizeof(ar->fw_features)); > - __set_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features); > + ar->wmi.op_version = ATH10K_FW_WMI_OP_VERSION_10_1; > > ret = ath10k_hif_power_up(ar); > if (ret) { > @@ -224,6 +225,7 @@ err_fw_features: > /* return the original firmware features */ > memcpy(ar->fw_features, ar->testmode.orig_fw_features, > sizeof(ar->fw_features)); > + ar->wmi.op_version = ar->testmode.orig_wmi_op_version; > > release_firmware(ar->testmode.utf); > ar->testmode.utf = NULL; > @@ -250,6 +252,7 @@ static void __ath10k_tm_cmd_utf_stop(struct ath10k *ar) > /* return the original firmware features */ > memcpy(ar->fw_features, ar->testmode.orig_fw_features, > sizeof(ar->fw_features)); > + ar->wmi.op_version = ar->testmode.orig_wmi_op_version; > > release_firmware(ar->testmode.utf); > ar->testmode.utf = NULL; Does testmode stuff really belong to this patchset? Shouldn't this be done in the one that introduces WMI OP version? Michał
WARNING: multiple messages have this Message-ID (diff)
From: Michal Kazior <michal.kazior@tieto.com> To: Kalle Valo <kvalo@qca.qualcomm.com> Cc: linux-wireless <linux-wireless@vger.kernel.org>, "ath10k@lists.infradead.org" <ath10k@lists.infradead.org> Subject: Re: [PATCH v4 6/8] ath10k: introduce wmi ops Date: Wed, 3 Dec 2014 13:59:59 +0100 [thread overview] Message-ID: <CA+BoTQmEG2UQdp=42qHMMQDE04xm2Xnss4su0TNav1Z_RQEX3Q@mail.gmail.com> (raw) In-Reply-To: <20141203081054.31187.10953.stgit@potku.adurom.net> On 3 December 2014 at 09:10, Kalle Valo <kvalo@qca.qualcomm.com> wrote: [...] > diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h > index e0999cdaa18f..8c839f68beac 100644 > --- a/drivers/net/wireless/ath/ath10k/core.h > +++ b/drivers/net/wireless/ath/ath10k/core.h [...] > @@ -612,6 +613,7 @@ struct ath10k { > /* protected by conf_mutex */ > const struct firmware *utf; > DECLARE_BITMAP(orig_fw_features, ATH10K_FW_FEATURE_COUNT); > + enum ath10k_fw_wmi_op_version orig_wmi_op_version; > > /* protected by data_lock */ > bool utf_monitor; [...] > diff --git a/drivers/net/wireless/ath/ath10k/testmode.c b/drivers/net/wireless/ath/ath10k/testmode.c > index 483db9cb8c96..b084f88da102 100644 > --- a/drivers/net/wireless/ath/ath10k/testmode.c > +++ b/drivers/net/wireless/ath/ath10k/testmode.c > @@ -187,13 +187,14 @@ static int ath10k_tm_cmd_utf_start(struct ath10k *ar, struct nlattr *tb[]) > > memcpy(ar->testmode.orig_fw_features, ar->fw_features, > sizeof(ar->fw_features)); > + ar->testmode.orig_wmi_op_version = ar->wmi.op_version; > > /* utf.bin firmware image does not advertise firmware features. Do > * an ugly hack where we force the firmware features so that wmi.c > * will use the correct WMI interface. > */ > memset(ar->fw_features, 0, sizeof(ar->fw_features)); > - __set_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features); > + ar->wmi.op_version = ATH10K_FW_WMI_OP_VERSION_10_1; > > ret = ath10k_hif_power_up(ar); > if (ret) { > @@ -224,6 +225,7 @@ err_fw_features: > /* return the original firmware features */ > memcpy(ar->fw_features, ar->testmode.orig_fw_features, > sizeof(ar->fw_features)); > + ar->wmi.op_version = ar->testmode.orig_wmi_op_version; > > release_firmware(ar->testmode.utf); > ar->testmode.utf = NULL; > @@ -250,6 +252,7 @@ static void __ath10k_tm_cmd_utf_stop(struct ath10k *ar) > /* return the original firmware features */ > memcpy(ar->fw_features, ar->testmode.orig_fw_features, > sizeof(ar->fw_features)); > + ar->wmi.op_version = ar->testmode.orig_wmi_op_version; > > release_firmware(ar->testmode.utf); > ar->testmode.utf = NULL; Does testmode stuff really belong to this patchset? Shouldn't this be done in the one that introduces WMI OP version? Michał _______________________________________________ ath10k mailing list ath10k@lists.infradead.org http://lists.infradead.org/mailman/listinfo/ath10k
next prev parent reply other threads:[~2014-12-03 13:00 UTC|newest] Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-12-03 8:09 [PATCH v4 0/8] ath10k: add support for new wmi-tlv backend Kalle Valo 2014-12-03 8:09 ` Kalle Valo 2014-12-03 8:09 ` [PATCH v4 1/8] ath10k: clean up error handling in ath10k_core_probe_fw() Kalle Valo 2014-12-03 8:09 ` Kalle Valo 2014-12-03 8:09 ` [PATCH v4 2/8] ath10k: create ath10k_core_init_features() Kalle Valo 2014-12-03 8:09 ` Kalle Valo 2014-12-03 8:10 ` [PATCH v4 3/8] ath10k: add ATH10K_FW_IE_WMI_OP_VERSION Kalle Valo 2014-12-03 8:10 ` Kalle Valo 2014-12-03 8:10 ` [PATCH v4 4/8] ath10k: set max_num_pending_tx in ath10k_core_init_firmware_features() Kalle Valo 2014-12-03 8:10 ` Kalle Valo 2014-12-03 8:10 ` [PATCH v4 5/8] ath10k: implement intermediate event args Kalle Valo 2014-12-03 8:10 ` Kalle Valo 2014-12-03 8:10 ` [PATCH v4 6/8] ath10k: introduce wmi ops Kalle Valo 2014-12-03 8:10 ` Kalle Valo 2014-12-03 12:59 ` Michal Kazior [this message] 2014-12-03 12:59 ` Michal Kazior 2014-12-08 6:58 ` Kalle Valo 2014-12-08 6:58 ` Kalle Valo 2014-12-08 6:51 ` Michal Kazior 2014-12-08 6:51 ` Michal Kazior 2014-12-08 7:03 ` Kalle Valo 2014-12-08 7:03 ` Kalle Valo 2014-12-03 8:11 ` [PATCH v4 7/8] ath10k: make some wmi functions public Kalle Valo 2014-12-03 8:11 ` Kalle Valo 2014-12-03 8:11 ` [PATCH v4 8/8] ath10k: implement wmi-tlv backend Kalle Valo 2014-12-03 8:11 ` Kalle Valo 2014-12-03 13:01 ` Michal Kazior 2014-12-03 13:01 ` Michal Kazior 2014-12-08 6:54 ` Kalle Valo 2014-12-08 6:54 ` Kalle Valo 2014-12-08 15:41 ` [PATCH v4 0/8] ath10k: add support for new " Kalle Valo 2014-12-08 15:41 ` Kalle Valo
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='CA+BoTQmEG2UQdp=42qHMMQDE04xm2Xnss4su0TNav1Z_RQEX3Q@mail.gmail.com' \ --to=michal.kazior@tieto.com \ --cc=ath10k@lists.infradead.org \ --cc=kvalo@qca.qualcomm.com \ --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.