From patchwork Sun Jul 1 14:23:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Manoharan, Rajkumar" X-Patchwork-Id: 1144221 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id CE9873FE4F for ; Sun, 1 Jul 2012 14:22:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755731Ab2GAOWq (ORCPT ); Sun, 1 Jul 2012 10:22:46 -0400 Received: from wolverine01.qualcomm.com ([199.106.114.254]:15554 "EHLO wolverine01.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755242Ab2GAOWp (ORCPT ); Sun, 1 Jul 2012 10:22:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=qca.qualcomm.com; i=@qca.qualcomm.com; q=dns/txt; s=qcdkim; t=1341152566; x=1372688566; h=from:to:cc:subject:date:message-id:mime-version; bh=QXyeDvlwrwkrN/hA16NruiqY03WL44qGvibf5By7v4c=; b=b3yxKpvIesVyN2eeKqzHw1xfqvs8DK6zB4jCgmj92U/6QET9nH2qgPca ygUXMZqSI82UZ4XEruZs2lzDiz3rsoFhSoMi6rtw+8t7Ok0tADzkNSR0j st66pJVY7Faq/sIH5idBvw9BlyGpqhn6avvig/AaG5LhhhzE4RzGTLsYg Q=; X-IronPort-AV: E=McAfee;i="5400,1158,6758"; a="206473174" Received: from ironmsg04-l.qualcomm.com ([172.30.48.19]) by wolverine01.qualcomm.com with ESMTP; 01 Jul 2012 07:22:36 -0700 X-IronPort-AV: E=Sophos;i="4.77,504,1336374000"; d="scan'208";a="251350496" Received: from nasanexhc08.na.qualcomm.com ([172.30.39.7]) by Ironmsg04-L.qualcomm.com with ESMTP/TLS/RC4-SHA; 01 Jul 2012 07:22:36 -0700 Received: from qcmail1.qualcomm.com (172.30.39.5) by qcmail1.qualcomm.com (172.30.39.7) with Microsoft SMTP Server (TLS) id 14.2.283.3; Sun, 1 Jul 2012 07:22:33 -0700 Received: by qcmail1.qualcomm.com (sSMTP sendmail emulation); Sun, 01 Jul 2012 19:53:57 +0530 From: Rajkumar Manoharan To: CC: , Rajkumar Manoharan Subject: [PATCH v3 1/5] ath9k_hw: start noisefloor calibration after MCI reset Date: Sun, 1 Jul 2012 19:53:51 +0530 Message-ID: <1341152635-4840-1-git-send-email-rmanohar@qca.qualcomm.com> X-Mailer: git-send-email 1.7.11.1 MIME-Version: 1.0 X-Originating-IP: [172.30.39.5] Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org noisefloor calibration has to be loaded and started after chip reset completion and restoring chainmask. Right now it is being started before MCI reset completion on full reset. Fix that. Signed-off-by: Rajkumar Manoharan --- drivers/net/wireless/ath/ath9k/hw.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index ebfb2a3..10a55bc 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c @@ -1949,9 +1949,6 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan, if (!ath9k_hw_init_cal(ah, chan)) return -EIO; - ath9k_hw_loadnf(ah, chan); - ath9k_hw_start_nfcal(ah, true); - if (ath9k_hw_mci_is_enabled(ah) && ar9003_mci_end_reset(ah, chan, caldata)) return -EIO; @@ -2000,6 +1997,9 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan, if (ath9k_hw_mci_is_enabled(ah)) ar9003_mci_check_bt(ah); + ath9k_hw_loadnf(ah, chan); + ath9k_hw_start_nfcal(ah, true); + if (AR_SREV_9300_20_OR_LATER(ah)) { ar9003_hw_bb_watchdog_config(ah);