net: txgbe: fix GPIO interrupt blocking

[ Upstream commit b4a2496c17ed645f8d51061047c9c249b58c74ba ]

The register of GPIO interrupt status is masked before MAC IRQ
is enabled. This is because of hardware deficiency. So manually
clear the interrupt status before using them. Otherwise, GPIO
interrupts will never be reported again. There is a workaround for
clearing interrupts to set GPIO EOI in txgbe_up_complete().

Fixes: aefd013624a1 ("net: txgbe: use irq_domain for interrupt controller")
Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
Link: https://lore.kernel.org/r/20240301092956.18544-1-jiawenwu@trustnetic.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/wangxun/txgbe/txgbe_main.c b/drivers/net/ethernet/wangxun/txgbe/txgbe_main.c
index 88ea20946e6ecb156b97958e894ea220ac70831a..8c7a74981b907fc3eed08d993a89f7e6ab4a456b 100644 (file)
--- a/drivers/net/ethernet/wangxun/txgbe/txgbe_main.c
+++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_main.c
@@ -81,6 +81,7 @@ static void txgbe_up_complete(struct wx *wx)
 {
        struct net_device *netdev = wx->netdev;
 
+       txgbe_reinit_gpio_intr(wx);
        wx_control_hw(wx, true);
        wx_configure_vectors(wx);
 

diff --git a/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c b/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
index 3c9bb4ab98681ea0baed58a794a45a90375524c8..93295916b1d2b80751637dee4a0006688958c428 100644 (file)
--- a/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
+++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
@@ -491,6 +491,33 @@ irqreturn_t txgbe_gpio_irq_handler(int irq, void *data)
        return IRQ_HANDLED;
 }
 
+void txgbe_reinit_gpio_intr(struct wx *wx)
+{
+       struct txgbe *txgbe = wx->priv;
+       irq_hw_number_t hwirq;
+       unsigned long gpioirq;
+       struct gpio_chip *gc;
+       unsigned long flags;
+
+       /* for gpio interrupt pending before irq enable */
+       gpioirq = rd32(wx, WX_GPIO_INTSTATUS);
+
+       gc = txgbe->gpio;
+       for_each_set_bit(hwirq, &gpioirq, gc->ngpio) {
+               int gpio = irq_find_mapping(gc->irq.domain, hwirq);
+               struct irq_data *d = irq_get_irq_data(gpio);
+               u32 irq_type = irq_get_trigger_type(gpio);
+
+               txgbe_gpio_irq_ack(d);
+
+               if ((irq_type & IRQ_TYPE_SENSE_MASK) == IRQ_TYPE_EDGE_BOTH) {
+                       raw_spin_lock_irqsave(&wx->gpio_lock, flags);
+                       txgbe_toggle_trigger(gc, hwirq);
+                       raw_spin_unlock_irqrestore(&wx->gpio_lock, flags);
+               }
+       }
+}
+
 static int txgbe_gpio_init(struct txgbe *txgbe)
 {
        struct gpio_irq_chip *girq;

diff --git a/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.h b/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.h
index 9855d44076cb82e47780b91eb3ec8869c26632be..8a026d804fe24c73738e8ce88bd06455da029be5 100644 (file)
--- a/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.h
+++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.h
@@ -5,6 +5,7 @@
 #define _TXGBE_PHY_H_
 
 irqreturn_t txgbe_gpio_irq_handler(int irq, void *data);
+void txgbe_reinit_gpio_intr(struct wx *wx);
 irqreturn_t txgbe_link_irq_handler(int irq, void *data);
 int txgbe_init_phy(struct txgbe *txgbe);
 void txgbe_remove_phy(struct txgbe *txgbe);