Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1163bdb6 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

mt76x0: phy: unify calibration between mt76x0u and mt76x0e 



Align phy calibration logic between mt76x0u and mt76x0e drivers
This patch improves connection stability with low SNR

Signed-off-by: default avatarLorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 70289adc

drivers/net/wireless/mediatek/mt76/mt76x0/main.c

+0 −3
Original line number Diff line number Diff line
@@ -121,9 +121,6 @@ void mt76x0_bss_info_changed(struct ieee80211_hw *hw, 
			       MT_BKOFF_SLOT_CFG_SLOTTIME, slottime);

	}



	if (changed & BSS_CHANGED_ASSOC)

		mt76x0_phy_recalibrate_after_assoc(dev);



	mutex_unlock(&dev->mt76.mutex);

}

EXPORT_SYMBOL_GPL(mt76x0_bss_info_changed);

drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h

+0 −1
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ void mt76x0_phy_init(struct mt76x02_dev *dev); 
int mt76x0_phy_wait_bbp_ready(struct mt76x02_dev *dev);

int mt76x0_phy_set_channel(struct mt76x02_dev *dev,

			    struct cfg80211_chan_def *chandef);

void mt76x0_phy_recalibrate_after_assoc(struct mt76x02_dev *dev);

void mt76x0_phy_set_txpower(struct mt76x02_dev *dev);

void mt76x0_phy_calibrate(struct mt76x02_dev *dev, bool power_on);

drivers/net/wireless/mediatek/mt76/mt76x0/phy.c

+3 −80
Original line number Diff line number Diff line
@@ -212,44 +212,6 @@ int mt76x0_phy_wait_bbp_ready(struct mt76x02_dev *dev) 
	return 0;

}



static void mt76x0_phy_vco_cal(struct mt76x02_dev *dev, u8 channel)

{

	u8 val;



	val = mt76x0_rf_rr(dev, MT_RF(0, 4));

	if ((val & 0x70) != 0x30)

		return;



	/* closed loop calibarion - B0.R06.[3:0]: 1001 */

	mt76x0_rf_rmw(dev, MT_RF(0, 6), MT_RF_VCO_BP_CLOSE_LOOP_MASK,

		      MT_RF_VCO_BP_CLOSE_LOOP | BIT(0));



	/* open loop calibration - B0.R05.[7:0]: 0x0 */

	mt76x0_rf_wr(dev, MT_RF(0, 5), 0x0);



	/* caliration mask - B0.R04.[2:0]: 000 */

	mt76x0_rf_clear(dev, MT_RF(0, 4), MT_RF_VCO_CAL_MASK);



	/* startup time - B0.R03.[2:0] startup_time: 011 */

	mt76x0_rf_rmw(dev, MT_RF(0, 3), MT_RF_START_TIME_MASK,

		      MT_RF_START_TIME);



	/* settle_time - B0.R03.[6:4] */

	if (channel == 3 || channel == 4 || channel == 10)

		val = 0x50;

	else if (channel == 2 || channel == 5 || channel == 6 ||

		 channel == 8 || channel == 11 || channel == 12)

		val = 0x40;

	else

		val = 0x60;

	mt76x0_rf_rmw(dev, MT_RF(0, 3), MT_RF_SETTLE_TIME_MASK, val);



	/* enable vco */

	mt76x0_rf_set(dev, MT_RF(0, 4), BIT(7));



	msleep(2);

}



static void

mt76x0_phy_set_band(struct mt76x02_dev *dev, enum nl80211_band band)

{
@@ -670,17 +632,11 @@ int mt76x0_phy_set_channel(struct mt76x02_dev *dev, 
	mt76x0_phy_set_chan_bbp_params(dev, rf_bw_band);

	mt76x02_init_agc_gain(dev);



	if (mt76_is_usb(dev)) {

		mt76x0_phy_vco_cal(dev, channel);

	} else {

	/* enable vco */

	mt76x0_rf_set(dev, MT_RF(0, 4), BIT(7));

	}



	if (scan)

		return 0;



	if (mt76_is_mmio(dev))

	mt76x0_phy_calibrate(dev, false);

	mt76x0_phy_set_txpower(dev);
@@ -690,39 +646,6 @@ int mt76x0_phy_set_channel(struct mt76x02_dev *dev, 
	return 0;

}



void mt76x0_phy_recalibrate_after_assoc(struct mt76x02_dev *dev)

{

	u32 tx_alc, reg_val;

	u8 channel = dev->mt76.chandef.chan->hw_value;

	int is_5ghz = (dev->mt76.chandef.chan->band == NL80211_BAND_5GHZ) ? 1 : 0;



	mt76x02_mcu_calibrate(dev, MCU_CAL_R, 0, false);



	mt76x0_phy_vco_cal(dev, channel);



	tx_alc = mt76_rr(dev, MT_TX_ALC_CFG_0);

	mt76_wr(dev, MT_TX_ALC_CFG_0, 0);

	usleep_range(500, 700);



	reg_val = mt76_rr(dev, MT_BBP(IBI, 9));

	mt76_wr(dev, MT_BBP(IBI, 9), 0xffffff7e);



	mt76x02_mcu_calibrate(dev, MCU_CAL_RXDCOC, 0, false);



	mt76x02_mcu_calibrate(dev, MCU_CAL_LC, is_5ghz, false);

	mt76x02_mcu_calibrate(dev, MCU_CAL_LOFT, is_5ghz, false);

	mt76x02_mcu_calibrate(dev, MCU_CAL_TXIQ, is_5ghz, false);

	mt76x02_mcu_calibrate(dev, MCU_CAL_TX_GROUP_DELAY, is_5ghz, false);

	mt76x02_mcu_calibrate(dev, MCU_CAL_RXIQ, is_5ghz, false);

	mt76x02_mcu_calibrate(dev, MCU_CAL_RX_GROUP_DELAY, is_5ghz, false);



	mt76_wr(dev, MT_BBP(IBI, 9), reg_val);

	mt76_wr(dev, MT_TX_ALC_CFG_0, tx_alc);

	msleep(100);



	mt76x02_mcu_calibrate(dev, MCU_CAL_RXDCOC, 1, false);

}



static void mt76x0_phy_temp_sensor(struct mt76x02_dev *dev)

{

	u8 rf_b7_73, rf_b0_66, rf_b0_67;

drivers/net/wireless/mediatek/mt76/mt76x0/usb.c

+1 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ static int mt76x0u_start(struct ieee80211_hw *hw) 
	if (ret)

		goto out;



	mt76x0_phy_calibrate(dev, true);

	ieee80211_queue_delayed_work(dev->mt76.hw, &dev->mac_work,

				     MT_CALIBRATE_INTERVAL);

	ieee80211_queue_delayed_work(dev->mt76.hw, &dev->cal_work,