From patchwork Sat Jun 30 06:08:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Manoharan, Rajkumar" X-Patchwork-Id: 1134051 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 DEF2340AC1 for ; Sat, 30 Jun 2012 06:07:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751323Ab2F3GHb (ORCPT ); Sat, 30 Jun 2012 02:07:31 -0400 Received: from wolverine02.qualcomm.com ([199.106.114.251]:22710 "EHLO wolverine02.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751204Ab2F3GHb (ORCPT ); Sat, 30 Jun 2012 02:07:31 -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=1341036451; x=1372572451; h=from:to:cc:subject:date:message-id:mime-version; bh=QXyeDvlwrwkrN/hA16NruiqY03WL44qGvibf5By7v4c=; b=YKuk/ouEsBb0pjB1L+Yh+zG1l7jhJtrU55m1nZ0nRJKfJj4fKJxql/7n hVEkXpyYZGVKdpUKWrxQE/RACK2tC/CBRqo8RmCdp1Le0Uw7F8wvC2Crn Je8omeIhGdVaPWMjiN+rGQBME2icDZxoSsYebHWIbAt/6uR8VSrdED0AE 0=; X-IronPort-AV: E=McAfee;i="5400,1158,6757"; a="203875437" Received: from ironmsg03-l.qualcomm.com ([172.30.48.18]) by wolverine02.qualcomm.com with ESMTP; 29 Jun 2012 23:07:30 -0700 X-IronPort-AV: E=Sophos;i="4.77,501,1336374000"; d="scan'208";a="276081839" Received: from nasanexhc08.na.qualcomm.com ([172.30.39.7]) by Ironmsg03-L.qualcomm.com with ESMTP/TLS/RC4-SHA; 29 Jun 2012 23:07:30 -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; Fri, 29 Jun 2012 23:07:29 -0700 Received: by qcmail1.qualcomm.com (sSMTP sendmail emulation); Sat, 30 Jun 2012 11:38:51 +0530 From: Rajkumar Manoharan To: CC: , Rajkumar Manoharan Subject: [PATCH v2 1/5] ath9k_hw: start noisefloor calibration after MCI reset Date: Sat, 30 Jun 2012 11:38:45 +0530 Message-ID: <1341036529-10823-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);