iwlwifi: fixes intended for v5.10 2020-12-02
cover iwlwifi: fixes intended for v5.10 2020-12-02
From: Luca Coelho <[email protected]>
Hi,
This is the second patchset with fixes for v5.10.
The changes are:
* Add a few PCI IDs for some new devices;
* Fix 160 vs. non-160 MHz device detection.
As usual, I'm pushing this to a pending branch, for kbuild bot. And since these are fixes for the rc series, please take them directly to wireless-drivers.git, as we agreed.
Cheers,
Luca.
Golan Ben Ami (1):
iwlwifi: pcie: add some missing entries for AX210
Luca Coelho (2):
iwlwifi: pcie: add one missing entry for AX210
iwlwifi: pcie: invert values of NO_160 device config entries
drivers/net/wireless/intel/iwlwifi/iwl-config.h | 4 ++-- drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-)
Signature · 1 line
2.29.2
PATCH 1/3 iwlwifi: pcie: add one missing entry for AX210
From: Luca Coelho <[email protected]>
The 0x0024 subsytem device ID was missing from the list, so some AX210 devices were not recognized. Add it.
--- drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/intel/iwlwifi/pcie/drv.c +1 -0
@@ -536,6 +536,7 @@ static const struct pci_device_id iwl_hw_card_ids[] = { {IWL_PCI_DEVICE(0x2725, 0x0090, iwlax211_2ax_cfg_so_gf_a0)}, {IWL_PCI_DEVICE(0x2725, 0x0020, iwlax210_2ax_cfg_ty_gf_a0)}, + {IWL_PCI_DEVICE(0x2725, 0x0024, iwlax210_2ax_cfg_ty_gf_a0)}, {IWL_PCI_DEVICE(0x2725, 0x0310, iwlax210_2ax_cfg_ty_gf_a0)}, {IWL_PCI_DEVICE(0x2725, 0x0510, iwlax210_2ax_cfg_ty_gf_a0)}, {IWL_PCI_DEVICE(0x2725, 0x0A10, iwlax210_2ax_cfg_ty_gf_a0)},
Signature · 1 line
2.29.2
Re: [PATCH 1/3] iwlwifi: pcie: add one missing entry for AX210
Quoted 6 lines · Luca Coelho
From: Luca Coelho <[email protected]>
The
0x0024subsytem device ID was missing from the list, so some AX210 devices were not recognized. Add it.Signed-off-by Luca Coelho <[email protected]>
3 patches applied to wireless-drivers.git, thanks.
5febcdef3090 iwlwifi: pcie: add one missing entry for AX210 568d3434178b iwlwifi: pcie: invert values of NO_160 device config entries a0426b6caf18 iwlwifi: pcie: add some missing entries for AX210
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/iwlwifi.20201202143859.308eab4db42c.I3763196cd3f7bb36f3dcabf02ec4e7c4fe859c0f@changeid/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
PATCH 2/3 iwlwifi: pcie: invert values of NO_160 device config entries
In reply to Luca CoelhoFrom: Luca Coelho <[email protected]>
The NO_160 flag specifies if the device doesn't have 160 MHz support, but we errorneously assumed the opposite. If the flag was set, we were considering that 160 MHz was supported, but it's actually the opposite. Fix it by inverting the bits, i.e. NO_160 is 0x1 and 160 is 0x0.
--- drivers/net/wireless/intel/iwlwifi/iwl-config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/intel/iwlwifi/iwl-config.h +2 -2
@@ -491,8 +491,8 @@ struct iwl_cfg {#define IWL_CFG_RF_ID_HR 0x7#define IWL_CFG_RF_ID_HR1 0x4 -#define IWL_CFG_NO_160 0x0 -#define IWL_CFG_160 0x1 +#define IWL_CFG_NO_160 0x1 +#define IWL_CFG_160 0x0#define IWL_CFG_CORES_BT 0x0#define IWL_CFG_CORES_BT_GNSS 0x5
Signature · 1 line
2.29.2
PATCH 3/3 iwlwifi: pcie: add some missing entries for AX210
In reply to Luca CoelhoFrom: Golan Ben Ami <[email protected]>
Some subsytem device IDs were missing from the list, so some AX210 devices were not recognized. Add them.
--- drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/wireless/intel/iwlwifi/pcie/drv.c +5 -0
@@ -540,6 +540,11 @@ static const struct pci_device_id iwl_hw_card_ids[] = { {IWL_PCI_DEVICE(0x2725, 0x0310, iwlax210_2ax_cfg_ty_gf_a0)}, {IWL_PCI_DEVICE(0x2725, 0x0510, iwlax210_2ax_cfg_ty_gf_a0)}, {IWL_PCI_DEVICE(0x2725, 0x0A10, iwlax210_2ax_cfg_ty_gf_a0)}, + {IWL_PCI_DEVICE(0x2725, 0xE020, iwlax210_2ax_cfg_ty_gf_a0)}, + {IWL_PCI_DEVICE(0x2725, 0xE024, iwlax210_2ax_cfg_ty_gf_a0)}, + {IWL_PCI_DEVICE(0x2725, 0x4020, iwlax210_2ax_cfg_ty_gf_a0)}, + {IWL_PCI_DEVICE(0x2725, 0x6020, iwlax210_2ax_cfg_ty_gf_a0)}, + {IWL_PCI_DEVICE(0x2725, 0x6024, iwlax210_2ax_cfg_ty_gf_a0)}, {IWL_PCI_DEVICE(0x2725, 0x00B0, iwlax411_2ax_cfg_sosnj_gf4_a0)}, {IWL_PCI_DEVICE(0x2726, 0x0070, iwlax201_cfg_snj_hr_b0)}, {IWL_PCI_DEVICE(0x2726, 0x0074, iwlax201_cfg_snj_hr_b0)},
Signature · 1 line
2.29.2