Received: by 2002:aa6:c46f:0:b029:96:faae:e639 with SMTP id i15csp324161lkq; Thu, 5 Nov 2020 03:31:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJxih2a9gWf92aU7/ojrB6uoYVVso4+2TkT57+PiV4w/hboam7wX9wl92BdXJJqwoW1maVmQ X-Received: by 2002:aa7:dc52:: with SMTP id g18mr2055165edu.369.1604575901698; Thu, 05 Nov 2020 03:31:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604575901; cv=none; d=google.com; s=arc-20160816; b=t/6y/F+Fx9KdlcZA6D1aX/Qu9yoQaw9iXFQXikO1BvXz9FuqN6s6v7H0lCIlg0S+7H xPBZuyJ7aJRFjsTL3xo3SXevp2P0gsHhr/Rw7nmEGrZP37fMETrvo185aI3AUHDo/r0V wzqOe97dpAJ2LJ6Df8V6/x7tspxcnv45zeXloxw/KKvgwj7NyOxP7x5DggO8rDFC+Qsd 8rOnbvDln+mgutF81IuejJ5laFeS8StxzoEHHXtArmq97xwPfGwdhLs5BSvZdzxSn/13 WgqF+cm9gZkIFNUDwEAKE6m+FyPIxDwOfyDL61nbl6te9Qs6r5GovUz0pu2/lrNyLbdO 18AA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:user-agent:message-id:references:in-reply-to :subject:cc:to:from:date:content-transfer-encoding:mime-version :sender:dkim-signature; bh=pZQtBLTu/5pvlKCerLHD2vjY6Uc7ZSyuE4aZsLcZCVU=; b=EBTvrC3HfI9cfdam2Xfsap4OemogASTfgoAOttg8DmGnAZCrSRKHoV/7I9KEcg5ZTi 67Ny6lxbvLYYMLFj+igG3t+BHT2VfE1Sh1W8ZQeN4Wc2zf6Z61bIXKq5z0T6QvCs6R8a FHrEFecK+vvuWjaCP+wZ3Hb/gmzFeh/ZZGdHmBYcxz1DTOrtDSVKD1yyjVcMZZBlVg9c FKoKxAVErv9oy5x9bF8yLEF8hLuYlrVCq5OYn8IRuXK5CDdOcXyqZ1DYLR/6UklLK31g +bkssaAF7yfOFlcq96XLpN8Ct8Z+dJKyS0kdZvSMU40yWOXl849aSgcWK+/6qHmwgjML UZSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mg.codeaurora.org header.s=smtp header.b=vp4bjgrc; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n3si916456ejd.44.2020.11.05.03.31.12; Thu, 05 Nov 2020 03:31:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@mg.codeaurora.org header.s=smtp header.b=vp4bjgrc; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730244AbgKEL2d (ORCPT + 99 others); Thu, 5 Nov 2020 06:28:33 -0500 Received: from m42-4.mailgun.net ([69.72.42.4]:35994 "EHLO m42-4.mailgun.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729227AbgKEL1u (ORCPT ); Thu, 5 Nov 2020 06:27:50 -0500 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1604575668; h=Message-ID: References: In-Reply-To: Subject: Cc: To: From: Date: Content-Transfer-Encoding: Content-Type: MIME-Version: Sender; bh=pZQtBLTu/5pvlKCerLHD2vjY6Uc7ZSyuE4aZsLcZCVU=; b=vp4bjgrcoBSSL5GiCVkn3cyOvY2hWNMN56AZaMX96Tiogimd2OkHsbgnv4eJEmLr4nBBgt6D /0pG0k09ooqeKwWEvZmR5h87UlTuE+YXMSz60c5hlhkRDWvAfVc6AS4BhIKgRZYNWbuitOMf nbsLL3qoaI3zStlKSPrRcWfS6c4= X-Mailgun-Sending-Ip: 69.72.42.4 X-Mailgun-Sid: WyI3YTAwOSIsICJsaW51eC13aXJlbGVzc0B2Z2VyLmtlcm5lbC5vcmciLCAiYmU5ZTRhIl0= Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by smtp-out-n06.prod.us-east-1.postgun.com with SMTP id 5fa3e1b402c7ef95a66e205f (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Thu, 05 Nov 2020 11:27:48 GMT Sender: cjhuang=codeaurora.org@mg.codeaurora.org Received: by smtp.codeaurora.org (Postfix, from userid 1001) id 507E3C433CB; Thu, 5 Nov 2020 11:27:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-caf-mail-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=ALL_TRUSTED,BAYES_00, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.codeaurora.org (localhost.localdomain [127.0.0.1]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: cjhuang) by smtp.codeaurora.org (Postfix) with ESMTPSA id 63306C433C8; Thu, 5 Nov 2020 11:27:46 +0000 (UTC) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Thu, 05 Nov 2020 19:27:46 +0800 From: Carl Huang To: Brian Norris Cc: ath10k@lists.infradead.org, linux-wireless@vger.kernel.org, dianders@chromium.org, kuabhs@google.com Subject: Re: [RFC 2/2] ath10k: allow dynamic SAR power limits via common API In-Reply-To: <20201104231128.GA3212577@google.com> References: <1600753775-4745-1-git-send-email-cjhuang@codeaurora.org> <1600753775-4745-2-git-send-email-cjhuang@codeaurora.org> <20201104231128.GA3212577@google.com> Message-ID: <6563d6ac38368de40cd07ae36f230a86@codeaurora.org> X-Sender: cjhuang@codeaurora.org User-Agent: Roundcube Webmail/1.3.9 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org On 2020-11-05 07:11, Brian Norris wrote: > Hi, > > On Tue, Sep 22, 2020 at 01:49:35PM +0800, Carl Huang wrote: >> ath10k assigns ath10k_mac_set_sar_specs to ath10k_ops, and >> this function is called when user space application calls >> NL80211_CMD_SET_SAR_SPECS. ath10k also registers SAR type, >> and supported frequency ranges to wiphy so user space can >> query SAR capabilities. >> >> ath10k_mac_set_sar_specs further sets the power to firmware >> to limit the TX power. >> >> This feature is controlled by hw parameter: dynamic_sar_support. >> >> Signed-off-by: Carl Huang >> --- > >> diff --git a/drivers/net/wireless/ath/ath10k/mac.c >> b/drivers/net/wireless/ath/ath10k/mac.c >> index 2e3eb5b..830c61f 100644 >> --- a/drivers/net/wireless/ath/ath10k/mac.c >> +++ b/drivers/net/wireless/ath/ath10k/mac.c >> @@ -81,6 +81,17 @@ static struct ieee80211_rate ath10k_rates_rev2[] = >> { >> { .bitrate = 540, .hw_value = ATH10K_HW_RATE_OFDM_54M }, >> }; >> >> +static const struct cfg80211_sar_freq_ranges ath10k_sar_freq_ranges[] >> = { >> + { .index = 0, .start_freq = 2412000, .end_freq = 2484000 }, > > 2412 MHz is a center frequency, but other parts of the nl80211 API use > band edges. For example: > > * @NL80211_ATTR_FREQ_RANGE_START: starting frequencry for the > regulatory > * rule in KHz. This is not a center of frequency but an actual > regulatory > * band edge. > * @NL80211_ATTR_FREQ_RANGE_END: ending frequency for the regulatory > rule > * in KHz. This is not a center a frequency but an actual > regulatory > * band edge. > > Seems like we should improve the nl80211.h docs (patch 1) and make > these > edges (this patch). > >> + { .index = 1, .start_freq = 2484000, .end_freq = 5865000 }, >> +}; >> + >> +static const struct cfg80211_sar_capa ath10k_sar_capa = { >> + .type = NL80211_SAR_TYPE_POWER, >> + .num_freq_ranges = (ARRAY_SIZE(ath10k_sar_freq_ranges)), >> + .freq_ranges = &ath10k_sar_freq_ranges[0], >> +}; >> + >> #define ATH10K_MAC_FIRST_OFDM_RATE_IDX 4 >> >> #define ath10k_a_rates (ath10k_rates + >> ATH10K_MAC_FIRST_OFDM_RATE_IDX) >> @@ -2880,6 +2891,95 @@ static int ath10k_mac_vif_recalc_txbf(struct >> ath10k *ar, >> return 0; >> } >> >> +static bool ath10k_mac_is_connected(struct ath10k *ar) >> +{ >> + struct ath10k_vif *arvif; >> + >> + list_for_each_entry(arvif, &ar->arvifs, list) { >> + if (arvif->is_up && arvif->vdev_type == WMI_VDEV_TYPE_STA) >> + return true; >> + } >> + >> + return false; >> +} >> + >> +int ath10k_mac_set_sar_power(struct ath10k *ar) > > This function should be static. > Right. >> +{ >> + int ret; >> + >> + if (!ar->hw_params.dynamic_sar_support) >> + return 0; > > return -EOPNOTSUPP ? > sure >> + >> + if (ar->tx_power_2g_limit == 0 || ar->tx_power_5g_limit == 0) > > ath10k_mac_txpower_recalc() doesn't care about this -- why should you? > This also seems especially weird, because one of the 2 could be valid > nonzero values, and yet you're silently rejecting it. Regardless, the > following seems wrong: > Per current design, it's required for userspace to always set meaningful power limitations. Now in V2, 0 will be treated as "don't have SAR on this range". >> + return 0; > > This should probably be an error. > >> + >> + if (!ath10k_mac_is_connected(ar)) >> + return 0; > > Note to self (since this wasn't obvious to me the first read-through): > you're calling this function from ath10k_bss_assoc() too, so even if > you > weren't connected the first time around, it'll get called later. > >> + >> + ret = ath10k_wmi_pdev_set_param(ar, >> + ar->wmi.pdev_param->txpower_limit2g, >> + ar->tx_power_2g_limit); >> + if (ret) { >> + ath10k_warn(ar, "failed to set 2.4G txpower %d: %d\n", >> + ar->tx_power_2g_limit, ret); >> + return ret; >> + } >> + >> + ret = ath10k_wmi_pdev_set_param(ar, >> + ar->wmi.pdev_param->txpower_limit5g, >> + ar->tx_power_5g_limit); >> + if (ret) { >> + ath10k_warn(ar, "failed to set 5G txpower %d: %d\n", >> + ar->tx_power_5g_limit, ret); >> + return ret; >> + } > > Hmm, so these are the same params configured by > ath10k_mac_txpower_recalc(), except that we're not taking into account > the limitations in ath10k_mac_txpower_recalc() (and vice versa) -- > isn't > that bad? Should we be merging the SAR limitation into > ath10k_mac_txpower_recalc() and calling that instead? > Good suggestions. > Brian > >> + >> + ath10k_dbg(ar, ATH10K_DBG_MAC, "set txpower 2G:%d, 5G:%d >> successfully\n", >> + ar->tx_power_2g_limit, ar->tx_power_5g_limit); >> + >> + return ret; >> +} >> +