korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-16 07:24:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

iwlwifi: remove flags argument for nic_access

Browse Source 
Since we no longer save interrupts, we no longer need the flags
argument here, remove it throughout.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20210210142629.8de8fe6f9fff.If040b056d0e8c771c65ac5c29230f939354a142b@changeid
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
This commit is contained in:
Johannes Berg 2021-02-10 14:29:20 +02:00 committed by Luca Coelho
parent c52b251d1c
commit 1ed08f6fb5
8 changed files with 66 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/wireless/intel/iwlwifi/dvm/main.c
View File

@ -406,7 +406,6 @@ static void iwl_print_cont_event_trace(struct iwl_priv *priv, u32 base,
u32 i; u32 i;
u32 ptr; /* SRAM byte address of log data */ u32 ptr; /* SRAM byte address of log data */
u32 ev, time, data; /* event log data */ u32 ev, time, data; /* event log data */
unsigned long reg_flags;
if (mode == 0) if (mode == 0)
ptr = base + (4 * sizeof(u32)) + (start_idx * 2 * sizeof(u32)); ptr = base + (4 * sizeof(u32)) + (start_idx * 2 * sizeof(u32));
@ -414,7 +413,7 @@ static void iwl_print_cont_event_trace(struct iwl_priv *priv, u32 base,
ptr = base + (4 * sizeof(u32)) + (start_idx * 3 * sizeof(u32)); ptr = base + (4 * sizeof(u32)) + (start_idx * 3 * sizeof(u32));
/* Make sure device is powered up for SRAM reads */ /* Make sure device is powered up for SRAM reads */
if (!iwl_trans_grab_nic_access(priv->trans, &reg_flags)) if (!iwl_trans_grab_nic_access(priv->trans))
return; return;
/* Set starting address; reads will auto-increment */ /* Set starting address; reads will auto-increment */
@ -446,7 +445,7 @@ static void iwl_print_cont_event_trace(struct iwl_priv *priv, u32 base,
} }
} }
/* Allow device to power down */ /* Allow device to power down */
iwl_trans_release_nic_access(priv->trans, &reg_flags); iwl_trans_release_nic_access(priv->trans);
} }
static void iwl_continuous_event_trace(struct iwl_priv *priv) static void iwl_continuous_event_trace(struct iwl_priv *priv)
@ -1694,7 +1693,6 @@ static int iwl_print_event_log(struct iwl_priv *priv, u32 start_idx,
u32 event_size; /* 2 u32s, or 3 u32s if timestamp recorded */ u32 event_size; /* 2 u32s, or 3 u32s if timestamp recorded */
u32 ptr; /* SRAM byte address of log data */ u32 ptr; /* SRAM byte address of log data */
u32 ev, time, data; /* event log data */ u32 ev, time, data; /* event log data */
unsigned long reg_flags;
struct iwl_trans *trans = priv->trans; struct iwl_trans *trans = priv->trans;
@ -1718,7 +1716,7 @@ static int iwl_print_event_log(struct iwl_priv *priv, u32 start_idx,
ptr = base + EVENT_START_OFFSET + (start_idx * event_size); ptr = base + EVENT_START_OFFSET + (start_idx * event_size);
/* Make sure device is powered up for SRAM reads */ /* Make sure device is powered up for SRAM reads */
if (!iwl_trans_grab_nic_access(trans, &reg_flags)) if (!iwl_trans_grab_nic_access(trans))
return pos; return pos;
/* Set starting address; reads will auto-increment */ /* Set starting address; reads will auto-increment */
@ -1757,7 +1755,7 @@ static int iwl_print_event_log(struct iwl_priv *priv, u32 start_idx,
} }
/* Allow device to power down */ /* Allow device to power down */
iwl_trans_release_nic_access(trans, &reg_flags); iwl_trans_release_nic_access(trans);
return pos; return pos;
} }

7
drivers/net/wireless/intel/iwlwifi/dvm/tt.c
View File

@ -2,7 +2,7 @@
/****************************************************************************** /******************************************************************************
* *
* Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved. * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.
* Copyright (C) 2018 Intel Corporation * Copyright (C) 2018, 2020 Intel Corporation
* *
* Portions of this file are derived from the ipw3945 project, as well * Portions of this file are derived from the ipw3945 project, as well
* as portions of the ieee80211 subsystem header files. * as portions of the ieee80211 subsystem header files.
@ -155,7 +155,6 @@ static void iwl_tt_check_exit_ct_kill(struct timer_list *t)
struct iwl_priv *priv = from_timer(priv, t, struct iwl_priv *priv = from_timer(priv, t,
thermal_throttle.ct_kill_exit_tm); thermal_throttle.ct_kill_exit_tm);
struct iwl_tt_mgmt *tt = &priv->thermal_throttle; struct iwl_tt_mgmt *tt = &priv->thermal_throttle;
unsigned long flags;
if (test_bit(STATUS_EXIT_PENDING, &priv->status)) if (test_bit(STATUS_EXIT_PENDING, &priv->status))
return; return;
@ -171,8 +170,8 @@ static void iwl_tt_check_exit_ct_kill(struct timer_list *t)
priv->thermal_throttle.ct_kill_toggle = true; priv->thermal_throttle.ct_kill_toggle = true;
} }
iwl_read32(priv->trans, CSR_UCODE_DRV_GP1); iwl_read32(priv->trans, CSR_UCODE_DRV_GP1);
if (iwl_trans_grab_nic_access(priv->trans, &flags)) if (iwl_trans_grab_nic_access(priv->trans))
iwl_trans_release_nic_access(priv->trans, &flags); iwl_trans_release_nic_access(priv->trans);
/* Reschedule the ct_kill timer to occur in /* Reschedule the ct_kill timer to occur in
* CT_KILL_EXIT_DURATION seconds to ensure we get a * CT_KILL_EXIT_DURATION seconds to ensure we get a

45
drivers/net/wireless/intel/iwlwifi/fw/dbg.c
View File

@ -33,12 +33,11 @@ static void iwl_read_radio_regs(struct iwl_fw_runtime *fwrt,
struct iwl_fw_error_dump_data **dump_data) struct iwl_fw_error_dump_data **dump_data)
{ {
u8 *pos = (void *)(*dump_data)->data; u8 *pos = (void *)(*dump_data)->data;
unsigned long flags;
int i; int i;
IWL_DEBUG_INFO(fwrt, "WRT radio registers dump\n"); IWL_DEBUG_INFO(fwrt, "WRT radio registers dump\n");
if (!iwl_trans_grab_nic_access(fwrt->trans, &flags)) if (!iwl_trans_grab_nic_access(fwrt->trans))
return; return;
(*dump_data)->type = cpu_to_le32(IWL_FW_ERROR_DUMP_RADIO_REG); (*dump_data)->type = cpu_to_le32(IWL_FW_ERROR_DUMP_RADIO_REG);
@ -56,7 +55,7 @@ static void iwl_read_radio_regs(struct iwl_fw_runtime *fwrt,
*dump_data = iwl_fw_error_next_data(*dump_data); *dump_data = iwl_fw_error_next_data(*dump_data);
iwl_trans_release_nic_access(fwrt->trans, &flags); iwl_trans_release_nic_access(fwrt->trans);
} }
static void iwl_fwrt_dump_rxf(struct iwl_fw_runtime *fwrt, static void iwl_fwrt_dump_rxf(struct iwl_fw_runtime *fwrt,
@ -172,11 +171,10 @@ static void iwl_fw_dump_rxf(struct iwl_fw_runtime *fwrt,
struct iwl_fw_error_dump_data **dump_data) struct iwl_fw_error_dump_data **dump_data)
{ {
struct iwl_fwrt_shared_mem_cfg *cfg = &fwrt->smem_cfg; struct iwl_fwrt_shared_mem_cfg *cfg = &fwrt->smem_cfg;
unsigned long flags;
IWL_DEBUG_INFO(fwrt, "WRT RX FIFO dump\n"); IWL_DEBUG_INFO(fwrt, "WRT RX FIFO dump\n");
if (!iwl_trans_grab_nic_access(fwrt->trans, &flags)) if (!iwl_trans_grab_nic_access(fwrt->trans))
return; return;
if (iwl_fw_dbg_type_on(fwrt, IWL_FW_ERROR_DUMP_RXF)) { if (iwl_fw_dbg_type_on(fwrt, IWL_FW_ERROR_DUMP_RXF)) {
@ -194,7 +192,7 @@ static void iwl_fw_dump_rxf(struct iwl_fw_runtime *fwrt,
LMAC2_PRPH_OFFSET, 2); LMAC2_PRPH_OFFSET, 2);
} }
iwl_trans_release_nic_access(fwrt->trans, &flags); iwl_trans_release_nic_access(fwrt->trans);
} }
static void iwl_fw_dump_txf(struct iwl_fw_runtime *fwrt, static void iwl_fw_dump_txf(struct iwl_fw_runtime *fwrt,
@ -204,12 +202,11 @@ static void iwl_fw_dump_txf(struct iwl_fw_runtime *fwrt,
struct iwl_fwrt_shared_mem_cfg *cfg = &fwrt->smem_cfg; struct iwl_fwrt_shared_mem_cfg *cfg = &fwrt->smem_cfg;
u32 *fifo_data; u32 *fifo_data;
u32 fifo_len; u32 fifo_len;
unsigned long flags;
int i, j; int i, j;
IWL_DEBUG_INFO(fwrt, "WRT TX FIFO dump\n"); IWL_DEBUG_INFO(fwrt, "WRT TX FIFO dump\n");
if (!iwl_trans_grab_nic_access(fwrt->trans, &flags)) if (!iwl_trans_grab_nic_access(fwrt->trans))
return; return;
if (iwl_fw_dbg_type_on(fwrt, IWL_FW_ERROR_DUMP_TXF)) { if (iwl_fw_dbg_type_on(fwrt, IWL_FW_ERROR_DUMP_TXF)) {
@ -299,7 +296,7 @@ static void iwl_fw_dump_txf(struct iwl_fw_runtime *fwrt,
} }
} }
iwl_trans_release_nic_access(fwrt->trans, &flags); iwl_trans_release_nic_access(fwrt->trans);
} }
#define IWL8260_ICCM_OFFSET 0x44000 /* Only for B-step */ #define IWL8260_ICCM_OFFSET 0x44000 /* Only for B-step */
@ -527,7 +524,6 @@ static void iwl_dump_prph(struct iwl_fw_runtime *fwrt,
struct iwl_trans *trans = fwrt->trans; struct iwl_trans *trans = fwrt->trans;
struct iwl_fw_error_dump_data **data = struct iwl_fw_error_dump_data **data =
(struct iwl_fw_error_dump_data **)ptr; (struct iwl_fw_error_dump_data **)ptr;
unsigned long flags;
u32 i; u32 i;
if (!data) if (!data)
@ -535,7 +531,7 @@ static void iwl_dump_prph(struct iwl_fw_runtime *fwrt,
IWL_DEBUG_INFO(trans, "WRT PRPH dump\n"); IWL_DEBUG_INFO(trans, "WRT PRPH dump\n");
if (!iwl_trans_grab_nic_access(trans, &flags)) if (!iwl_trans_grab_nic_access(trans))
return; return;
for (i = 0; i < range_len; i++) { for (i = 0; i < range_len; i++) {
@ -558,7 +554,7 @@ static void iwl_dump_prph(struct iwl_fw_runtime *fwrt,
*data = iwl_fw_error_next_data(*data); *data = iwl_fw_error_next_data(*data);
} }
iwl_trans_release_nic_access(trans, &flags); iwl_trans_release_nic_access(trans);
} }
/* /*
@ -1048,7 +1044,6 @@ iwl_dump_ini_prph_phy_iter(struct iwl_fw_runtime *fwrt,
u32 addr = le32_to_cpu(reg->addrs[idx]); u32 addr = le32_to_cpu(reg->addrs[idx]);
u32 dphy_state; u32 dphy_state;
u32 dphy_addr; u32 dphy_addr;
unsigned long flags;
int i; int i;
range->internal_base_addr = cpu_to_le32(addr); range->internal_base_addr = cpu_to_le32(addr);
@ -1060,7 +1055,7 @@ iwl_dump_ini_prph_phy_iter(struct iwl_fw_runtime *fwrt,
indirect_wr_addr += le32_to_cpu(reg->dev_addr.offset); indirect_wr_addr += le32_to_cpu(reg->dev_addr.offset);
indirect_rd_addr += le32_to_cpu(reg->dev_addr.offset); indirect_rd_addr += le32_to_cpu(reg->dev_addr.offset);
if (!iwl_trans_grab_nic_access(fwrt->trans, &flags)) if (!iwl_trans_grab_nic_access(fwrt->trans))
return -EBUSY; return -EBUSY;
dphy_addr = (reg->dev_addr.offset) ? WFPM_LMAC2_PS_CTL_RW : dphy_addr = (reg->dev_addr.offset) ? WFPM_LMAC2_PS_CTL_RW :
@ -1082,7 +1077,7 @@ iwl_dump_ini_prph_phy_iter(struct iwl_fw_runtime *fwrt,
*val++ = cpu_to_le32(prph_val); *val++ = cpu_to_le32(prph_val);
} }
iwl_trans_release_nic_access(fwrt->trans, &flags); iwl_trans_release_nic_access(fwrt->trans);
return sizeof(*range) + le32_to_cpu(range->range_data_size); return sizeof(*range) + le32_to_cpu(range->range_data_size);
} }
@ -1297,13 +1292,12 @@ static int iwl_dump_ini_txf_iter(struct iwl_fw_runtime *fwrt,
u32 registers_num = iwl_tlv_array_len(reg_data->reg_tlv, reg, addrs); u32 registers_num = iwl_tlv_array_len(reg_data->reg_tlv, reg, addrs);
u32 registers_size = registers_num * sizeof(*reg_dump); u32 registers_size = registers_num * sizeof(*reg_dump);
__le32 *data; __le32 *data;
unsigned long flags;
int i; int i;
if (!iwl_ini_txf_iter(fwrt, reg_data, idx)) if (!iwl_ini_txf_iter(fwrt, reg_data, idx))
return -EIO; return -EIO;
if (!iwl_trans_grab_nic_access(fwrt->trans, &flags)) if (!iwl_trans_grab_nic_access(fwrt->trans))
return -EBUSY; return -EBUSY;
range->fifo_hdr.fifo_num = cpu_to_le32(iter->fifo); range->fifo_hdr.fifo_num = cpu_to_le32(iter->fifo);
@ -1345,7 +1339,7 @@ static int iwl_dump_ini_txf_iter(struct iwl_fw_runtime *fwrt,
*data++ = cpu_to_le32(iwl_read_prph_no_grab(fwrt->trans, addr)); *data++ = cpu_to_le32(iwl_read_prph_no_grab(fwrt->trans, addr));
out: out:
iwl_trans_release_nic_access(fwrt->trans, &flags); iwl_trans_release_nic_access(fwrt->trans);
return sizeof(*range) + le32_to_cpu(range->range_data_size); return sizeof(*range) + le32_to_cpu(range->range_data_size);
} }
@ -1429,14 +1423,13 @@ static int iwl_dump_ini_rxf_iter(struct iwl_fw_runtime *fwrt,
u32 registers_num = iwl_tlv_array_len(reg_data->reg_tlv, reg, addrs); u32 registers_num = iwl_tlv_array_len(reg_data->reg_tlv, reg, addrs);
u32 registers_size = registers_num * sizeof(*reg_dump); u32 registers_size = registers_num * sizeof(*reg_dump);
__le32 *data; __le32 *data;
unsigned long flags;
int i; int i;
iwl_ini_get_rxf_data(fwrt, reg_data, &rxf_data); iwl_ini_get_rxf_data(fwrt, reg_data, &rxf_data);
if (!rxf_data.size) if (!rxf_data.size)
return -EIO; return -EIO;
if (!iwl_trans_grab_nic_access(fwrt->trans, &flags)) if (!iwl_trans_grab_nic_access(fwrt->trans))
return -EBUSY; return -EBUSY;
range->fifo_hdr.fifo_num = cpu_to_le32(rxf_data.fifo_num); range->fifo_hdr.fifo_num = cpu_to_le32(rxf_data.fifo_num);
@ -1479,7 +1472,7 @@ static int iwl_dump_ini_rxf_iter(struct iwl_fw_runtime *fwrt,
*data++ = cpu_to_le32(iwl_read_prph_no_grab(fwrt->trans, addr)); *data++ = cpu_to_le32(iwl_read_prph_no_grab(fwrt->trans, addr));
out: out:
iwl_trans_release_nic_access(fwrt->trans, &flags); iwl_trans_release_nic_access(fwrt->trans);
return sizeof(*range) + le32_to_cpu(range->range_data_size); return sizeof(*range) + le32_to_cpu(range->range_data_size);
} }
@ -1596,9 +1589,8 @@ iwl_dump_ini_mon_fill_header(struct iwl_fw_runtime *fwrt,
{ {
struct iwl_fw_ini_region_tlv *reg = (void *)reg_data->reg_tlv->data; struct iwl_fw_ini_region_tlv *reg = (void *)reg_data->reg_tlv->data;
u32 alloc_id = le32_to_cpu(reg->dram_alloc_id); u32 alloc_id = le32_to_cpu(reg->dram_alloc_id);
unsigned long flags;
if (!iwl_trans_grab_nic_access(fwrt->trans, &flags)) { if (!iwl_trans_grab_nic_access(fwrt->trans)) {
IWL_ERR(fwrt, "Failed to get monitor header\n"); IWL_ERR(fwrt, "Failed to get monitor header\n");
return NULL; return NULL;
} }
@ -1615,7 +1607,7 @@ iwl_dump_ini_mon_fill_header(struct iwl_fw_runtime *fwrt,
data->cur_frag = iwl_get_mon_reg(fwrt, alloc_id, data->cur_frag = iwl_get_mon_reg(fwrt, alloc_id,
&addrs->cur_frag); &addrs->cur_frag);
iwl_trans_release_nic_access(fwrt->trans, &flags); iwl_trans_release_nic_access(fwrt->trans);
data->header.version = cpu_to_le32(IWL_INI_DUMP_VER); data->header.version = cpu_to_le32(IWL_INI_DUMP_VER);
@ -2762,7 +2754,6 @@ IWL_EXPORT_SYMBOL(iwl_fw_dbg_stop_sync);
void iwl_fw_error_print_fseq_regs(struct iwl_fw_runtime *fwrt) void iwl_fw_error_print_fseq_regs(struct iwl_fw_runtime *fwrt)
{ {
struct iwl_trans *trans = fwrt->trans; struct iwl_trans *trans = fwrt->trans;
unsigned long flags;
int i; int i;
struct { struct {
u32 addr; u32 addr;
@ -2782,7 +2773,7 @@ void iwl_fw_error_print_fseq_regs(struct iwl_fw_runtime *fwrt)
FSEQ_REG(CNVR_SCU_SD_REGS_SD_REG_ACTIVE_VDIG_MIRROR), FSEQ_REG(CNVR_SCU_SD_REGS_SD_REG_ACTIVE_VDIG_MIRROR),
}; };
if (!iwl_trans_grab_nic_access(trans, &flags)) if (!iwl_trans_grab_nic_access(trans))
return; return;
IWL_ERR(fwrt, "Fseq Registers:\n"); IWL_ERR(fwrt, "Fseq Registers:\n");
@ -2792,7 +2783,7 @@ void iwl_fw_error_print_fseq_regs(struct iwl_fw_runtime *fwrt)
iwl_read_prph_no_grab(trans, fseq_regs[i].addr), iwl_read_prph_no_grab(trans, fseq_regs[i].addr),
fseq_regs[i].str); fseq_regs[i].str);
iwl_trans_release_nic_access(trans, &flags); iwl_trans_release_nic_access(trans);
} }
IWL_EXPORT_SYMBOL(iwl_fw_error_print_fseq_regs); IWL_EXPORT_SYMBOL(iwl_fw_error_print_fseq_regs);

46
drivers/net/wireless/intel/iwlwifi/iwl-io.c
View File

@ -66,10 +66,10 @@ IWL_EXPORT_SYMBOL(iwl_poll_bit);
u32 iwl_read_direct32(struct iwl_trans *trans, u32 reg) u32 iwl_read_direct32(struct iwl_trans *trans, u32 reg)
{ {
u32 value = 0x5a5a5a5a; u32 value = 0x5a5a5a5a;
unsigned long flags;
if (iwl_trans_grab_nic_access(trans, &flags)) { if (iwl_trans_grab_nic_access(trans)) {
value = iwl_read32(trans, reg); value = iwl_read32(trans, reg);
iwl_trans_release_nic_access(trans, &flags); iwl_trans_release_nic_access(trans);
} }
return value; return value;
@ -78,22 +78,18 @@ IWL_EXPORT_SYMBOL(iwl_read_direct32);
void iwl_write_direct32(struct iwl_trans *trans, u32 reg, u32 value) void iwl_write_direct32(struct iwl_trans *trans, u32 reg, u32 value)
{ {
unsigned long flags; if (iwl_trans_grab_nic_access(trans)) {
if (iwl_trans_grab_nic_access(trans, &flags)) {
iwl_write32(trans, reg, value); iwl_write32(trans, reg, value);
iwl_trans_release_nic_access(trans, &flags); iwl_trans_release_nic_access(trans);
} }
} }
IWL_EXPORT_SYMBOL(iwl_write_direct32); IWL_EXPORT_SYMBOL(iwl_write_direct32);
void iwl_write_direct64(struct iwl_trans *trans, u64 reg, u64 value) void iwl_write_direct64(struct iwl_trans *trans, u64 reg, u64 value)
{ {
unsigned long flags; if (iwl_trans_grab_nic_access(trans)) {
if (iwl_trans_grab_nic_access(trans, &flags)) {
iwl_write64(trans, reg, value); iwl_write64(trans, reg, value);
iwl_trans_release_nic_access(trans, &flags); iwl_trans_release_nic_access(trans);
} }
} }
IWL_EXPORT_SYMBOL(iwl_write_direct64); IWL_EXPORT_SYMBOL(iwl_write_direct64);
@ -139,12 +135,11 @@ IWL_EXPORT_SYMBOL(iwl_write_prph64_no_grab);
u32 iwl_read_prph(struct iwl_trans *trans, u32 ofs) u32 iwl_read_prph(struct iwl_trans *trans, u32 ofs)
{ {
unsigned long flags;
u32 val = 0x5a5a5a5a; u32 val = 0x5a5a5a5a;
if (iwl_trans_grab_nic_access(trans, &flags)) { if (iwl_trans_grab_nic_access(trans)) {
val = iwl_read_prph_no_grab(trans, ofs); val = iwl_read_prph_no_grab(trans, ofs);
iwl_trans_release_nic_access(trans, &flags); iwl_trans_release_nic_access(trans);
} }
return val; return val;
} }
@ -152,12 +147,10 @@ IWL_EXPORT_SYMBOL(iwl_read_prph);
void iwl_write_prph_delay(struct iwl_trans *trans, u32 ofs, u32 val, u32 delay_ms) void iwl_write_prph_delay(struct iwl_trans *trans, u32 ofs, u32 val, u32 delay_ms)
{ {
unsigned long flags; if (iwl_trans_grab_nic_access(trans)) {
if (iwl_trans_grab_nic_access(trans, &flags)) {
mdelay(delay_ms); mdelay(delay_ms);
iwl_write_prph_no_grab(trans, ofs, val); iwl_write_prph_no_grab(trans, ofs, val);
iwl_trans_release_nic_access(trans, &flags); iwl_trans_release_nic_access(trans);
} }
} }
IWL_EXPORT_SYMBOL(iwl_write_prph_delay); IWL_EXPORT_SYMBOL(iwl_write_prph_delay);
@ -179,13 +172,11 @@ int iwl_poll_prph_bit(struct iwl_trans *trans, u32 addr,
void iwl_set_bits_prph(struct iwl_trans *trans, u32 ofs, u32 mask) void iwl_set_bits_prph(struct iwl_trans *trans, u32 ofs, u32 mask)
{ {
unsigned long flags; if (iwl_trans_grab_nic_access(trans)) {
if (iwl_trans_grab_nic_access(trans, &flags)) {
iwl_write_prph_no_grab(trans, ofs, iwl_write_prph_no_grab(trans, ofs,
iwl_read_prph_no_grab(trans, ofs) | iwl_read_prph_no_grab(trans, ofs) |
mask); mask);
iwl_trans_release_nic_access(trans, &flags); iwl_trans_release_nic_access(trans);
} }
} }
IWL_EXPORT_SYMBOL(iwl_set_bits_prph); IWL_EXPORT_SYMBOL(iwl_set_bits_prph);
@ -193,26 +184,23 @@ IWL_EXPORT_SYMBOL(iwl_set_bits_prph);
void iwl_set_bits_mask_prph(struct iwl_trans *trans, u32 ofs, void iwl_set_bits_mask_prph(struct iwl_trans *trans, u32 ofs,
u32 bits, u32 mask) u32 bits, u32 mask)
{ {
unsigned long flags; if (iwl_trans_grab_nic_access(trans)) {
if (iwl_trans_grab_nic_access(trans, &flags)) {
iwl_write_prph_no_grab(trans, ofs, iwl_write_prph_no_grab(trans, ofs,
(iwl_read_prph_no_grab(trans, ofs) & (iwl_read_prph_no_grab(trans, ofs) &
mask) | bits); mask) | bits);
iwl_trans_release_nic_access(trans, &flags); iwl_trans_release_nic_access(trans);
} }
} }
IWL_EXPORT_SYMBOL(iwl_set_bits_mask_prph); IWL_EXPORT_SYMBOL(iwl_set_bits_mask_prph);
void iwl_clear_bits_prph(struct iwl_trans *trans, u32 ofs, u32 mask) void iwl_clear_bits_prph(struct iwl_trans *trans, u32 ofs, u32 mask)
{ {
unsigned long flags;
u32 val; u32 val;
if (iwl_trans_grab_nic_access(trans, &flags)) { if (iwl_trans_grab_nic_access(trans)) {
val = iwl_read_prph_no_grab(trans, ofs); val = iwl_read_prph_no_grab(trans, ofs);
iwl_write_prph_no_grab(trans, ofs, (val & ~mask)); iwl_write_prph_no_grab(trans, ofs, (val & ~mask));
iwl_trans_release_nic_access(trans, &flags); iwl_trans_release_nic_access(trans);
} }
} }
IWL_EXPORT_SYMBOL(iwl_clear_bits_prph); IWL_EXPORT_SYMBOL(iwl_clear_bits_prph);

13
drivers/net/wireless/intel/iwlwifi/iwl-trans.h
View File

@ -579,9 +579,8 @@ struct iwl_trans_ops {
const struct iwl_trans_config *trans_cfg); const struct iwl_trans_config *trans_cfg);
void (*set_pmi)(struct iwl_trans *trans, bool state); void (*set_pmi)(struct iwl_trans *trans, bool state);
void (*sw_reset)(struct iwl_trans *trans); void (*sw_reset)(struct iwl_trans *trans);
bool (*grab_nic_access)(struct iwl_trans *trans, unsigned long *flags); bool (*grab_nic_access)(struct iwl_trans *trans);
void (*release_nic_access)(struct iwl_trans *trans, void (*release_nic_access)(struct iwl_trans *trans);
unsigned long *flags);
void (*set_bits_mask)(struct iwl_trans *trans, u32 reg, u32 mask, void (*set_bits_mask)(struct iwl_trans *trans, u32 reg, u32 mask,
u32 value); u32 value);
@ -1368,14 +1367,14 @@ iwl_trans_set_bits_mask(struct iwl_trans *trans, u32 reg, u32 mask, u32 value)
trans->ops->set_bits_mask(trans, reg, mask, value); trans->ops->set_bits_mask(trans, reg, mask, value);
} }
#define iwl_trans_grab_nic_access(trans, flags) \ #define iwl_trans_grab_nic_access(trans) \
__cond_lock(nic_access, \ __cond_lock(nic_access, \
likely((trans)->ops->grab_nic_access(trans, flags))) likely((trans)->ops->grab_nic_access(trans)))
static inline void __releases(nic_access) static inline void __releases(nic_access)
iwl_trans_release_nic_access(struct iwl_trans *trans, unsigned long *flags) iwl_trans_release_nic_access(struct iwl_trans *trans)
{ {
trans->ops->release_nic_access(trans, flags); trans->ops->release_nic_access(trans);
__release(nic_access); __release(nic_access);
} }

10
drivers/net/wireless/intel/iwlwifi/pcie/rx.c
View File

@ -847,7 +847,6 @@ static void iwl_pcie_rx_hw_init(struct iwl_trans *trans, struct iwl_rxq *rxq)
{ {
struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans); struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
u32 rb_size; u32 rb_size;
unsigned long flags;
const u32 rfdnlog = RX_QUEUE_SIZE_LOG; /* 256 RBDs */ const u32 rfdnlog = RX_QUEUE_SIZE_LOG; /* 256 RBDs */
switch (trans_pcie->rx_buf_size) { switch (trans_pcie->rx_buf_size) {
@ -865,7 +864,7 @@ static void iwl_pcie_rx_hw_init(struct iwl_trans *trans, struct iwl_rxq *rxq)
rb_size = FH_RCSR_RX_CONFIG_REG_VAL_RB_SIZE_4K; rb_size = FH_RCSR_RX_CONFIG_REG_VAL_RB_SIZE_4K;
} }
if (!iwl_trans_grab_nic_access(trans, &flags)) if (!iwl_trans_grab_nic_access(trans))
return; return;
/* Stop Rx DMA */ /* Stop Rx DMA */
@ -902,7 +901,7 @@ static void iwl_pcie_rx_hw_init(struct iwl_trans *trans, struct iwl_rxq *rxq)
(RX_RB_TIMEOUT << FH_RCSR_RX_CONFIG_REG_IRQ_RBTH_POS) | (RX_RB_TIMEOUT << FH_RCSR_RX_CONFIG_REG_IRQ_RBTH_POS) |
(rfdnlog << FH_RCSR_RX_CONFIG_RBDCB_SIZE_POS)); (rfdnlog << FH_RCSR_RX_CONFIG_RBDCB_SIZE_POS));
iwl_trans_release_nic_access(trans, &flags); iwl_trans_release_nic_access(trans);
/* Set interrupt coalescing timer to default (2048 usecs) */ /* Set interrupt coalescing timer to default (2048 usecs) */
iwl_write8(trans, CSR_INT_COALESCING, IWL_HOST_INT_TIMEOUT_DEF); iwl_write8(trans, CSR_INT_COALESCING, IWL_HOST_INT_TIMEOUT_DEF);
@ -916,7 +915,6 @@ static void iwl_pcie_rx_mq_hw_init(struct iwl_trans *trans)
{ {
struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans); struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
u32 rb_size, enabled = 0; u32 rb_size, enabled = 0;
unsigned long flags;
int i; int i;
switch (trans_pcie->rx_buf_size) { switch (trans_pcie->rx_buf_size) {
@ -937,7 +935,7 @@ static void iwl_pcie_rx_mq_hw_init(struct iwl_trans *trans)
rb_size = RFH_RXF_DMA_RB_SIZE_4K; rb_size = RFH_RXF_DMA_RB_SIZE_4K;
} }
if (!iwl_trans_grab_nic_access(trans, &flags)) if (!iwl_trans_grab_nic_access(trans))
return; return;
/* Stop Rx DMA */ /* Stop Rx DMA */
@ -995,7 +993,7 @@ static void iwl_pcie_rx_mq_hw_init(struct iwl_trans *trans)
/* Enable the relevant rx queues */ /* Enable the relevant rx queues */
iwl_write_prph_no_grab(trans, RFH_RXF_RXQ_ACTIVE, enabled); iwl_write_prph_no_grab(trans, RFH_RXF_RXQ_ACTIVE, enabled);
iwl_trans_release_nic_access(trans, &flags); iwl_trans_release_nic_access(trans);
/* Set interrupt coalescing timer to default (2048 usecs) */ /* Set interrupt coalescing timer to default (2048 usecs) */
iwl_write8(trans, CSR_INT_COALESCING, IWL_HOST_INT_TIMEOUT_DEF); iwl_write8(trans, CSR_INT_COALESCING, IWL_HOST_INT_TIMEOUT_DEF);

31
drivers/net/wireless/intel/iwlwifi/pcie/trans.c
View File

@ -640,17 +640,16 @@ static int iwl_pcie_load_firmware_chunk(struct iwl_trans *trans,
u32 byte_cnt) u32 byte_cnt)
{ {
struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans); struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
unsigned long flags;
int ret; int ret;
trans_pcie->ucode_write_complete = false; trans_pcie->ucode_write_complete = false;
if (!iwl_trans_grab_nic_access(trans, &flags)) if (!iwl_trans_grab_nic_access(trans))
return -EIO; return -EIO;
iwl_pcie_load_firmware_chunk_fh(trans, dst_addr, phy_addr, iwl_pcie_load_firmware_chunk_fh(trans, dst_addr, phy_addr,
byte_cnt); byte_cnt);
iwl_trans_release_nic_access(trans, &flags); iwl_trans_release_nic_access(trans);
ret = wait_event_timeout(trans_pcie->ucode_write_waitq, ret = wait_event_timeout(trans_pcie->ucode_write_waitq,
trans_pcie->ucode_write_complete, 5 * HZ); trans_pcie->ucode_write_complete, 5 * HZ);
@ -1974,8 +1973,7 @@ static void iwl_trans_pcie_removal_wk(struct work_struct *wk)
module_put(THIS_MODULE); module_put(THIS_MODULE);
} }
static bool iwl_trans_pcie_grab_nic_access(struct iwl_trans *trans, static bool iwl_trans_pcie_grab_nic_access(struct iwl_trans *trans)
unsigned long *flags)
{ {
int ret; int ret;
struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans); struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
@ -2078,8 +2076,7 @@ out:
return true; return true;
} }
static void iwl_trans_pcie_release_nic_access(struct iwl_trans *trans, static void iwl_trans_pcie_release_nic_access(struct iwl_trans *trans)
unsigned long *flags)
{ {
struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans); struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
@ -2109,7 +2106,6 @@ out:
static int iwl_trans_pcie_read_mem(struct iwl_trans *trans, u32 addr, static int iwl_trans_pcie_read_mem(struct iwl_trans *trans, u32 addr,
void *buf, int dwords) void *buf, int dwords)
{ {
unsigned long flags;
int offs = 0; int offs = 0;
u32 *vals = buf; u32 *vals = buf;
@ -2118,7 +2114,7 @@ static int iwl_trans_pcie_read_mem(struct iwl_trans *trans, u32 addr,
unsigned long end = jiffies + HZ / 2; unsigned long end = jiffies + HZ / 2;
bool resched = false; bool resched = false;
if (iwl_trans_grab_nic_access(trans, &flags)) { if (iwl_trans_grab_nic_access(trans)) {
iwl_write32(trans, HBUS_TARG_MEM_RADDR, iwl_write32(trans, HBUS_TARG_MEM_RADDR,
addr + 4 * offs); addr + 4 * offs);
@ -2132,7 +2128,7 @@ static int iwl_trans_pcie_read_mem(struct iwl_trans *trans, u32 addr,
break; break;
} }
} }
iwl_trans_release_nic_access(trans, &flags); iwl_trans_release_nic_access(trans);
if (resched) if (resched)
cond_resched(); cond_resched();
@ -2147,16 +2143,15 @@ static int iwl_trans_pcie_read_mem(struct iwl_trans *trans, u32 addr,
static int iwl_trans_pcie_write_mem(struct iwl_trans *trans, u32 addr, static int iwl_trans_pcie_write_mem(struct iwl_trans *trans, u32 addr,
const void *buf, int dwords) const void *buf, int dwords)
{ {
unsigned long flags;
int offs, ret = 0; int offs, ret = 0;
const u32 *vals = buf; const u32 *vals = buf;
if (iwl_trans_grab_nic_access(trans, &flags)) { if (iwl_trans_grab_nic_access(trans)) {
iwl_write32(trans, HBUS_TARG_MEM_WADDR, addr); iwl_write32(trans, HBUS_TARG_MEM_WADDR, addr);
for (offs = 0; offs < dwords; offs++) for (offs = 0; offs < dwords; offs++)
iwl_write32(trans, HBUS_TARG_MEM_WDAT, iwl_write32(trans, HBUS_TARG_MEM_WDAT,
vals ? vals[offs] : 0); vals ? vals[offs] : 0);
iwl_trans_release_nic_access(trans, &flags); iwl_trans_release_nic_access(trans);
} else { } else {
ret = -EBUSY; ret = -EBUSY;
} }
@ -2952,11 +2947,10 @@ static u32 iwl_trans_pcie_fh_regs_dump(struct iwl_trans *trans,
struct iwl_fw_error_dump_data **data) struct iwl_fw_error_dump_data **data)
{ {
u32 fh_regs_len = FH_MEM_UPPER_BOUND - FH_MEM_LOWER_BOUND; u32 fh_regs_len = FH_MEM_UPPER_BOUND - FH_MEM_LOWER_BOUND;
unsigned long flags;
__le32 *val; __le32 *val;
int i; int i;
if (!iwl_trans_grab_nic_access(trans, &flags)) if (!iwl_trans_grab_nic_access(trans))
return 0; return 0;
(*data)->type = cpu_to_le32(IWL_FW_ERROR_DUMP_FH_REGS); (*data)->type = cpu_to_le32(IWL_FW_ERROR_DUMP_FH_REGS);
@ -2974,7 +2968,7 @@ static u32 iwl_trans_pcie_fh_regs_dump(struct iwl_trans *trans,
*val++ = cpu_to_le32(iwl_trans_pcie_read_prph(trans, *val++ = cpu_to_le32(iwl_trans_pcie_read_prph(trans,
i)); i));
iwl_trans_release_nic_access(trans, &flags); iwl_trans_release_nic_access(trans);
*data = iwl_fw_error_next_data(*data); *data = iwl_fw_error_next_data(*data);
@ -2988,10 +2982,9 @@ iwl_trans_pci_dump_marbh_monitor(struct iwl_trans *trans,
{ {
u32 buf_size_in_dwords = (monitor_len >> 2); u32 buf_size_in_dwords = (monitor_len >> 2);
u32 *buffer = (u32 *)fw_mon_data->data; u32 *buffer = (u32 *)fw_mon_data->data;
unsigned long flags;
u32 i; u32 i;
if (!iwl_trans_grab_nic_access(trans, &flags)) if (!iwl_trans_grab_nic_access(trans))
return 0; return 0;
iwl_write_umac_prph_no_grab(trans, MON_DMARB_RD_CTL_ADDR, 0x1); iwl_write_umac_prph_no_grab(trans, MON_DMARB_RD_CTL_ADDR, 0x1);
@ -3000,7 +2993,7 @@ iwl_trans_pci_dump_marbh_monitor(struct iwl_trans *trans,
MON_DMARB_RD_DATA_ADDR); MON_DMARB_RD_DATA_ADDR);
iwl_write_umac_prph_no_grab(trans, MON_DMARB_RD_CTL_ADDR, 0x0); iwl_write_umac_prph_no_grab(trans, MON_DMARB_RD_CTL_ADDR, 0x0);
iwl_trans_release_nic_access(trans, &flags); iwl_trans_release_nic_access(trans);
return monitor_len; return monitor_len;
} }

5
drivers/net/wireless/intel/iwlwifi/pcie/tx.c
View File

@ -392,13 +392,12 @@ void iwl_trans_pcie_tx_reset(struct iwl_trans *trans)
static void iwl_pcie_tx_stop_fh(struct iwl_trans *trans) static void iwl_pcie_tx_stop_fh(struct iwl_trans *trans)
{ {
struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans); struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
unsigned long flags;
int ch, ret; int ch, ret;
u32 mask = 0; u32 mask = 0;
spin_lock_bh(&trans_pcie->irq_lock); spin_lock_bh(&trans_pcie->irq_lock);
if (!iwl_trans_grab_nic_access(trans, &flags)) if (!iwl_trans_grab_nic_access(trans))
goto out; goto out;
/* Stop each Tx DMA channel */ /* Stop each Tx DMA channel */
@ -414,7 +413,7 @@ static void iwl_pcie_tx_stop_fh(struct iwl_trans *trans)
"Failing on timeout while stopping DMA channel %d [0x%08x]\n", "Failing on timeout while stopping DMA channel %d [0x%08x]\n",
ch, iwl_read32(trans, FH_TSSR_TX_STATUS_REG)); ch, iwl_read32(trans, FH_TSSR_TX_STATUS_REG));
iwl_trans_release_nic_access(trans, &flags); iwl_trans_release_nic_access(trans);
out: out:
spin_unlock_bh(&trans_pcie->irq_lock); spin_unlock_bh(&trans_pcie->irq_lock);