From patchwork Thu Jan 13 08:42:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Coelho X-Patchwork-Id: 532425 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E3B33C433F5 for ; Thu, 13 Jan 2022 08:42:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233082AbiAMImp (ORCPT ); Thu, 13 Jan 2022 03:42:45 -0500 Received: from paleale.coelho.fi ([176.9.41.70]:52430 "EHLO farmhouse.coelho.fi" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S231756AbiAMImp (ORCPT ); Thu, 13 Jan 2022 03:42:45 -0500 Received: from 91-155-254-253.elisa-laajakaista.fi ([91.155.254.253] helo=kveik.ger.corp.intel.com) by farmhouse.coelho.fi with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1n7vgv-001bSo-UZ; Thu, 13 Jan 2022 10:42:42 +0200 From: Luca Coelho To: kvalo@kernel.org Cc: luca@coelho.fi, linux-wireless@vger.kernel.org, lenb@kernel.org, johannes@sipsolutions.net Date: Thu, 13 Jan 2022 10:42:40 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [PATCH] iwlwifi: mvm: check if SAR GEO is supported before sending command Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Luca Coelho Older hardware, for instance 3160, do not support SAR GEO offsets. We used to check for support before sending the command, but when moving the command to the init phase, we lost the check. This causes a failure when initializing HW that do not support this command. Fix that by adding a check before sending the command. Additionally, fix the caller so that it checks for the return value of the iwl_mvm_sar_geo_init() function, which it was ignoring. Fixes: db700bc35703 ("iwlwifi: mvm: check if SAR GEO is supported before sending command") Cc: stable@vger.kernel.org # 5.15+ Reported-by: Len Brown Signed-off-by: Luca Coelho --- drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c index 6f4690e56a46..6528a6253336 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c @@ -882,6 +882,10 @@ static int iwl_mvm_sar_geo_init(struct iwl_mvm *mvm) offsetof(struct iwl_geo_tx_power_profiles_cmd_v4, ops) != offsetof(struct iwl_geo_tx_power_profiles_cmd_v5, ops)); + /* not supporting GEO is not a failure, so return 0 */ + if (!iwl_sar_geo_support(&mvm->fwrt)) + return 0; + /* the ops field is at the same spot for all versions, so set in v1 */ cmd.v1.ops = cpu_to_le32(IWL_PER_CHAIN_OFFSET_SET_TABLES); @@ -1741,7 +1745,7 @@ int iwl_mvm_up(struct iwl_mvm *mvm) ret = iwl_mvm_sar_init(mvm); if (ret == 0) ret = iwl_mvm_sar_geo_init(mvm); - else if (ret < 0) + if (ret < 0) goto error; ret = iwl_mvm_sgom_init(mvm);