From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oa1-f41.google.com (mail-oa1-f41.google.com [209.85.160.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ACED72E0413 for ; Wed, 1 Apr 2026 18:23:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775067821; cv=none; b=kjvwAa2Xszi9OcfwF5pq+W/LtIQAiOIsUWosOa1yzLDM8ja9ahxBLfZ62onwaWsaSN+UNDQfJUXQQmc5GVWy8HeN3sWvJUc5nDb/HssU0LIGc8My5ZjiDdVlb3YRSp0fxfM9JIOGSgL4qaWDYTZ9C6LVeup4JXUXRcJXlxd5W4U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775067821; c=relaxed/simple; bh=AGNEhDAOdO1/MKvSBYbhcMbSmHF2DqwykbcTVHldLDE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XcE6zEi4pAWJQpaXcDrpXzhFaKBvSA2ga0m0y8SkCoVhrSjIiJtW8UXKtENhPhgfJ046KU2raKFRNhqwWTYniE17OX3medgW+fKvHdlAf/JEvMCTv9J9ODT8gDmlBy9lpo/r5aYsVpX39JR13otuPSvOWIoqnAvYicIn77MgNb0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=kernel.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.160.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=kernel.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-oa1-f41.google.com with SMTP id 586e51a60fabf-40efc77933fso43037fac.3 for ; Wed, 01 Apr 2026 11:23:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775067818; x=1775672618; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=fFwAsGzOmBHffBxJWkSRpHG2Hwbi2J13ykcPgyMD9uk=; b=UJ1SDdSkDxvwy7oZcNcSEzvCmTm0Z2xztXz9w+Rv9wfZbYZuJwO5JfQXj5FRZrRkag PCaDjtM+MeUv08ZUevoX6AfZYtsbZ6DphY5uOP15bYNUp9T1HOo8K7C109sdv7MpFpHF bwaVVDSMgNxDIma2ayLPDtXYUiaBU/2dXIdBlTabH4+FPtuR0yHkGmyEM+qBw0p1mM07 +Uv3/beNQi4PDWTvG0W+mC9YoU2oitHzLgoi+aOKu8pYwe3VRm7WrCuuCa3ajoo1HTJO eZ/keIn9MeRZ/NhTk/rUPB+UP7LTAF29mnq1Mns0Zp7d6qYYdD5ysEVgk/dc/y3r1p3B h6ng== X-Gm-Message-State: AOJu0Ywajh667f05MDoFKPZZ86QUb7/2G6PhlKIgFTxj+IV+jZWm1p5l ji51lRkoI3QRRllvpLnkiw3kcsO1q6s7HngpKNnZQZ0/gu/Sayz2l2Y5 X-Gm-Gg: ATEYQzx+AT7+hDQqAMyKuKsdgPHmoubPcNmdVZwO0MP03uif53n7HMCIPMEhdpMTCP4 ubH9n2HwjEsW2CHbYRLTRjihIv6F7gIXWiZDcvZdq+aMmj5XFby8+g1rx7MQIxgCj0n/WzqveXr ajdcQSvegvZ05TQSEV3DPtmA8ifCwNqcteMtNSbAKZtVjMkeX6TNY5bXJHqHW3PnFctrr3YQYDd RwobfUH9HHK4T8zbEhAY3bb1nJWQ8SroPpgHGny/BeZs4ph0hCbFZWQqyuLEe92R+tIrj9+bY7M TKeRqbc5ZdnlIvNMVEuRCUMw6Ef4QzO4KEI2ZyKNK9BriUftenlVmk8CK7yZgtxJRzeoy7y/nt/ K0stnAvK4kWbEgSF1JzBnhH2NKGwGra2Vgzd9yfjIrXswZygYGThL4pDyf+Uy1wg/hUpVtv3AlG f34MiASR9fPGU6W6g1bMIRNF3vOCD2N5DKlw0HFZ5PEFJ0p+QryQ0Cv96FXg== X-Received: by 2002:a05:6870:2012:b0:417:5b7a:704b with SMTP id 586e51a60fabf-422cfec06abmr2923345fac.31.1775067818559; Wed, 01 Apr 2026 11:23:38 -0700 (PDT) Received: from sean-HP-EliteBook-830-G6.lan ([207.191.35.252]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-422eb3c9e06sm386778fac.15.2026.04.01.11.23.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Apr 2026 11:23:38 -0700 (PDT) From: Sean Wang To: nbd@nbd.name, lorenzo.bianconi@redhat.com Cc: linux-wireless@vger.kernel.org, linux-mediatek@lists.infradead.org, Sean Wang , Devin Wittmayer , Satadru Pramanik Subject: [PATCH v2 2/3] wifi: mt76: connac: factor out rate power limit calculation Date: Wed, 1 Apr 2026 13:23:21 -0500 Message-ID: <20260401182322.64355-2-sean.wang@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260401182322.64355-1-sean.wang@kernel.org> References: <20260401182322.64355-1-sean.wang@kernel.org> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Sean Wang Factor out the per-channel rate power limit calculation into a shared helper. This avoids duplicating the same regulatory, SAR and rate-limit logic in multiple paths. Reported-by: Devin Wittmayer Closes: https://lore.kernel.org/linux-wireless/20260130215839.53270-1-lucid_duck@justthetip.ca/ Tested-by: Devin Wittmayer Tested-by: Satadru Pramanik Co-developed-by: Devin Wittmayer Signed-off-by: Devin Wittmayer Signed-off-by: Sean Wang --- v2: - Rebased onto the latest mt76 tree - Added Reported-by, Tested-by, Co-developed-by and Signed-off-by tags --- .../net/wireless/mediatek/mt76/mt76_connac.h | 3 ++ .../wireless/mediatek/mt76/mt76_connac_mcu.c | 28 +++++++++++++------ 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac.h b/drivers/net/wireless/mediatek/mt76/mt76_connac.h index d0953e02810b..1549a97873ee 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76_connac.h +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac.h @@ -421,6 +421,9 @@ void mt76_connac_gen_ppe_thresh(u8 *he_ppet, int nss, enum nl80211_band band); int mt76_connac_init_tx_queues(struct mt76_phy *phy, int idx, int n_desc, int ring_base, void *wed, u32 flags); void mt76_connac_set_txpower_cur(struct mt76_phy *phy, s8 max_power); +s8 mt76_connac_get_rate_power_limit(struct mt76_phy *phy, + struct ieee80211_channel *chan, + struct mt76_power_limits *limits); void mt76_connac_write_hw_txp(struct mt76_dev *dev, struct mt76_tx_info *tx_info, void *txp_ptr, u32 id); diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c index 897b065a2be6..1117a22c70ac 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c @@ -2223,15 +2223,10 @@ mt76_connac_mcu_rate_txpower_band(struct mt76_phy *phy, .hw_value = ch_list[idx], .band = band, }; - s8 reg_power, sar_power, max_power; - - reg_power = mt76_connac_get_ch_power(phy, &chan, - tx_power); - sar_power = mt76_get_sar_power(phy, &chan, reg_power); - - max_power = mt76_get_rate_power_limits(phy, &chan, limits, - sar_power); + s8 max_power; + max_power = mt76_connac_get_rate_power_limit(phy, &chan, + limits); if (phy->chandef.chan && phy->chandef.chan->hw_value == ch_list[idx] && phy->chandef.chan->band == band) @@ -2967,6 +2962,23 @@ int mt76_connac_mcu_rdd_cmd(struct mt76_dev *dev, int cmd, u8 index, } EXPORT_SYMBOL_GPL(mt76_connac_mcu_rdd_cmd); +s8 mt76_connac_get_rate_power_limit(struct mt76_phy *phy, + struct ieee80211_channel *chan, + struct mt76_power_limits *limits) +{ + s8 reg_power, sar_power; + int tx_power; + + tx_power = 2 * phy->hw->conf.power_level; + if (!tx_power) + tx_power = 127; + + reg_power = mt76_connac_get_ch_power(phy, chan, tx_power); + sar_power = mt76_get_sar_power(phy, chan, reg_power); + return mt76_get_rate_power_limits(phy, chan, limits, sar_power); +} +EXPORT_SYMBOL_GPL(mt76_connac_get_rate_power_limit); + static int mt76_connac_mcu_send_ram_firmware(struct mt76_dev *dev, const struct mt76_connac2_fw_trailer *hdr, -- 2.43.0