unify mt76x2 and mt76x0 eeprom code
Subsystems (2)
cover unify mt76x2 and mt76x0 eeprom code
This series unify most of eeprom parsing between mt76x2 and mt76x0 driver. That patchset will be used to properly support mt76x0e chipsets without duplicating the code.
Lorenzo Bianconi (19):
mt76: move seq_put_array in mt76-core module
mt76: move common eeprom definitions in mt76x02-lib module
mt76: move eeprom utility routines in mt76x02_eeprom.h
mt76: move mt76x2_eeprom_get in mt76x02_eeprom.h
mt76: move mt76x02_mac_setaddr in mt76x02-lib module
mt76: move mt76x2_get_efuse_data in mt76x02-lib module
mt76: move mt76x2_ext_pa_enabled routine in mt76x02_eeprom.c
mt76x0: remove mt76x0_set_country_reg routine
mt76: add mt76x02_get_rx_gain and mt76x02_get_lna_gain utility
routines
mt76x0: unify lna_gain parsing
mt76x0: unify rssi_offset parsing
mt76x0: unify temperature offset parsing
mt76x0: unify freq offset parsing
mt76: move mt76x02_eeprom_parse_hw_cap in mt76x02-lib module
mt76x0: unify parse hw capabilities
mt76: move mt76x2_tssi_enabled in mt76x02_eeprom.h
mt76x0: remove eeprom dependency from mt76x0_set_tx_power_per_rate
mt76x0: remove eeprom dependency from mt76x0_set_tx_power_per_chan
mt76x0: use shared debugfs implementation
Felix Fietkau (1):
mt76: add stbc entries to mt76_rate_power
drivers/net/wireless/mediatek/mt76/Makefile | 3 +- drivers/net/wireless/mediatek/mt76/debugfs.c | 12 + drivers/net/wireless/mediatek/mt76/mt76.h | 5 +- .../wireless/mediatek/mt76/mt76x0/debugfs.c | 92 +--- .../wireless/mediatek/mt76/mt76x0/eeprom.c | 513 +++++++----------- .../wireless/mediatek/mt76/mt76x0/eeprom.h | 119 +--- .../wireless/mediatek/mt76/mt76x0/mt76x0.h | 5 +- .../net/wireless/mediatek/mt76/mt76x0/phy.c | 68 +-- .../wireless/mediatek/mt76/mt76x02_eeprom.c | 156 ++++++ .../wireless/mediatek/mt76/mt76x02_eeprom.h | 194 +++++++ .../net/wireless/mediatek/mt76/mt76x02_mac.c | 18 + .../net/wireless/mediatek/mt76/mt76x02_mac.h | 1 + .../wireless/mediatek/mt76/mt76x2_debugfs.c | 33 +- .../wireless/mediatek/mt76/mt76x2_eeprom.c | 239 +++----- .../wireless/mediatek/mt76/mt76x2_eeprom.h | 122 +---- .../net/wireless/mediatek/mt76/mt76x2_init.c | 6 +- .../net/wireless/mediatek/mt76/mt76x2_mcu.c | 2 +- .../mediatek/mt76/mt76x2_mcu_common.c | 5 +- .../net/wireless/mediatek/mt76/mt76x2_phy.c | 8 +- .../mediatek/mt76/mt76x2_phy_common.c | 16 +- drivers/net/wireless/mediatek/mt76/mt76x2u.h | 1 - .../net/wireless/mediatek/mt76/mt76x2u_init.c | 5 +- .../net/wireless/mediatek/mt76/mt76x2u_mac.c | 24 +- .../net/wireless/mediatek/mt76/mt76x2u_main.c | 2 +- .../net/wireless/mediatek/mt76/mt76x2u_phy.c | 6 +- 25 files changed, 740 insertions(+), 915 deletions(-) create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.c create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.h
Signature · 1 line
2.17.1
A message that is not in the archive (sent off-list or not yet received): cover.1537433365.git.lorenzo.bianconi-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org
PATCH 1/20 mt76: move seq_put_array in mt76-core module
Move seq_put_array utility routine in mt76-core module in order to be reused in mt76x0 driver
--- drivers/net/wireless/mediatek/mt76/debugfs.c | 12 +++++++ drivers/net/wireless/mediatek/mt76/mt76.h | 2 ++ .../wireless/mediatek/mt76/mt76x2_debugfs.c | 31 ++++++------------- 3 files changed, 24 insertions(+), 21 deletions(-)
drivers/net/wireless/mediatek/mt76/debugfs.c +12 -0
@@ -56,6 +56,18 @@ mt76_queues_read(struct seq_file *s, void *data)return 0 ; } +void mt76_seq_puts_array (struct seq_file *file,const char *str, +s8 *val,int len) +{ +int i; + +seq_printf (file,"%10s:" , str); +for (i =0 ; i < len; i++) +seq_printf (file," %2d" , val[i]); +seq_puts (file,"\n" ); +} +EXPORT_SYMBOL_GPL (mt76_seq_puts_array); +struct dentry *mt76_register_debugfs (struct mt76_dev *dev) {struct dentry *dir;
drivers/net/wireless/mediatek/mt76/mt76.h +2 -0
@@ -539,6 +539,8 @@ int mt76_register_device(struct mt76_dev *dev, bool vht,void mt76_unregister_device (struct mt76_dev *dev);struct dentry *mt76_register_debugfs (struct mt76_dev *dev); +void mt76_seq_puts_array (struct seq_file *file,const char *str, +s8 *val,int len);int mt76_eeprom_init (struct mt76_dev *dev,int len);void mt76_eeprom_override (struct mt76_dev *dev);
drivers/net/wireless/mediatek/mt76/mt76x2_debugfs.c +10 -21
@@ -47,33 +47,22 @@ mt76x2_ampdu_stat_open(struct inode *inode, struct file *f)return single_open (f, mt76x2_ampdu_stat_read, inode->i_private); } -static void -seq_puts_array (struct seq_file *file,const char *str,s8 *val,int len) -{ -int i; - -seq_printf (file,"%10s:" , str); -for (i =0 ; i < len; i++) -seq_printf (file," %2d" , val[i]); -seq_puts (file,"\n" ); -} -static int read_txpower (struct seq_file *file,void *data) {struct mt76x2_dev *dev =dev_get_drvdata (file->private);seq_printf (file,"Target power: %d\n" , dev->target_power); -seq_puts_array (file,"Delta" , dev->target_power_delta, -ARRAY_SIZE (dev->target_power_delta)); -seq_puts_array (file,"CCK" , dev->rate_power.cck, -ARRAY_SIZE (dev->rate_power.cck)); -seq_puts_array (file,"OFDM" , dev->rate_power.ofdm, -ARRAY_SIZE (dev->rate_power.ofdm)); -seq_puts_array (file,"HT" , dev->rate_power.ht, -ARRAY_SIZE (dev->rate_power.ht)); -seq_puts_array (file,"VHT" , dev->rate_power.vht, -ARRAY_SIZE (dev->rate_power.vht)); +mt76_seq_puts_array (file,"Delta" , dev->target_power_delta, +ARRAY_SIZE (dev->target_power_delta)); +mt76_seq_puts_array (file,"CCK" , dev->rate_power.cck, +ARRAY_SIZE (dev->rate_power.cck)); +mt76_seq_puts_array (file,"OFDM" , dev->rate_power.ofdm, +ARRAY_SIZE (dev->rate_power.ofdm)); +mt76_seq_puts_array (file,"HT" , dev->rate_power.ht, +ARRAY_SIZE (dev->rate_power.ht)); +mt76_seq_puts_array (file,"VHT" , dev->rate_power.vht, +ARRAY_SIZE (dev->rate_power.vht));return 0 ; }
Signature · 1 line
2.17.1
PATCH 2/20 mt76: add stbc entries to mt76_rate_power
In reply to a message not in the archiveFrom: Felix Fietkau <[email protected]>
Add stbc tx power eeprom parsing support for mt76x2 driver.
--- drivers/net/wireless/mediatek/mt76/mt76.h | 3 ++- drivers/net/wireless/mediatek/mt76/mt76x2_debugfs.c | 2 ++ drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.c | 1 + drivers/net/wireless/mediatek/mt76/mt76x2_phy_common.c | 4 ++-- 4 files changed, 7 insertions(+), 3 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76.h +2 -1
@@ -423,10 +423,11 @@ struct mt76_rate_power {struct {s8 cck[4 ];s8 ofdm[8 ]; +s8 stbc[8 ];s8 ht[16 ];s8 vht[10 ]; }; -s8 all[38 ]; +s8 all[46 ]; }; };
drivers/net/wireless/mediatek/mt76/mt76x2_debugfs.c +2 -0
@@ -59,6 +59,8 @@ static int read_txpower(struct seq_file *file, void *data) ARRAY_SIZE(dev->rate_power.cck));mt76_seq_puts_array (file,"OFDM" , dev->rate_power.ofdm,ARRAY_SIZE (dev->rate_power.ofdm)); +mt76_seq_puts_array (file,"STBC" , dev->rate_power.stbc, +ARRAY_SIZE (dev->rate_power.stbc));mt76_seq_puts_array (file,"HT" , dev->rate_power.ht,ARRAY_SIZE (dev->rate_power.ht)); mt76_seq_puts_array(file, "VHT", dev->rate_power.vht,
drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.c +1 -0
@@ -461,6 +461,7 @@ void mt76x2_get_rate_power(struct mt76x2_dev *dev, struct mt76_rate_power *t, val =mt76x2_eeprom_get (dev,MT_EE_TX_POWER_HT_MCS4 ); t->ht[4 ] = t->ht[5 ] =mt76x2_rate_power_val (val); t->ht[6 ] = t->ht[7 ] =mt76x2_rate_power_val (val >>8 ); +memcpy (t->stbc, t->ht,sizeof (t->stbc)); val =mt76x2_eeprom_get (dev,MT_EE_TX_POWER_HT_MCS8 ); t->ht[8 ] = t->ht[9 ] =mt76x2_rate_power_val (val);
drivers/net/wireless/mediatek/mt76/mt76x2_phy_common.c +2 -2
@@ -227,9 +227,9 @@ void mt76x2_phy_set_txpower(struct mt76x2_dev *dev)mt76_wr (dev,MT_TX_PWR_CFG_2 ,mt76x2_tx_power_mask (t.ht[4 ], t.ht[6 ], t.ht[8 ], t.ht[10 ]));mt76_wr (dev,MT_TX_PWR_CFG_3 , -mt76x2_tx_power_mask (t.ht[12 ], t.ht[14 ], t.ht[0 ], t.ht[2 ])); +mt76x2_tx_power_mask (t.ht[12 ], t.ht[14 ], t.stbc[0 ], t.stbc[2 ]));mt76_wr (dev,MT_TX_PWR_CFG_4 , -mt76x2_tx_power_mask (t.ht[4 ], t.ht[6 ],0 ,0 )); +mt76x2_tx_power_mask (t.stbc[4 ], t.stbc[6 ],0 ,0 ));mt76_wr (dev,MT_TX_PWR_CFG_7 ,mt76x2_tx_power_mask (t.ofdm[6 ], t.vht[8 ], t.ht[6 ], t.vht[8 ])); mt76_wr(dev, MT_TX_PWR_CFG_8,
Signature · 1 line
2.17.1
A message that is not in the archive (sent off-list or not yet received): 15d756db7fef57befcc2e2e28e640be10493df88.1537433365.git.lorenzo.bianconi-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org
Re: [PATCH 02/20] mt76: add stbc entries to mt76_rate_power
Quoted 6 lines · Lorenzo Bianconi
From: Felix Fietkau <[email protected]>
Add stbc tx power eeprom parsing support for mt76x2 driver.
Signed-off-by Felix Fietkau <[email protected]>Signed-off-by Lorenzo Bianconi <[email protected]>
I folded in the following extra change, and changed the description. VHT8/9 also have STBC specific entries in the power registers. I also added a distinction between vht[8/9] and ofdm[6/7], which come from the same EEPROM value but have distinct register fields.
- Felix
---
mt76.h +2 -2
@@ -423,11 +423,11 @@ struct mt76_rate_power {struct {s8 cck[4 ];s8 ofdm[8 ]; -s8 stbc[8 ]; +s8 stbc[10 ];s8 ht[16 ];s8 vht[10 ]; }; -s8 all[46 ]; +s8 all[48 ]; }; };
mt76x2_eeprom.c +4 -1
@@ -353,7 +353,6 @@ void mt76x2_get_rate_power(struct mt76x2_dev *dev, struct mt76_rate_power *t, val =mt76x02_eeprom_get (&dev->mt76,MT_EE_TX_POWER_HT_MCS4 ); t->ht[4 ] = t->ht[5 ] =mt76x2_rate_power_val (val); t->ht[6 ] = t->ht[7 ] =mt76x2_rate_power_val (val >>8 ); -memcpy (t->stbc, t->ht,sizeof (t->stbc)); val =mt76x02_eeprom_get (&dev->mt76,MT_EE_TX_POWER_HT_MCS8 ); t->ht[8 ] = t->ht[9 ] =mt76x2_rate_power_val (val);
@@ -375,6 +374,10 @@ void mt76x2_get_rate_power(struct mt76x2_dev *dev, struct mt76_rate_power *t,if (!is_5ghz) val >>=8 ; t->vht[8 ] = t->vht[9 ] =mt76x2_rate_power_val (val >>8 ); + +memcpy (t->stbc, t->ht,sizeof (t->stbc[0 ]) *8 ); + t->stbc[8 ] = t->vht[8 ]; + t->stbc[9 ] = t->vht[9 ]; }EXPORT_SYMBOL_GPL (mt76x2_get_rate_power);
mt76x2_phy_common.c +3 -3
@@ -231,11 +231,11 @@ void mt76x2_phy_set_txpower(struct mt76x2_dev *dev)mt76_wr (dev,MT_TX_PWR_CFG_4 ,mt76x2_tx_power_mask (t.stbc[4 ], t.stbc[6 ],0 ,0 ));mt76_wr (dev,MT_TX_PWR_CFG_7 , -mt76x2_tx_power_mask (t.ofdm[6 ], t.vht[8 ], t.ht[6 ], t.vht[8 ])); +mt76x2_tx_power_mask (t.ofdm[7 ], t.vht[8 ], t.ht[7 ], t.vht[9 ]));mt76_wr (dev,MT_TX_PWR_CFG_8 , -mt76x2_tx_power_mask (t.ht[14 ],0 , t.vht[8 ], t.vht[8 ])); +mt76x2_tx_power_mask (t.ht[14 ],0 , t.vht[8 ], t.vht[9 ]));mt76_wr (dev,MT_TX_PWR_CFG_9 , -mt76x2_tx_power_mask (t.ht[6 ],0 , t.vht[8 ], t.vht[8 ])); +mt76x2_tx_power_mask (t.ht[7 ],0 , t.stbc[8 ], t.stbc[9 ])); }EXPORT_SYMBOL_GPL (mt76x2_phy_set_txpower);
PATCH 3/20 mt76: move common eeprom definitions in mt76x02-lib module
In reply to a message not in the archiveMove mt76x2 and mt76x0 common definitions in mt76x02_eeprom.h and remove duplicated code
--- .../wireless/mediatek/mt76/mt76x0/eeprom.c | 18 +-- .../wireless/mediatek/mt76/mt76x0/eeprom.h | 71 +--------- .../wireless/mediatek/mt76/mt76x02_eeprom.h | 124 ++++++++++++++++++ .../wireless/mediatek/mt76/mt76x2_eeprom.c | 2 +- .../wireless/mediatek/mt76/mt76x2_eeprom.h | 85 +----------- 5 files changed, 140 insertions(+), 160 deletions(-) create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.h
drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c +9 -9
@@ -245,8 +245,8 @@ mt76x0_set_lna_gain(struct mt76x0_dev *dev, u8 *eeprom) {u8 gain; - dev->ee->lna_gain_2ghz = eeprom[MT_EE_LNA_GAIN_2GHZ ]; - dev->ee->lna_gain_5ghz[0 ] = eeprom[MT_EE_LNA_GAIN_5GHZ_0 ]; + dev->ee->lna_gain_2ghz = eeprom[MT_EE_LNA_GAIN ]; + dev->ee->lna_gain_5ghz[0 ] = eeprom[MT_EE_LNA_GAIN +1 ]; gain = eeprom[MT_EE_LNA_GAIN_5GHZ_1 ];if (gain ==0xff || gain ==0 )
@@ -268,7 +268,7 @@ mt76x0_set_rssi_offset(struct mt76x0_dev *dev, u8 *eeprom)s8 *rssi_offset = dev->ee->rssi_offset_2ghz;for (i =0 ; i <2 ; i++) { - rssi_offset[i] = eeprom[MT_EE_RSSI_OFFSET + i]; + rssi_offset[i] = eeprom[MT_EE_RSSI_OFFSET_2G_0 + i];if (rssi_offset[i] <-10 || rssi_offset[i] >10 ) { dev_warn(dev->mt76.dev,
@@ -281,7 +281,7 @@ mt76x0_set_rssi_offset(struct mt76x0_dev *dev, u8 *eeprom) rssi_offset = dev->ee->rssi_offset_5ghz;for (i =0 ; i <3 ; i++) { - rssi_offset[i] = eeprom[MT_EE_RSSI_OFFSET_5GHZ + i]; + rssi_offset[i] = eeprom[MT_EE_RSSI_OFFSET_5G_0 + i];if (rssi_offset[i] <-10 || rssi_offset[i] >10 ) { dev_warn(dev->mt76.dev,
@@ -377,7 +377,7 @@ mt76x0_set_tx_power_per_chan(struct mt76x0_dev *dev, u8 *eeprom)u8 tx_pwr;for (i =0 ; i <14 ; i++) { - tx_pwr = eeprom[MT_EE_TX_POWER_OFFSET_2GHZ + i]; + tx_pwr = eeprom[MT_EE_TX_POWER_DELTA_BW80 + i];if (tx_pwr <=0x3f && tx_pwr >0 ) dev->ee->tx_pwr_per_chan[i] = tx_pwr;else
@@ -385,7 +385,7 @@ mt76x0_set_tx_power_per_chan(struct mt76x0_dev *dev, u8 *eeprom) }for (i =0 ; i <40 ; i++) { - tx_pwr = eeprom[MT_EE_TX_POWER_OFFSET_5GHZ + i]; + tx_pwr = eeprom[MT_EE_TX_POWER_0_GRP4_TSSI_SLOPE +2 + i];if (tx_pwr <=0x3f && tx_pwr >0 ) dev->ee->tx_pwr_per_chan[14 + i] = tx_pwr;else
@@ -422,12 +422,12 @@ mt76x0_eeprom_init(struct mt76x0_dev *dev) goto out; } -if (eeprom[MT_EE_VERSION_EE ] >MT76X0U_EE_MAX_VER ) +if (eeprom[MT_EE_VERSION +1 ] >MT76X0U_EE_MAX_VER )dev_warn (dev->mt76.dev,"Warning: unsupported EEPROM version %02hhx\n" , - eeprom[MT_EE_VERSION_EE ]); + eeprom[MT_EE_VERSION +1 ]);dev_info (dev->mt76.dev,"EEPROM ver:%02hhx fae:%02hhx\n" , - eeprom[MT_EE_VERSION_EE ], eeprom[MT_EE_VERSION_FAE ]); + eeprom[MT_EE_VERSION +1 ], eeprom[MT_EE_VERSION ]);mt76x0_set_macaddr (dev, eeprom);mt76x0_set_chip_cap (dev, eeprom);
drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.h +4 -67
79 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.h new file +124 -0
124 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.c +1 -1
@@ -21,7 +21,7 @@#define EE_FIELD (_name, _value) [MT_EE_##_name] = (_value) | 1static int -mt76x2_eeprom_copy (struct mt76x2_dev *dev,enum mt76x2_eeprom_field field, +mt76x2_eeprom_copy (struct mt76x2_dev *dev,enum mt76x02_eeprom_field field,void *dest,int len) {if (field + len > dev->mt76.eeprom.size)
drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.h +0 -75
78 lines not on this page · raw message
PATCH 4/20 mt76: move eeprom utility routines in mt76x02_eeprom.h
In reply to a message not in the archiveMove shared eeprom utility routines in mt76x02_eeprom.h and remove duplicated code
--- .../wireless/mediatek/mt76/mt76x0/eeprom.c | 44 +++++-------------- .../wireless/mediatek/mt76/mt76x02_eeprom.h | 15 +++++++ .../wireless/mediatek/mt76/mt76x2_eeprom.c | 37 +++++----------- 3 files changed, 38 insertions(+), 58 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c +12 -32
@@ -21,31 +21,6 @@#include "mt76x0.h" #include "eeprom.h" -static bool -field_valid (u8 val) -{ -return val !=0xff ; -} - -static s8 -field_validate (u8 val) -{ -if (!field_valid (val)) -return 0 ; - -return val; -} - -static inline int -sign_extend (u32 val,unsigned int size) -{ -bool sign = val &BIT (size -1 ); - - val &=BIT (size -1 ) -1 ; - -return sign ? val : -val; -} -static int mt76x0_efuse_read (struct mt76x0_dev *dev,u16 addr,u8 *data,enum mt76x0_eeprom_access_modes mode)
@@ -137,14 +112,14 @@ mt76x0_set_chip_cap(struct mt76x0_dev *dev, u8 *eeprom)dev_dbg (dev->mt76.dev,"Has 2GHZ %d 5GHZ %d\n" , dev->mt76.cap.has_2ghz, dev->mt76.cap.has_5ghz); -if (!field_valid (nic_conf1 &0xff )) +if (!mt76x02_field_valid (nic_conf1 &0xff )) nic_conf1 &=0xff00 ;if (nic_conf1 &MT_EE_NIC_CONF_1_HW_RF_CTRL )dev_err (dev->mt76.dev,"Error: this driver does not support HW RF ctrl\n" ); -if (!field_valid (nic_conf0 >>8 )) +if (!mt76x02_field_valid (nic_conf0 >>8 ))return ; if (FIELD_GET(MT_EE_NIC_CONF_0_RX_PATH, nic_conf0) > 1 ||
@@ -183,8 +158,8 @@ mt76x0_set_temp_offset(struct mt76x0_dev *dev, u8 *eeprom) {u8 temp = eeprom[MT_EE_TEMP_OFFSET ]; -if (field_valid (temp)) - dev->ee->temp_off =sign_extend (temp,8 ); +if (mt76x02_field_valid (temp)) + dev->ee->temp_off =mt76x02_sign_extend (temp,8 );else dev->ee->temp_off =-10 ; }
@@ -231,8 +206,13 @@ mt76x0_set_rf_freq_off(struct mt76x0_dev *dev, u8 *eeprom) {u8 comp; - dev->ee->rf_freq_off =field_validate (eeprom[MT_EE_FREQ_OFFSET ]); - comp =field_validate (eeprom[MT_EE_FREQ_OFFSET_COMPENSATION ]); + comp = eeprom[MT_EE_FREQ_OFFSET_COMPENSATION ]; +if (!mt76x02_field_valid (comp)) + comp =0 ; + + dev->ee->rf_freq_off = eeprom[MT_EE_FREQ_OFFSET ]; +if (!mt76x02_field_valid (dev->ee->rf_freq_off)) + dev->ee->rf_freq_off =0 ;if (comp &BIT (7 )) dev->ee->rf_freq_off -= comp &0x7f ;
@@ -311,7 +291,7 @@ get_delta(u8 val) {s8 ret; -if (!field_valid (val) || !(val &BIT (7 ))) +if (!mt76x02_field_valid (val) || !(val &BIT (7 )))return 0 ; ret = val &0x1f ;
drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.h +15 -0
@@ -121,4 +121,19 @@ enum mt76x02_eeprom_field {#define MT_EFUSE_USAGE_MAP_SIZE (MT_EE_USAGE_MAP_END - \ MT_EE_USAGE_MAP_START + 1) +static inline bool mt76x02_field_valid (u8 val) +{ +return val !=0 && val !=0xff ; +} + +static inline int +mt76x02_sign_extend (u32 val,unsigned int size) +{ +bool sign = val &BIT (size -1 ); + + val &=BIT (size -1 ) -1 ; + +return sign ? val : -val; +} +#endif /* __MT76x02_EEPROM_H */
drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.c +11 -26
@@ -259,28 +259,12 @@ mt76x2_eeprom_load(struct mt76x2_dev *dev)return 0 ; } -static inline int -mt76x2_sign_extend (u32 val,unsigned int size) -{ -bool sign = val &BIT (size -1 ); - - val &=BIT (size -1 ) -1 ; - -return sign ? val : -val; -} -static inline int mt76x2_sign_extend_optional (u32 val,unsigned int size) {bool enable = val &BIT (size); -return enable ?mt76x2_sign_extend (val, size) :0 ; -} - -static bool -field_valid (u8 val) -{ -return val !=0 && val !=0xff ; +return enable ?mt76x02_sign_extend (val, size) :0 ; } static void
@@ -288,14 +272,14 @@ mt76x2_set_rx_gain_group(struct mt76x2_dev *dev, u8 val) {s8 *dest = dev->cal.rx.high_gain; -if (!field_valid (val)) { +if (!mt76x02_field_valid (val)) { dest[0 ] =0 ; dest[1 ] =0 ;return ; } - dest[0 ] =mt76x2_sign_extend (val,4 ); - dest[1 ] =mt76x2_sign_extend (val >>4 ,4 ); + dest[0 ] =mt76x02_sign_extend (val,4 ); + dest[1 ] =mt76x02_sign_extend (val >>4 ,4 ); } static void
@@ -303,7 +287,7 @@ mt76x2_set_rssi_offset(struct mt76x2_dev *dev, int chain, u8 val) {s8 *dest = dev->cal.rx.rssi_offset; -if (!field_valid (val)) { +if (!mt76x02_field_valid (val)) { dest[chain] =0 ;return ; }
@@ -384,10 +368,10 @@ void mt76x2_read_rx_gain(struct mt76x2_dev *dev) val =mt76x2_eeprom_get (dev,MT_EE_RSSI_OFFSET_5G_1 ); lna_5g[2 ] = val >>8 ; -if (!field_valid (lna_5g[1 ])) +if (!mt76x02_field_valid (lna_5g[1 ])) lna_5g[1 ] = lna_5g[0 ]; -if (!field_valid (lna_5g[2 ])) +if (!mt76x02_field_valid (lna_5g[2 ])) lna_5g[2 ] = lna_5g[0 ]; dev->cal.rx.mcu_gain = (lna_2g &0xff );
@@ -413,14 +397,14 @@ void mt76x2_read_rx_gain(struct mt76x2_dev *dev)if (lna ==0xff ) lna =0 ; - dev->cal.rx.lna_gain =mt76x2_sign_extend (lna,8 ); + dev->cal.rx.lna_gain =mt76x02_sign_extend (lna,8 ); }EXPORT_SYMBOL_GPL (mt76x2_read_rx_gain);static s8 mt76x2_rate_power_val (u8 val) { -if (!field_valid (val)) +if (!mt76x02_field_valid (val))return 0 ;return mt76x2_sign_extend_optional (val,7 );
@@ -598,7 +582,8 @@ void mt76x2_get_power_info(struct mt76x2_dev *dev, MT_EE_TX_POWER_1_START_2G); } -if (mt76x2_tssi_enabled (dev) || !field_valid (t->target_power)) +if (mt76x2_tssi_enabled (dev) || + !mt76x02_field_valid (t->target_power)) t->target_power = t->chain[0 ].target_power; t->delta_bw40 =mt76x2_rate_power_val (bw40);
Signature · 1 line
2.17.1
PATCH 5/20 mt76: move mt76x2_eeprom_get in mt76x02_eeprom.h
In reply to a message not in the archiveMove mt76x2_eeprom_get utility routine in mt76x02_eeprom.h since it will be used to parse mt76x0 eeprom in order to unify eeprom support between mt76x2 and mt76x0 drivers
--- .../wireless/mediatek/mt76/mt76x02_eeprom.h | 10 +++ .../wireless/mediatek/mt76/mt76x2_eeprom.c | 87 +++++++++++-------- .../wireless/mediatek/mt76/mt76x2_eeprom.h | 17 +--- .../net/wireless/mediatek/mt76/mt76x2_init.c | 6 +- .../net/wireless/mediatek/mt76/mt76x2_mcu.c | 2 +- .../mediatek/mt76/mt76x2_mcu_common.c | 5 +- .../net/wireless/mediatek/mt76/mt76x2_phy.c | 2 +- .../net/wireless/mediatek/mt76/mt76x2u_mac.c | 6 +- .../net/wireless/mediatek/mt76/mt76x2u_phy.c | 2 +- 9 files changed, 77 insertions(+), 60 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.h +10 -0
@@ -136,4 +136,14 @@ mt76x02_sign_extend(u32 val, unsigned int size) return sign ? val : -val; } +static inline int +mt76x02_eeprom_get (struct mt76_dev *dev, +enum mt76x02_eeprom_field field) +{ +if ((field &1 ) || field >= __MT_EE_MAX) +return -1 ; + +return get_unaligned_le16 (dev->eeprom.data + field); +} +#endif /* __MT76x02_EEPROM_H */
drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.c +51 -36
205 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.h +4 -13
@@ -56,15 +56,6 @@ struct mt76x2_temp_comp {unsigned int low_slope;/* J / dB */ }; -static inline int -mt76x2_eeprom_get (struct mt76x2_dev *dev,enum mt76x02_eeprom_field field) -{ -if ((field &1 ) || field >= __MT_EE_MAX) -return -1 ; - -return get_unaligned_le16 (dev->mt76.eeprom.data + field); -} -void mt76x2_get_rate_power (struct mt76x2_dev *dev,struct mt76_rate_power *t,struct ieee80211_channel *chan);int mt76x2_get_max_rate_power (struct mt76_rate_power *r);
@@ -81,11 +72,11 @@ mt76x2_temp_tx_alc_enabled(struct mt76x2_dev *dev) {u16 val; - val =mt76x2_eeprom_get (dev,MT_EE_TX_POWER_EXT_PA_5G ); + val =mt76x02_eeprom_get (&dev->mt76,MT_EE_TX_POWER_EXT_PA_5G );if (!(val &BIT (15 )))return false; -return mt76x2_eeprom_get (dev,MT_EE_NIC_CONF_1 ) & +return mt76x02_eeprom_get (&dev->mt76,MT_EE_NIC_CONF_1 ) &MT_EE_NIC_CONF_1_TEMP_TX_ALC ; }
@@ -93,14 +84,14 @@ static inline bool mt76x2_tssi_enabled(struct mt76x2_dev *dev) {return !mt76x2_temp_tx_alc_enabled (dev) && - (mt76x2_eeprom_get (dev,MT_EE_NIC_CONF_1 ) & + (mt76x02_eeprom_get (&dev->mt76,MT_EE_NIC_CONF_1 ) &MT_EE_NIC_CONF_1_TX_ALC_EN ); }static inline bool mt76x2_has_ext_lna (struct mt76x2_dev *dev) { -u32 val =mt76x2_eeprom_get (dev,MT_EE_NIC_CONF_1 ); +u32 val =mt76x02_eeprom_get (&dev->mt76,MT_EE_NIC_CONF_1 );if (dev->mt76.chandef.chan->band ==NL80211_BAND_2GHZ )return val &MT_EE_NIC_CONF_1_LNA_EXT_2G ;
drivers/net/wireless/mediatek/mt76/mt76x2_init.c +3 -3
@@ -44,7 +44,7 @@ mt76x2_fixup_xtal(struct mt76x2_dev *dev)u16 eep_val;s8 offset =0 ; - eep_val =mt76x2_eeprom_get (dev,MT_EE_XTAL_TRIM_2 ); + eep_val =mt76x02_eeprom_get (&dev->mt76,MT_EE_XTAL_TRIM_2 ); offset = eep_val &0x7f ;if ((eep_val &0xff ) ==0xff )
@@ -54,7 +54,7 @@ mt76x2_fixup_xtal(struct mt76x2_dev *dev) eep_val >>=8 ;if (eep_val ==0x00 || eep_val ==0xff ) { - eep_val =mt76x2_eeprom_get (dev,MT_EE_XTAL_TRIM_1 ); + eep_val =mt76x02_eeprom_get (&dev->mt76,MT_EE_XTAL_TRIM_1 ); eep_val &=0xff ;if (eep_val ==0x00 || eep_val ==0xff )
@@ -65,7 +65,7 @@ mt76x2_fixup_xtal(struct mt76x2_dev *dev)mt76_rmw_field (dev,MT_XO_CTRL5 ,MT_XO_CTRL5_C2_VAL , eep_val + offset);mt76_set (dev,MT_XO_CTRL6 ,MT_XO_CTRL6_C2_CTRL ); - eep_val =mt76x2_eeprom_get (dev,MT_EE_NIC_CONF_2 ); + eep_val =mt76x02_eeprom_get (&dev->mt76,MT_EE_NIC_CONF_2 );switch (FIELD_GET (MT_EE_NIC_CONF_2_XTAL_OPTION , eep_val)) {case 0 :mt76_wr (dev,MT_XO_CTRL7 ,0x5c1fee80 );
drivers/net/wireless/mediatek/mt76/mt76x2_mcu.c +1 -1
@@ -141,7 +141,7 @@ mt76pci_load_firmware(struct mt76x2_dev *dev)mt76_wr (dev,MT_MCU_PCIE_REMAP_BASE4 ,0 ); - val =mt76x2_eeprom_get (dev,MT_EE_NIC_CONF_2 ); + val =mt76x02_eeprom_get (&dev->mt76,MT_EE_NIC_CONF_2 );if (FIELD_GET (MT_EE_NIC_CONF_2_XTAL_OPTION , val) ==1 )mt76_set (dev,MT_MCU_COM_REG0 ,BIT (30 ));
drivers/net/wireless/mediatek/mt76/mt76x2_mcu_common.c +3 -2
@@ -60,6 +60,7 @@ EXPORT_SYMBOL_GPL(mt76x2_mcu_set_channel);int mt76x2_mcu_load_cr (struct mt76x2_dev *dev,u8 type,u8 temp_level,u8 channel) { +struct mt76_dev *mdev = &dev->mt76;struct sk_buff *skb;struct {u8 cr_mode;
@@ -76,8 +77,8 @@ int mt76x2_mcu_load_cr(struct mt76x2_dev *dev, u8 type, u8 temp_level,u32 val; val =BIT (31 ); - val |= (mt76x2_eeprom_get (dev,MT_EE_NIC_CONF_0 ) >>8 ) &0x00ff ; - val |= (mt76x2_eeprom_get (dev,MT_EE_NIC_CONF_1 ) <<8 ) &0xff00 ; + val |= (mt76x02_eeprom_get (mdev,MT_EE_NIC_CONF_0 ) >>8 ) &0x00ff ; + val |= (mt76x02_eeprom_get (mdev,MT_EE_NIC_CONF_1 ) <<8 ) &0xff00 ; msg.cfg =cpu_to_le32 (val);/* first set the channel without the extension channel info */
drivers/net/wireless/mediatek/mt76/mt76x2_phy.c +1 -1
@@ -360,7 +360,7 @@ int mt76x2_phy_set_channel(struct mt76x2_dev *dev,mt76_set (dev,MT_BBP (RXO ,13 ),BIT (10 ));if (!dev->cal.init_cal_done) { -u8 val =mt76x2_eeprom_get (dev,MT_EE_BT_RCAL_RESULT ); +u8 val =mt76x02_eeprom_get (&dev->mt76,MT_EE_BT_RCAL_RESULT );if (val !=0xff )mt76x02_mcu_calibrate (&dev->mt76,MCU_CAL_R ,0 , true);
drivers/net/wireless/mediatek/mt76/mt76x2u_mac.c +3 -3
@@ -32,7 +32,7 @@ static void mt76x2u_mac_fixup_xtal(struct mt76x2_dev *dev)s8 offset =0 ;u16 eep_val; - eep_val =mt76x2_eeprom_get (dev,MT_EE_XTAL_TRIM_2 ); + eep_val =mt76x02_eeprom_get (&dev->mt76,MT_EE_XTAL_TRIM_2 ); offset = eep_val &0x7f ;if ((eep_val &0xff ) ==0xff )
@@ -42,7 +42,7 @@ static void mt76x2u_mac_fixup_xtal(struct mt76x2_dev *dev) eep_val >>=8 ;if (eep_val ==0x00 || eep_val ==0xff ) { - eep_val =mt76x2_eeprom_get (dev,MT_EE_XTAL_TRIM_1 ); + eep_val =mt76x02_eeprom_get (&dev->mt76,MT_EE_XTAL_TRIM_1 ); eep_val &=0xff ;if (eep_val ==0x00 || eep_val ==0xff )
@@ -67,7 +67,7 @@ static void mt76x2u_mac_fixup_xtal(struct mt76x2_dev *dev)/* init fce */ mt76_clear (dev,MT_FCE_L2_STUFF ,MT_FCE_L2_STUFF_WR_MPDU_LEN_EN ); - eep_val =mt76x2_eeprom_get (dev,MT_EE_NIC_CONF_2 ); + eep_val =mt76x02_eeprom_get (&dev->mt76,MT_EE_NIC_CONF_2 );switch (FIELD_GET (MT_EE_NIC_CONF_2_XTAL_OPTION , eep_val)) {case 0 :mt76_wr (dev,MT_XO_CTRL7 ,0x5c1fee80 );
drivers/net/wireless/mediatek/mt76/mt76x2u_phy.c +1 -1
@@ -209,7 +209,7 @@ int mt76x2u_phy_set_channel(struct mt76x2_dev *dev,mt76_set (dev,MT_BBP (RXO ,13 ),BIT (10 ));if (!dev->cal.init_cal_done) { -u8 val =mt76x2_eeprom_get (dev,MT_EE_BT_RCAL_RESULT ); +u8 val =mt76x02_eeprom_get (&dev->mt76,MT_EE_BT_RCAL_RESULT );if (val !=0xff ) mt76x02_mcu_calibrate(&dev->mt76, MCU_CAL_R,
Signature · 1 line
2.17.1
PATCH 6/20 mt76: move mt76x02_mac_setaddr in mt76x02-lib module
In reply to a message not in the archiveMove mt76x02_mac_setaddr utility routine in mt76x02-lib module and remove duplicated code. This is a preliminary patch to unify eeprom code between mt76x2 and mt76x0 driver
--- .../wireless/mediatek/mt76/mt76x0/eeprom.c | 24 +------------------ .../net/wireless/mediatek/mt76/mt76x02_mac.c | 18 ++++++++++++++ .../net/wireless/mediatek/mt76/mt76x02_mac.h | 1 + drivers/net/wireless/mediatek/mt76/mt76x2u.h | 1 - .../net/wireless/mediatek/mt76/mt76x2u_init.c | 3 ++- .../net/wireless/mediatek/mt76/mt76x2u_mac.c | 18 -------------- .../net/wireless/mediatek/mt76/mt76x2u_main.c | 2 +- 7 files changed, 23 insertions(+), 44 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c +1 -23
@@ -131,28 +131,6 @@ mt76x0_set_chip_cap(struct mt76x0_dev *dev, u8 *eeprom)dev_dbg (dev->mt76.dev,"PA Type %d\n" , dev->ee->pa_type); } -static int -mt76x0_set_macaddr (struct mt76x0_dev *dev,const u8 *eeprom) -{ -const void *src = eeprom +MT_EE_MAC_ADDR ; -u8 *dst = dev->mt76.macaddr; - -ether_addr_copy (dev->mt76.macaddr, src); - -if (!is_valid_ether_addr (dst)) { -eth_random_addr (dst); -dev_info (dev->mt76.dev, -"Invalid MAC address, using random address %pM\n" , - dst); - } - -mt76_wr (dev,MT_MAC_ADDR_DW0 ,get_unaligned_le32 (dst)); -mt76_wr (dev,MT_MAC_ADDR_DW1 ,get_unaligned_le16 (dst +4 ) | -FIELD_PREP (MT_MAC_ADDR_DW1_U2ME_MASK ,0xff )); - -return 0 ; -} -static void mt76x0_set_temp_offset (struct mt76x0_dev *dev,u8 *eeprom) {
@@ -409,7 +387,7 @@ mt76x0_eeprom_init(struct mt76x0_dev *dev)dev_info (dev->mt76.dev,"EEPROM ver:%02hhx fae:%02hhx\n" , eeprom[MT_EE_VERSION +1 ], eeprom[MT_EE_VERSION ]); -mt76x0_set_macaddr (dev, eeprom); +mt76x02_mac_setaddr (&dev->mt76, eeprom +MT_EE_MAC_ADDR );mt76x0_set_chip_cap (dev, eeprom);mt76x0_set_country_reg (dev, eeprom);mt76x0_set_rf_freq_off (dev, eeprom);
drivers/net/wireless/mediatek/mt76/mt76x02_mac.c +18 -0
@@ -502,3 +502,21 @@ mt76x02_mac_process_rate(struct mt76_rx_status *status, u16 rate)return 0 ; }EXPORT_SYMBOL_GPL (mt76x02_mac_process_rate); + +void mt76x02_mac_setaddr (struct mt76_dev *dev,u8 *addr) +{ +ether_addr_copy (dev->macaddr, addr); + +if (!is_valid_ether_addr (dev->macaddr)) { +eth_random_addr (dev->macaddr); +dev_info (dev->dev, +"Invalid MAC address, using random address %pM\n" , + dev->macaddr); + } + +__mt76_wr (dev,MT_MAC_ADDR_DW0 ,get_unaligned_le32 (dev->macaddr)); +__mt76_wr (dev,MT_MAC_ADDR_DW1 , +get_unaligned_le16 (dev->macaddr +4 ) | +FIELD_PREP (MT_MAC_ADDR_DW1_U2ME_MASK ,0xff )); +} +EXPORT_SYMBOL_GPL (mt76x02_mac_setaddr);
drivers/net/wireless/mediatek/mt76/mt76x02_mac.h +1 -0
@@ -202,4 +202,5 @@ void mt76x02_send_tx_status(struct mt76_dev *dev, struct mt76x02_tx_status *stat, u8 *update);int mt76x02_mac_process_rate (struct mt76_rx_status *status,u16 rate); +void mt76x02_mac_setaddr (struct mt76_dev *dev,u8 *addr);#endif
drivers/net/wireless/mediatek/mt76/mt76x2u.h +0 -1
@@ -36,7 +36,6 @@ int mt76x2u_init_hardware(struct mt76x2_dev *dev);void mt76x2u_cleanup (struct mt76x2_dev *dev);void mt76x2u_stop_hw (struct mt76x2_dev *dev); -void mt76x2u_mac_setaddr (struct mt76x2_dev *dev,u8 *addr);int mt76x2u_mac_reset (struct mt76x2_dev *dev);void mt76x2u_mac_resume (struct mt76x2_dev *dev);int mt76x2u_mac_start (struct mt76x2_dev *dev);
drivers/net/wireless/mediatek/mt76/mt76x2u_init.c +2 -1
@@ -212,7 +212,8 @@ int mt76x2u_init_hardware(struct mt76x2_dev *dev)if (err <0 )return err; -mt76x2u_mac_setaddr (dev, dev->mt76.eeprom.data +MT_EE_MAC_ADDR ); +mt76x02_mac_setaddr (&dev->mt76, + dev->mt76.eeprom.data +MT_EE_MAC_ADDR ); dev->mt76.rxfilter =mt76_rr (dev,MT_RX_FILTR_CFG );mt76x2u_init_beacon_offsets (dev);
drivers/net/wireless/mediatek/mt76/mt76x2u_mac.c +0 -17
@@ -220,21 +220,3 @@ void mt76x2u_mac_resume(struct mt76x2_dev *dev)mt76_set (dev,MT_TXOP_CTRL_CFG ,BIT (20 ));mt76_set (dev,MT_TXOP_HLDR_ET ,BIT (1 )); } - -void mt76x2u_mac_setaddr (struct mt76x2_dev *dev,u8 *addr) -{ -ether_addr_copy (dev->mt76.macaddr, addr); - -if (!is_valid_ether_addr (dev->mt76.macaddr)) { -eth_random_addr (dev->mt76.macaddr); -dev_info (dev->mt76.dev, -"Invalid MAC address, using random address %pM\n" , - dev->mt76.macaddr); - } - -mt76_wr (dev,MT_MAC_ADDR_DW0 ,get_unaligned_le32 (dev->mt76.macaddr)); -mt76_wr (dev,MT_MAC_ADDR_DW1 , -get_unaligned_le16 (dev->mt76.macaddr +4 ) | -FIELD_PREP (MT_MAC_ADDR_DW1_U2ME_MASK ,0xff )); -}
PATCH 7/20 mt76: move mt76x2_get_efuse_data in mt76x02-lib module
In reply to a message not in the archiveMove mt76x2_efuse_read and mt76x2_get_efuse_data in mt76x02_eeprom.c in order to be reused in mt76x0 driver for eeprom parsing
--- drivers/net/wireless/mediatek/mt76/Makefile | 3 +- .../wireless/mediatek/mt76/mt76x0/eeprom.c | 59 +++------------ .../wireless/mediatek/mt76/mt76x0/eeprom.h | 5 -- .../wireless/mediatek/mt76/mt76x02_eeprom.c | 72 +++++++++++++++++++ .../wireless/mediatek/mt76/mt76x02_eeprom.h | 8 +++ .../wireless/mediatek/mt76/mt76x2_eeprom.c | 49 +------------ 6 files changed, 95 insertions(+), 101 deletions(-) create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.c
drivers/net/wireless/mediatek/mt76/Makefile +2 -1
@@ -15,7 +15,8 @@ mt76-usb-y := usb.o usb_trace.o usb_mcu.o CFLAGS_trace.o := -I$(src) CFLAGS_usb_trace.o := -I$(src) -mt76x02-lib-y := mt76x02_util.o mt76x02_mac.o mt76x02_mcu.o +mt76x02-lib-y := mt76x02_util.o mt76x02_mac.o mt76x02_mcu.o \ + mt76x02_eeprom.o mt76x02-usb-y := mt76x02_usb_mcu.o mt76x02_usb_core.o
drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c +11 -48
89 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.h +0 -5
@@ -23,11 +23,6 @@ struct mt76x0_dev;#define MT76X0U_EE_MAX_VER 0x0c#define MT76X0_EEPROM_SIZE 512 -enum mt76x0_eeprom_access_modes { -MT_EE_READ =0 , -MT_EE_PHYSICAL_READ =1 , -}; -struct reg_channel_bounds {u8 start;u8 num;
drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.c new file +72 -0
72 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.h +8 -0
@@ -121,6 +121,11 @@ enum mt76x02_eeprom_field {#define MT_EFUSE_USAGE_MAP_SIZE (MT_EE_USAGE_MAP_END - \ MT_EE_USAGE_MAP_START + 1) +enum mt76x02_eeprom_modes { +MT_EE_READ , +MT_EE_PHYSICAL_READ , +}; +static inline bool mt76x02_field_valid (u8 val) {return val !=0 && val !=0xff ;
@@ -146,4 +151,7 @@ mt76x02_eeprom_get(struct mt76_dev *dev, return get_unaligned_le16(dev->eeprom.data + field); } +int mt76x02_get_efuse_data (struct mt76_dev *dev,u16 base,void *buf, +int len,enum mt76x02_eeprom_modes mode); +#endif /* __MT76x02_EEPROM_H */
drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.c +0 -45
48 lines not on this page · raw message
PATCH 8/20 mt76: move mt76x2_ext_pa_enabled routine in mt76x02_eeprom.c
In reply to a message not in the archiveMove mt76x2_ext_pa_enabled utility routine in mt76x02_eeprom.c and remove duplicated code. This is a preliminary patch to unify eeprom code between mt76x2 and mt76x0 driver
--- drivers/net/wireless/mediatek/mt76/mt76x0/debugfs.c | 6 +++++- drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c | 7 ++++--- drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.h | 1 - drivers/net/wireless/mediatek/mt76/mt76x0/phy.c | 13 +++---------- drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.c | 11 +++++++++++ drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.h | 1 + drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.c | 13 +------------ drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.h | 1 - drivers/net/wireless/mediatek/mt76/mt76x2_phy.c | 2 +- .../net/wireless/mediatek/mt76/mt76x2_phy_common.c | 12 ++++++------ drivers/net/wireless/mediatek/mt76/mt76x2u_phy.c | 2 +- 11 files changed, 33 insertions(+), 36 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76x0/debugfs.c +5 -1
@@ -99,6 +99,7 @@ static int mt76x0_eeprom_param_read(struct seq_file *file, void *data) { struct mt76x0_dev *dev = file->private; +u16 val;int i;seq_printf (file,"RF freq offset: %hhx\n" , dev->ee->rf_freq_off);
@@ -112,7 +113,10 @@ mt76x0_eeprom_param_read(struct seq_file *file, void *data)seq_printf (file,"LNA gain 5Ghz: %hhx %hhx %hhx\n" , dev->ee->lna_gain_5ghz[0 ], dev->ee->lna_gain_5ghz[1 ], dev->ee->lna_gain_5ghz[2 ]); -seq_printf (file,"Power Amplifier type %hhx\n" , dev->ee->pa_type); + + val =mt76x02_eeprom_get (&dev->mt76,MT_EE_NIC_CONF_0 ); +seq_printf (file,"Power Amplifier type %lx\n" , + val &MT_EE_NIC_CONF_0_PA_TYPE );seq_printf (file,"Reg channels: %hhu-%hhu\n" , dev->ee->reg.start, dev->ee->reg.start + dev->ee->reg.num -1 );
drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c +4 -3
@@ -90,9 +90,6 @@ mt76x0_set_chip_cap(struct mt76x0_dev *dev, u8 *eeprom) FIELD_GET(MT_EE_NIC_CONF_0_TX_PATH, nic_conf0) > 1)dev_err (dev->mt76.dev,"Error: device has more than 1 RX/TX stream!\n" ); - - dev->ee->pa_type =FIELD_GET (MT_EE_NIC_CONF_0_PA_TYPE , nic_conf0); -dev_dbg (dev->mt76.dev,"PA Type %d\n" , dev->ee->pa_type); } static void
@@ -330,6 +327,10 @@ mt76x0_eeprom_init(struct mt76x0_dev *dev)if (ret)return ret; + ret =mt76_eeprom_init (&dev->mt76,MT76X0_EEPROM_SIZE ); +if (ret <0 ) +return ret; + dev->ee =devm_kzalloc (dev->mt76.dev,sizeof (*dev->ee),GFP_KERNEL );if (!dev->ee)return -ENOMEM ;
drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.h +0 -1
@@ -35,7 +35,6 @@ struct mt76x0_eeprom_params {s8 rssi_offset_5ghz[3 ];s8 lna_gain_2ghz;s8 lna_gain_5ghz[3 ]; -u8 pa_type;/* TX_PWR_CFG_* values from EEPROM for 20 and 40 Mhz bandwidths. */ u32 tx_pwr_cfg_2g[5 ][2 ];
drivers/net/wireless/mediatek/mt76/mt76x0/phy.c +3 -10
@@ -340,16 +340,12 @@ mt76x0_phy_set_band(struct mt76x0_dev *dev, enum nl80211_band band) } } -#define EXT_PA_2G_5G 0x0 -#define EXT_PA_5G_ONLY 0x1 -#define EXT_PA_2G_ONLY 0x2 -#define INT_PA_2G_5G 0x3 -static void mt76x0_phy_set_chan_rf_params (struct mt76x0_dev *dev,u8 channel,u16 rf_bw_band) {u16 rf_band = rf_bw_band &0xff00 ;u16 rf_bw = rf_bw_band &0x00ff ; +enum nl80211_band band;u32 mac_reg;u8 rf_val;int i;
@@ -496,11 +492,8 @@ mt76x0_phy_set_chan_rf_params(struct mt76x0_dev *dev, u8 channel, u16 rf_bw_band mac_reg &= ~0xC ;/* Clear 0x518[3:2] */ mt76_wr (dev,MT_RF_MISC , mac_reg); -if (dev->ee->pa_type ==INT_PA_2G_5G || - (dev->ee->pa_type ==EXT_PA_5G_ONLY && (rf_band &RF_G_BAND )) || - (dev->ee->pa_type ==EXT_PA_2G_ONLY && (rf_band &RF_A_BAND ))) { - ;/* Internal PA - nothing to do. */ - }else { + band = (rf_band &RF_G_BAND ) ?NL80211_BAND_2GHZ :NL80211_BAND_5GHZ ; +if (mt76x02_ext_pa_enabled (&dev->mt76, band)) {/* MT_RF_MISC (offset: 0x0518) [2]1'b1: enable external A band PA, 1'b0: disable external A band PA
drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.c +11 -0
@@ -70,3 +70,14 @@ int mt76x02_get_efuse_data(struct mt76_dev *dev, u16 base, void *buf,return 0 ; }EXPORT_SYMBOL_GPL (mt76x02_get_efuse_data); + +bool mt76x02_ext_pa_enabled (struct mt76_dev *dev,enum nl80211_band band) +{ +u16 conf0 =mt76x02_eeprom_get (dev,MT_EE_NIC_CONF_0 ); + +if (band ==NL80211_BAND_5GHZ ) +return !(conf0 &MT_EE_NIC_CONF_0_PA_INT_5G ); +else +return !(conf0 &MT_EE_NIC_CONF_0_PA_INT_2G ); +} +EXPORT_SYMBOL_GPL (mt76x02_ext_pa_enabled);
drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.h +1 -0
@@ -151,6 +151,7 @@ mt76x02_eeprom_get(struct mt76_dev *dev,return get_unaligned_le16 (dev->eeprom.data + field); } +bool mt76x02_ext_pa_enabled (struct mt76_dev *dev,enum nl80211_band band);int mt76x02_get_efuse_data (struct mt76_dev *dev,u16 base,void *buf,int len,enum mt76x02_eeprom_modes mode);
drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.c +1 -12
@@ -568,7 +568,7 @@ int mt76x2_get_temp_comp(struct mt76x2_dev *dev, struct mt76x2_temp_comp *t)if (!mt76x2_temp_tx_alc_enabled (dev))return -EINVAL ; -if (!mt76x2_ext_pa_enabled (dev, band)) +if (!mt76x02_ext_pa_enabled (&dev->mt76, band))return -EINVAL ; val =mt76x02_eeprom_get (&dev->mt76,MT_EE_TX_POWER_EXT_PA_5G ) >>8 ;
@@ -594,17 +594,6 @@ int mt76x2_get_temp_comp(struct mt76x2_dev *dev, struct mt76x2_temp_comp *t) }EXPORT_SYMBOL_GPL (mt76x2_get_temp_comp); -bool mt76x2_ext_pa_enabled (struct mt76x2_dev *dev,enum nl80211_band band) -{ -u16 conf0 =mt76x02_eeprom_get (&dev->mt76,MT_EE_NIC_CONF_0 ); - -if (band ==NL80211_BAND_5GHZ ) -return !(conf0 &MT_EE_NIC_CONF_0_PA_INT_5G ); -else -return !(conf0 &MT_EE_NIC_CONF_0_PA_INT_2G ); -} -EXPORT_SYMBOL_GPL (mt76x2_ext_pa_enabled); -int mt76x2_eeprom_init (struct mt76x2_dev *dev) {int ret;
drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.h +0 -1
@@ -63,7 +63,6 @@ void mt76x2_get_power_info(struct mt76x2_dev *dev,struct mt76x2_tx_power_info *t, struct ieee80211_channel *chan);int mt76x2_get_temp_comp (struct mt76x2_dev *dev,struct mt76x2_temp_comp *t); -bool mt76x2_ext_pa_enabled (struct mt76x2_dev *dev,enum nl80211_band band);void mt76x2_read_rx_gain (struct mt76x2_dev *dev);void mt76x2_eeprom_parse_hw_cap (struct mt76x2_dev *dev);
drivers/net/wireless/mediatek/mt76/mt76x2_phy.c +1 -1
@@ -34,7 +34,7 @@ mt76x2_phy_tssi_init_cal(struct mt76x2_dev *dev)if (chan->band ==NL80211_BAND_5GHZ ) flag |=BIT (0 ); -if (mt76x2_ext_pa_enabled (dev, chan->band)) +if (mt76x02_ext_pa_enabled (&dev->mt76, chan->band)) flag |=BIT (8 );mt76x02_mcu_calibrate (&dev->mt76,MCU_CAL_TSSI , flag, true);
drivers/net/wireless/mediatek/mt76/mt76x2_phy_common.c +6 -6
@@ -64,7 +64,7 @@ void mt76x2_phy_set_txpower_regs(struct mt76x2_dev *dev,mt76_wr (dev,MT_TX_ALC_CFG_2 ,0x35160a00 );mt76_wr (dev,MT_TX_ALC_CFG_3 ,0x35160a06 ); -if (mt76x2_ext_pa_enabled (dev, band)) { +if (mt76x02_ext_pa_enabled (&dev->mt76, band)) {mt76_wr (dev,MT_RF_PA_MODE_ADJ0 ,0x0000ec00 );mt76_wr (dev,MT_RF_PA_MODE_ADJ1 ,0x0000ec00 ); }else {
@@ -75,7 +75,7 @@ void mt76x2_phy_set_txpower_regs(struct mt76x2_dev *dev, pa_mode[0 ] =0x0000ffff ; pa_mode[1 ] =0x00ff00ff ; -if (mt76x2_ext_pa_enabled (dev, band)) { +if (mt76x02_ext_pa_enabled (&dev->mt76, band)) {mt76_wr (dev,MT_TX_ALC_CFG_2 ,0x2f0f0400 );mt76_wr (dev,MT_TX_ALC_CFG_3 ,0x2f0f0476 ); }else {
@@ -83,7 +83,7 @@ void mt76x2_phy_set_txpower_regs(struct mt76x2_dev *dev,mt76_wr (dev,MT_TX_ALC_CFG_3 ,0x1b0f0476 ); } -if (mt76x2_ext_pa_enabled (dev, band)) +if (mt76x02_ext_pa_enabled (&dev->mt76, band)) pa_mode_adj =0x04000000 ;else pa_mode_adj =0 ;
@@ -97,7 +97,7 @@ void mt76x2_phy_set_txpower_regs(struct mt76x2_dev *dev,mt76_wr (dev,MT_RF_PA_MODE_CFG0 , pa_mode[0 ]);mt76_wr (dev,MT_RF_PA_MODE_CFG1 , pa_mode[1 ]); -if (mt76x2_ext_pa_enabled (dev, band)) { +if (mt76x02_ext_pa_enabled (&dev->mt76, band)) {u32 val;if (band ==NL80211_BAND_2GHZ )
@@ -244,7 +244,7 @@ void mt76x2_configure_tx_delay(struct mt76x2_dev *dev, {u32 cfg0, cfg1; -if (mt76x2_ext_pa_enabled (dev, band)) { +if (mt76x02_ext_pa_enabled (&dev->mt76, band)) { cfg0 = bw ?0x000b0c01 :0x00101101 ; cfg1 =0x00011414 ; }else {
@@ -370,7 +370,7 @@ void mt76x2_phy_tssi_compensate(struct mt76x2_dev *dev, bool wait) dev->cal.tssi_comp_pending = false;mt76x2_get_power_info (dev, &txp, chan); -if (mt76x2_ext_pa_enabled (dev, chan->band)) +if (mt76x02_ext_pa_enabled (&dev->mt76, chan->band)) t.pa_mode =1 ; t.cal_mode =BIT (1 );
drivers/net/wireless/mediatek/mt76/mt76x2u_phy.c +1 -1
@@ -250,7 +250,7 @@ int mt76x2u_phy_set_channel(struct mt76x2_dev *dev, chan = dev->mt76.chandef.chan;if (chan->band ==NL80211_BAND_5GHZ ) flag |=BIT (0 ); -if (mt76x2_ext_pa_enabled (dev, chan->band)) +if (mt76x02_ext_pa_enabled (&dev->mt76, chan->band)) flag |=BIT (8 );mt76x02_mcu_calibrate (&dev->mt76,MCU_CAL_TSSI , flag, false);
Signature · 1 line
2.17.1
PATCH 9/20 mt76x0: remove mt76x0_set_country_reg routine
In reply to a message not in the archiveRemove mt76x0_set_country_reg routine for the moment since it is partial and it is not actually used
--- .../wireless/mediatek/mt76/mt76x0/debugfs.c | 2 - .../wireless/mediatek/mt76/mt76x0/eeprom.c | 38 ------------------- .../wireless/mediatek/mt76/mt76x0/eeprom.h | 2 - 3 files changed, 42 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76x0/debugfs.c +0 -2
@@ -117,8 +117,6 @@ mt76x0_eeprom_param_read(struct seq_file *file, void *data) val =mt76x02_eeprom_get (&dev->mt76,MT_EE_NIC_CONF_0 );seq_printf (file,"Power Amplifier type %lx\n" , val &MT_EE_NIC_CONF_0_PA_TYPE ); -seq_printf (file,"Reg channels: %hhu-%hhu\n" , dev->ee->reg.start, - dev->ee->reg.start + dev->ee->reg.num -1 );seq_puts (file,"Per channel power:\n" );for (i =0 ; i <58 ; i++)
drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c +0 -38
@@ -103,43 +103,6 @@ mt76x0_set_temp_offset(struct mt76x0_dev *dev, u8 *eeprom) dev->ee->temp_off =-10 ; } -static void -mt76x0_set_country_reg (struct mt76x0_dev *dev,u8 *eeprom) -{ -/* Note: - region 31 is not valid for mt76x0 (see rtmp_init.c) -* - comments in rtmp_def.h are incorrect (see rt_channel.c) -*/ -static const struct reg_channel_bounds chan_bounds[] = { -/* EEPROM country regions 0 - 7 */ - {1 ,11 }, {1 ,13 }, {10 ,2 }, {10 ,4 }, - {14 ,1 }, {1 ,14 }, {3 ,7 }, {5 ,9 }, -/* EEPROM country regions 32 - 33 */ - {1 ,11 }, {1 ,14 } - }; -u8 val = eeprom[MT_EE_COUNTRY_REGION_2GHZ ]; -int idx =-1 ; - -dev_dbg (dev->mt76.dev,"REG 2GHZ %u REG 5GHZ %u\n" , val, eeprom[MT_EE_COUNTRY_REGION_5GHZ ]); -if (val <8 ) - idx = val; -if (val >31 && val <33 ) - idx = val -32 +8 ; - -if (idx !=-1 ) -dev_info (dev->mt76.dev, -"EEPROM country region %02hhx (channels %hhd-%hhd)\n" , - val, chan_bounds[idx].start, - chan_bounds[idx].start + chan_bounds[idx].num -1 ); -else - idx =5 ;/* channels 1 - 14 */ - - dev->ee->reg = chan_bounds[idx]; - -/* TODO: country region 33 is special - phy should be set to B-mode -* before entering channel 14 (see sta/connect.c) -*/ -} -static void mt76x0_set_rf_freq_off (struct mt76x0_dev *dev,u8 *eeprom) {
@@ -353,7 +316,6 @@ mt76x0_eeprom_init(struct mt76x0_dev *dev)mt76x02_mac_setaddr (&dev->mt76, eeprom +MT_EE_MAC_ADDR );mt76x0_set_chip_cap (dev, eeprom); -mt76x0_set_country_reg (dev, eeprom);mt76x0_set_rf_freq_off (dev, eeprom);mt76x0_set_temp_offset (dev, eeprom);mt76x0_set_lna_gain (dev, eeprom);
drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.h +0 -0
@@ -41,8 +41,6 @@ struct mt76x0_eeprom_params {u32 tx_pwr_cfg_5g[5 ][2 ];u8 tx_pwr_per_chan[58 ];
PATCH 10/20 mt76: add mt76x02_get_rx_gain and mt76x02_get_lna_gain utility routines
In reply to a message not in the archiveAdd mt76x02_get_rx_gain and mt76x02_get_lna_gain utility routines for rx gain parsing. mt76x02_get_rx_gain and mt76x02_get_lna_gain will be reused for eeprom parsing in mt76x0 driver
--- .../wireless/mediatek/mt76/mt76x02_eeprom.c | 54 +++++++++++++++++++ .../wireless/mediatek/mt76/mt76x02_eeprom.h | 5 ++ .../wireless/mediatek/mt76/mt76x2_eeprom.c | 47 ++-------------- 3 files changed, 63 insertions(+), 43 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.c +54 -0
@@ -81,3 +81,57 @@ bool mt76x02_ext_pa_enabled(struct mt76_dev *dev, enum nl80211_band band)return !(conf0 &MT_EE_NIC_CONF_0_PA_INT_2G ); }EXPORT_SYMBOL_GPL (mt76x02_ext_pa_enabled); + +void mt76x02_get_rx_gain (struct mt76_dev *dev,enum nl80211_band band, +u16 *rssi_offset,s8 *lna_2g,s8 *lna_5g) +{ +u16 val; + + val =mt76x02_eeprom_get (dev,MT_EE_LNA_GAIN ); + *lna_2g = val &0xff ; + lna_5g[0 ] = val >>8 ; + + val =mt76x02_eeprom_get (dev,MT_EE_RSSI_OFFSET_2G_1 ); + lna_5g[1 ] = val >>8 ; + + val =mt76x02_eeprom_get (dev,MT_EE_RSSI_OFFSET_5G_1 ); + lna_5g[2 ] = val >>8 ; + +if (!mt76x02_field_valid (lna_5g[1 ])) + lna_5g[1 ] = lna_5g[0 ]; + +if (!mt76x02_field_valid (lna_5g[2 ])) + lna_5g[2 ] = lna_5g[0 ]; + +if (band ==NL80211_BAND_2GHZ ) + *rssi_offset =mt76x02_eeprom_get (dev,MT_EE_RSSI_OFFSET_2G_0 ); +else + *rssi_offset =mt76x02_eeprom_get (dev,MT_EE_RSSI_OFFSET_5G_0 ); +} +EXPORT_SYMBOL_GPL (mt76x02_get_rx_gain); + +u8 mt76x02_get_lna_gain (struct mt76_dev *dev, +s8 *lna_2g,s8 *lna_5g, +struct ieee80211_channel *chan) +{ +u16 val; +u8 lna; + + val =mt76x02_eeprom_get (dev,MT_EE_NIC_CONF_1 ); +if (val &MT_EE_NIC_CONF_1_LNA_EXT_2G ) + *lna_2g =0 ; +if (val &MT_EE_NIC_CONF_1_LNA_EXT_5G ) +memset (lna_5g,0 ,sizeof (s8) *3 ); + +if (chan->band ==NL80211_BAND_2GHZ ) + lna = *lna_2g; +else if (chan->hw_value <=64 ) + lna = lna_5g[0 ]; +else if (chan->hw_value <=128 ) + lna = lna_5g[1 ]; +else + lna = lna_5g[2 ]; + +return lna !=0xff ? lna :0 ; +} +EXPORT_SYMBOL_GPL (mt76x02_get_lna_gain);
drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.h +5 -0
@@ -154,5 +154,10 @@ mt76x02_eeprom_get(struct mt76_dev *dev,bool mt76x02_ext_pa_enabled (struct mt76_dev *dev,enum nl80211_band band);int mt76x02_get_efuse_data (struct mt76_dev *dev,u16 base,void *buf,int len,enum mt76x02_eeprom_modes mode); +void mt76x02_get_rx_gain (struct mt76_dev *dev,enum nl80211_band band, +u16 *rssi_offset,s8 *lna_2g,s8 *lna_5g); +u8 mt76x02_get_lna_gain (struct mt76_dev *dev, +s8 *lna_2g,s8 *lna_5g, +struct ieee80211_channel *chan);#endif /* __MT76x02_EEPROM_H */
drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.c +3 -42
54 lines not on this page · raw message
PATCH 11/20 mt76x0: unify lna_gain parsing
In reply to a message not in the archiveUnify lna gain parsing with mt76x2 driver using eeprom utility routines available in mt76x02-lib module
--- .../wireless/mediatek/mt76/mt76x0/debugfs.c | 5 +--- .../wireless/mediatek/mt76/mt76x0/eeprom.c | 26 +++++++------------ .../wireless/mediatek/mt76/mt76x0/eeprom.h | 7 +++-- .../wireless/mediatek/mt76/mt76x0/mt76x0.h | 2 ++ .../net/wireless/mediatek/mt76/mt76x0/phy.c | 24 +++++------------ 5 files changed, 24 insertions(+), 40 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76x0/debugfs.c +1 -4
@@ -109,10 +109,7 @@ mt76x0_eeprom_param_read(struct seq_file *file, void *data) dev->ee->rssi_offset_5ghz[0 ], dev->ee->rssi_offset_5ghz[1 ], dev->ee->rssi_offset_5ghz[2]);seq_printf (file,"Temperature offset: %hhx\n" , dev->ee->temp_off); -seq_printf (file,"LNA gain 2Ghz: %hhx\n" , dev->ee->lna_gain_2ghz); -seq_printf (file,"LNA gain 5Ghz: %hhx %hhx %hhx\n" , - dev->ee->lna_gain_5ghz[0 ], dev->ee->lna_gain_5ghz[1 ], - dev->ee->lna_gain_5ghz[2 ]); +seq_printf (file,"LNA gain: %x\n" , dev->caldata.lna_gain); val =mt76x02_eeprom_get (&dev->mt76,MT_EE_NIC_CONF_0 ); seq_printf(file, "Power Amplifier type %lx\n",
drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c +9 -17
@@ -122,25 +122,18 @@ mt76x0_set_rf_freq_off(struct mt76x0_dev *dev, u8 *eeprom) dev->ee->rf_freq_off += comp; } -static void -mt76x0_set_lna_gain (struct mt76x0_dev *dev,u8 *eeprom) +void mt76x0_read_rx_gain (struct mt76x0_dev *dev) { -u8 gain; - - dev->ee->lna_gain_2ghz = eeprom[MT_EE_LNA_GAIN ]; - dev->ee->lna_gain_5ghz[0 ] = eeprom[MT_EE_LNA_GAIN +1 ]; +struct ieee80211_channel *chan = dev->mt76.chandef.chan; +struct mt76x0_caldata *caldata = &dev->caldata; +s8 lna_5g[3 ], lna_2g; +u16 rssi_offset; - gain = eeprom[MT_EE_LNA_GAIN_5GHZ_1 ]; -if (gain ==0xff || gain ==0 ) - dev->ee->lna_gain_5ghz[1 ] = dev->ee->lna_gain_5ghz[0 ]; -else - dev->ee->lna_gain_5ghz[1 ] = gain; +mt76x02_get_rx_gain (&dev->mt76, chan->band, &rssi_offset, + &lna_2g, lna_5g); + caldata->lna_gain =mt76x02_get_lna_gain (&dev->mt76, &lna_2g, + lna_5g, chan); - gain = eeprom[MT_EE_LNA_GAIN_5GHZ_2 ]; -if (gain ==0xff || gain ==0 ) - dev->ee->lna_gain_5ghz[2 ] = dev->ee->lna_gain_5ghz[0 ]; -else - dev->ee->lna_gain_5ghz[2 ] = gain; } static void
@@ -318,7 +311,6 @@ mt76x0_eeprom_init(struct mt76x0_dev *dev)mt76x0_set_chip_cap (dev, eeprom);mt76x0_set_rf_freq_off (dev, eeprom);mt76x0_set_temp_offset (dev, eeprom); -mt76x0_set_lna_gain (dev, eeprom);mt76x0_set_rssi_offset (dev, eeprom); dev->chainmask =0x0101 ;
drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.h +5 -2
@@ -28,13 +28,15 @@ struct reg_channel_bounds {u8 num; }; +struct mt76x0_caldata { +s8 lna_gain; +}; +struct mt76x0_eeprom_params {u8 rf_freq_off;s16 temp_off;s8 rssi_offset_2ghz[2 ];s8 rssi_offset_5ghz[3 ]; -s8 lna_gain_2ghz; -s8 lna_gain_5ghz[3 ];/* TX_PWR_CFG_* values from EEPROM for 20 and 40 Mhz bandwidths. */ u32 tx_pwr_cfg_2g[5 ][2 ];
@@ -44,6 +46,7 @@ struct mt76x0_eeprom_params { };int mt76x0_eeprom_init (struct mt76x0_dev *dev); +void mt76x0_read_rx_gain (struct mt76x0_dev *dev);static inline u32 s6_validate (u32 reg) {
drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h +2 -0
@@ -28,6 +28,7 @@#include "../mt76.h" #include "../mt76x02_regs.h" #include "../mt76x02_mac.h" +#include "eeprom.h" #define MT_CALIBRATE_INTERVAL (4 * HZ)
@@ -89,6 +90,7 @@ struct mt76x0_dev {const u16 *beacon_offsets;struct mt76x0_eeprom_params *ee; +struct mt76x0_caldata caldata;struct mutex reg_atomic_mutex;struct mutex hw_atomic_mutex;
drivers/net/wireless/mediatek/mt76/mt76x0/phy.c +3 -13
@@ -228,18 +228,17 @@ mt76x0_bbp_set_ctrlch(struct mt76x0_dev *dev, enum nl80211_chan_width width,int mt76x0_phy_get_rssi (struct mt76x0_dev *dev,struct mt76x02_rxwi *rxwi) { -s8 lna_gain, rssi_offset; +struct mt76x0_caldata *caldata = &dev->caldata; +s8 rssi_offset;int val;if (dev->mt76.chandef.chan->band ==NL80211_BAND_2GHZ ) { - lna_gain = dev->ee->lna_gain_2ghz; rssi_offset = dev->ee->rssi_offset_2ghz[0 ]; }else { - lna_gain = dev->ee->lna_gain_5ghz[0 ]; rssi_offset = dev->ee->rssi_offset_5ghz[0 ]; } - val = rxwi->rssi[0 ] + rssi_offset - lna_gain; + val = rxwi->rssi[0 ] + rssi_offset - caldata->lna_gain;return val; }
@@ -545,20 +544,10 @@ mt76x0_phy_set_chan_bbp_params(struct mt76x0_dev *dev, u8 channel, u16 rf_bw_banif (pair->reg ==MT_BBP (AGC ,8 )) {u32 val = pair->value; -u8 gain =FIELD_GET (MT_BBP_AGC_GAIN , val); - -if (channel >14 ) { -if (channel <100 ) - gain -= dev->ee->lna_gain_5ghz[0 ]*2 ; -else if (channel <137 ) - gain -= dev->ee->lna_gain_5ghz[1 ]*2 ; -else - gain -= dev->ee->lna_gain_5ghz[2 ]*2 ;
PATCH 12/20 mt76x0: unify rssi_offset parsing
In reply to a message not in the archiveUnify rssi_offset parsing with mt76x2 driver using eeprom utility routines available in mt76x02-lib module
--- .../wireless/mediatek/mt76/mt76x0/debugfs.c | 7 +--- .../wireless/mediatek/mt76/mt76x0/eeprom.c | 38 ++++--------------- .../wireless/mediatek/mt76/mt76x0/eeprom.h | 3 +- .../net/wireless/mediatek/mt76/mt76x0/phy.c | 12 +----- 4 files changed, 11 insertions(+), 49 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76x0/debugfs.c +2 -5
@@ -103,11 +103,8 @@ mt76x0_eeprom_param_read(struct seq_file *file, void *data)int i;seq_printf (file,"RF freq offset: %hhx\n" , dev->ee->rf_freq_off); -seq_printf (file,"RSSI offset 2GHz: %hhx %hhx\n" , - dev->ee->rssi_offset_2ghz[0 ], dev->ee->rssi_offset_2ghz[1 ]); -seq_printf (file,"RSSI offset 5GHz: %hhx %hhx %hhx\n" , - dev->ee->rssi_offset_5ghz[0 ], dev->ee->rssi_offset_5ghz[1 ], - dev->ee->rssi_offset_5ghz[2 ]); +seq_printf (file,"RSSI offset: %hhx %hhx\n" , + dev->caldata.rssi_offset[0 ], dev->caldata.rssi_offset[1 ]);seq_printf (file,"Temperature offset: %hhx\n" , dev->ee->temp_off);seq_printf (file,"LNA gain: %x\n" , dev->caldata.lna_gain);
drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c +7 -31
@@ -126,44 +126,21 @@ void mt76x0_read_rx_gain(struct mt76x0_dev *dev) {struct ieee80211_channel *chan = dev->mt76.chandef.chan;struct mt76x0_caldata *caldata = &dev->caldata; -s8 lna_5g[3 ], lna_2g; +s8 val, lna_5g[3 ], lna_2g;u16 rssi_offset; +int i;mt76x02_get_rx_gain (&dev->mt76, chan->band, &rssi_offset, &lna_2g, lna_5g); caldata->lna_gain =mt76x02_get_lna_gain (&dev->mt76, &lna_2g, lna_5g, chan); -} - -static void -mt76x0_set_rssi_offset (struct mt76x0_dev *dev,u8 *eeprom) -{ -int i; -s8 *rssi_offset = dev->ee->rssi_offset_2ghz; - -for (i =0 ; i <2 ; i++) { - rssi_offset[i] = eeprom[MT_EE_RSSI_OFFSET_2G_0 + i]; +for (i =0 ; i <ARRAY_SIZE (caldata->rssi_offset); i++) { + val = rssi_offset >> (8 * i); +if (val <-10 || val >10 ) + val =0 ; -if (rssi_offset[i] <-10 || rssi_offset[i] >10 ) { -dev_warn (dev->mt76.dev, -"Warning: EEPROM RSSI is invalid %02hhx\n" , - rssi_offset[i]); - rssi_offset[i] =0 ; - } - } - - rssi_offset = dev->ee->rssi_offset_5ghz; - -for (i =0 ; i <3 ; i++) { - rssi_offset[i] = eeprom[MT_EE_RSSI_OFFSET_5G_0 + i]; - -if (rssi_offset[i] <-10 || rssi_offset[i] >10 ) { -dev_warn (dev->mt76.dev, -"Warning: EEPROM RSSI is invalid %02hhx\n" , - rssi_offset[i]); - rssi_offset[i] =0 ; - } + caldata->rssi_offset[i] = val; } }
@@ -311,7 +288,6 @@ mt76x0_eeprom_init(struct mt76x0_dev *dev)mt76x0_set_chip_cap (dev, eeprom);mt76x0_set_rf_freq_off (dev, eeprom);mt76x0_set_temp_offset (dev, eeprom); -mt76x0_set_rssi_offset (dev, eeprom); dev->chainmask =0x0101 ;mt76x0_set_tx_power_per_rate (dev, eeprom);
drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.h +1 -2
@@ -29,14 +29,13 @@ struct reg_channel_bounds { };struct mt76x0_caldata { +s8 rssi_offset[2 ];s8 lna_gain; };struct mt76x0_eeprom_params {u8 rf_freq_off;s16 temp_off; -s8 rssi_offset_2ghz[2 ]; -s8 rssi_offset_5ghz[3 ];/* TX_PWR_CFG_* values from EEPROM for 20 and 40 Mhz bandwidths. */ u32 tx_pwr_cfg_2g[5 ][2 ];
drivers/net/wireless/mediatek/mt76/mt76x0/phy.c +0 -9
@@ -229,18 +229,8 @@ mt76x0_bbp_set_ctrlch(struct mt76x0_dev *dev, enum nl80211_chan_width width,int mt76x0_phy_get_rssi (struct mt76x0_dev *dev,struct mt76x02_rxwi *rxwi) {struct mt76x0_caldata *caldata = &dev->caldata; -s8 rssi_offset; -int val; -if (dev->mt76.chandef.chan->band ==NL80211_BAND_2GHZ ) { - rssi_offset = dev->ee->rssi_offset_2ghz[0 ]; - }else { - rssi_offset = dev->ee->rssi_offset_5ghz[0 ]; - } - - val = rxwi->rssi[0 ] + rssi_offset - caldata->lna_gain;
PATCH 13/20 mt76x0: unify temperature offset parsing
In reply to a message not in the archiveUnify temperature offset parsing with mt76x2 driver using eeprom utility routines available in mt76x02-lib module
--- .../net/wireless/mediatek/mt76/mt76x0/debugfs.c | 3 ++- drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c | 14 +++++++------- drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.h | 3 ++- drivers/net/wireless/mediatek/mt76/mt76x0/phy.c | 2 +- .../net/wireless/mediatek/mt76/mt76x02_eeprom.h | 1 + 5 files changed, 13 insertions(+), 10 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76x0/debugfs.c +2 -1
@@ -105,7 +105,8 @@ mt76x0_eeprom_param_read(struct seq_file *file, void *data)seq_printf (file,"RF freq offset: %hhx\n" , dev->ee->rf_freq_off);seq_printf (file,"RSSI offset: %hhx %hhx\n" , dev->caldata.rssi_offset[0 ], dev->caldata.rssi_offset[1 ]); -seq_printf (file,"Temperature offset: %hhx\n" , dev->ee->temp_off); +seq_printf (file,"Temperature offset: %hhx\n" , + dev->caldata.temp_offset);seq_printf (file,"LNA gain: %x\n" , dev->caldata.lna_gain); val =mt76x02_eeprom_get (&dev->mt76,MT_EE_NIC_CONF_0 );
drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c +7 -7
@@ -92,15 +92,15 @@ mt76x0_set_chip_cap(struct mt76x0_dev *dev, u8 *eeprom) "Error: device has more than 1 RX/TX stream!\n"); } -static void -mt76x0_set_temp_offset (struct mt76x0_dev *dev,u8 *eeprom) +static void mt76x0_set_temp_offset (struct mt76x0_dev *dev) { -u8 temp = eeprom[MT_EE_TEMP_OFFSET ]; +u8 val; -if (mt76x02_field_valid (temp)) - dev->ee->temp_off =mt76x02_sign_extend (temp,8 ); + val =mt76x02_eeprom_get (&dev->mt76,MT_EE_2G_TARGET_POWER ) >>8 ; +if (mt76x02_field_valid (val)) + dev->caldata.temp_offset =mt76x02_sign_extend (val,8 );else - dev->ee->temp_off =-10 ; + dev->caldata.temp_offset =-10 ; } static void
@@ -287,7 +287,7 @@ mt76x0_eeprom_init(struct mt76x0_dev *dev)mt76x02_mac_setaddr (&dev->mt76, eeprom +MT_EE_MAC_ADDR );mt76x0_set_chip_cap (dev, eeprom);mt76x0_set_rf_freq_off (dev, eeprom); -mt76x0_set_temp_offset (dev, eeprom); +mt76x0_set_temp_offset (dev); dev->chainmask =0x0101 ;mt76x0_set_tx_power_per_rate (dev, eeprom);
drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.h +2 -1
@@ -31,11 +31,12 @@ struct reg_channel_bounds {struct mt76x0_caldata {s8 rssi_offset[2 ];s8 lna_gain; + +s16 temp_offset; };struct mt76x0_eeprom_params {u8 rf_freq_off; -s16 temp_off;/* TX_PWR_CFG_* values from EEPROM for 20 and 40 Mhz bandwidths. */ u32 tx_pwr_cfg_2g[5 ][2 ];
drivers/net/wireless/mediatek/mt76/mt76x0/phy.c +1 -1
@@ -836,7 +836,7 @@ static void mt76x0_temp_sensor(struct mt76x0_dev *dev)else sval |=0xffffff00 ;/* Negative */ - temp = (35 * (sval - dev->ee->temp_off))/10 +25 ; + temp = (35 * (sval - dev->caldata.temp_offset)) /10 +25 ; done:rf_wr (dev,MT_RF (7 ,73 ), rf_b7_73);
drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.h +1 -0
@@ -72,6 +72,7 @@ enum mt76x02_eeprom_field {MT_EE_TX_POWER_VHT_MCS4 =0x0bc ,MT_EE_TX_POWER_VHT_MCS8 =0x0be , +MT_EE_2G_TARGET_POWER =0x0d0 ,MT_EE_TEMP_OFFSET =0x0d1 ,MT_EE_FREQ_OFFSET_COMPENSATION =0x0db , MT_EE_TX_POWER_BYRATE_BASE = 0x0de,
Signature · 1 line
2.17.1
PATCH 14/20 mt76x0: unify freq offset parsing
In reply to a message not in the archiveUnify frequency offset parsing with mt76x2 driver using eeprom utility routines available in mt76x02-lib module
--- .../wireless/mediatek/mt76/mt76x0/debugfs.c | 3 ++- .../wireless/mediatek/mt76/mt76x0/eeprom.c | 26 +++++++++---------- .../wireless/mediatek/mt76/mt76x0/eeprom.h | 3 +-- .../net/wireless/mediatek/mt76/mt76x0/phy.c | 3 ++- .../wireless/mediatek/mt76/mt76x02_eeprom.h | 5 ++++ 5 files changed, 22 insertions(+), 18 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76x0/debugfs.c +2 -1
@@ -102,7 +102,8 @@ mt76x0_eeprom_param_read(struct seq_file *file, void *data)u16 val;int i; -seq_printf (file,"RF freq offset: %hhx\n" , dev->ee->rf_freq_off); +seq_printf (file,"RF freq offset: %hhx\n" , + dev->caldata.freq_offset);seq_printf (file,"RSSI offset: %hhx %hhx\n" , dev->caldata.rssi_offset[0 ], dev->caldata.rssi_offset[1 ]); seq_printf(file, "Temperature offset: %hhx\n",
drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c +12 -14
@@ -103,23 +103,21 @@ static void mt76x0_set_temp_offset(struct mt76x0_dev *dev) dev->caldata.temp_offset =-10 ; } -static void -mt76x0_set_rf_freq_off (struct mt76x0_dev *dev,u8 *eeprom) +static void mt76x0_set_freq_offset (struct mt76x0_dev *dev) { -u8 comp; +struct mt76x0_caldata *caldata = &dev->caldata; +u8 val; - comp = eeprom[MT_EE_FREQ_OFFSET_COMPENSATION ]; -if (!mt76x02_field_valid (comp)) - comp =0 ; + val =mt76x02_eeprom_get (&dev->mt76,MT_EE_FREQ_OFFSET ); +if (!mt76x02_field_valid (val)) + val =0 ; + caldata->freq_offset = val; - dev->ee->rf_freq_off = eeprom[MT_EE_FREQ_OFFSET ]; -if (!mt76x02_field_valid (dev->ee->rf_freq_off)) - dev->ee->rf_freq_off =0 ; + val =mt76x02_eeprom_get (&dev->mt76,MT_EE_TSSI_BOUND4 ) >>8 ; +if (!mt76x02_field_valid (val)) + val =0 ; -if (comp &BIT (7 )) - dev->ee->rf_freq_off -= comp &0x7f ; -else - dev->ee->rf_freq_off += comp; + caldata->freq_offset -=mt76x02_sign_extend (val,8 ); }void mt76x0_read_rx_gain (struct mt76x0_dev *dev)
@@ -286,7 +284,7 @@ mt76x0_eeprom_init(struct mt76x0_dev *dev)mt76x02_mac_setaddr (&dev->mt76, eeprom +MT_EE_MAC_ADDR );mt76x0_set_chip_cap (dev, eeprom); -mt76x0_set_rf_freq_off (dev, eeprom); +mt76x0_set_freq_offset (dev);mt76x0_set_temp_offset (dev); dev->chainmask =0x0101 ;
drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.h +1 -2
@@ -33,11 +33,10 @@ struct mt76x0_caldata {s8 lna_gain;s16 temp_offset; +u8 freq_offset; };struct mt76x0_eeprom_params { -u8 rf_freq_off; -/* TX_PWR_CFG_* values from EEPROM for 20 and 40 Mhz bandwidths. */ u32 tx_pwr_cfg_2g[5 ][2 ];u32 tx_pwr_cfg_5g[5 ][2 ];
drivers/net/wireless/mediatek/mt76/mt76x0/phy.c +2 -1
@@ -942,7 +942,8 @@ mt76x0_rf_init(struct mt76x0_dev *dev)E1: B0.R22<6:0>: xo_cxo<6:0> E2: B0.R21<0>: xo_cxo<0>, B0.R22<7:0>: xo_cxo<8:1> */ -rf_wr (dev,MT_RF (0 ,22 ),min_t (u8, dev->ee->rf_freq_off,0xBF )); +rf_wr (dev,MT_RF (0 ,22 ), +min_t (u8, dev->caldata.freq_offset,0xbf )); val =rf_rr (dev,MT_RF (0 ,22 ));/*
drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.h +5 -0
@@ -74,7 +74,12 @@ enum mt76x02_eeprom_field {MT_EE_2G_TARGET_POWER =0x0d0 ,MT_EE_TEMP_OFFSET =0x0d1 , +MT_EE_TSSI_BOUND1 =0x0d4 , +MT_EE_TSSI_BOUND2 =0x0d6 , +MT_EE_TSSI_BOUND3 =0x0d8 , +MT_EE_TSSI_BOUND4 =0x0da ,MT_EE_FREQ_OFFSET_COMPENSATION =0x0db , +MT_EE_TSSI_BOUND5 =0x0dc ,MT_EE_TX_POWER_BYRATE_BASE =0x0de , MT_EE_RF_TEMP_COMP_SLOPE_5G = 0x0f2,
Signature · 1 line
2.17.1
PATCH 15/20 mt76: move mt76x02_eeprom_parse_hw_cap in mt76x02-lib module
In reply to a message not in the archiveMove mt76x02_eeprom_parse_hw_cap utility routine in mt76x02-lib module in order to be reused in mt76x0 driver
--- .../wireless/mediatek/mt76/mt76x02_eeprom.c | 19 +++++++++++++++++ .../wireless/mediatek/mt76/mt76x02_eeprom.h | 6 ++++++ .../wireless/mediatek/mt76/mt76x2_eeprom.c | 21 +------------------ .../wireless/mediatek/mt76/mt76x2_eeprom.h | 6 ------ .../net/wireless/mediatek/mt76/mt76x2u_init.c | 2 +- 5 files changed, 27 insertions(+), 27 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.c +19 -0
@@ -71,6 +71,25 @@ int mt76x02_get_efuse_data(struct mt76_dev *dev, u16 base, void *buf, }EXPORT_SYMBOL_GPL (mt76x02_get_efuse_data); +void mt76x02_eeprom_parse_hw_cap (struct mt76_dev *dev) +{ +u16 val =mt76x02_eeprom_get (dev,MT_EE_NIC_CONF_0 ); + +switch (FIELD_GET (MT_EE_NIC_CONF_0_BOARD_TYPE , val)) { +case BOARD_TYPE_5GHZ : + dev->cap.has_5ghz = true; +break ; +case BOARD_TYPE_2GHZ : + dev->cap.has_2ghz = true; +break ; +default : + dev->cap.has_2ghz = true; + dev->cap.has_5ghz = true; +break ; + } +} +EXPORT_SYMBOL_GPL (mt76x02_eeprom_parse_hw_cap); +bool mt76x02_ext_pa_enabled (struct mt76_dev *dev,enum nl80211_band band) {u16 conf0 =mt76x02_eeprom_get (dev,MT_EE_NIC_CONF_0 );
drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.h +6 -0
@@ -132,6 +132,11 @@ enum mt76x02_eeprom_modes { MT_EE_PHYSICAL_READ, }; +enum mt76x02_board_type { +BOARD_TYPE_2GHZ =1 , +BOARD_TYPE_5GHZ =2 , +}; +static inline bool mt76x02_field_valid (u8 val) {return val !=0 && val !=0xff ;
@@ -165,5 +170,6 @@ void mt76x02_get_rx_gain(struct mt76_dev *dev, enum nl80211_band band,u8 mt76x02_get_lna_gain (struct mt76_dev *dev,s8 *lna_2g,s8 *lna_5g,struct ieee80211_channel *chan); +void mt76x02_eeprom_parse_hw_cap (struct mt76_dev *dev);#endif /* __MT76x02_EEPROM_H */
drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.c +1 -20
@@ -40,25 +40,6 @@ mt76x2_eeprom_get_macaddr(struct mt76x2_dev *dev)return 0 ; } -void mt76x2_eeprom_parse_hw_cap (struct mt76x2_dev *dev) -{ -u16 val =mt76x02_eeprom_get (&dev->mt76,MT_EE_NIC_CONF_0 ); - -switch (FIELD_GET (MT_EE_NIC_CONF_0_BOARD_TYPE , val)) { -case BOARD_TYPE_5GHZ : - dev->mt76.cap.has_5ghz = true; -break ; -case BOARD_TYPE_2GHZ : - dev->mt76.cap.has_2ghz = true; -break ; -default : - dev->mt76.cap.has_2ghz = true; - dev->mt76.cap.has_5ghz = true; -break ; - } -} -EXPORT_SYMBOL_GPL (mt76x2_eeprom_parse_hw_cap); -static bool mt76x2_has_cal_free_data (struct mt76x2_dev *dev,u8 *efuse) {
@@ -563,7 +544,7 @@ int mt76x2_eeprom_init(struct mt76x2_dev *dev)if (ret)return ret; -mt76x2_eeprom_parse_hw_cap (dev); +mt76x02_eeprom_parse_hw_cap (&dev->mt76);mt76x2_eeprom_get_macaddr (dev);mt76_eeprom_override (&dev->mt76); dev->mt76.macaddr[0 ] &= ~BIT (1 );
drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.h +0 -4
@@ -19,11 +19,6 @@#include "mt76x02_eeprom.h" -enum mt76x2_board_type { -BOARD_TYPE_2GHZ =1 , -BOARD_TYPE_5GHZ =2 , -};
PATCH 16/20 mt76x0: unify parse hw capabilities
In reply to a message not in the archiveUnify parse hw capabilities with mt76x2 driver using mt76x02_eeprom_parse_hw_cap utility routine available in mt76x02-lib module
--- .../wireless/mediatek/mt76/mt76x0/eeprom.c | 33 +++++-------------- 1 file changed, 8 insertions(+), 25 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c +8 -25
@@ -51,29 +51,13 @@ mt76x0_efuse_physical_size_check(struct mt76x0_dev *dev)return 0 ; } -static void -mt76x0_set_chip_cap (struct mt76x0_dev *dev,u8 *eeprom) +static void mt76x0_set_chip_cap (struct mt76x0_dev *dev) { -enum mt76x2_board_type {BOARD_TYPE_2GHZ =1 ,BOARD_TYPE_5GHZ =2 }; -u16 nic_conf0 =get_unaligned_le16 (eeprom +MT_EE_NIC_CONF_0 ); -u16 nic_conf1 =get_unaligned_le16 (eeprom +MT_EE_NIC_CONF_1 ); - -dev_dbg (dev->mt76.dev,"NIC_CONF0: %04x NIC_CONF1: %04x\n" , nic_conf0, nic_conf1); - -switch (FIELD_GET (MT_EE_NIC_CONF_0_BOARD_TYPE , nic_conf0)) { -case BOARD_TYPE_5GHZ : - dev->mt76.cap.has_5ghz = true; -break ; -case BOARD_TYPE_2GHZ : - dev->mt76.cap.has_2ghz = true; -break ; -default : - dev->mt76.cap.has_2ghz = true; - dev->mt76.cap.has_5ghz = true; -break ; - } +u16 nic_conf0 =mt76x02_eeprom_get (&dev->mt76,MT_EE_NIC_CONF_0 ); +u16 nic_conf1 =mt76x02_eeprom_get (&dev->mt76,MT_EE_NIC_CONF_1 ); -dev_dbg (dev->mt76.dev,"Has 2GHZ %d 5GHZ %d\n" , +mt76x02_eeprom_parse_hw_cap (&dev->mt76); +dev_dbg (dev->mt76.dev,"2GHz %d 5GHz %d\n" , dev->mt76.cap.has_2ghz, dev->mt76.cap.has_5ghz);if (!mt76x02_field_valid (nic_conf1 &0xff ))
@@ -81,15 +65,14 @@ mt76x0_set_chip_cap(struct mt76x0_dev *dev, u8 *eeprom)if (nic_conf1 &MT_EE_NIC_CONF_1_HW_RF_CTRL )dev_err (dev->mt76.dev, -"Error: this driver does not support HW RF ctrl\n" ); +"driver does not support HW RF ctrl\n" );if (!mt76x02_field_valid (nic_conf0 >>8 ))return ;if (FIELD_GET (MT_EE_NIC_CONF_0_RX_PATH , nic_conf0) >1 ||FIELD_GET (MT_EE_NIC_CONF_0_TX_PATH , nic_conf0) >1 ) -dev_err (dev->mt76.dev, -"Error: device has more than 1 RX/TX stream!\n" ); +dev_err (dev->mt76.dev,"invalid tx-rx stream\n" ); }static void mt76x0_set_temp_offset (struct mt76x0_dev *dev)
@@ -283,7 +266,7 @@ mt76x0_eeprom_init(struct mt76x0_dev *dev) eeprom[MT_EE_VERSION + 1], eeprom[MT_EE_VERSION]);mt76x02_mac_setaddr (&dev->mt76, eeprom +MT_EE_MAC_ADDR ); -mt76x0_set_chip_cap (dev, eeprom); +mt76x0_set_chip_cap (dev);mt76x0_set_freq_offset (dev);mt76x0_set_temp_offset (dev); dev->chainmask =0x0101 ;
Signature · 1 line
2.17.1
PATCH 17/20 mt76: move mt76x2_tssi_enabled in mt76x02_eeprom.h
In reply to a message not in the archiveMove mt76x2_tssi_enabled and mt76x02_temp_tx_alc_enabled in mt76x02_eeprom.h in order to be reused in mt76x0 driver
--- .../wireless/mediatek/mt76/mt76x02_eeprom.h | 21 +++++++++++++++++++ .../wireless/mediatek/mt76/mt76x2_eeprom.c | 4 ++-- .../wireless/mediatek/mt76/mt76x2_eeprom.h | 21 ------------------- .../net/wireless/mediatek/mt76/mt76x2_phy.c | 4 ++-- .../net/wireless/mediatek/mt76/mt76x2u_phy.c | 2 +- 5 files changed, 26 insertions(+), 26 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.h +21 -0
@@ -162,6 +162,27 @@ mt76x02_eeprom_get(struct mt76_dev *dev,return get_unaligned_le16 (dev->eeprom.data + field); } +static inline bool +mt76x02_temp_tx_alc_enabled (struct mt76_dev *dev) +{ +u16 val; + + val =mt76x02_eeprom_get (dev,MT_EE_TX_POWER_EXT_PA_5G ); +if (!(val &BIT (15 ))) +return false; + +return mt76x02_eeprom_get (dev,MT_EE_NIC_CONF_1 ) & +MT_EE_NIC_CONF_1_TEMP_TX_ALC ; +} + +static inline bool +mt76x02_tssi_enabled (struct mt76_dev *dev) +{ +return !mt76x02_temp_tx_alc_enabled (dev) && + (mt76x02_eeprom_get (dev,MT_EE_NIC_CONF_1 ) & +MT_EE_NIC_CONF_1_TX_ALC_EN ); +} +bool mt76x02_ext_pa_enabled (struct mt76_dev *dev,enum nl80211_band band);int mt76x02_get_efuse_data (struct mt76_dev *dev,u16 base,void *buf,int len,enum mt76x02_eeprom_modes mode);
drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.c +2 -2
@@ -490,7 +490,7 @@ void mt76x2_get_power_info(struct mt76x2_dev *dev, MT_EE_TX_POWER_1_START_2G); } -if (mt76x2_tssi_enabled (dev) || +if (mt76x02_tssi_enabled (&dev->mt76) || !mt76x02_field_valid (t->target_power)) t->target_power = t->chain[0 ].target_power;
@@ -507,7 +507,7 @@ int mt76x2_get_temp_comp(struct mt76x2_dev *dev, struct mt76x2_temp_comp *t)memset (t,0 ,sizeof (*t)); -if (!mt76x2_temp_tx_alc_enabled (dev)) +if (!mt76x02_temp_tx_alc_enabled (&dev->mt76))return -EINVAL ;if (!mt76x02_ext_pa_enabled (&dev->mt76, band))
drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.h +0 -21
@@ -60,27 +60,6 @@ void mt76x2_get_power_info(struct mt76x2_dev *dev,int mt76x2_get_temp_comp (struct mt76x2_dev *dev,struct mt76x2_temp_comp *t);void mt76x2_read_rx_gain (struct mt76x2_dev *dev); -static inline bool -mt76x2_temp_tx_alc_enabled (struct mt76x2_dev *dev) -{ -u16 val; - - val =mt76x02_eeprom_get (&dev->mt76,MT_EE_TX_POWER_EXT_PA_5G ); -if (!(val &BIT (15 ))) -return false; - -return mt76x02_eeprom_get (&dev->mt76,MT_EE_NIC_CONF_1 ) & -MT_EE_NIC_CONF_1_TEMP_TX_ALC ; -} - -static inline bool -mt76x2_tssi_enabled (struct mt76x2_dev *dev) -{ -return !mt76x2_temp_tx_alc_enabled (dev) && - (mt76x02_eeprom_get (&dev->mt76,MT_EE_NIC_CONF_1 ) & -MT_EE_NIC_CONF_1_TX_ALC_EN ); -} -static inline bool mt76x2_has_ext_lna (struct mt76x2_dev *dev) {
drivers/net/wireless/mediatek/mt76/mt76x2_phy.c +2 -2
@@ -25,7 +25,7 @@ mt76x2_phy_tssi_init_cal(struct mt76x2_dev *dev)struct ieee80211_channel *chan = dev->mt76.chandef.chan;u32 flag =0 ; -if (!mt76x2_tssi_enabled (dev)) +if (!mt76x02_tssi_enabled (&dev->mt76))return false;if (mt76x2_channel_silent (dev))
@@ -390,7 +390,7 @@ int mt76x2_phy_set_channel(struct mt76x2_dev *dev, sizeof(dev->cal.agc_gain_cur));/* init default values for temp compensation */ -if (mt76x2_tssi_enabled (dev)) { +if (mt76x02_tssi_enabled (&dev->mt76)) {mt76_rmw_field (dev,MT_TX_ALC_CFG_1 ,MT_TX_ALC_CFG_1_TEMP_COMP ,0x38 ); mt76_rmw_field(dev, MT_TX_ALC_CFG_2, MT_TX_ALC_CFG_2_TEMP_COMP,
drivers/net/wireless/mediatek/mt76/mt76x2u_phy.c +1 -1
@@ -235,7 +235,7 @@ int mt76x2u_phy_set_channel(struct mt76x2_dev *dev,if (scan)return 0 ; -if (mt76x2_tssi_enabled (dev)) { +if (mt76x02_tssi_enabled (&dev->mt76)) {/* init default values for temp compensation */ mt76_rmw_field (dev,MT_TX_ALC_CFG_1 ,MT_TX_ALC_CFG_1_TEMP_COMP ,0x38 );
Signature · 1 line
2.17.1
PATCH 18/20 mt76x0: remove eeprom dependency from mt76x0_set_tx_power_per_rate
In reply to a message not in the archiveIn order to unify eeprom parsing between mt76x0 and mt76x2 drivers, remove eeprom pointer dependency from mt76x0_set_tx_power_per_rate. Moreover use mt76_rate_power to store power vs rate calibration data.
--- .../wireless/mediatek/mt76/mt76x0/debugfs.c | 32 ++-- .../wireless/mediatek/mt76/mt76x0/eeprom.c | 144 ++++++++++-------- .../wireless/mediatek/mt76/mt76x0/eeprom.h | 25 ++- .../net/wireless/mediatek/mt76/mt76x0/phy.c | 16 +- .../wireless/mediatek/mt76/mt76x02_eeprom.h | 4 +- 5 files changed, 117 insertions(+), 104 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76x0/debugfs.c +19 -13
@@ -118,19 +118,6 @@ mt76x0_eeprom_param_read(struct seq_file *file, void *data)for (i =0 ; i <58 ; i++)seq_printf (file,"\t%d chan:%d pwr:%d\n" , i, i, dev->ee->tx_pwr_per_chan[i]); - -seq_puts (file,"Per rate power 2GHz:\n" ); -for (i =0 ; i <5 ; i++) -seq_printf (file,"\t %d bw20:%d bw40:%d\n" , - i, dev->ee->tx_pwr_cfg_2g[i][0 ], - dev->ee->tx_pwr_cfg_5g[i][1 ]); - -seq_puts (file,"Per rate power 5GHz:\n" ); -for (i =0 ; i <5 ; i++) -seq_printf (file,"\t %d bw20:%d bw40:%d\n" , - i, dev->ee->tx_pwr_cfg_5g[i][0 ], - dev->ee->tx_pwr_cfg_5g[i][1 ]); -return 0 ; }
@@ -147,6 +134,23 @@ static const struct file_operations fops_eeprom_param = { .release = single_release, }; +static int mt76x0_read_txpower (struct seq_file *file,void *data) +{ +struct mt76x0_dev *dev =dev_get_drvdata (file->private); + +mt76_seq_puts_array (file,"CCK" , dev->caldata.rate_power.cck, +ARRAY_SIZE (dev->caldata.rate_power.cck)); +mt76_seq_puts_array (file,"OFDM" , dev->caldata.rate_power.ofdm, +ARRAY_SIZE (dev->caldata.rate_power.ofdm)); +mt76_seq_puts_array (file,"STBC" , dev->caldata.rate_power.stbc, +ARRAY_SIZE (dev->caldata.rate_power.stbc)); +mt76_seq_puts_array (file,"HT" , dev->caldata.rate_power.ht, +ARRAY_SIZE (dev->caldata.rate_power.ht)); +mt76_seq_puts_array (file,"VHT" , dev->caldata.rate_power.vht, +ARRAY_SIZE (dev->caldata.rate_power.vht)); +return 0 ; +} +void mt76x0_init_debugfs (struct mt76x0_dev *dev) {struct dentry *dir;
@@ -161,4 +165,6 @@ void mt76x0_init_debugfs(struct mt76x0_dev *dev)debugfs_create_file ("ampdu_stat" ,S_IRUSR , dir, dev, &fops_ampdu_stat);debugfs_create_file ("eeprom_param" ,S_IRUSR , dir, dev, &fops_eeprom_param); +debugfs_create_devm_seqfile (dev->mt76.dev,"txpower" , dir, + mt76x0_read_txpower); }
drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c +82 -62
171 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.h +9 -16
@@ -34,34 +34,27 @@ struct mt76x0_caldata {s16 temp_offset;u8 freq_offset; + +struct mt76_rate_power rate_power; };struct mt76x0_eeprom_params { -/* TX_PWR_CFG_* values from EEPROM for 20 and 40 Mhz bandwidths. */ -u32 tx_pwr_cfg_2g[5 ][2 ]; -u32 tx_pwr_cfg_5g[5 ][2 ];u8 tx_pwr_per_chan[58 ]; };int mt76x0_eeprom_init (struct mt76x0_dev *dev);void mt76x0_read_rx_gain (struct mt76x0_dev *dev); +void mt76x0_set_tx_power_per_rate (struct mt76x0_dev *dev, +struct cfg80211_chan_def *chandef); -static inline u32 s6_validate (u32 reg) +static inline s8 s6_to_s8 (u32 val) { -WARN_ON (reg & ~GENMASK (5 ,0 )); -return reg &GENMASK (5 ,0 ); -} - -static inline int s6_to_int (u32 reg) -{ -int s6; - - s6 =s6_validate (reg); -if (s6 &BIT (5 )) - s6 -=BIT (6 ); +s8 ret = val &GENMASK (5 ,0 ); -return s6; +if (ret &BIT (5 )) + ret -=BIT (6 ); +return ret; }static inline u32 int_to_s6 (int val)
drivers/net/wireless/mediatek/mt76/mt76x0/phy.c +6 -10
@@ -566,21 +566,16 @@ mt76x0_extra_power_over_mac(struct mt76x0_dev *dev) }static void -mt76x0_phy_set_tx_power (struct mt76x0_dev *dev,u8 channel,u8 rf_bw_band) +mt76x0_phy_set_tx_power (struct mt76x0_dev *dev,u8 rf_bw_band) { +struct mt76x0_caldata *caldata = &dev->caldata; +int i, bw = (rf_bw_band &RF_BW_20 ) ?0 :1 ;u32 val; -int i; -int bw = (rf_bw_band &RF_BW_20 ) ?0 :1 ;for (i =0 ; i <4 ; i++) { -if (channel <=14 ) - val = dev->ee->tx_pwr_cfg_2g[i][bw]; -else - val = dev->ee->tx_pwr_cfg_5g[i][bw]; - -mt76_wr (dev,MT_TX_PWR_CFG_0 +4 *i, val); + val = caldata->tx_pwr_cfg[i][bw]; +mt76_wr (dev,MT_TX_PWR_CFG_0 +4 * i, val); } -mt76x0_extra_power_over_mac (dev); }#endif
@@ -716,6 +711,7 @@ __mt76x0_phy_set_channel(struct mt76x0_dev *dev,mt76x0_phy_set_band (dev, chandef->chan->band);mt76x0_phy_set_chan_rf_params (dev, channel, rf_bw_band); +mt76x0_set_tx_power_per_rate (dev, chandef);mt76x0_read_rx_gain (dev);/* set Japan Tx filter at channel 14 */
drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.h +1 -2
@@ -74,6 +74,7 @@ enum mt76x02_eeprom_field {MT_EE_2G_TARGET_POWER =0x0d0 ,MT_EE_TEMP_OFFSET =0x0d1 , +MT_EE_5G_TARGET_POWER =0x0d2 ,MT_EE_TSSI_BOUND1 =0x0d4 ,MT_EE_TSSI_BOUND2 =0x0d6 , MT_EE_TSSI_BOUND3 = 0x0d8,
@@ -121,9 +122,6 @@ enum mt76x02_eeprom_field {#define MT_EE_NIC_CONF_2_TEMP_DISABLE BIT(11)#define MT_EE_NIC_CONF_2_COEX_METHOD GENMASK(15, 13) -#define MT_EE_TX_POWER_BYRATE (x) (MT_EE_TX_POWER_BYRATE_BASE + \ - (x) * 4)
PATCH 19/20 mt76x0: remove eeprom dependency from mt76x0_set_tx_power_per_chan
In reply to a message not in the archiveIn order to unify eeprom parsing between mt76x0 and mt76x2 drivers, remove eeprom pointer dependency from mt76x0_set_tx_power_per_chan routine.
Remove mt76x0_eeprom_params since it is now an empty structure
--- .../wireless/mediatek/mt76/mt76x0/debugfs.c | 4 +- .../wireless/mediatek/mt76/mt76x0/eeprom.c | 92 +++++++++++-------- .../wireless/mediatek/mt76/mt76x0/eeprom.h | 7 +- .../wireless/mediatek/mt76/mt76x0/mt76x0.h | 1 - .../net/wireless/mediatek/mt76/mt76x0/phy.c | 2 +- 5 files changed, 58 insertions(+), 48 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76x0/debugfs.c +2 -2
@@ -115,9 +115,9 @@ mt76x0_eeprom_param_read(struct seq_file *file, void *data) val & MT_EE_NIC_CONF_0_PA_TYPE);seq_puts (file,"Per channel power:\n" ); -for (i =0 ; i <58 ; i++) +for (i =0 ; i <MT76X0_NUM_CHANS ; i++)seq_printf (file,"\t%d chan:%d pwr:%d\n" , i, i, - dev->ee->tx_pwr_per_chan[i]); + dev->caldata.tx_pwr_per_chan[i]);return 0 ; }
drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c +53 -39
128 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.h +2 -5
@@ -28,6 +28,7 @@ struct reg_channel_bounds {u8 num; }; +#define MT76X0_NUM_CHANS 58struct mt76x0_caldata {s8 rssi_offset[2 ];s8 lna_gain;
@@ -35,14 +36,10 @@ struct mt76x0_caldata {s16 temp_offset;u8 freq_offset; +u8 tx_pwr_per_chan[MT76X0_NUM_CHANS ];struct mt76_rate_power rate_power; }; -struct mt76x0_eeprom_params { - -u8 tx_pwr_per_chan[58 ]; -}; -int mt76x0_eeprom_init (struct mt76x0_dev *dev);void mt76x0_read_rx_gain (struct mt76x0_dev *dev); void mt76x0_set_tx_power_per_rate(struct mt76x0_dev *dev,
drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h +0 -1
@@ -89,7 +89,6 @@ struct mt76x0_dev {const u16 *beacon_offsets; -struct mt76x0_eeprom_params *ee;struct mt76x0_caldata caldata;struct mutex reg_atomic_mutex;
drivers/net/wireless/mediatek/mt76/mt76x0/phy.c +1 -1
@@ -633,7 +633,7 @@ mt76x0_phy_set_chan_pwr(struct mt76x0_dev *dev, u8 channel) val =mt76_rr (dev,MT_TX_ALC_CFG_0 ); val &= ~0x3f3f ; - val |= dev->ee->tx_pwr_per_chan[i]; + val |= dev->caldata.tx_pwr_per_chan[i]; val |=0x2f2f <<16 ;mt76_wr (dev,MT_TX_ALC_CFG_0 , val); }
Signature · 1 line
2.17.1
PATCH 20/20 mt76x0: use shared debugfs implementation
In reply to a message not in the archiveUse mt76 shared debugfs implementation and remove duplicated code
--- .../wireless/mediatek/mt76/mt76x0/debugfs.c | 66 +------------------ .../wireless/mediatek/mt76/mt76x0/mt76x0.h | 2 - 2 files changed, 1 insertion(+), 67 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76x0/debugfs.c +1 -65
@@ -18,26 +18,6 @@#include "mt76x0.h" #include "eeprom.h" -static int -mt76_reg_set (void *data,u64 val) -{ -struct mt76x0_dev *dev = data; - -mt76_wr (dev, dev->debugfs_reg, val); -return 0 ; -} - -static int -mt76_reg_get (void *data,u64 *val) -{ -struct mt76x0_dev *dev = data; - - *val =mt76_rr (dev, dev->debugfs_reg); -return 0 ; -} - -DEFINE_SIMPLE_ATTRIBUTE (fops_regval, mt76_reg_get, mt76_reg_set,"0x%08llx\n" ); -static int mt76x0_ampdu_stat_read (struct seq_file *file,void *data) {
@@ -95,45 +75,6 @@ static const struct file_operations fops_ampdu_stat = { .release = single_release, }; -static int -mt76x0_eeprom_param_read (struct seq_file *file,void *data) -{ -struct mt76x0_dev *dev = file->private; -u16 val; -int i; - -seq_printf (file,"RF freq offset: %hhx\n" , - dev->caldata.freq_offset); -seq_printf (file,"RSSI offset: %hhx %hhx\n" , - dev->caldata.rssi_offset[0 ], dev->caldata.rssi_offset[1 ]); -seq_printf (file,"Temperature offset: %hhx\n" , - dev->caldata.temp_offset); -seq_printf (file,"LNA gain: %x\n" , dev->caldata.lna_gain); - - val =mt76x02_eeprom_get (&dev->mt76,MT_EE_NIC_CONF_0 ); -seq_printf (file,"Power Amplifier type %lx\n" , - val &MT_EE_NIC_CONF_0_PA_TYPE ); - -seq_puts (file,"Per channel power:\n" ); -for (i =0 ; i <MT76X0_NUM_CHANS ; i++) -seq_printf (file,"\t%d chan:%d pwr:%d\n" , i, i, - dev->caldata.tx_pwr_per_chan[i]); -return 0 ; -} - -static int -mt76x0_eeprom_param_open (struct inode *inode,struct file *f) -{ -return single_open (f, mt76x0_eeprom_param_read, inode->i_private); -} - -static const struct file_operations fops_eeprom_param = { - .open = mt76x0_eeprom_param_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; -static int mt76x0_read_txpower (struct seq_file *file,void *data) {struct mt76x0_dev *dev =dev_get_drvdata (file->private);
@@ -155,16 +96,11 @@ void mt76x0_init_debugfs(struct mt76x0_dev *dev) {struct dentry *dir; - dir =debugfs_create_dir ("mt76x0" , dev->mt76.hw->wiphy->debugfsdir); + dir =mt76_register_debugfs (&dev->mt76);if (!dir)return ; -debugfs_create_u32 ("regidx" ,S_IRUSR |S_IWUSR , dir, &dev->debugfs_reg); -debugfs_create_file ("regval" ,S_IRUSR |S_IWUSR , dir, dev, - &fops_regval);debugfs_create_file ("ampdu_stat" ,S_IRUSR , dir, dev, &fops_ampdu_stat); -debugfs_create_file ("eeprom_param" ,S_IRUSR , dir, dev, - &fops_eeprom_param);debugfs_create_devm_seqfile (dev->mt76.dev,"txpower" , dir, mt76x0_read_txpower); }
drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h +0 -1
@@ -94,8 +94,6 @@ struct mt76x0_dev {struct mutex reg_atomic_mutex;struct mutex hw_atomic_mutex; -u32 debugfs_reg;
Quoted 3 lines · Lorenzo Bianconi
This series unify most of eeprom parsing between mt76x2 and mt76x0 driver. That patchset will be used to properly support mt76x0e chipsets without duplicating the code.
Merged patches 1-17. Transmit power handling will be unified in a different way.
- Felix