From patchwork Fri Jun 29 06:40:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Manoharan, Rajkumar" X-Patchwork-Id: 1130711 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id BEDDADFF34 for ; Fri, 29 Jun 2012 06:38:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751339Ab2F2Giu (ORCPT ); Fri, 29 Jun 2012 02:38:50 -0400 Received: from wolverine02.qualcomm.com ([199.106.114.251]:25597 "EHLO wolverine02.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750907Ab2F2Git (ORCPT ); Fri, 29 Jun 2012 02:38:49 -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=1340951929; x=1372487929; h=from:to:cc:subject:date:message-id:mime-version; bh=QXyeDvlwrwkrN/hA16NruiqY03WL44qGvibf5By7v4c=; b=CneTBFMi6qO/tboeBkTeAXeMUZ06vEdQwU1BRVqP/dOVtfxKVrcBdGIY vGqv9HDj9BvpcScuT/o5VkZ/IXMc9S9yDjcqBQ4L4Wet4duvijCXWe1PO Pl8nIoFL5aXsi8xquYY0jvurZBuNV7HQwu3tqImf66fXhAoQ/h3xrmzXn k=; X-IronPort-AV: E=McAfee;i="5400,1158,6756"; a="203478372" Received: from ironmsg03-l.qualcomm.com ([172.30.48.18]) by wolverine02.qualcomm.com with ESMTP; 28 Jun 2012 23:38:49 -0700 X-IronPort-AV: E=Sophos;i="4.77,496,1336374000"; d="scan'208";a="275351355" Received: from nasanexhc04.na.qualcomm.com ([172.30.48.17]) by Ironmsg03-L.qualcomm.com with ESMTP/TLS/RC4-SHA; 28 Jun 2012 23:38:49 -0700 Received: from qcmail1.qualcomm.com (172.30.48.1) by qcmail1.qualcomm.com (172.30.48.17) with Microsoft SMTP Server (TLS) id 14.2.283.3; Thu, 28 Jun 2012 23:38:47 -0700 Received: by qcmail1.qualcomm.com (sSMTP sendmail emulation); Fri, 29 Jun 2012 12:10:09 +0530 From: Rajkumar Manoharan To: CC: , Rajkumar Manoharan Subject: [PATCH 1/5] ath9k_hw: start noisefloor calibration after MCI reset Date: Fri, 29 Jun 2012 12:10:05 +0530 Message-ID: <1340952009-12223-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.48.1] 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);