Re: [PATCH v2] net: txgbe: fix GPIO interrupt blocking

[Jiri Pirko <jiri@resnulli.us>]

Thu, Feb 29, 2024 at 03:42:37AM CET, jiawenwu@trustnetic.com wrote:
>There were two problems to be solved in this patch:
>
>1. 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().
>
>2. GPIO EOI is not set to clear interrupt status after handling
>the interrupt. It should be done in irq_chip->irq_ack, but this
>function is not called in handle_nested_irq(). So executing
>function txgbe_gpio_irq_ack() manually in txgbe_gpio_irq_handler().

Two patches then, no?


>
>Fixes: aefd013624a1 ("net: txgbe: use irq_domain for interrupt controller")
>Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
>---
> .../net/ethernet/wangxun/txgbe/txgbe_main.c   |  1 +
> .../net/ethernet/wangxun/txgbe/txgbe_phy.c    | 29 +++++++++++++++++++
> .../net/ethernet/wangxun/txgbe/txgbe_phy.h    |  1 +
> 3 files changed, 31 insertions(+)
>
>diff --git a/drivers/net/ethernet/wangxun/txgbe/txgbe_main.c b/drivers/net/ethernet/wangxun/txgbe/txgbe_main.c
>index e67a21294158..bd4624d14ca0 100644
>--- 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 bae0a8ee7014..93295916b1d2 100644
>--- a/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
>+++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
>@@ -475,8 +475,10 @@ irqreturn_t txgbe_gpio_irq_handler(int irq, void *data)
> 	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);
> 		handle_nested_irq(gpio);
> 
> 		if ((irq_type & IRQ_TYPE_SENSE_MASK) == IRQ_TYPE_EDGE_BOTH) {
>@@ -489,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 9855d44076cb..8a026d804fe2 100644
>--- 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);
>-- 
>2.27.0
>
>