From patchwork Wed Oct 23 11:02:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 3087871 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E2250BF924 for ; Wed, 23 Oct 2013 11:05:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C4EAC20320 for ; Wed, 23 Oct 2013 11:05:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F0FED20343 for ; Wed, 23 Oct 2013 11:05:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752905Ab3JWLFZ (ORCPT ); Wed, 23 Oct 2013 07:05:25 -0400 Received: from mail-ea0-f182.google.com ([209.85.215.182]:40005 "EHLO mail-ea0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752367Ab3JWLFY (ORCPT ); Wed, 23 Oct 2013 07:05:24 -0400 Received: by mail-ea0-f182.google.com with SMTP id o10so338939eaj.27 for ; Wed, 23 Oct 2013 04:05:23 -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=+lMbhdZ2suFZ6K1jBe36Cvn9WuuGBO8aUVY70eADqP0=; b=q+AU4XUgLDGgQwnicus7rS2lIjqbTzIT8L9BDdb7c+foxjtX8jGTsjDEdgRHhZblJs m1Ml5Qe0w2YalUfXRY6HlDdvMoTgo5MLGPhZF56G+1tDeFORmrb0pjj+BzcE9Af+YiN+ fzlZIcWZdlMesgdx7jRfIC4lLDvt/1FBE1O1Y= 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=+lMbhdZ2suFZ6K1jBe36Cvn9WuuGBO8aUVY70eADqP0=; b=Txtw00tpnXuOhW+QyDUhP+tf6S8yyjNAIF/rqzjjmaRpUMa4BygxKD4M1kNGCCNLIg gUcBWNRsF6nEhG3s9rQumgXDjmZOCulmn3bWv1in0bW+GmR+mpvTr6Cm1we4lvJpH+Tu 3zM8Hre18OhfA72f5w+tf32IWHKyq5gsmXNTBXDq3mOulKyK3jz1PpsI9JTHF6hvizva L32LAeGwaII5IzUatx4Z9xShe7AvB0ZEvW7iews3HYLxHCJXmY8bRIAMSaYKx7HEdAhF PItiXzI0XASKBNj5DLGAMGJv1XNVJ6LQ3QV4F9S67RgIsiHPke5xIu+YrOflgNu14WDF 8GPw== X-Gm-Message-State: ALoCoQlCKgeKijxGZPjwPI3P46gbLdTEmrwNB+keO1pgMQzThsFYtXfsTGma8Rp5nFPBNYZvFoL34WZbASnzprFec4XP517jih5RrHVOydVeBa4AGBBvPLk= X-Received: by 10.14.214.136 with SMTP id c8mr1250077eep.6.1382526323238; Wed, 23 Oct 2013 04:05:23 -0700 (PDT) Received: from localhost.localdomain ([91.198.246.8]) by mx.google.com with ESMTPSA id a1sm68764635eem.1.2013.10.23.04.05.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Oct 2013 04:05:22 -0700 (PDT) From: Michal Kazior To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Michal Kazior Subject: [PATCH 2/3] ath10k: use proper tx power unit Date: Wed, 23 Oct 2013 04:02:14 -0700 Message-Id: <1382526135-3215-3-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 1.8.4.rc3 In-Reply-To: <1382526135-3215-1-git-send-email-michal.kazior@tieto.com> References: <1382526135-3215-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=-7.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 It was previously thought that FW expects tx power in quarters of dBm. Signed-off-by: Michal Kazior --- drivers/net/wireless/ath/ath10k/mac.c | 18 +++++++++--------- drivers/net/wireless/ath/ath10k/wmi.h | 3 ++- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 35d5d3a..1d91201 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -451,9 +451,9 @@ static int ath10k_vdev_start(struct ath10k_vif *arvif) arg.channel.mode = chan_to_phymode(&conf->chandef); arg.channel.min_power = 0; - arg.channel.max_power = channel->max_power * 4; - arg.channel.max_reg_power = channel->max_reg_power * 4; - arg.channel.max_antenna_gain = channel->max_antenna_gain; + arg.channel.max_power = channel->max_power * 2; + arg.channel.max_reg_power = channel->max_reg_power * 2; + arg.channel.max_antenna_gain = channel->max_antenna_gain * 2; if (arvif->vdev_type == WMI_VDEV_TYPE_AP) { arg.ssid = arvif->u.ap.ssid; @@ -530,9 +530,9 @@ static int ath10k_monitor_start(struct ath10k *ar, int vdev_id) arg.channel.mode = chan_to_phymode(&ar->hw->conf.chandef); arg.channel.min_power = 0; - arg.channel.max_power = channel->max_power * 4; - arg.channel.max_reg_power = channel->max_reg_power * 4; - arg.channel.max_antenna_gain = channel->max_antenna_gain; + arg.channel.max_power = channel->max_power * 2; + arg.channel.max_reg_power = channel->max_reg_power * 2; + arg.channel.max_antenna_gain = channel->max_antenna_gain * 2; ret = ath10k_wmi_vdev_start(ar, &arg); if (ret) { @@ -1376,9 +1376,9 @@ static int ath10k_update_channel_list(struct ath10k *ar) ch->freq = channel->center_freq; ch->min_power = 0; - ch->max_power = channel->max_power * 4; - ch->max_reg_power = channel->max_reg_power * 4; - ch->max_antenna_gain = channel->max_antenna_gain; + ch->max_power = channel->max_power * 2; + ch->max_reg_power = channel->max_reg_power * 2; + ch->max_antenna_gain = channel->max_antenna_gain * 2; ch->reg_class_id = 0; /* FIXME */ /* FIXME: why use only legacy modes, why not any diff --git a/drivers/net/wireless/ath/ath10k/wmi.h b/drivers/net/wireless/ath/ath10k/wmi.h index 78c991a..81e33a7 100644 --- a/drivers/net/wireless/ath/ath10k/wmi.h +++ b/drivers/net/wireless/ath/ath10k/wmi.h @@ -893,6 +893,7 @@ struct wmi_channel { union { __le32 reginfo0; struct { + /* note: power unit is 0.5 dBm */ u8 min_power; u8 max_power; u8 reg_power; @@ -915,7 +916,7 @@ struct wmi_channel_arg { bool allow_ht; bool allow_vht; bool ht40plus; - /* note: power unit is 1/4th of dBm */ + /* note: power unit is 0.5 dBm */ u32 min_power; u32 max_power; u32 max_reg_power;