wifi: mt76: mt7615: enable per-phy led support

Introduce the capability to support per-phy led blinking. This is needed
for devices supporting dbdc.

Co-developed-by: Ryder Lee <ryder.Lee@mediatek.com>
Signed-off-by: Ryder Lee <ryder.Lee@mediatek.com>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/init.c b/drivers/net/wireless/mediatek/mt76/mt7615/init.c
index 07a1fea94f66ed7e2746c92a3a8ec8168d068ad1..5fa6f097ec30743222a8572ec2ac0e3f2a9891c7 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/init.c
@@ -443,6 +443,85 @@ mt7615_cap_dbdc_disable(struct mt7615_dev *dev)
        mt76_set_stream_caps(&dev->mphy, true);
 }
 
+u32 mt7615_reg_map(struct mt7615_dev *dev, u32 addr)
+{
+       u32 base, offset;
+
+       if (is_mt7663(&dev->mt76)) {
+               base = addr & MT7663_MCU_PCIE_REMAP_2_BASE;
+               offset = addr & MT7663_MCU_PCIE_REMAP_2_OFFSET;
+       } else {
+               base = addr & MT_MCU_PCIE_REMAP_2_BASE;
+               offset = addr & MT_MCU_PCIE_REMAP_2_OFFSET;
+       }
+       mt76_wr(dev, MT_MCU_PCIE_REMAP_2, base);
+
+       return MT_PCIE_REMAP_BASE_2 + offset;
+}
+EXPORT_SYMBOL_GPL(mt7615_reg_map);
+
+static void
+mt7615_led_set_config(struct led_classdev *led_cdev,
+                     u8 delay_on, u8 delay_off)
+{
+       struct mt7615_dev *dev;
+       struct mt76_phy *mphy;
+       u32 val, addr;
+       u8 index;
+
+       mphy = container_of(led_cdev, struct mt76_phy, leds.cdev);
+       dev = container_of(mphy->dev, struct mt7615_dev, mt76);
+
+       if (!mt76_connac_pm_ref(mphy, &dev->pm))
+               return;
+
+       val = FIELD_PREP(MT_LED_STATUS_DURATION, 0xffff) |
+             FIELD_PREP(MT_LED_STATUS_OFF, delay_off) |
+             FIELD_PREP(MT_LED_STATUS_ON, delay_on);
+
+       index = dev->dbdc_support ? mphy->band_idx : mphy->leds.pin;
+       addr = mt7615_reg_map(dev, MT_LED_STATUS_0(index));
+       mt76_wr(dev, addr, val);
+       addr = mt7615_reg_map(dev, MT_LED_STATUS_1(index));
+       mt76_wr(dev, addr, val);
+
+       val = MT_LED_CTRL_REPLAY(index) | MT_LED_CTRL_KICK(index);
+       if (dev->mphy.leds.al)
+               val |= MT_LED_CTRL_POLARITY(index);
+       if (mphy->band_idx)
+               val |= MT_LED_CTRL_BAND(index);
+
+       addr = mt7615_reg_map(dev, MT_LED_CTRL);
+       mt76_wr(dev, addr, val);
+
+       mt76_connac_pm_unref(mphy, &dev->pm);
+}
+
+int mt7615_led_set_blink(struct led_classdev *led_cdev,
+                        unsigned long *delay_on,
+                        unsigned long *delay_off)
+{
+       u8 delta_on, delta_off;
+
+       delta_off = max_t(u8, *delay_off / 10, 1);
+       delta_on = max_t(u8, *delay_on / 10, 1);
+
+       mt7615_led_set_config(led_cdev, delta_on, delta_off);
+
+       return 0;
+}
+EXPORT_SYMBOL_GPL(mt7615_led_set_blink);
+
+void mt7615_led_set_brightness(struct led_classdev *led_cdev,
+                              enum led_brightness brightness)
+{
+       if (!brightness)
+               mt7615_led_set_config(led_cdev, 0, 0xff);
+       else
+               mt7615_led_set_config(led_cdev, 0xff, 0);
+}
+EXPORT_SYMBOL_GPL(mt7615_led_set_brightness);
+
 int mt7615_register_ext_phy(struct mt7615_dev *dev)
 {
        struct mt7615_phy *phy = mt7615_ext_phy(dev);
@@ -497,6 +576,12 @@ int mt7615_register_ext_phy(struct mt7615_dev *dev)
        for (i = 0; i <= MT_TXQ_PSD ; i++)
                mphy->q_tx[i] = dev->mphy.q_tx[i];
 
+       /* init led callbacks */
+       if (IS_ENABLED(CONFIG_MT76_LEDS)) {
+               mphy->leds.cdev.brightness_set = mt7615_led_set_brightness;
+               mphy->leds.cdev.blink_set = mt7615_led_set_blink;
+       }
+
        ret = mt76_register_phy(mphy, true, mt76_rates,
                                ARRAY_SIZE(mt76_rates));
        if (ret)

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mmio.c b/drivers/net/wireless/mediatek/mt76/mt7615/mmio.c
index a784f9d9e93557fd911db0788cb56f6186fb0f89..83173efb56dc42c4abd887b2dee05b45242d581f 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mmio.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mmio.c
@@ -63,22 +63,6 @@ const u32 mt7663e_reg_map[] = {
        [MT_EFUSE_ADDR_BASE]    = 0x78011000,
 };
 
-u32 mt7615_reg_map(struct mt7615_dev *dev, u32 addr)
-{
-       u32 base, offset;
-
-       if (is_mt7663(&dev->mt76)) {
-               base = addr & MT7663_MCU_PCIE_REMAP_2_BASE;
-               offset = addr & MT7663_MCU_PCIE_REMAP_2_OFFSET;
-       } else {
-               base = addr & MT_MCU_PCIE_REMAP_2_BASE;
-               offset = addr & MT_MCU_PCIE_REMAP_2_OFFSET;
-       }
-       mt76_wr(dev, MT_MCU_PCIE_REMAP_2, base);
-
-       return MT_PCIE_REMAP_BASE_2 + offset;
-}
-
 static void
 mt7615_rx_poll_complete(struct mt76_dev *mdev, enum mt76_rxq_id q)
 {

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
index 087d4886162e625d58dfc7e3a840c842266efad2..43591b4c1d9afc38d516b62862a0995c9bc99a5e 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
@@ -376,6 +376,12 @@ int mt7615_mmio_probe(struct device *pdev, void __iomem *mem_base,
                      int irq, const u32 *map);
 u32 mt7615_reg_map(struct mt7615_dev *dev, u32 addr);
 
+u32 mt7615_reg_map(struct mt7615_dev *dev, u32 addr);
+int mt7615_led_set_blink(struct led_classdev *led_cdev,
+                        unsigned long *delay_on,
+                        unsigned long *delay_off);
+void mt7615_led_set_brightness(struct led_classdev *led_cdev,
+                              enum led_brightness brightness);
 void mt7615_init_device(struct mt7615_dev *dev);
 int mt7615_register_device(struct mt7615_dev *dev);
 void mt7615_unregister_device(struct mt7615_dev *dev);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/pci_init.c b/drivers/net/wireless/mediatek/mt76/mt7615/pci_init.c
index 506a3b561d4accf9a4fa0a12698914df2d5ae3b0..0680e002b9814506dc690f215556148a676e2209 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/pci_init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/pci_init.c
@@ -66,64 +66,6 @@ static int mt7615_init_hardware(struct mt7615_dev *dev)
        return 0;
 }
 
-static void
-mt7615_led_set_config(struct led_classdev *led_cdev,
-                     u8 delay_on, u8 delay_off)
-{
-       struct mt7615_dev *dev;
-       struct mt76_phy *mphy;
-       u32 val, addr;
-
-       mphy = container_of(led_cdev, struct mt76_phy, leds.cdev);
-       dev = container_of(mphy->dev, struct mt7615_dev, mt76);
-
-       if (!mt76_connac_pm_ref(mphy, &dev->pm))
-               return;
-
-       val = FIELD_PREP(MT_LED_STATUS_DURATION, 0xffff) |
-             FIELD_PREP(MT_LED_STATUS_OFF, delay_off) |
-             FIELD_PREP(MT_LED_STATUS_ON, delay_on);
-
-       addr = mt7615_reg_map(dev, MT_LED_STATUS_0(mphy->leds.pin));
-       mt76_wr(dev, addr, val);
-       addr = mt7615_reg_map(dev, MT_LED_STATUS_1(mphy->leds.pin));
-       mt76_wr(dev, addr, val);
-
-       val = MT_LED_CTRL_REPLAY(mphy->leds.pin) |
-             MT_LED_CTRL_KICK(mphy->leds.pin);
-       if (mphy->leds.al)
-               val |= MT_LED_CTRL_POLARITY(mphy->leds.pin);
-       addr = mt7615_reg_map(dev, MT_LED_CTRL);
-       mt76_wr(dev, addr, val);
-
-       mt76_connac_pm_unref(mphy, &dev->pm);
-}
-
-static int
-mt7615_led_set_blink(struct led_classdev *led_cdev,
-                    unsigned long *delay_on,
-                    unsigned long *delay_off)
-{
-       u8 delta_on, delta_off;
-
-       delta_off = max_t(u8, *delay_off / 10, 1);
-       delta_on = max_t(u8, *delay_on / 10, 1);
-
-       mt7615_led_set_config(led_cdev, delta_on, delta_off);
-
-       return 0;
-}
-
-static void
-mt7615_led_set_brightness(struct led_classdev *led_cdev,
-                         enum led_brightness brightness)
-{
-       if (!brightness)
-               mt7615_led_set_config(led_cdev, 0, 0xff);
-       else
-               mt7615_led_set_config(led_cdev, 0xff, 0);
-}
-
 int mt7615_register_device(struct mt7615_dev *dev)
 {
        int ret;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/regs.h b/drivers/net/wireless/mediatek/mt76/mt7615/regs.h
index fa1b9b26b399ebbd746bfe4b5fd03b1ca7a2432b..7cecb22c569ef0158523355fdd6fd62094427abe 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/regs.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/regs.h
@@ -544,6 +544,7 @@ enum mt7615_reg_base {
 #define MT_LED_CTRL_POLARITY(_n)       BIT(1 + (8 * (_n)))
 #define MT_LED_CTRL_TX_BLINK_MODE(_n)  BIT(2 + (8 * (_n)))
 #define MT_LED_CTRL_TX_MANUAL_BLINK(_n)        BIT(3 + (8 * (_n)))
+#define MT_LED_CTRL_BAND(_n)           BIT(4 + (8 * (_n)))
 #define MT_LED_CTRL_TX_OVER_BLINK(_n)  BIT(5 + (8 * (_n)))
 #define MT_LED_CTRL_KICK(_n)           BIT(7 + (8 * (_n)))