lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 0987/1039] iwlwifi: fix Bz NMI behaviour
    Date
    From: Johannes Berg <johannes.berg@intel.com>

    commit fdfde0cb79264f88992e72b5a056a3a3284fcaad upstream.

    Contrary to what was stated before, the hardware hasn't changed
    the bits here yet. In any case, the new CSR is also directly
    (lower 16 bits) connected to UREG_DOORBELL_TO_ISR6, so if it
    still changes the changes would be there. Adjust the code and
    comments accordingly.

    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Fixes: 6c0795f1a524 ("iwlwifi: implement Bz NMI behaviour")
    Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
    Link: https://lore.kernel.org/r/iwlwifi.20211210090244.75b6207536e3.I7d170a48a9096e6b7269c3a9f447c326f929b171@changeid
    Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 5 +++--
    drivers/net/wireless/intel/iwlwifi/iwl-io.c | 2 +-
    2 files changed, 4 insertions(+), 3 deletions(-)

    --- a/drivers/net/wireless/intel/iwlwifi/iwl-csr.h
    +++ b/drivers/net/wireless/intel/iwlwifi/iwl-csr.h
    @@ -105,9 +105,10 @@
    /* GIO Chicken Bits (PCI Express bus link power management) */
    #define CSR_GIO_CHICKEN_BITS (CSR_BASE+0x100)

    -/* Doorbell NMI (since Bz) */
    +/* Doorbell - since Bz
    + * connected to UREG_DOORBELL_TO_ISR6 (lower 16 bits only)
    + */
    #define CSR_DOORBELL_VECTOR (CSR_BASE + 0x130)
    -#define CSR_DOORBELL_VECTOR_NMI BIT(1)

    /* host chicken bits */
    #define CSR_HOST_CHICKEN (CSR_BASE + 0x204)
    --- a/drivers/net/wireless/intel/iwlwifi/iwl-io.c
    +++ b/drivers/net/wireless/intel/iwlwifi/iwl-io.c
    @@ -218,7 +218,7 @@ void iwl_force_nmi(struct iwl_trans *tra
    UREG_DOORBELL_TO_ISR6_NMI_BIT);
    else
    iwl_write32(trans, CSR_DOORBELL_VECTOR,
    - CSR_DOORBELL_VECTOR_NMI);
    + UREG_DOORBELL_TO_ISR6_NMI_BIT);
    }
    IWL_EXPORT_SYMBOL(iwl_force_nmi);


    \
     
     \ /
      Last update: 2022-01-25 04:09    [W:2.826 / U:1.144 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site