lkml.org 
[lkml]   [2019]   [Aug]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.2 144/144] iwlwifi: mvm: fix version check for GEO_TX_POWER_LIMIT support
    Date
    From: Luca Coelho <luciano.coelho@intel.com>

    commit f5a47fae6aa3eb06f100e701d2342ee56b857bee upstream.

    We erroneously added a check for FW API version 41 before sending
    GEO_TX_POWER_LIMIT, but this was already implemented in version 38.
    Additionally, it was cherry-picked to older versions, namely 17, 26
    and 29, so check for those as well.

    Cc: stable@vger.kernel.org
    Fixes: eca1e56ceedd ("iwlwifi: mvm: don't send GEO_TX_POWER_LIMIT to old firmwares")
    Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 9 +++++++--
    1 file changed, 7 insertions(+), 2 deletions(-)

    --- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
    +++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
    @@ -880,9 +880,14 @@ static bool iwl_mvm_sar_geo_support(stru
    * The GEO_TX_POWER_LIMIT command is not supported on earlier
    * firmware versions. Unfortunately, we don't have a TLV API
    * flag to rely on, so rely on the major version which is in
    - * the first byte of ucode_ver.
    + * the first byte of ucode_ver. This was implemented
    + * initially on version 38 and then backported to 36, 29 and
    + * 17.
    */
    - return IWL_UCODE_SERIAL(mvm->fw->ucode_ver) >= 41;
    + return IWL_UCODE_SERIAL(mvm->fw->ucode_ver) >= 38 ||
    + IWL_UCODE_SERIAL(mvm->fw->ucode_ver) == 36 ||
    + IWL_UCODE_SERIAL(mvm->fw->ucode_ver) == 29 ||
    + IWL_UCODE_SERIAL(mvm->fw->ucode_ver) == 17;
    }

    int iwl_mvm_get_sar_geo_profile(struct iwl_mvm *mvm)

    \
     
     \ /
      Last update: 2019-08-14 19:10    [W:2.414 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site