lkml.org 
[lkml]   [2020]   [Dec]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 109/130] iwlwifi: mvm: fix 22000 series driver NMI
    Date
    From: Johannes Berg <johannes.berg@intel.com>

    [ Upstream commit 9e8338ad17eb8976edd5d2def516e4b3346a4470 ]

    For triggering an NMI in the firmware, we should only set BIT(24)
    in the corresponding register, not the entire mask that's usable
    by the driver.

    This currently doesn't matter because the firmware only enables
    BIT(24), but we'll start using BIT(25) for other purposes with an
    upcoming API change.

    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.20201209231352.2f982365d085.Id09daabfd331ba9e120abcbbedd2ad6448902ed0@changeid
    Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/intel/iwlwifi/iwl-io.c | 2 +-
    drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-io.c b/drivers/net/wireless/intel/iwlwifi/iwl-io.c
    index 1b7414bf7bef2..2144c1f745337 100644
    --- a/drivers/net/wireless/intel/iwlwifi/iwl-io.c
    +++ b/drivers/net/wireless/intel/iwlwifi/iwl-io.c
    @@ -309,7 +309,7 @@ void iwl_force_nmi(struct iwl_trans *trans)
    DEVICE_SET_NMI_VAL_DRV);
    else if (trans->trans_cfg->device_family < IWL_DEVICE_FAMILY_AX210)
    iwl_write_umac_prph(trans, UREG_NIC_SET_NMI_DRIVER,
    - UREG_NIC_SET_NMI_DRIVER_NMI_FROM_DRIVER_MSK);
    + UREG_NIC_SET_NMI_DRIVER_NMI_FROM_DRIVER);
    else
    iwl_write_umac_prph(trans, UREG_DOORBELL_TO_ISR6,
    UREG_DOORBELL_TO_ISR6_NMI_BIT);
    diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-prph.h b/drivers/net/wireless/intel/iwlwifi/iwl-prph.h
    index 23c25a7665f27..80b3fca8f2328 100644
    --- a/drivers/net/wireless/intel/iwlwifi/iwl-prph.h
    +++ b/drivers/net/wireless/intel/iwlwifi/iwl-prph.h
    @@ -111,7 +111,7 @@
    #define DEVICE_SET_NMI_VAL_DRV BIT(7)
    /* Device NMI register and value for 9000 family and above hw's */
    #define UREG_NIC_SET_NMI_DRIVER 0x00a05c10
    -#define UREG_NIC_SET_NMI_DRIVER_NMI_FROM_DRIVER_MSK 0xff000000
    +#define UREG_NIC_SET_NMI_DRIVER_NMI_FROM_DRIVER BIT(24)

    /* Shared registers (0x0..0x3ff, via target indirect or periphery */
    #define SHR_BASE 0x00a10000
    --
    2.27.0
    \
     
     \ /
      Last update: 2020-12-23 03:54    [W:2.711 / U:0.108 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site