From patchwork Fri Jul 22 05:41:54 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kalle Valo X-Patchwork-Id: 998162 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p6M5hSGP009501 for ; Fri, 22 Jul 2011 05:43:29 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753241Ab1GVFn0 (ORCPT ); Fri, 22 Jul 2011 01:43:26 -0400 Received: from wolverine02.qualcomm.com ([199.106.114.251]:54611 "EHLO wolverine02.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753052Ab1GVFnY (ORCPT ); Fri, 22 Jul 2011 01:43:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=qca.qualcomm.com; i=kvalo@qca.qualcomm.com; q=dns/txt; s=qcdkim; t=1311313404; x=1342849404; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; z=From:=20Kalle=20Valo=20|To:=20|CC:=20,=20Vasanthakumar=20Thiagarajan=0D=0A=09|Subject:=20[PATCH=2021/31]=20ath6kl:=20Mov e=20chk_irq_status_cnt=20from=20ath6kl_device=20to=20htc_ target|Date:=20Fri,=2022=20Jul=202011=2008:41:54=20+0300 |Message-ID:=20<1311313324-6766-23-git-send-email-kvalo@q ca.qualcomm.com>|In-Reply-To:=20<1311313324-6766-1-git-se nd-email-kvalo@qca.qualcomm.com>|References:=20<131131332 4-6766-1-git-send-email-kvalo@qca.qualcomm.com> |MIME-Version:=201.0; bh=T3UkW/dhI/YdCyB3fsXKj7irZvU6e++SvrhKogVl64Q=; b=Kdt55L3J/lbC1nezULWqgA0bfweGqDro9Svc9g5fXDUSTSxFubtW5MHt Jmxr2DIYGWk4JG8VR67bC0i19wi0kXDGjB3yyVnY+CkZuKiG2j0DKd8oB YE+HmoX98OhQIQd70EZ0PdIx50lpRlXmIAXMRqRgzO56YrEoVOkDbMlV0 I=; X-IronPort-AV: E=McAfee;i="5400,1158,6414"; a="104991754" Received: from ironmsg03-l.qualcomm.com ([172.30.48.18]) by wolverine02.qualcomm.com with ESMTP; 21 Jul 2011 22:43:24 -0700 X-IronPort-AV: E=Sophos;i="4.67,244,1309762800"; d="scan'208";a="52132743" Received: from nasanexhub03.na.qualcomm.com ([10.46.93.98]) by Ironmsg03-L.qualcomm.com with ESMTP/TLS/RC4-MD5; 21 Jul 2011 22:43:24 -0700 Received: from NASJOEXHC01.na.qualcomm.com (10.234.56.15) by nasanexhub03.na.qualcomm.com (10.46.93.98) with Microsoft SMTP Server (TLS) id 8.3.83.0; Thu, 21 Jul 2011 22:43:24 -0700 Received: from localhost.localdomain (10.234.11.69) by qcamail1.atheros.com (10.234.56.15) with Microsoft SMTP Server (TLS) id 14.1.323.0; Thu, 21 Jul 2011 22:43:19 -0700 From: Kalle Valo To: CC: , Vasanthakumar Thiagarajan Subject: [PATCH 21/31] ath6kl: Move chk_irq_status_cnt from ath6kl_device to htc_target Date: Fri, 22 Jul 2011 08:41:54 +0300 Message-ID: <1311313324-6766-23-git-send-email-kvalo@qca.qualcomm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1311313324-6766-1-git-send-email-kvalo@qca.qualcomm.com> References: <1311313324-6766-1-git-send-email-kvalo@qca.qualcomm.com> MIME-Version: 1.0 X-Originating-IP: [10.234.11.69] Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Fri, 22 Jul 2011 05:43:29 +0000 (UTC) From: Vasanthakumar Thiagarajan Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: Kalle Valo --- drivers/net/wireless/ath/ath6kl/htc.c | 4 ++-- drivers/net/wireless/ath/ath6kl/htc.h | 2 ++ drivers/net/wireless/ath/ath6kl/htc_hif.c | 6 +++--- drivers/net/wireless/ath/ath6kl/htc_hif.h | 1 - 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/net/wireless/ath/ath6kl/htc.c b/drivers/net/wireless/ath/ath6kl/htc.c index ea87a19..8367979 100644 --- a/drivers/net/wireless/ath/ath6kl/htc.c +++ b/drivers/net/wireless/ath/ath6kl/htc.c @@ -1774,7 +1774,7 @@ int htc_rxmsg_pending_handler(struct htc_target *target, u32 msg_look_ahead[], * A recv bundle was detected, force IRQ status * re-check again */ - target->dev->chk_irq_status_cnt = 1; + target->chk_irq_status_cnt = 1; n_fetched += get_queue_depth(&rx_pktq); @@ -1799,7 +1799,7 @@ int htc_rxmsg_pending_handler(struct htc_target *target, u32 msg_look_ahead[], * before leaving IRQ processing, this can net better * performance in high throughput situations. */ - target->dev->chk_irq_status_cnt = 1; + target->chk_irq_status_cnt = 1; } if (status) { diff --git a/drivers/net/wireless/ath/ath6kl/htc.h b/drivers/net/wireless/ath/ath6kl/htc.h index bf9c725..d844d36 100644 --- a/drivers/net/wireless/ath/ath6kl/htc.h +++ b/drivers/net/wireless/ath/ath6kl/htc.h @@ -536,6 +536,8 @@ struct htc_target { int max_scat_entries; int max_xfer_szper_scatreq; + + int chk_irq_status_cnt; }; void *htc_create(struct ath6kl *ar); diff --git a/drivers/net/wireless/ath/ath6kl/htc_hif.c b/drivers/net/wireless/ath/ath6kl/htc_hif.c index 7ab40c1..5d397b5 100644 --- a/drivers/net/wireless/ath/ath6kl/htc_hif.c +++ b/drivers/net/wireless/ath/ath6kl/htc_hif.c @@ -426,7 +426,7 @@ static int proc_pending_irqs(struct ath6kl_device *dev, bool *done) * HTC could not pull any messages out due to lack * of resources. */ - dev->chk_irq_status_cnt = 0; + dev->htc_cnxt->chk_irq_status_cnt = 0; } /* now handle the rest of them */ @@ -469,7 +469,7 @@ out: ath6kl_dbg(ATH6KL_DBG_IRQ, "bypassing irq status re-check, forcing done\n"); - if (!dev->chk_irq_status_cnt) + if (!dev->htc_cnxt->chk_irq_status_cnt) *done = true; ath6kl_dbg(ATH6KL_DBG_IRQ, @@ -489,7 +489,7 @@ int ath6kldev_intr_bh_handler(struct ath6kl *ar) * Reset counter used to flag a re-scan of IRQ status registers on * the target. */ - dev->chk_irq_status_cnt = 0; + dev->htc_cnxt->chk_irq_status_cnt = 0; /* * IRQ processing is synchronous, interrupt status registers can be diff --git a/drivers/net/wireless/ath/ath6kl/htc_hif.h b/drivers/net/wireless/ath/ath6kl/htc_hif.h index 47f086c..498701f 100644 --- a/drivers/net/wireless/ath/ath6kl/htc_hif.h +++ b/drivers/net/wireless/ath/ath6kl/htc_hif.h @@ -80,7 +80,6 @@ struct ath6kl_device { struct ath6kl_irq_enable_reg irq_en_reg; u8 pad3[A_CACHE_LINE_PAD]; struct htc_target *htc_cnxt; - int chk_irq_status_cnt; struct ath6kl *ar; };