Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp10532179ybi; Thu, 25 Jul 2019 01:01:48 -0700 (PDT) X-Google-Smtp-Source: APXvYqwvW5PszClVHfXAX/dVAD3TpezzK1l7N2U5MbmZf8XcaX9AzYG1ouxfWGLEf6ggT6IL70pt X-Received: by 2002:a17:902:a9ca:: with SMTP id b10mr15885842plr.69.1564041708053; Thu, 25 Jul 2019 01:01:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564041708; cv=none; d=google.com; s=arc-20160816; b=WhM03vdjvDJzgQcbpwevgF01NfEEKrKkKkGJqOeJTLEg3m9EG0Hfp9kQbipNHhe+Xr YdT0O0DiZifh6juGMBanMdugfrkqSMXxO6BrolFrFY46+sLf9cx7cGzgtAAVft1/O6KD /Gupv3D1Z/P5udKGhUTrHAT7D9ZuVJvDvrbK1FltHxcWAHBM+wTWz4EIwLGKPB8WwryK CPGjr9iChy63feF8UziVnk73f1VwV96sYhZYqIH925L/cc4FcaKWgVVLhbDpxvk20nPj NIoIYxiAQ/reWHGi57OKbo5D3JsZ5XMzQXVWKijE9TdeaU2w3x8ZshhMexUIpgOhXaAF yfBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=q8gH/g/WXbXdUvm+6gh4xW+6eQepCloHRMHuxx9IG1U=; b=KVNJktfmFkRPVoPB8GKFs8+qGgFPDnYMOhgxpNVhBIQh/Ofl+0Ci+biJidxpcGgalZ BZ3GaHe3CfdWTzuWlcPVbp3xaKveGKQb9VQZATABSlSPHm1j3T5N/7e8sxEOtEapvnH4 PbYRPBx5m6vbQ9n6NWJUP3c9OXqim4dpp6OQo0qGWUALnQ3ta/EGp8QRV71+7ZYoVWl/ xafs0Zk2kkHQnBNZjqXZ0hHZitpWSuV2BTqn5Ppl0v7lBLzeOTy5pF8/ZjYTzs/oOsgN NBfDMKqVTgqSKcxqUYnwmqm1cvtbWJax0Y50SuJWLC5Y92+9pdojLARSWkXBQWsZBRzP qwUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ttVCH86x; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id co12si15266972plb.197.2019.07.25.01.01.29; Thu, 25 Jul 2019 01:01:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ttVCH86x; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404897AbfGXUN0 (ORCPT + 99 others); Wed, 24 Jul 2019 16:13:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:40728 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404633AbfGXT4X (ORCPT ); Wed, 24 Jul 2019 15:56:23 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1A73C20665; Wed, 24 Jul 2019 19:56:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563998182; bh=CPNZ+QSf1n22rncsUpD/LvnhCTo6fBi49pfftRYaJgI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ttVCH86xtMNqFalg7bV2FFaoPZYdz5v2TKalWcuaw1DjeNLiUyC9LInojujbew6jI AcUM71XYwhzb6c8MaB4MwFKUHOyzLJOq70NYgi/pQu6d2GI+M/ihDi8uB9eh26y2XN okZymADsn8tnF00s2mTcFj3r883xTYeFvHQiccTs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Emmanuel Grumbach , Luca Coelho Subject: [PATCH 5.1 275/371] iwlwifi: mvm: clear rfkill_safe_init_done when we start the firmware Date: Wed, 24 Jul 2019 21:20:27 +0200 Message-Id: <20190724191745.020427315@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190724191724.382593077@linuxfoundation.org> References: <20190724191724.382593077@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Emmanuel Grumbach commit 940225628652b340b2bfe99f42f3d2db9fd9ce6c upstream. Otherwise it'll stay set forever which is clearly buggy. Cc: stable@vger.kernel.org Signed-off-by: Emmanuel Grumbach Signed-off-by: Luca Coelho Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) --- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c @@ -419,6 +419,8 @@ static int iwl_run_unified_mvm_ucode(str lockdep_assert_held(&mvm->mutex); + mvm->rfkill_safe_init_done = false; + iwl_init_notification_wait(&mvm->notif_wait, &init_wait, init_complete, @@ -537,8 +539,7 @@ int iwl_run_init_mvm_ucode(struct iwl_mv lockdep_assert_held(&mvm->mutex); - if (WARN_ON_ONCE(mvm->rfkill_safe_init_done)) - return 0; + mvm->rfkill_safe_init_done = false; iwl_init_notification_wait(&mvm->notif_wait, &calib_wait, @@ -1108,10 +1109,13 @@ static int iwl_mvm_load_rt_fw(struct iwl iwl_fw_dbg_apply_point(&mvm->fwrt, IWL_FW_INI_APPLY_EARLY); + mvm->rfkill_safe_init_done = false; ret = iwl_mvm_load_ucode_wait_alive(mvm, IWL_UCODE_REGULAR); if (ret) return ret; + mvm->rfkill_safe_init_done = true; + iwl_fw_dbg_apply_point(&mvm->fwrt, IWL_FW_INI_APPLY_AFTER_ALIVE); return iwl_init_paging(&mvm->fwrt, mvm->fwrt.cur_fw_img);