dt-bindings: net: wireless: mt76: document mediatek,eeprom-merge-otp property
Subsystems (4)
Felix Fietkau
maintainerPATCH 1/4 dt-bindings: net: wireless: mt76: document mediatek,eeprom-merge-otp property
It is used to enable merging of Flash EEPROM data with OTP ROM calibration.
--- .../devicetree/bindings/net/wireless/mediatek,mt76.txt | 3 +++ 1 file changed, 3 insertions(+)
Documentation/devicetree/bindings/net/wireless/mediatek,mt76.txt +3 -0
@@ -25,6 +25,9 @@ Optional properties: - mediatek,mtd-eeprom: Specify a MTD partition + offset containing EEPROM data - big-endian: if the radio eeprom partition is written in big-endian, specify this property +- mediatek,eeprom-merge-otp: Merge EEPROM data with OTP data. Can be used on + boards where the flash calibration data is generic and specific calibration + data should be pulled from the OTP ROM The MAC address can as well be set with corresponding optional properties defined in net/ethernet.txt.
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 2/4 mt76: mt7615: disable merge of OTP ROM data by default
The reference driver does not seem to enable it by default, only under certain conditions, e.g. when a .bin file is loaded.
Make it opt-in via a device tree property for now, in case it is needed on some boards.
--- drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c +6 -0
@@ -5,6 +5,7 @@* Felix Fietkau <[email protected]> */ +#include <linux/of.h> #include "mt7615.h" #include "eeprom.h"
@@ -255,6 +256,11 @@ static void mt7622_apply_cal_free_data(struct mt7615_dev *dev)static void mt7615_cal_free_data (struct mt7615_dev *dev) { +struct device_node *np = dev->mt76.dev->of_node; + +if (!np || !of_property_read_bool (np,"mediatek,eeprom-merge-otp" )) +return ; +switch (mt76_chip (&dev->mt76)) {case 0x7622 :mt7622_apply_cal_free_data (dev);
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 3/4 mt76: mt7615: add support for applying DC offset calibration from EEPROM
In reply to Felix FietkauWhen the EEPROM data is read from flash, it can contain DC offset calibration data. Add support for sending the data to the firmware.
--- .../wireless/mediatek/mt76/mt7615/eeprom.c | 9 +- .../wireless/mediatek/mt76/mt7615/eeprom.h | 19 ++ .../net/wireless/mediatek/mt76/mt7615/main.c | 3 + .../net/wireless/mediatek/mt76/mt7615/mcu.c | 194 +++++++++++++++--- .../net/wireless/mediatek/mt76/mt7615/mcu.h | 1 + .../wireless/mediatek/mt76/mt7615/mt7615.h | 2 + 6 files changed, 199 insertions(+), 29 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c +6 -3
@@ -72,7 +72,8 @@ static int mt7615_eeprom_load(struct mt7615_dev *dev, u32 addr) {int ret; - ret =mt76_eeprom_init (&dev->mt76,MT7615_EEPROM_SIZE ); + ret =mt76_eeprom_init (&dev->mt76,MT7615_EEPROM_SIZE + +MT7615_EEPROM_EXTRA_DATA );if (ret <0 )return ret;
@@ -280,11 +281,13 @@ int mt7615_eeprom_init(struct mt7615_dev *dev, u32 addr)return ret; ret =mt7615_check_eeprom (&dev->mt76); -if (ret && dev->mt76.otp.data) +if (ret && dev->mt76.otp.data) {memcpy (dev->mt76.eeprom.data, dev->mt76.otp.data,MT7615_EEPROM_SIZE ); -else + }else { + dev->flash_eeprom = true;mt7615_cal_free_data (dev); + }mt7615_eeprom_parse_hw_cap (dev); memcpy(dev->mt76.macaddr, dev->mt76.eeprom.data + MT_EE_MAC_ADDR,
drivers/net/wireless/mediatek/mt76/mt7615/eeprom.h +19 -0
@@ -6,6 +6,21 @@#include "mt7615.h" + +#define MT7615_EEPROM_DCOC_OFFSET MT7615_EEPROM_SIZE +#define MT7615_EEPROM_DCOC_SIZE 256 +#define MT7615_EEPROM_DCOC_COUNT 34 + +#define MT7615_EEPROM_TXDPD_OFFSET (MT7615_EEPROM_SIZE + \ + MT7615_EEPROM_DCOC_COUNT * \ + MT7615_EEPROM_DCOC_SIZE) +#define MT7615_EEPROM_TXDPD_SIZE 216 +#define MT7615_EEPROM_TXDPD_COUNT (44 + 3) + +#define MT7615_EEPROM_EXTRA_DATA (MT7615_EEPROM_TXDPD_OFFSET + \ + MT7615_EEPROM_TXDPD_COUNT * \ + MT7615_EEPROM_TXDPD_SIZE) +enum mt7615_eeprom_field {MT_EE_CHIP_ID =0x000 ,MT_EE_VERSION =0x002 ,
@@ -13,6 +28,7 @@ enum mt7615_eeprom_field {MT_EE_NIC_CONF_0 =0x034 ,MT_EE_NIC_CONF_1 =0x036 ,MT_EE_WIFI_CONF =0x03e , +MT_EE_CALDATA_FLASH =0x052 ,MT_EE_TX0_2G_TARGET_POWER =0x058 ,MT_EE_TX0_5G_G0_TARGET_POWER =0x070 , MT_EE_TX1_5G_G0_TARGET_POWER = 0x098,
@@ -27,6 +43,9 @@ enum mt7615_eeprom_field { MT7663_EE_MAX = 0x400, }; +#define MT_EE_CALDATA_FLASH_TX_DPD BIT(0) +#define MT_EE_CALDATA_FLASH_RX_CAL BIT(1) +#define MT_EE_NIC_CONF_TX_MASK GENMASK(7, 4)#define MT_EE_NIC_CONF_RX_MASK GENMASK(3, 0)
drivers/net/wireless/mediatek/mt76/mt7615/main.c +3 -0
@@ -253,6 +253,9 @@ static int mt7615_set_channel(struct mt7615_phy *phy)mt7615_init_dfs_state (phy);mt76_set_channel (phy->mt76); +if (is_mt7615 (&dev->mt76) && dev->flash_eeprom) +mt7615_mcu_apply_rx_dcoc (phy); + ret =mt7615_mcu_set_chan_info (phy,MCU_EXT_CMD_CHANNEL_SWITCH );if (ret) goto out;
drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +168 -26
209 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7615/mcu.h +1 -0
@@ -270,6 +270,7 @@ enum {MCU_EXT_CMD_BCN_OFFLOAD =0x49 ,MCU_EXT_CMD_SET_RX_PATH =0x4e ,MCU_EXT_CMD_TX_POWER_FEATURE_CTRL =0x58 , +MCU_EXT_CMD_RXDCOC_CAL =0x59 ,MCU_EXT_CMD_SET_RDD_TH =0x7c , MCU_EXT_CMD_SET_RDD_PATTERN = 0x7d, };
drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h +2 -0
@@ -258,6 +258,7 @@ struct mt7615_dev {u8 mac_work_count;bool fw_debug; +bool flash_eeprom;spinlock_t token_lock;struct idr token;
@@ -494,6 +495,7 @@ int mt7615_mcu_set_pulse_th(struct mt7615_dev *dev,int mt7615_mcu_set_radar_th (struct mt7615_dev *dev,int index,const struct mt7615_dfs_pattern *pattern);int mt7615_mcu_set_sku_en (struct mt7615_phy *phy,bool enable); +int mt7615_mcu_apply_rx_dcoc (struct mt7615_phy *phy);int mt7615_dfs_init_radar_detector (struct mt7615_phy *phy);int mt7615_init_debugfs (struct mt7615_dev *dev);
Signature · 1 line
2.24.0
Felix Fietkau
maintainerPATCH 4/4 mt76: mt7615: add support for applying tx DPD calibration from EEPROM
In reply to Felix FietkauWhen the EEPROM data is read from flash, it can contain tx DPD calibration data. Add support for sending the data to the firmware.
--- .../net/wireless/mediatek/mt76/mt7615/main.c | 4 +- .../net/wireless/mediatek/mt76/mt7615/mcu.c | 120 ++++++++++++++++++ .../net/wireless/mediatek/mt76/mt7615/mcu.h | 1 + .../wireless/mediatek/mt76/mt7615/mt7615.h | 1 + 4 files changed, 125 insertions(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7615/main.c +3 -1
@@ -253,8 +253,10 @@ static int mt7615_set_channel(struct mt7615_phy *phy)mt7615_init_dfs_state (phy);mt76_set_channel (phy->mt76); -if (is_mt7615 (&dev->mt76) && dev->flash_eeprom) +if (is_mt7615 (&dev->mt76) && dev->flash_eeprom) {mt7615_mcu_apply_rx_dcoc (phy); +mt7615_mcu_apply_tx_dpd (phy); + } ret =mt7615_mcu_set_chan_info (phy,MCU_EXT_CMD_CHANNEL_SWITCH );if (ret)
drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +120 -0
123 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7615/mcu.h +1 -0
@@ -271,6 +271,7 @@ enum {MCU_EXT_CMD_SET_RX_PATH =0x4e ,MCU_EXT_CMD_TX_POWER_FEATURE_CTRL =0x58 ,MCU_EXT_CMD_RXDCOC_CAL =0x59 , +MCU_EXT_CMD_TXDPD_CAL =0x60 ,MCU_EXT_CMD_SET_RDD_TH =0x7c , MCU_EXT_CMD_SET_RDD_PATTERN = 0x7d, };
drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h +1 -0
@@ -496,6 +496,7 @@ int mt7615_mcu_set_radar_th(struct mt7615_dev *dev, int index, const struct mt7615_dfs_pattern *pattern);int mt7615_mcu_set_sku_en (struct mt7615_phy *phy,bool enable);int mt7615_mcu_apply_rx_dcoc (struct mt7615_phy *phy); +int mt7615_mcu_apply_tx_dpd (struct mt7615_phy *phy);int mt7615_dfs_init_radar_detector (struct mt7615_phy *phy);int mt7615_init_debugfs (struct mt7615_dev *dev);
Signature · 1 line
2.24.0
Quoted 7 lines · Felix Fietkau
It is used to enable merging of Flash EEPROM data with OTP ROM calibration.
Signed-off-by Felix Fietkau <[email protected]>--- .../devicetree/bindings/net/wireless/mediatek,mt76.txt | 3 +++ 1 file changed, 3 insertions(+)