Attachment 227963 Details for Bug 258551 – Partial revert msi-x, unconditional re-arms

[patch] Partial revert msi-x, unconditional re-arms

igb-intrs (text/plain), 1.14 KB, created by Kevin Bowling on 2021-09-17 16:23:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kevin Bowling

Created: 2021-09-17 16:23:36 UTC

Size: 1.14 KB

patch

obsolete

>diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c
>index b533ee3962c2..86101210fe87 100644
>--- a/sys/dev/e1000/if_em.c
>+++ b/sys/dev/e1000/if_em.c
>@@ -1492,7 +1492,6 @@ em_msix_link(void *arg)
> {
> 	struct adapter *adapter = arg;
> 	u32 reg_icr;
>-	bool notlink = false;
> 
> 	++adapter->link_irq;
> 	MPASS(adapter->hw.back != NULL);
>@@ -1503,17 +1502,14 @@ em_msix_link(void *arg)
> 
> 	if (reg_icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC))
> 		em_handle_link(adapter->ctx);
>-	else
>-		notlink = true;
> 
>-	/* Re-arm for other/spurious interrupts */
>-	if (notlink && adapter->hw.mac.type >= igb_mac_min) {
>+	/* Re-arm unconditionally */
>+	if (adapter->hw.mac.type >= igb_mac_min) {
> 		E1000_WRITE_REG(&adapter->hw, E1000_IMS, E1000_IMS_LSC);
> 		E1000_WRITE_REG(&adapter->hw, E1000_EIMS, adapter->link_mask);
> 	} else if (adapter->hw.mac.type == e1000_82574) {
>-		if (notlink)
>-			E1000_WRITE_REG(&adapter->hw, E1000_IMS, E1000_IMS_LSC |
>-			    E1000_IMS_OTHER);
>+		E1000_WRITE_REG(&adapter->hw, E1000_IMS, E1000_IMS_LSC |
>+		    E1000_IMS_OTHER);
> 		/*
> 		 * Because we must read the ICR for this interrupt it may
> 		 * clear other causes using autoclear, for this reason we

Flags:

kbowling: maintainer-approval-

Actions: View | Diff

Attachments on bug 258551: 227954 | 227955 | 227963