[PATCH] iwlwifi: add support for hr1 RF ID

All of lore.kernel.org
 help / color / mirror / Atom feed

* [PATCH] iwlwifi: add support for hr1 RF ID
@ 2019-06-20  8:46 Luca Coelho
  2019-06-20 10:30 ` Luciano Coelho
  2019-06-24 13:24 ` Kalle Valo
  0 siblings, 2 replies; 4+ messages in thread
From: Luca Coelho @ 2019-06-20  8:46 UTC (permalink / raw)
  To: kvalo; +Cc: linux-wireless, Oren Givon, stable, Luciano Coelho

From: Oren Givon <oren.givon@intel.com>

The 22000 series FW that was meant to be used with hr is
also the FW that is used for hr1 and has a different RF ID.
Add support to load the hr FW when hr1 RF ID is detected.

Cc: stable@vger.kernel.org # 5.1+
Signed-off-by: Oren Givon <oren.givon@intel.com>
Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
---
 drivers/net/wireless/intel/iwlwifi/iwl-csr.h    | 1 +
 drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-csr.h b/drivers/net/wireless/intel/iwlwifi/iwl-csr.h
index 553554846009..93da96a7247c 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-csr.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-csr.h
@@ -336,6 +336,7 @@ enum {
 /* RF_ID value */
 #define CSR_HW_RF_ID_TYPE_JF		(0x00105100)
 #define CSR_HW_RF_ID_TYPE_HR		(0x0010A000)
+#define CSR_HW_RF_ID_TYPE_HR1		(0x0010c100)
 #define CSR_HW_RF_ID_TYPE_HRCDB		(0x00109F00)
 #define CSR_HW_RF_ID_TYPE_GF		(0x0010D000)
 #define CSR_HW_RF_ID_TYPE_GF4		(0x0010E000)
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
index b93753233223..38ab24d96244 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
@@ -3575,9 +3575,11 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
 			trans->cfg = &iwlax411_2ax_cfg_so_gf4_a0;
 		}
 	} else if (cfg == &iwl_ax101_cfg_qu_hr) {
-		if (CSR_HW_RF_ID_TYPE_CHIP_ID(trans->hw_rf_id) ==
-		    CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HR) &&
-		    trans->hw_rev == CSR_HW_REV_TYPE_QNJ_B0) {
+		if ((CSR_HW_RF_ID_TYPE_CHIP_ID(trans->hw_rf_id) ==
+		     CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HR) &&
+		     trans->hw_rev == CSR_HW_REV_TYPE_QNJ_B0) ||
+		    (CSR_HW_RF_ID_TYPE_CHIP_ID(trans->hw_rf_id) ==
+		     CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HR1))) {
 			trans->cfg = &iwl22000_2ax_cfg_qnj_hr_b0;
 		} else if (CSR_HW_RF_ID_TYPE_CHIP_ID(trans->hw_rf_id) ==
 		    CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HR)) {
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] iwlwifi: add support for hr1 RF ID
  2019-06-20  8:46 [PATCH] iwlwifi: add support for hr1 RF ID Luca Coelho
@ 2019-06-20 10:30 ` Luciano Coelho
  2019-06-20 10:34   ` Luciano Coelho
  2019-06-24 13:24 ` Kalle Valo
  1 sibling, 1 reply; 4+ messages in thread
From: Luciano Coelho @ 2019-06-20 10:30 UTC (permalink / raw)
  To: kvalo; +Cc: linux-wireless, Oren Givon, stable

Hi Kalle,

Please take this to 5.1-rc* as well.

--
Cheers,
Luca.


On Thu, 2019-06-20 at 11:46 +0300, Luca Coelho wrote:
> From: Oren Givon <oren.givon@intel.com>
> 
> The 22000 series FW that was meant to be used with hr is
> also the FW that is used for hr1 and has a different RF ID.
> Add support to load the hr FW when hr1 RF ID is detected.
> 
> Cc: stable@vger.kernel.org # 5.1+
> Signed-off-by: Oren Givon <oren.givon@intel.com>
> Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
> ---
>  drivers/net/wireless/intel/iwlwifi/iwl-csr.h    | 1 +
>  drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 8 +++++---
>  2 files changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-csr.h b/drivers/net/wireless/intel/iwlwifi/iwl-csr.h
> index 553554846009..93da96a7247c 100644
> --- a/drivers/net/wireless/intel/iwlwifi/iwl-csr.h
> +++ b/drivers/net/wireless/intel/iwlwifi/iwl-csr.h
> @@ -336,6 +336,7 @@ enum {
>  /* RF_ID value */
>  #define CSR_HW_RF_ID_TYPE_JF		(0x00105100)
>  #define CSR_HW_RF_ID_TYPE_HR		(0x0010A000)
> +#define CSR_HW_RF_ID_TYPE_HR1		(0x0010c100)
>  #define CSR_HW_RF_ID_TYPE_HRCDB		(0x00109F00)
>  #define CSR_HW_RF_ID_TYPE_GF		(0x0010D000)
>  #define CSR_HW_RF_ID_TYPE_GF4		(0x0010E000)
> diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
> index b93753233223..38ab24d96244 100644
> --- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
> +++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
> @@ -3575,9 +3575,11 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
>  			trans->cfg = &iwlax411_2ax_cfg_so_gf4_a0;
>  		}
>  	} else if (cfg == &iwl_ax101_cfg_qu_hr) {
> -		if (CSR_HW_RF_ID_TYPE_CHIP_ID(trans->hw_rf_id) ==
> -		    CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HR) &&
> -		    trans->hw_rev == CSR_HW_REV_TYPE_QNJ_B0) {
> +		if ((CSR_HW_RF_ID_TYPE_CHIP_ID(trans->hw_rf_id) ==
> +		     CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HR) &&
> +		     trans->hw_rev == CSR_HW_REV_TYPE_QNJ_B0) ||
> +		    (CSR_HW_RF_ID_TYPE_CHIP_ID(trans->hw_rf_id) ==
> +		     CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HR1))) {
>  			trans->cfg = &iwl22000_2ax_cfg_qnj_hr_b0;
>  		} else if (CSR_HW_RF_ID_TYPE_CHIP_ID(trans->hw_rf_id) ==
>  		    CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HR)) {


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] iwlwifi: add support for hr1 RF ID
  2019-06-20 10:30 ` Luciano Coelho
@ 2019-06-20 10:34   ` Luciano Coelho
  0 siblings, 0 replies; 4+ messages in thread
From: Luciano Coelho @ 2019-06-20 10:34 UTC (permalink / raw)
  To: kvalo; +Cc: linux-wireless, Oren Givon, stable

On Thu, 2019-06-20 at 13:30 +0300, Luciano Coelho wrote:
> Hi Kalle,
> 
> Please take this to 5.1-rc* as well.

I obviously meant 5.2-rc*.

Thanks!

--
Luca.


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] iwlwifi: add support for hr1 RF ID
  2019-06-20  8:46 [PATCH] iwlwifi: add support for hr1 RF ID Luca Coelho
  2019-06-20 10:30 ` Luciano Coelho
@ 2019-06-24 13:24 ` Kalle Valo
  1 sibling, 0 replies; 4+ messages in thread
From: Kalle Valo @ 2019-06-24 13:24 UTC (permalink / raw)
  To: Luca Coelho; +Cc: linux-wireless, Oren Givon, stable, Luciano Coelho

Luca Coelho <luca@coelho.fi> wrote:

> From: Oren Givon <oren.givon@intel.com>
> 
> The 22000 series FW that was meant to be used with hr is
> also the FW that is used for hr1 and has a different RF ID.
> Add support to load the hr FW when hr1 RF ID is detected.
> 
> Cc: stable@vger.kernel.org # 5.1+
> Signed-off-by: Oren Givon <oren.givon@intel.com>
> Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>

Patch applied to wireless-drivers.git, thanks.

498d3eb5bfbb iwlwifi: add support for hr1 RF ID

-- 
https://patchwork.kernel.org/patch/11006135/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2019-06-24 13:24 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-20  8:46 [PATCH] iwlwifi: add support for hr1 RF ID Luca Coelho
2019-06-20 10:30 ` Luciano Coelho
2019-06-20 10:34   ` Luciano Coelho
2019-06-24 13:24 ` Kalle Valo

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.