Commit b4a2496c authored by Jiawen Wu's avatar Jiawen Wu Committed by Paolo Abeni

net: txgbe: fix GPIO interrupt blocking

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: aefd0136 ("net: txgbe: use irq_domain for interrupt controller")
Signed-off-by: default avatarJiawen Wu <jiawenwu@trustnetic.com>
Link: https://lore.kernel.org/r/20240301092956.18544-1-jiawenwu@trustnetic.comSigned-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent b307e25d
...@@ -81,6 +81,7 @@ static void txgbe_up_complete(struct wx *wx) ...@@ -81,6 +81,7 @@ static void txgbe_up_complete(struct wx *wx)
{ {
struct net_device *netdev = wx->netdev; struct net_device *netdev = wx->netdev;
txgbe_reinit_gpio_intr(wx);
wx_control_hw(wx, true); wx_control_hw(wx, true);
wx_configure_vectors(wx); wx_configure_vectors(wx);
......
...@@ -489,6 +489,33 @@ irqreturn_t txgbe_gpio_irq_handler(int irq, void *data) ...@@ -489,6 +489,33 @@ irqreturn_t txgbe_gpio_irq_handler(int irq, void *data)
return IRQ_HANDLED; 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) static int txgbe_gpio_init(struct txgbe *txgbe)
{ {
struct gpio_irq_chip *girq; struct gpio_irq_chip *girq;
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#define _TXGBE_PHY_H_ #define _TXGBE_PHY_H_
irqreturn_t txgbe_gpio_irq_handler(int irq, void *data); 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); irqreturn_t txgbe_link_irq_handler(int irq, void *data);
int txgbe_init_phy(struct txgbe *txgbe); int txgbe_init_phy(struct txgbe *txgbe);
void txgbe_remove_phy(struct txgbe *txgbe); void txgbe_remove_phy(struct txgbe *txgbe);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment