Skip to content

L
linux
Commit bfdff5d0 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files
Options

mt76: use mt76x02_dev instead of mt76_dev in mt76x02_phy.c 

Use mt76x02_dev data structure as reference in mt76x02_phy.c
instead of mt76_dev
Signed-off-by: default avatarLorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 499cd0aa
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 59 deletions
drivers/net/wireless/mediatek/mt76/mt76x0/phy.c
View file @ bfdff5d0
...@@ -618,7 +618,7 @@ void mt76x0_phy_set_txpower(struct mt76x02_dev *dev) ...@@ -618,7 +618,7 @@ void mt76x0_phy_set_txpower(struct mt76x02_dev *dev)
dev->mt76.txpower_cur = mt76x02_get_max_rate_power(t); dev->mt76.txpower_cur = mt76x02_get_max_rate_power(t);
mt76x02_add_rate_power_offset(t, -info[0]); mt76x02_add_rate_power_offset(t, -info[0]);
mt76x02_phy_set_txpower(&dev->mt76, info[0], info[1]); mt76x02_phy_set_txpower(dev, info[0], info[1]);
} }
int mt76x0_phy_set_channel(struct mt76x02_dev *dev, int mt76x0_phy_set_channel(struct mt76x02_dev *dev,
...@@ -815,7 +815,7 @@ static void mt76x0_dynamic_vga_tuning(struct mt76x02_dev *dev) ...@@ -815,7 +815,7 @@ static void mt76x0_dynamic_vga_tuning(struct mt76x02_dev *dev)
int avg_rssi; int avg_rssi;
init_vga = chandef->chan->band == NL80211_BAND_5GHZ ? 0x54 : 0x4E; init_vga = chandef->chan->band == NL80211_BAND_5GHZ ? 0x54 : 0x4E;
avg_rssi = mt76x02_phy_get_min_avg_rssi(&dev->mt76); avg_rssi = mt76x02_phy_get_min_avg_rssi(dev);
if (avg_rssi > -60) if (avg_rssi > -60)
init_vga -= 0x20; init_vga -= 0x20;
else if (avg_rssi > -70) else if (avg_rssi > -70)
...@@ -897,6 +897,6 @@ void mt76x0_phy_init(struct mt76x02_dev *dev) ...@@ -897,6 +897,6 @@ void mt76x0_phy_init(struct mt76x02_dev *dev)
INIT_DELAYED_WORK(&dev->cal_work, mt76x0_phy_calibrate); INIT_DELAYED_WORK(&dev->cal_work, mt76x0_phy_calibrate);
mt76x0_rf_init(dev); mt76x0_rf_init(dev);
mt76x02_phy_set_rxpath(&dev->mt76); mt76x02_phy_set_rxpath(dev);
mt76x02_phy_set_txdac(&dev->mt76); mt76x02_phy_set_txdac(dev);
} }
drivers/net/wireless/mediatek/mt76/mt76x02_phy.c
View file @ bfdff5d0
...@@ -17,18 +17,17 @@ ...@@ -17,18 +17,17 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include "mt76.h" #include "mt76x02.h"
#include "mt76x02_phy.h" #include "mt76x02_phy.h"
#include "mt76x02_mac.h"
void mt76x02_phy_set_rxpath(struct mt76_dev *dev) void mt76x02_phy_set_rxpath(struct mt76x02_dev *dev)
{ {
u32 val; u32 val;
val = __mt76_rr(dev, MT_BBP(AGC, 0)); val = mt76_rr(dev, MT_BBP(AGC, 0));
val &= ~BIT(4); val &= ~BIT(4);
switch (dev->chainmask & 0xf) { switch (dev->mt76.chainmask & 0xf) {
case 2: case 2:
val |= BIT(3); val |= BIT(3);
break; break;
...@@ -37,23 +36,23 @@ void mt76x02_phy_set_rxpath(struct mt76_dev *dev) ...@@ -37,23 +36,23 @@ void mt76x02_phy_set_rxpath(struct mt76_dev *dev)
break; break;
} }
__mt76_wr(dev, MT_BBP(AGC, 0), val); mt76_wr(dev, MT_BBP(AGC, 0), val);
mb(); mb();
val = __mt76_rr(dev, MT_BBP(AGC, 0)); val = mt76_rr(dev, MT_BBP(AGC, 0));
} }
EXPORT_SYMBOL_GPL(mt76x02_phy_set_rxpath); EXPORT_SYMBOL_GPL(mt76x02_phy_set_rxpath);
void mt76x02_phy_set_txdac(struct mt76_dev *dev) void mt76x02_phy_set_txdac(struct mt76x02_dev *dev)
{ {
int txpath; int txpath;
txpath = (dev->chainmask >> 8) & 0xf; txpath = (dev->mt76.chainmask >> 8) & 0xf;
switch (txpath) { switch (txpath) {
case 2: case 2:
__mt76_set(dev, MT_BBP(TXBE, 5), 0x3); mt76_set(dev, MT_BBP(TXBE, 5), 0x3);
break; break;
default: default:
__mt76_clear(dev, MT_BBP(TXBE, 5), 0x3); mt76_clear(dev, MT_BBP(TXBE, 5), 0x3);
break; break;
} }
} }
...@@ -102,40 +101,38 @@ void mt76x02_add_rate_power_offset(struct mt76_rate_power *r, int offset) ...@@ -102,40 +101,38 @@ void mt76x02_add_rate_power_offset(struct mt76_rate_power *r, int offset)
} }
EXPORT_SYMBOL_GPL(mt76x02_add_rate_power_offset); EXPORT_SYMBOL_GPL(mt76x02_add_rate_power_offset);
void mt76x02_phy_set_txpower(struct mt76_dev *dev, int txp_0, int txp_1) void mt76x02_phy_set_txpower(struct mt76x02_dev *dev, int txp_0, int txp_1)
{ {
struct mt76_rate_power *t = &dev->rate_power; struct mt76_rate_power *t = &dev->mt76.rate_power;
__mt76_rmw_field(dev, MT_TX_ALC_CFG_0, MT_TX_ALC_CFG_0_CH_INIT_0, mt76_rmw_field(dev, MT_TX_ALC_CFG_0, MT_TX_ALC_CFG_0_CH_INIT_0, txp_0);
txp_0); mt76_rmw_field(dev, MT_TX_ALC_CFG_0, MT_TX_ALC_CFG_0_CH_INIT_1, txp_1);
__mt76_rmw_field(dev, MT_TX_ALC_CFG_0, MT_TX_ALC_CFG_0_CH_INIT_1,
txp_1); mt76_wr(dev, MT_TX_PWR_CFG_0,
mt76x02_tx_power_mask(t->cck[0], t->cck[2], t->ofdm[0],
__mt76_wr(dev, MT_TX_PWR_CFG_0, t->ofdm[2]));
mt76x02_tx_power_mask(t->cck[0], t->cck[2], t->ofdm[0], mt76_wr(dev, MT_TX_PWR_CFG_1,
t->ofdm[2])); mt76x02_tx_power_mask(t->ofdm[4], t->ofdm[6], t->ht[0],
__mt76_wr(dev, MT_TX_PWR_CFG_1, t->ht[2]));
mt76x02_tx_power_mask(t->ofdm[4], t->ofdm[6], t->ht[0], mt76_wr(dev, MT_TX_PWR_CFG_2,
t->ht[2])); mt76x02_tx_power_mask(t->ht[4], t->ht[6], t->ht[8],
__mt76_wr(dev, MT_TX_PWR_CFG_2, t->ht[10]));
mt76x02_tx_power_mask(t->ht[4], t->ht[6], t->ht[8], mt76_wr(dev, MT_TX_PWR_CFG_3,
t->ht[10])); mt76x02_tx_power_mask(t->ht[12], t->ht[14], t->stbc[0],
__mt76_wr(dev, MT_TX_PWR_CFG_3, t->stbc[2]));
mt76x02_tx_power_mask(t->ht[12], t->ht[14], t->stbc[0], mt76_wr(dev, MT_TX_PWR_CFG_4,
t->stbc[2])); mt76x02_tx_power_mask(t->stbc[4], t->stbc[6], 0, 0));
__mt76_wr(dev, MT_TX_PWR_CFG_4, mt76_wr(dev, MT_TX_PWR_CFG_7,
mt76x02_tx_power_mask(t->stbc[4], t->stbc[6], 0, 0)); mt76x02_tx_power_mask(t->ofdm[7], t->vht[8], t->ht[7],
__mt76_wr(dev, MT_TX_PWR_CFG_7, t->vht[9]));
mt76x02_tx_power_mask(t->ofdm[7], t->vht[8], t->ht[7], mt76_wr(dev, MT_TX_PWR_CFG_8,
t->vht[9])); mt76x02_tx_power_mask(t->ht[14], 0, t->vht[8], t->vht[9]));
__mt76_wr(dev, MT_TX_PWR_CFG_8, mt76_wr(dev, MT_TX_PWR_CFG_9,
mt76x02_tx_power_mask(t->ht[14], 0, t->vht[8], t->vht[9])); mt76x02_tx_power_mask(t->ht[7], 0, t->stbc[8], t->stbc[9]));
__mt76_wr(dev, MT_TX_PWR_CFG_9,
mt76x02_tx_power_mask(t->ht[7], 0, t->stbc[8], t->stbc[9]));
} }
EXPORT_SYMBOL_GPL(mt76x02_phy_set_txpower); EXPORT_SYMBOL_GPL(mt76x02_phy_set_txpower);
int mt76x02_phy_get_min_avg_rssi(struct mt76_dev *dev) int mt76x02_phy_get_min_avg_rssi(struct mt76x02_dev *dev)
{ {
struct mt76x02_sta *sta; struct mt76x02_sta *sta;
struct mt76_wcid *wcid; struct mt76_wcid *wcid;
...@@ -145,8 +142,8 @@ int mt76x02_phy_get_min_avg_rssi(struct mt76_dev *dev) ...@@ -145,8 +142,8 @@ int mt76x02_phy_get_min_avg_rssi(struct mt76_dev *dev)
local_bh_disable(); local_bh_disable();
rcu_read_lock(); rcu_read_lock();
for (i = 0; i < ARRAY_SIZE(dev->wcid_mask); i++) { for (i = 0; i < ARRAY_SIZE(dev->mt76.wcid_mask); i++) {
unsigned long mask = dev->wcid_mask[i]; unsigned long mask = dev->mt76.wcid_mask[i];
if (!mask) if (!mask)
continue; continue;
...@@ -155,17 +152,17 @@ int mt76x02_phy_get_min_avg_rssi(struct mt76_dev *dev) ...@@ -155,17 +152,17 @@ int mt76x02_phy_get_min_avg_rssi(struct mt76_dev *dev)
if (!(mask & 1)) if (!(mask & 1))
continue; continue;
wcid = rcu_dereference(dev->wcid[j]); wcid = rcu_dereference(dev->mt76.wcid[j]);
if (!wcid) if (!wcid)
continue; continue;
sta = container_of(wcid, struct mt76x02_sta, wcid); sta = container_of(wcid, struct mt76x02_sta, wcid);
spin_lock(&dev->rx_lock); spin_lock(&dev->mt76.rx_lock);
if (sta->inactive_count++ < 5) if (sta->inactive_count++ < 5)
cur_rssi = ewma_signal_read(&sta->rssi); cur_rssi = ewma_signal_read(&sta->rssi);
else else
cur_rssi = 0; cur_rssi = 0;
spin_unlock(&dev->rx_lock); spin_unlock(&dev->mt76.rx_lock);
if (cur_rssi < min_rssi) if (cur_rssi < min_rssi)
min_rssi = cur_rssi; min_rssi = cur_rssi;
......
drivers/net/wireless/mediatek/mt76/mt76x02_phy.h
View file @ bfdff5d0
...@@ -20,11 +20,11 @@ ...@@ -20,11 +20,11 @@
#include "mt76x02_regs.h" #include "mt76x02_regs.h"
void mt76x02_add_rate_power_offset(struct mt76_rate_power *r, int offset); void mt76x02_add_rate_power_offset(struct mt76_rate_power *r, int offset);
void mt76x02_phy_set_txpower(struct mt76_dev *dev, int txp_0, int txp_2); void mt76x02_phy_set_txpower(struct mt76x02_dev *dev, int txp_0, int txp_2);
void mt76x02_limit_rate_power(struct mt76_rate_power *r, int limit); void mt76x02_limit_rate_power(struct mt76_rate_power *r, int limit);
int mt76x02_get_max_rate_power(struct mt76_rate_power *r); int mt76x02_get_max_rate_power(struct mt76_rate_power *r);
void mt76x02_phy_set_rxpath(struct mt76_dev *dev); void mt76x02_phy_set_rxpath(struct mt76x02_dev *dev);
void mt76x02_phy_set_txdac(struct mt76_dev *dev); void mt76x02_phy_set_txdac(struct mt76x02_dev *dev);
int mt76x02_phy_get_min_avg_rssi(struct mt76_dev *dev); int mt76x02_phy_get_min_avg_rssi(struct mt76x02_dev *dev);
#endif /* __MT76x02_PHY_H */ #endif /* __MT76x02_PHY_H */
drivers/net/wireless/mediatek/mt76/mt76x2/pci_phy.c
View file @ bfdff5d0
...@@ -210,7 +210,7 @@ mt76x2_phy_update_channel_gain(struct mt76x02_dev *dev) ...@@ -210,7 +210,7 @@ mt76x2_phy_update_channel_gain(struct mt76x02_dev *dev)
int low_gain; int low_gain;
u32 val; u32 val;
dev->cal.avg_rssi_all = mt76x02_phy_get_min_avg_rssi(&dev->mt76); dev->cal.avg_rssi_all = mt76x02_phy_get_min_avg_rssi(dev);
low_gain = (dev->cal.avg_rssi_all > mt76x2_get_rssi_gain_thresh(dev)) + low_gain = (dev->cal.avg_rssi_all > mt76x2_get_rssi_gain_thresh(dev)) +
(dev->cal.avg_rssi_all > mt76x2_get_low_rssi_gain_thresh(dev)); (dev->cal.avg_rssi_all > mt76x2_get_low_rssi_gain_thresh(dev));
......
drivers/net/wireless/mediatek/mt76/mt76x2/phy.c
View file @ bfdff5d0
...@@ -187,7 +187,7 @@ void mt76x2_phy_set_txpower(struct mt76x02_dev *dev) ...@@ -187,7 +187,7 @@ void mt76x2_phy_set_txpower(struct mt76x02_dev *dev)
dev->target_power_delta[1] = txp_1 - txp.chain[0].target_power; dev->target_power_delta[1] = txp_1 - txp.chain[0].target_power;
dev->mt76.rate_power = t; dev->mt76.rate_power = t;
mt76x02_phy_set_txpower(&dev->mt76, txp_0, txp_1); mt76x02_phy_set_txpower(dev, txp_0, txp_1);
} }
EXPORT_SYMBOL_GPL(mt76x2_phy_set_txpower); EXPORT_SYMBOL_GPL(mt76x2_phy_set_txpower);
......
drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c
View file @ bfdff5d0
...@@ -237,8 +237,8 @@ int mt76x2u_init_hardware(struct mt76x02_dev *dev) ...@@ -237,8 +237,8 @@ int mt76x2u_init_hardware(struct mt76x02_dev *dev)
if (err < 0) if (err < 0)
return err; return err;
mt76x02_phy_set_rxpath(&dev->mt76); mt76x02_phy_set_rxpath(dev);
mt76x02_phy_set_txdac(&dev->mt76); mt76x02_phy_set_txdac(dev);
return mt76x2u_mac_stop(dev); return mt76x2u_mac_stop(dev);
} }
......
drivers/net/wireless/mediatek/mt76/mt76x2/usb_phy.c
View file @ bfdff5d0
...@@ -69,7 +69,7 @@ mt76x2u_phy_update_channel_gain(struct mt76x02_dev *dev) ...@@ -69,7 +69,7 @@ mt76x2u_phy_update_channel_gain(struct mt76x02_dev *dev)
break; break;
} }
dev->cal.avg_rssi_all = mt76x02_phy_get_min_avg_rssi(&dev->mt76); dev->cal.avg_rssi_all = mt76x02_phy_get_min_avg_rssi(dev);
false_cca = FIELD_GET(MT_RX_STAT_1_CCA_ERRORS, false_cca = FIELD_GET(MT_RX_STAT_1_CCA_ERRORS,
mt76_rr(dev, MT_RX_STAT_1)); mt76_rr(dev, MT_RX_STAT_1));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7