From patchwork Mon May 25 12:06:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 6474121 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C95AB9F1CC for ; Mon, 25 May 2015 12:07:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C63EB201F5 for ; Mon, 25 May 2015 12:07:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AF49C20125 for ; Mon, 25 May 2015 12:07:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752187AbbEYMH2 (ORCPT ); Mon, 25 May 2015 08:07:28 -0400 Received: from mail-wg0-f46.google.com ([74.125.82.46]:35004 "EHLO mail-wg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751907AbbEYMH2 (ORCPT ); Mon, 25 May 2015 08:07:28 -0400 Received: by wgme6 with SMTP id e6so3005740wgm.2 for ; Mon, 25 May 2015 05:07:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=psuL78EJVa7QWN09YfXLgYPwM19oe/w3yoS7KcZofto=; b=DVq0fJVdyDp8eLsbwPVnJWhsVjtADH8Q8H2n2VZhpjqyKRo+eb/8uw5j/TAQq9cfYH BLn+XYs/1XjIsTPPsNVDVpECSCxSmHnCfIetnMZKTCXODrcMvqkDOp9KorcxDiTXVXDV eYDOXqZl6LDLQIrvhfAz7wUWra3D3oinz7ZSo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=psuL78EJVa7QWN09YfXLgYPwM19oe/w3yoS7KcZofto=; b=h4zLZ3sy/Usf7+7dIy48Vaq8crxIIUJt3AkW98wjRazxG1u5dMqoR8lVJD7lW1lzDU O26Vw7rHYihFiFdSKxPU8/xXAmCvTonFbaRDs1E8uAT61eEeay7i6JhlXNcvNcD0bHdl lwjid2PJsrHYQxWcnVNFXcwAGV2aTnmL27WADEHQottwwyNOzvXZF+sIPtQndM9FoPqm 0WUwI9/lrC5sIMXNG2Gs/xpwbJxSBdjjsVZ0USR7ecJXbJzPrE8hIr/uyMMQLRXNsYZ4 bXLY+Z5+v7BjD0J87l5R9WUtCV3jtI0/lGzaefevKCajdQzC7UD/G9+96sWRZiFAZQLk NUsA== X-Gm-Message-State: ALoCoQkh/TQ5KbiPzoqCfyfcXbATNcsfiEr5mRmECrgTJIb6rdCiZ9b0G7DgY91LW3HtlKf6rRCwvacgIX4e3TnsIVStpaOiGCZCWKUEgnumDK46grpnbjM3JVpZmB31RQ+Vrt2v1c16 X-Received: by 10.180.94.106 with SMTP id db10mr30350904wib.1.1432555646795; Mon, 25 May 2015 05:07:26 -0700 (PDT) Received: from localhost.localdomain ([91.198.246.8]) by mx.google.com with ESMTPSA id q10sm16459307wjo.38.2015.05.25.05.07.25 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 25 May 2015 05:07:26 -0700 (PDT) From: Michal Kazior To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Michal Kazior Subject: [PATCH v4 1/3] ath10k: move cycle_count macro Date: Mon, 25 May 2015 14:06:17 +0200 Message-Id: <1432555579-18347-1-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1432282693-4553-1-git-send-email-michal.kazior@tieto.com> References: <1432282693-4553-1-git-send-email-michal.kazior@tieto.com> X-DomainID: tieto.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=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,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 The macro isn't WMI specific. Instead it is related to hardware chip so move the macro accordingly. While at it document the magic value. Signed-off-by: Michal Kazior --- Notes: I've had to move more survey logic in "ath10k: handle cycle counter wraparound" into hw.c hence this patch. v4: * add this patch drivers/net/wireless/ath/ath10k/hw.h | 3 +++ drivers/net/wireless/ath/ath10k/wmi.c | 4 ++-- drivers/net/wireless/ath/ath10k/wmi.h | 1 - 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/hw.h b/drivers/net/wireless/ath/ath10k/hw.h index 89e09cbeac19..372f0b8c96f5 100644 --- a/drivers/net/wireless/ath/ath10k/hw.h +++ b/drivers/net/wireless/ath/ath10k/hw.h @@ -449,6 +449,9 @@ enum ath10k_hw_rate_cck { #define SCRATCH_3_ADDRESS ar->regs->scratch_3_address #define CPU_INTR_ADDRESS 0x0010 +/* Cycle counters are running at 88MHz */ +#define CCNT_TO_MSEC(x) ((x) / 88000) + /* Firmware indications to the Host via SCRATCH_3 register. */ #define FW_INDICATOR_ADDRESS (SOC_CORE_BASE_ADDRESS + SCRATCH_3_ADDRESS) #define FW_IND_EVENT_PENDING 1 diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c index 0fabe689179c..43caabf5b025 100644 --- a/drivers/net/wireless/ath/ath10k/wmi.c +++ b/drivers/net/wireless/ath/ath10k/wmi.c @@ -1644,8 +1644,8 @@ void ath10k_wmi_event_chan_info(struct ath10k *ar, struct sk_buff *skb) rx_clear_count -= ar->survey_last_rx_clear_count; survey = &ar->survey[idx]; - survey->time = WMI_CHAN_INFO_MSEC(cycle_count); - survey->time_busy = WMI_CHAN_INFO_MSEC(rx_clear_count); + survey->time = CCNT_TO_MSEC(cycle_count); + survey->time_busy = CCNT_TO_MSEC(rx_clear_count); survey->noise = noise_floor; survey->filled = SURVEY_INFO_TIME | SURVEY_INFO_TIME_BUSY | diff --git a/drivers/net/wireless/ath/ath10k/wmi.h b/drivers/net/wireless/ath/ath10k/wmi.h index cad72ae76253..cf44a3d080a3 100644 --- a/drivers/net/wireless/ath/ath10k/wmi.h +++ b/drivers/net/wireless/ath/ath10k/wmi.h @@ -4665,7 +4665,6 @@ struct wmi_peer_sta_kickout_event { } __packed; #define WMI_CHAN_INFO_FLAG_COMPLETE BIT(0) -#define WMI_CHAN_INFO_MSEC(x) ((x) / 88000) /* Beacon filter wmi command info */ #define BCN_FLT_MAX_SUPPORTED_IES 256