Commit 8905a2c7 authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge branch 'net-txgbe-fix-msi-and-intx-interrupts' 

Jiawen Wu says:

====================
net: txgbe: fix MSI and INTx interrupts

Fix MSI and INTx interrupts for txgbe driver.

changes in v3:
- Add flag wx->misc_irq_domain.
- Separate commits.
- Detail null-defer events.

changes in v2: https://lore.kernel.org/all/20240626060703.31652-1-jiawenwu@trustnetic.com
- Split into two commits.
- Detail commit description.

v1: https://lore.kernel.org/all/20240621080951.14368-1-jiawenwu@trustnetic.com
====================

Link: https://patch.msgid.link/20240701071416.8468-1-jiawenwu@trustnetic.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents b698ab56 935124dd

drivers/net/ethernet/wangxun/libwx/wx_hw.c

+1 −0
Original line number Diff line number Diff line
@@ -1959,6 +1959,7 @@ int wx_sw_init(struct wx *wx) 
	}



	bitmap_zero(wx->state, WX_STATE_NBITS);

	wx->misc_irq_domain = false;



	return 0;

}

drivers/net/ethernet/wangxun/libwx/wx_lib.c

+7 −3
Original line number Diff line number Diff line
@@ -1686,6 +1686,7 @@ static int wx_set_interrupt_capability(struct wx *wx) 
	}



	pdev->irq = pci_irq_vector(pdev, 0);

	wx->num_q_vectors = 1;



	return 0;

}
@@ -1996,6 +1997,7 @@ void wx_free_irq(struct wx *wx) 
	int vector;



	if (!(pdev->msix_enabled)) {

		if (!wx->misc_irq_domain)

			free_irq(pdev->irq, wx);

		return;

	}
@@ -2011,7 +2013,7 @@ void wx_free_irq(struct wx *wx) 
		free_irq(entry->vector, q_vector);

	}



	if (wx->mac.type == wx_mac_em)

	if (!wx->misc_irq_domain)

		free_irq(wx->msix_entry->vector, wx);

}

EXPORT_SYMBOL(wx_free_irq);
@@ -2026,6 +2028,9 @@ int wx_setup_isb_resources(struct wx *wx) 
{

	struct pci_dev *pdev = wx->pdev;



	if (wx->isb_mem)

		return 0;



	wx->isb_mem = dma_alloc_coherent(&pdev->dev,

					 sizeof(u32) * 4,

					 &wx->isb_dma,
@@ -2385,7 +2390,6 @@ static void wx_free_all_tx_resources(struct wx *wx) 


void wx_free_resources(struct wx *wx)

{

	wx_free_isb_resources(wx);

	wx_free_all_rx_resources(wx);

	wx_free_all_tx_resources(wx);

}

drivers/net/ethernet/wangxun/libwx/wx_type.h

+1 −0
Original line number Diff line number Diff line
@@ -1058,6 +1058,7 @@ struct wx { 
	dma_addr_t isb_dma;

	u32 *isb_mem;

	u32 isb_tag[WX_ISB_MAX];

	bool misc_irq_domain;



#define WX_MAX_RETA_ENTRIES 128

#define WX_RSS_INDIR_TBL_MAX 64

drivers/net/ethernet/wangxun/ngbe/ngbe_main.c

+2 −0
Original line number Diff line number Diff line
@@ -387,6 +387,7 @@ static int ngbe_open(struct net_device *netdev) 
err_free_irq:

	wx_free_irq(wx);

err_free_resources:

	wx_free_isb_resources(wx);

	wx_free_resources(wx);

	return err;

}
@@ -408,6 +409,7 @@ static int ngbe_close(struct net_device *netdev) 


	ngbe_down(wx);

	wx_free_irq(wx);

	wx_free_isb_resources(wx);

	wx_free_resources(wx);

	phylink_disconnect_phy(wx->phylink);

	wx_control_hw(wx, false);

drivers/net/ethernet/wangxun/txgbe/txgbe_irq.c

+47 −77
Original line number Diff line number Diff line
@@ -27,57 +27,19 @@ void txgbe_irq_enable(struct wx *wx, bool queues) 
}



/**

 * txgbe_intr - msi/legacy mode Interrupt Handler

 * @irq: interrupt number

 * @data: pointer to a network interface device structure

 **/

static irqreturn_t txgbe_intr(int __always_unused irq, void *data)

{

	struct wx_q_vector *q_vector;

	struct wx *wx  = data;

	struct pci_dev *pdev;

	u32 eicr;



	q_vector = wx->q_vector[0];

	pdev = wx->pdev;



	eicr = wx_misc_isb(wx, WX_ISB_VEC0);

	if (!eicr) {

		/* shared interrupt alert!

		 * the interrupt that we masked before the ICR read.

		 */

		if (netif_running(wx->netdev))

			txgbe_irq_enable(wx, true);

		return IRQ_NONE;        /* Not our interrupt */

	}

	wx->isb_mem[WX_ISB_VEC0] = 0;

	if (!(pdev->msi_enabled))

		wr32(wx, WX_PX_INTA, 1);



	wx->isb_mem[WX_ISB_MISC] = 0;

	/* would disable interrupts here but it is auto disabled */

	napi_schedule_irqoff(&q_vector->napi);



	/* re-enable link(maybe) and non-queue interrupts, no flush.

	 * txgbe_poll will re-enable the queue interrupts

	 */

	if (netif_running(wx->netdev))

		txgbe_irq_enable(wx, false);



	return IRQ_HANDLED;

}



/**

 * txgbe_request_msix_irqs - Initialize MSI-X interrupts

 * txgbe_request_queue_irqs - Initialize MSI-X queue interrupts

 * @wx: board private structure

 *

 * Allocate MSI-X vectors and request interrupts from the kernel.

 * Allocate MSI-X queue vectors and request interrupts from the kernel.

 **/

static int txgbe_request_msix_irqs(struct wx *wx)

int txgbe_request_queue_irqs(struct wx *wx)

{

	struct net_device *netdev = wx->netdev;

	int vector, err;



	if (!wx->pdev->msix_enabled)

		return 0;



	for (vector = 0; vector < wx->num_q_vectors; vector++) {

		struct wx_q_vector *q_vector = wx->q_vector[vector];

		struct msix_entry *entry = &wx->msix_q_entries[vector];
@@ -110,34 +72,6 @@ static int txgbe_request_msix_irqs(struct wx *wx) 
	return err;

}



/**

 * txgbe_request_irq - initialize interrupts

 * @wx: board private structure

 *

 * Attempt to configure interrupts using the best available

 * capabilities of the hardware and kernel.

 **/

int txgbe_request_irq(struct wx *wx)

{

	struct net_device *netdev = wx->netdev;

	struct pci_dev *pdev = wx->pdev;

	int err;



	if (pdev->msix_enabled)

		err = txgbe_request_msix_irqs(wx);

	else if (pdev->msi_enabled)

		err = request_irq(wx->pdev->irq, &txgbe_intr, 0,

				  netdev->name, wx);

	else

		err = request_irq(wx->pdev->irq, &txgbe_intr, IRQF_SHARED,

				  netdev->name, wx);



	if (err)

		wx_err(wx, "request_irq failed, Error %d\n", err);



	return err;

}



static int txgbe_request_gpio_irq(struct txgbe *txgbe)

{

	txgbe->gpio_irq = irq_find_mapping(txgbe->misc.domain, TXGBE_IRQ_GPIO);
@@ -177,6 +111,36 @@ static const struct irq_domain_ops txgbe_misc_irq_domain_ops = { 
};



static irqreturn_t txgbe_misc_irq_handle(int irq, void *data)

{

	struct wx_q_vector *q_vector;

	struct txgbe *txgbe = data;

	struct wx *wx = txgbe->wx;

	u32 eicr;



	if (wx->pdev->msix_enabled)

		return IRQ_WAKE_THREAD;



	eicr = wx_misc_isb(wx, WX_ISB_VEC0);

	if (!eicr) {

		/* shared interrupt alert!

		 * the interrupt that we masked before the ICR read.

		 */

		if (netif_running(wx->netdev))

			txgbe_irq_enable(wx, true);

		return IRQ_NONE;        /* Not our interrupt */

	}

	wx->isb_mem[WX_ISB_VEC0] = 0;

	if (!(wx->pdev->msi_enabled))

		wr32(wx, WX_PX_INTA, 1);



	/* would disable interrupts here but it is auto disabled */

	q_vector = wx->q_vector[0];

	napi_schedule_irqoff(&q_vector->napi);



	return IRQ_WAKE_THREAD;

}



static irqreturn_t txgbe_misc_irq_thread_fn(int irq, void *data)

{

	struct txgbe *txgbe = data;

	struct wx *wx = txgbe->wx;
@@ -223,6 +187,7 @@ void txgbe_free_misc_irq(struct txgbe *txgbe) 


int txgbe_setup_misc_irq(struct txgbe *txgbe)

{

	unsigned long flags = IRQF_ONESHOT;

	struct wx *wx = txgbe->wx;

	int hwirq, err;
@@ -236,14 +201,17 @@ int txgbe_setup_misc_irq(struct txgbe *txgbe) 
		irq_create_mapping(txgbe->misc.domain, hwirq);



	txgbe->misc.chip = txgbe_irq_chip;

	if (wx->pdev->msix_enabled)

	if (wx->pdev->msix_enabled) {

		txgbe->misc.irq = wx->msix_entry->vector;

	else

	} else {

		txgbe->misc.irq = wx->pdev->irq;

		if (!wx->pdev->msi_enabled)

			flags |= IRQF_SHARED;

	}



	err = request_threaded_irq(txgbe->misc.irq, NULL,

				   txgbe_misc_irq_handle,

				   IRQF_ONESHOT,

	err = request_threaded_irq(txgbe->misc.irq, txgbe_misc_irq_handle,

				   txgbe_misc_irq_thread_fn,

				   flags,

				   wx->netdev->name, txgbe);

	if (err)

		goto del_misc_irq;
@@ -256,6 +224,8 @@ int txgbe_setup_misc_irq(struct txgbe *txgbe) 
	if (err)

		goto free_gpio_irq;



	wx->misc_irq_domain = true;



	return 0;



free_gpio_irq: