From patchwork Tue Feb 11 08:12:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Razvan Grigore X-Patchwork-Id: 864409 Received: from mail-ed1-f97.google.com (mail-ed1-f97.google.com [209.85.208.97]) (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 AD5661EE7DF for ; Tue, 11 Feb 2025 08:14:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.97 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739261651; cv=none; b=ZUY+w9jh+fGB9bu+0JNf6qRzZ+tVgmWroyFii/1KKttZowyzZPE6dj0vJFd3DzNYZPnVG5nNkfFuGWuz4sHvMeRhHE7LvW7xYAUHZ1YuNwvK99HnU6Qz7ubAb9HpW/bm6ozIOCvLmjmLc554+KOJuVKWFxK4AOu7r0+uRLCBhdo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739261651; c=relaxed/simple; bh=qySn+qutT/7QTH9+GPMef8PgnUwe7yKZFScnxrQJafg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Iv3IAlKFaBBn8OoeLbVwXTDQK75q7yOdR/Q+062980Z1A/7nctO4rwt4LsidmX4+TxZIyNIF7jRErX47upnZ9gvI69q2FR6sAVWwJX23HF6fS1cZlwfWa6XtxMZjmDKNnxlozn0ujlZsfw3jPH8hOtFBC0D4tJC8MJczcRXgd6E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=vampirebyte.ro; spf=pass smtp.mailfrom=vampirebyte.ro; dkim=pass (2048-bit key) header.d=vampirebyte-ro.20230601.gappssmtp.com header.i=@vampirebyte-ro.20230601.gappssmtp.com header.b=sMZH6Ie8; arc=none smtp.client-ip=209.85.208.97 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=vampirebyte.ro Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=vampirebyte.ro Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=vampirebyte-ro.20230601.gappssmtp.com header.i=@vampirebyte-ro.20230601.gappssmtp.com header.b="sMZH6Ie8" Received: by mail-ed1-f97.google.com with SMTP id 4fb4d7f45d1cf-5de6c70832bso4182239a12.1 for ; Tue, 11 Feb 2025 00:14:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vampirebyte-ro.20230601.gappssmtp.com; s=20230601; t=1739261648; x=1739866448; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ObnMbn2FLzqhaRiDyEEyyncfTfV/NglSimRNCizvXa4=; b=sMZH6Ie8dlG163YocC7TVNrftwO+3enrvyHpanX9a70vflErtL1NjAV96sn9/3qa4B tARUTtCDHFKGxN/NQxp1BERR8cicMF9yhYU5Y82eTgFBpjHbCWdvctgm1xrbnYt5RrUR nYHfhw7+/VzqBefXJLwata+nQnNQytdpf921mjcPuLj5ySO9XIUp2j750lvM271XjNZf WjqDAaBp4UeiiFCHOX/8iHi7eZjZG0sW1FIlw4bbF0+5RluxakF4NVBwhv2ok4vgIhhZ SA1OzOGLn+Eqa5lOUFm8vU4wI6LWiBlmp3I0tMNRcfDXupLFbkXtTu8mO2y3Qv/Wp9zI /A4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739261648; x=1739866448; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ObnMbn2FLzqhaRiDyEEyyncfTfV/NglSimRNCizvXa4=; b=sGGZ3lpLGE90Nk/KgJr9UBs95USTctBfRLb5wuEAmeoiexumhQMjVWIQSx5m/VKnWf QLtarHP1l9nZ3/FXv+NFob5BNbvseuH1uusKAQaXUWVxehLXmtDzA9WDJnfYmbKqb96a xy087xAWyU9KVrQV6JKkWotO7qY0jf67Gk1zRbtmEMfj6KoH50FCluVOB5s9v5fLDwju JIi0KHgVxNtaFNHizAWra8PcfeZ1WYFprDvsOHm/tA5/3KlCwbGDCBV7q5rDF28b+pzt hKkeruNKkt7Rv9trAt0/1+eWNmZfDAHPijPQgyUvymDH2Ixq/mDqfjZSv8ewGNRFzHZj n74w== X-Gm-Message-State: AOJu0YzfiTrvmuPXbfpkYwiw0uoKaZ8WhN02nI/j/rJB0FxcD5gOLyFe BhzaqKK97dLhku4vyv4b997BsV0JUIpeDc3hblV6CItflikE+iGvcq3zPVk05U7uMRgnQ8A13vo 4dmL/kyJ0HFHrIPf0ibOBGlTlKQfAzi0Y7p0k/ShY X-Gm-Gg: ASbGncsppFysrUScUOO5daVQuLQ5lg2xTjO2N35QLs5zSdvNjVYDf/mP+NQV4mEUygZ bnSBQB2XIKuv0ucUyjqrs17fbhQQBZyFC98ukhv7Lv5QYbsng0hJjCwHUUSorQCN2svd9wC8g0f VG83WY10kMuuHWujedlq/LEcEMCLInnxUIsrCGYnY11SCTL6G72vJCe22ytFaI7QjMjZ6WZc7+6 u3zDqktl9UHvjy9WoSlERtp9+AiiDu13F9j+7RgYojHgTw+iFTrAWoZOpRwXYnd3lGHlAWTsPEj zykuBlRsYgw35dI4Nilt3jx+4S3zUw== X-Google-Smtp-Source: AGHT+IFaNTh5tvrp3/K1K3ow4zTUrvgNIkWuqlZ9btpnX3NIMUU7vRlpIiSIDZuEGMVy79oo4olDttGZEADk X-Received: by 2002:a05:6402:2382:b0:5db:7353:2b5c with SMTP id 4fb4d7f45d1cf-5de9b931aaemr1862556a12.11.1739261647919; Tue, 11 Feb 2025 00:14:07 -0800 (PST) Received: from orin60.vampirebyte.net ([82.77.132.211]) by smtp-relay.gmail.com with ESMTPS id 4fb4d7f45d1cf-5de57041c05sm222537a12.12.2025.02.11.00.14.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2025 00:14:07 -0800 (PST) X-Relaying-Domain: vampirebyte.ro From: Razvan Grigore To: linux-wireless@vger.kernel.org, Felix Fietkau , Lorenzo Bianconi , Ryder Lee Cc: Shayne Chen , Sean Wang , Razvan Grigore Subject: [PATCH v2 1/5] wifi: mt76: add mt76_get_power_bound helper function Date: Tue, 11 Feb 2025 08:12:43 +0000 Message-Id: <20250211081247.5892-2-razvan.grigore@vampirebyte.ro> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250211081247.5892-1-razvan.grigore@vampirebyte.ro> References: <20250211081247.5892-1-razvan.grigore@vampirebyte.ro> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 This will replace mt7915_get_power_bound function from b/mt7915/mcu.h, since we will need it also for mt7921 and mt7925 Signed-off-by: Razvan Grigore --- drivers/net/wireless/mediatek/mt76/mac80211.c | 11 +++++++++++ drivers/net/wireless/mediatek/mt76/mt76.h | 2 ++ 2 files changed, 13 insertions(+) diff --git a/drivers/net/wireless/mediatek/mt76/mac80211.c b/drivers/net/wireless/mediatek/mt76/mac80211.c index 508b472408c2..2c98cc42cd7e 100644 --- a/drivers/net/wireless/mediatek/mt76/mac80211.c +++ b/drivers/net/wireless/mediatek/mt76/mac80211.c @@ -1697,6 +1697,17 @@ void mt76_wcid_add_poll(struct mt76_dev *dev, struct mt76_wcid *wcid) } EXPORT_SYMBOL_GPL(mt76_wcid_add_poll); +s8 mt76_get_power_bound(struct mt76_phy *phy, s8 txpower) +{ + int n_chains = hweight16(phy->chainmask); + + txpower = mt76_get_sar_power(phy, phy->chandef.chan, txpower * 2); + txpower -= mt76_tx_power_nss_delta(n_chains); + + return txpower; +} +EXPORT_SYMBOL_GPL(mt76_get_power_bound); + int mt76_get_txpower(struct ieee80211_hw *hw, struct ieee80211_vif *vif, unsigned int link_id, int *dbm) { diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h index 132148f7b107..96f98a0d55a8 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76.h +++ b/drivers/net/wireless/mediatek/mt76/mt76.h @@ -1482,6 +1482,8 @@ void mt76_sta_pre_rcu_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif, int mt76_get_min_avg_rssi(struct mt76_dev *dev, u8 phy_idx); +s8 mt76_get_power_bound(struct mt76_phy *phy, s8 txpower); + int mt76_get_txpower(struct ieee80211_hw *hw, struct ieee80211_vif *vif, unsigned int link_id, int *dbm); int mt76_init_sar_power(struct ieee80211_hw *hw, From patchwork Tue Feb 11 08:12:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Razvan Grigore X-Patchwork-Id: 864408 Received: from mail-ed1-f99.google.com (mail-ed1-f99.google.com [209.85.208.99]) (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 B07A01EEA2B for ; Tue, 11 Feb 2025 08:14:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.99 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739261657; cv=none; b=ZyqC3+/gDlVobx4saF5zCwfR6NkNy6Y4mUpPts5J8vV7nCvPRCauXeWgHYaxfFoRDnfYldKMv6NFmHQSgJF+EXNrURv+ohXi64wo74gjTjicJ5PySGN4kQt40ewg86qrRzyolwHIpQyhsKfLA29jugGRXg8Psp9w5680cNMV2Kc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739261657; c=relaxed/simple; bh=qNI8OLXVeDqt1gyYx5pfuOMsjmr22eZFqfci05wJLw0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JJ6V+7JTPNA8egapAdbGkgL8LZNHFQicA7avnAMo/UFRZ+ACm34tAdS38p4oUWK8JtgYlSfda7OFp05m7cInfRkeybhRFFQQE4bGSkGqJxyQ2wvw4CUzIl15Ium5kMyuLnXoc1S0iA/sV1huGihb/P6Pg6tfU20gz44homEGyjE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=vampirebyte.ro; spf=pass smtp.mailfrom=vampirebyte.ro; dkim=pass (2048-bit key) header.d=vampirebyte-ro.20230601.gappssmtp.com header.i=@vampirebyte-ro.20230601.gappssmtp.com header.b=TdTKu416; arc=none smtp.client-ip=209.85.208.99 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=vampirebyte.ro Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=vampirebyte.ro Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=vampirebyte-ro.20230601.gappssmtp.com header.i=@vampirebyte-ro.20230601.gappssmtp.com header.b="TdTKu416" Received: by mail-ed1-f99.google.com with SMTP id 4fb4d7f45d1cf-5de5a853090so6242006a12.3 for ; Tue, 11 Feb 2025 00:14:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vampirebyte-ro.20230601.gappssmtp.com; s=20230601; t=1739261654; x=1739866454; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=y4+/vDyLCe7EoIgVDWjJFYHuahtKhnzcPZ7kYVb/9us=; b=TdTKu416PB8JEoujw94ocnxFpxo+S3CNT6ny3lgn/YaoON0KaZiL0DFV3AwWSw7AvO GkmKaRSl3cRP0K8hRLEqst3QrWnKnRFYlWpSEMv6G9+J9NdGvULXukPjtS+9u+W5qpVl nyyqWrC+NrYASirOkUONK2/yqkuynQ4DuZEqxvFGgldbb8HtGE3Hh49rQ0VKo+xpF4q0 fZj0hotev5K4YmS3+C1yeAHFCuCFTrPZT5UUr5vvksZ696fWAWzlSJWU0QEzwbfZlO5J 5gaafqZiqpgJozDaJUQx9VFnBA4Q7zgkELa39ya45BZ3YgelVsgnOirqfuAU32F6935r ZzJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739261654; x=1739866454; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=y4+/vDyLCe7EoIgVDWjJFYHuahtKhnzcPZ7kYVb/9us=; b=lHgOQ8ydm0AmN3OnQilV4JBvcPLNMKTw71pzfUb2QD9sMDdRKJmuNUxrGj1qCZwhcV nil+o98qBx3j2rN2uzvzEtvg22xA6aMR4QZROHohnvcZBVRrSWXoRcUBs9mIw8JBwAXJ +yMElpf/32/f5BQ0c3QqS2Q79a4XWKMdb9u56PY/LSAZ7jgmh/tZhmKxMoigpZZraPOp dw3EgFLE7VMM676gKJtwvIWe3tfece1Sk1ObeAuB8pkuDis9oqbRhwLi2Q5kuL6z6jSl xhRYxf38aiDjGHx+ACbYB9b04HvGQUD8EjI2qIyel7u31AidWirsy0G02L0CbNzwbwSM EOaQ== X-Gm-Message-State: AOJu0YxaJ0+qYSb0k+GZHtr9R8BKvJ/r+T4YkFbmxw+FlKds/oBASOEt YRt+cp6z9uNDahyJ3tIiF3qWxB2jumv28pWxNw1Pmjdd8cK3NQRsJiUgWP9QanG4qj0IMbVMpZz e98K7sozuWL1+ZVsjT+4ymixhnqOQVa3l7YhoiP4d X-Gm-Gg: ASbGncuSvfSHyBo/qeRegCl1v+tXYhKB/4GUOl8ohEDQb6jwk/MaXi2OkQDmtGW+PKW mN7TqFIiSt0uAViUUIl4YozCjKfWTnLbshUCzDJXVXhZyZOB0ERlrLL6rkfRXQDKt7LQfUj0Aur p15G81eo7yGjqvyDyiJKmaRJSCETv/RKjuGSvI62Z+CITFOWmmbrsRBC7i38qWCMB3juYDo8DwN de7UJehHmLAc4friZwJVCnmvB++UurdLUe5OERx2LJJxYYdBFymC0b8Ns4PmUc0bu98lmW2YXK0 Ms+DWEaw+Mz4kD4SIDCKVdj0BafesA== X-Google-Smtp-Source: AGHT+IHGunfPId/rPn3vaGQJl34+jvybTYLPHDoqQdFIPiSQxqsRgWP0f9/dqnur6uXVzxihzV6zHoJ7MnVC X-Received: by 2002:a05:6402:3589:b0:5de:5d4a:9f56 with SMTP id 4fb4d7f45d1cf-5de5d4aa093mr12317793a12.31.1739261653956; Tue, 11 Feb 2025 00:14:13 -0800 (PST) Received: from orin60.vampirebyte.net ([82.77.132.211]) by smtp-relay.gmail.com with ESMTPS id 4fb4d7f45d1cf-5de57041c05sm222537a12.12.2025.02.11.00.14.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2025 00:14:13 -0800 (PST) X-Relaying-Domain: vampirebyte.ro From: Razvan Grigore To: linux-wireless@vger.kernel.org, Felix Fietkau , Lorenzo Bianconi , Ryder Lee Cc: Shayne Chen , Sean Wang , Razvan Grigore Subject: [PATCH v2 3/5] wifi: mt76: mt7925: fix returned txpower Date: Tue, 11 Feb 2025 08:12:45 +0000 Message-Id: <20250211081247.5892-4-razvan.grigore@vampirebyte.ro> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250211081247.5892-1-razvan.grigore@vampirebyte.ro> References: <20250211081247.5892-1-razvan.grigore@vampirebyte.ro> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Similar to the mt7921, seems the code was copy-paste from there. This bug was noticed by me and confirmed by many more people using this chipset with openwrt: https://github.com/openwrt/mt76/issues/783 It seems that for this particular chipset the mt76_phy->txpower_cur is never set, like in the case of other chipsets like mt7603, mt7615, etc. The driver is correctly calculating the TX power adjustment based on the number of antennas. However, the base TX power (phy->txpower_cur) is not being properly initialized or set to a meaningful value. It's starting at 0, so the final result is just the antenna gain compensation divided by 2. Signed-off-by: Razvan Grigore --- drivers/net/wireless/mediatek/mt76/mt7925/main.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/main.c b/drivers/net/wireless/mediatek/mt76/mt7925/main.c index 98daf80ac131..9da7897c0267 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7925/main.c +++ b/drivers/net/wireless/mediatek/mt76/mt7925/main.c @@ -1656,6 +1656,8 @@ int mt7925_set_tx_sar_pwr(struct ieee80211_hw *hw, const struct cfg80211_sar_specs *sar) { struct mt76_phy *mphy = hw->priv; + int tx_power; + struct mt76_power_limits limits_array; if (sar) { int err = mt76_init_sar_power(hw, sar); @@ -1665,6 +1667,11 @@ int mt7925_set_tx_sar_pwr(struct ieee80211_hw *hw, } mt792x_init_acpi_sar_power(mt792x_hw_phy(hw), !sar); + tx_power = mt76_get_power_bound(mphy, hw->conf.power_level); + tx_power = mt76_get_rate_power_limits(mphy, mphy->chandef.chan, + &limits_array, tx_power); + mphy->txpower_cur = tx_power; + return mt7925_mcu_set_rate_txpower(mphy); } From patchwork Tue Feb 11 08:12:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Razvan Grigore X-Patchwork-Id: 864407 Received: from mail-ed1-f99.google.com (mail-ed1-f99.google.com [209.85.208.99]) (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 478F91EF097 for ; Tue, 11 Feb 2025 08:14:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.99 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739261663; cv=none; b=Qtj3wYkjLsNAo43TIAXZtvdzW+kJWVIrr08gloe5iMN7UPh/fScTjcfLLuPVgd9djikSWLuSBrmXwGQHEVi2TXzLwGkxfO9D3Y5EN6GhNdkfX06WrKr++VBFK0XUum9MQLQzQhgRiKtx9XQacUSAnnzS61Ct9W+43DSmO6zNgEo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739261663; c=relaxed/simple; bh=J6F3zBCZe0fazTRt7fhzcVpdNnAccYYML2xKSe30dh4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=rpxAXYshtoOZeSBmgOSMLtr8KoFLmz7yvFN1saqBoB+HomDHV14ZOA5/+EvkYClwBsHJtKxUZ498w9HqjHaGi2otNmBQ+sdFy7/dkgkFLJNj2+U4M2b7yvChgiy/XJFLJCyswLdcoc8ZZe79+CLKRV17urstVbfxI0Sbl169eMY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=vampirebyte.ro; spf=pass smtp.mailfrom=vampirebyte.ro; dkim=pass (2048-bit key) header.d=vampirebyte-ro.20230601.gappssmtp.com header.i=@vampirebyte-ro.20230601.gappssmtp.com header.b=GfXBNq3O; arc=none smtp.client-ip=209.85.208.99 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=vampirebyte.ro Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=vampirebyte.ro Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=vampirebyte-ro.20230601.gappssmtp.com header.i=@vampirebyte-ro.20230601.gappssmtp.com header.b="GfXBNq3O" Received: by mail-ed1-f99.google.com with SMTP id 4fb4d7f45d1cf-5de4f4b0e31so6344583a12.0 for ; Tue, 11 Feb 2025 00:14:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vampirebyte-ro.20230601.gappssmtp.com; s=20230601; t=1739261660; x=1739866460; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1degeRkjr7tF9YW7hsf7m1PNJG7T8j2LksWyE93vkAw=; b=GfXBNq3Ow6hjeA3XybsOa7o+CINrCoRAjuFFLxxq5GFEk2QB5H6ilwM8UyS9hBCv8S sQkwPiwZGhvQ7iozEAkb6H9RBgyR1OpOLymQK30Cb8DwX0oe1pdEwbEIdq6nF1FvmHA3 2J6eqTJ/zQpdoQbsXCJT27GKAAbqOMrX/B2Y4kao0j7LuMxQZWa1efZtFfaFB5obGePw eVEc+52FqWUjziuyCyaKHWkFr2f6C08AjW/7fgkFVa5xrt1+F5rBGInoYoHiegJ062yz XGkoprqKXV+1hIz006kCuk85Jdbgyzlhh9qEYOxpZneLTHG4Cgl+Gu9CCKMErNrMQru5 wGWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739261660; x=1739866460; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1degeRkjr7tF9YW7hsf7m1PNJG7T8j2LksWyE93vkAw=; b=AwbJDs9bee7aZbaJXuZPSZoI3Uv6Uh3VXH87xlon1K32OkVIlQeVJzuwtGijV1GGyf ROtLcxsKGoCIWrJaL8J9LcBehj7fHVVM6lGCOF1m1YnsJQRyvaaSNZMC8oJnuzjdfz6U gONnW3AxLtMFTVk3KdnWZ39go3M7BBt1045ZQ5R2X88E6JdEsMTjZVUp4JE98q/b0Og8 bkhTYtGprnjIy3zTK+MpK/Qj7XfAEklzTT+i/QzYN23TzAYbrQWoa470r1tncfvk0OIO NJ5nYa1T+24dyxdZ0Vl4X1YrrfSqVrQz/g7LVxCK2XjPlk2UN+A6kCyVL7B/rRCqV2WA vFiA== X-Gm-Message-State: AOJu0YzPK6ojeMsbGR+oAmuJ/N34KWl1/mchB6PRbQIF0hNrzIoLq9gI lbhcwv7PAGwnP+42EXvhr64hP+CIgVomP87GBxtxbv4sxnVBWMvJOEAyZOHN4xSW3dxZSywOzs4 AZQuNMJic6pS12A+/LM55y06v/uOoHPv4Ajw5T54r X-Gm-Gg: ASbGnctLhrtm+lCLTE5rOewCBDnA0epTNTVsgVQhaOFUU+YhFQfDqfJvlbNemXUnHIi WVGrY0k1kAuoverJImacRtoc8qdU04eWRCxJJ3k4AKh2d1tvVp6HEWlhYNfvx5jRCW5mmiN8N7i /Z7yplLTnk+gIAtRJE9ECe4p/Rk5Q8n5gYEzWxmlQrfAcyt/zvaovJFNPnExGPmOMKY17tREhyU yX4qiTlD4JhBqk65lsndbVcI1/ZuPCsPe78hU5z9pq8r1mzvW9rsKEjGeKe8w6g7EWhy1glyafd iVsHGUm5NcFi5BuR6NQbqbpRCCodnQ== X-Google-Smtp-Source: AGHT+IGmceo4xpCUlPHgWiNSpUfNIptVQCJWVsQv965kNTPFGucqzfcJfpKIPW3cmSsfUlf+EvoS6S19r/z9 X-Received: by 2002:a05:6402:1ec5:b0:5dc:545:40a7 with SMTP id 4fb4d7f45d1cf-5de45005b92mr19536060a12.12.1739261659597; Tue, 11 Feb 2025 00:14:19 -0800 (PST) Received: from orin60.vampirebyte.net ([82.77.132.211]) by smtp-relay.gmail.com with ESMTPS id 4fb4d7f45d1cf-5de57041c05sm222537a12.12.2025.02.11.00.14.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2025 00:14:19 -0800 (PST) X-Relaying-Domain: vampirebyte.ro From: Razvan Grigore To: linux-wireless@vger.kernel.org, Felix Fietkau , Lorenzo Bianconi , Ryder Lee Cc: Shayne Chen , Sean Wang , Razvan Grigore Subject: [PATCH v2 5/5] wifi: mt76: mt7996: cleanup mt7996_get_power_bound Date: Tue, 11 Feb 2025 08:12:47 +0000 Message-Id: <20250211081247.5892-6-razvan.grigore@vampirebyte.ro> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250211081247.5892-1-razvan.grigore@vampirebyte.ro> References: <20250211081247.5892-1-razvan.grigore@vampirebyte.ro> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Refactor for making use of mt76_get_power_bound instead of the specific mt7996_get_power_bound, since we need this for other chipsets as well when calculating txpower Signed-off-by: Razvan Grigore --- drivers/net/wireless/mediatek/mt76/mt7996/mcu.c | 2 +- drivers/net/wireless/mediatek/mt76/mt7996/mcu.h | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c index e4569d032221..76f489e2f602 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c @@ -4579,7 +4579,7 @@ int mt7996_mcu_set_txpower_sku(struct mt7996_phy *phy) struct sk_buff *skb; int i, tx_power; - tx_power = mt7996_get_power_bound(phy, phy->txpower); + tx_power = mt76_get_power_bound(mphy, phy->txpower); tx_power = mt76_get_rate_power_limits(mphy, mphy->chandef.chan, &la, tx_power); mphy->txpower_cur = tx_power; diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.h b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.h index 43468bcaffc6..bd1ba00e1bc6 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.h +++ b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.h @@ -809,18 +809,6 @@ enum { #define MT7996_MAX_BSS_OFFLOAD_SIZE (MT7996_MAX_BEACON_SIZE + \ MT7996_BEACON_UPDATE_SIZE) -static inline s8 -mt7996_get_power_bound(struct mt7996_phy *phy, s8 txpower) -{ - struct mt76_phy *mphy = phy->mt76; - int n_chains = hweight16(mphy->chainmask); - - txpower = mt76_get_sar_power(mphy, mphy->chandef.chan, txpower * 2); - txpower -= mt76_tx_power_nss_delta(n_chains); - - return txpower; -} - enum { UNI_BAND_CONFIG_RADIO_ENABLE, UNI_BAND_CONFIG_RTS_THRESHOLD = 0x08,