From patchwork Mon Nov 3 19:49:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emmanuel Grumbach X-Patchwork-Id: 5219491 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 52294C11AC for ; Mon, 3 Nov 2014 19:49:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7E1E22014A for ; Mon, 3 Nov 2014 19:49:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 97AAD2013A for ; Mon, 3 Nov 2014 19:49:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752866AbaKCTtz (ORCPT ); Mon, 3 Nov 2014 14:49:55 -0500 Received: from mail-wi0-f179.google.com ([209.85.212.179]:58301 "EHLO mail-wi0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752543AbaKCTtz (ORCPT ); Mon, 3 Nov 2014 14:49:55 -0500 Received: by mail-wi0-f179.google.com with SMTP id h11so7404569wiw.6 for ; Mon, 03 Nov 2014 11:49:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/nz2z5l5tLY2OIGAHGKaH4xb8VNClLaCmM5JYN7FMMQ=; b=CDPPC3M4KrEM6dazVljpbpDNCldoFJn4ZbeW3xRBnQm5NTvTwd0j6i9WQiJXkfsL8S LXUhKKMNCoI/Jy66m++9cILrl/0nUZc1xYMw/PRZ/R3NGcuDnHzxDI9KVt6mL4HhDsYn 4dUp/UZBOonmHxE9jLkFsUYZpbJ58Q5/99uJb9Vzcx9WKETbkPbnfZnBjEEUp2w5FzJO JaFJfWzGZzXfJ2oOuzAnSEIP8mtfjpo1gKZs1MESd29zWgDB/dJObUaUStcdsEIcslkT G3Me0dzJqLLEn+7KUGcpt5sf4THzCXEi2SJH4j+bcS9+FUYnUcbrfxkyvAQek0iVrrcS ua4A== X-Received: by 10.194.20.42 with SMTP id k10mr6024059wje.75.1415044193710; Mon, 03 Nov 2014 11:49:53 -0800 (PST) Received: from localhost.localdomain (46-116-41-8.bb.netvision.net.il. [46.116.41.8]) by mx.google.com with ESMTPSA id hi8sm12108000wjc.34.2014.11.03.11.49.52 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 03 Nov 2014 11:49:53 -0800 (PST) From: Emmanuel Grumbach To: linux-wireless@vger.kernel.org Cc: Emmanuel Grumbach Subject: [PATCH 1/2] iwlwifi: mvm: initialize the cur_ucode upon boot Date: Mon, 3 Nov 2014 21:49:45 +0200 Message-Id: <1415044186-5559-1-git-send-email-egrumbach@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <5457DC1C.7020200@gmail.com> References: <5457DC1C.7020200@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Emmanuel Grumbach mvm->cur_ucode wasn't set before we actually load the firmware. This caused issues when we boot in RFKILL since we get an RFKILL interrupt upon boot even before we load any firmware. This leads to issues since iwl_mvm_set_hw_rfkill_state (the RFKILL interrupts handler in mvm) relies on this variable. Fix this. Signed-off-by: Emmanuel Grumbach --- drivers/net/wireless/iwlwifi/mvm/ops.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/wireless/iwlwifi/mvm/ops.c b/drivers/net/wireless/iwlwifi/mvm/ops.c index 48cb25a..27fb0a1 100644 --- a/drivers/net/wireless/iwlwifi/mvm/ops.c +++ b/drivers/net/wireless/iwlwifi/mvm/ops.c @@ -424,6 +424,7 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg, } mvm->sf_state = SF_UNINIT; mvm->low_latency_agg_frame_limit = 6; + mvm->cur_ucode = IWL_UCODE_INIT; mutex_init(&mvm->mutex); mutex_init(&mvm->d0i3_suspend_mutex);