Series includes smaller improvements.
Heiner Kallweit (3):
iwlwifi: use DECLARE_BITMAP macro
iwlwifi: switch "index larger than supported by driver" warning to
debug level
iwlwifi: use dma_set_mask_and_coherent
drivers/net/wireless/intel/iwlwifi/fw/img.h | 4 ++--
drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 10 ++++------
drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 10 ++--------
3 files changed, 8 insertions(+), 16 deletions(-)
--
2.30.2
If a chip supports additional API calls that are not supported by the
driver yet, then this is no reason to bother users with a warning.
Therefore switch the message to debug level.
Signed-off-by: Heiner Kallweit <[email protected]>
---
drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
index eb168dc53..647f8d003 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
@@ -408,9 +408,8 @@ static void iwl_set_ucode_api_flags(struct iwl_drv *drv, const u8 *data,
int i;
if (api_index >= DIV_ROUND_UP(NUM_IWL_UCODE_TLV_API, 32)) {
- IWL_WARN(drv,
- "api flags index %d larger than supported by driver\n",
- api_index);
+ IWL_DEBUG_FW_INFO(drv, "api flags index %d larger than supported by driver\n",
+ api_index);
return;
}
@@ -429,9 +428,8 @@ static void iwl_set_ucode_capabilities(struct iwl_drv *drv, const u8 *data,
int i;
if (api_index >= DIV_ROUND_UP(NUM_IWL_UCODE_TLV_CAPA, 32)) {
- IWL_WARN(drv,
- "capa flags index %d larger than supported by driver\n",
- api_index);
+ IWL_DEBUG_FW_INFO(drv, "capa flags index %d larger than supported by driver\n",
+ api_index);
return;
}
--
2.30.2
Use DECLARE_BITMAP macro to simplify the code.
Signed-off-by: Heiner Kallweit <[email protected]>
---
drivers/net/wireless/intel/iwlwifi/fw/img.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/img.h b/drivers/net/wireless/intel/iwlwifi/fw/img.h
index 1dee4714e..de6c7d05a 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/img.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/img.h
@@ -51,8 +51,8 @@ struct iwl_ucode_capabilities {
u32 error_log_addr;
u32 error_log_size;
u32 num_stations;
- unsigned long _api[BITS_TO_LONGS(NUM_IWL_UCODE_TLV_API)];
- unsigned long _capa[BITS_TO_LONGS(NUM_IWL_UCODE_TLV_CAPA)];
+ DECLARE_BITMAP(_api, NUM_IWL_UCODE_TLV_API);
+ DECLARE_BITMAP(_capa, NUM_IWL_UCODE_TLV_CAPA);
const struct iwl_fw_cmd_version *cmd_versions;
u32 n_cmd_versions;
--
2.30.2
Simplify the code by using dma_set_mask_and_coherent().
Signed-off-by: Heiner Kallweit <[email protected]>
---
drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
index 1bf4c37fe..4fd391dda 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
@@ -3440,15 +3440,9 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
pci_set_master(pdev);
addr_size = trans->txqs.tfd.addr_size;
- ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(addr_size));
- if (!ret)
- ret = pci_set_consistent_dma_mask(pdev,
- DMA_BIT_MASK(addr_size));
+ ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(addr_size));
if (ret) {
- ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
- if (!ret)
- ret = pci_set_consistent_dma_mask(pdev,
- DMA_BIT_MASK(32));
+ ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
/* both attempts failed: */
if (ret) {
dev_err(&pdev->dev, "No suitable DMA available\n");
--
2.30.2
Heiner Kallweit <[email protected]> writes:
> Series includes smaller improvements.
>
> Heiner Kallweit (3):
> iwlwifi: use DECLARE_BITMAP macro
> iwlwifi: switch "index larger than supported by driver" warning to
> debug level
> iwlwifi: use dma_set_mask_and_coherent
iwlwifi patches go to iwlwifi-next, not net-next. But no need to resend
just because of this.
--
https://patchwork.kernel.org/project/linux-wireless/list/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches