lkml.org 
[lkml]   [2021]   [Jul]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 60/74] iwlwifi: pcie: fix context info freeing
    Date
    From: Johannes Berg <johannes.berg@intel.com>

    [ Upstream commit 26d18c75a7496c4c52b0b6789e713dc76ebfbc87 ]

    After firmware alive, iwl_trans_pcie_gen2_fw_alive() is called
    to free the context info. However, on gen3 that will then free
    the context info with the wrong size.

    Since we free this allocation later, let it stick around until
    the device is stopped for now, freeing some of it earlier is a
    separate 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.20210618105614.afb63fb8cbc1.If4968db8e09f4ce2a1d27a6d750bca3d132d7d70@changeid
    Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c
    index df8455f14e4d..ee45e475405a 100644
    --- a/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c
    +++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c
    @@ -269,7 +269,8 @@ void iwl_trans_pcie_gen2_fw_alive(struct iwl_trans *trans, u32 scd_addr)
    /* now that we got alive we can free the fw image & the context info.
    * paging memory cannot be freed included since FW will still use it
    */
    - iwl_pcie_ctxt_info_free(trans);
    + if (trans->trans_cfg->device_family < IWL_DEVICE_FAMILY_AX210)
    + iwl_pcie_ctxt_info_free(trans);

    /*
    * Re-enable all the interrupts, including the RF-Kill one, now that
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-07-06 14:11    [W:6.684 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site