mt76: mt76x02: move MT_CH_TIME_CFG init to mt76x02_mac_cc_reset

Reduces code duplication and adds missing bits for USB variants

Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c b/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c
index f42450b4319c325e4d8ccfa8ee36505e92c54f7b..9f224f0f7c007671405548e03bce008d7266b43e 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c
@@ -132,15 +132,6 @@ static int mt76x0e_register_device(struct mt76x02_dev *dev)
        mt76_clear(dev, 0x110, BIT(9));
        mt76_set(dev, MT_MAX_LEN_CFG, BIT(13));
 
-       mt76_wr(dev, MT_CH_TIME_CFG,
-               MT_CH_TIME_CFG_TIMER_EN |
-               MT_CH_TIME_CFG_TX_AS_BUSY |
-               MT_CH_TIME_CFG_RX_AS_BUSY |
-               MT_CH_TIME_CFG_NAV_AS_BUSY |
-               MT_CH_TIME_CFG_EIFS_AS_BUSY |
-               MT_CH_CCA_RC_EN |
-               FIELD_PREP(MT_CH_TIME_CFG_CH_TIMER_CLR, 1));
-
        err = mt76x0_register_device(dev);
        if (err < 0)
                return err;

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c b/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
index 54f9c0cc881f3e55cea52d87d14f4c337cdf9b59..259bd2a55b231687e64aa1e499e0357fa8a34a01 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
@@ -165,13 +165,6 @@ static int mt76x0u_init_hardware(struct mt76x02_dev *dev, bool reset)
                FIELD_PREP(MT_TXOP_TRUN_EN, 0x3f) |
                FIELD_PREP(MT_TXOP_EXT_CCA_DLY, 0x58));
 
-       mt76_wr(dev, MT_CH_TIME_CFG,
-               MT_CH_TIME_CFG_TIMER_EN |
-               MT_CH_TIME_CFG_TX_AS_BUSY |
-               MT_CH_TIME_CFG_RX_AS_BUSY |
-               MT_CH_TIME_CFG_NAV_AS_BUSY |
-               MT_CH_TIME_CFG_EIFS_AS_BUSY);
-
        return 0;
 }
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
index e49d0136adbcd4d16bd1da7562aaad764821e573..d32efc0b100d277b91c90d8b39b1a15c861f0490 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
@@ -1148,6 +1148,15 @@ void mt76x02_mac_cc_reset(struct mt76x02_dev *dev)
 {
        dev->mt76.survey_time = ktime_get_boottime();
 
+       mt76_wr(dev, MT_CH_TIME_CFG,
+               MT_CH_TIME_CFG_TIMER_EN |
+               MT_CH_TIME_CFG_TX_AS_BUSY |
+               MT_CH_TIME_CFG_RX_AS_BUSY |
+               MT_CH_TIME_CFG_NAV_AS_BUSY |
+               MT_CH_TIME_CFG_EIFS_AS_BUSY |
+               MT_CH_CCA_RC_EN |
+               FIELD_PREP(MT_CH_TIME_CFG_CH_TIMER_CLR, 1));
+
        /* channel cycle counters read-and-clear */
        mt76_rr(dev, MT_CH_BUSY);
        mt76_rr(dev, MT_CH_IDLE);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c
index 3cf54963854af566b826b10b2a2b4e216a009b66..33fcec9179b224089f9efd578d71399e5810e437 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c
@@ -133,15 +133,6 @@ int mt76x2_mac_reset(struct mt76x02_dev *dev, bool hard)
        for (i = 0; i < 16; i++)
                mt76_rr(dev, MT_TX_STAT_FIFO);
 
-       mt76_wr(dev, MT_CH_TIME_CFG,
-               MT_CH_TIME_CFG_TIMER_EN |
-               MT_CH_TIME_CFG_TX_AS_BUSY |
-               MT_CH_TIME_CFG_RX_AS_BUSY |
-               MT_CH_TIME_CFG_NAV_AS_BUSY |
-               MT_CH_TIME_CFG_EIFS_AS_BUSY |
-               MT_CH_CCA_RC_EN |
-               FIELD_PREP(MT_CH_TIME_CFG_CH_TIMER_CLR, 1));
-
        mt76x02_set_tx_ackto(dev);
 
        return 0;

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c b/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c
index e305b374c90418a209138ddbcd015057a01ea6bb..2910068f4e79504ec0e7ad55459c605a6457c855 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c
@@ -184,13 +184,6 @@ int mt76x2u_init_hardware(struct mt76x02_dev *dev)
        mt76x02_phy_set_rxpath(dev);
        mt76x02_phy_set_txdac(dev);
 
-       mt76_wr(dev, MT_CH_TIME_CFG,
-               MT_CH_TIME_CFG_TIMER_EN |
-               MT_CH_TIME_CFG_TX_AS_BUSY |
-               MT_CH_TIME_CFG_RX_AS_BUSY |
-               MT_CH_TIME_CFG_NAV_AS_BUSY |
-               MT_CH_TIME_CFG_EIFS_AS_BUSY);
-
        return mt76x2u_mac_stop(dev);
 }