Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebe61d80 authored by Yuval Mintz's avatar Yuval Mintz Committed by David S. Miller
Browse files

bnx2x: Clean previous IGU status before ack 



When enabling interrupts, acknowledge the interrupt only
after configuring the IGU to the correct interrupt mode
(otherwise it would dirty selftests)

Signed-off-by: default avatarYuval Mintz <yuvalmin@broadcom.com>
Signed-off-by: default avatarAriel Elior <ariele@broadcom.com>
Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 823e1d90

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

+0 −1
Original line number Diff line number Diff line
@@ -1681,7 +1681,6 @@ static int bnx2x_setup_irqs(struct bnx2x *bp) 
		if (rc)

			return rc;

	} else {

		bnx2x_ack_int(bp);

		rc = bnx2x_req_irq(bp);

		if (rc) {

			BNX2X_ERR("IRQ request failed  rc %d, aborting\n", rc);

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

+11 −6
Original line number Diff line number Diff line
@@ -1539,26 +1539,31 @@ static void bnx2x_igu_int_enable(struct bnx2x *bp) 
	if (msix) {

		val &= ~(IGU_PF_CONF_INT_LINE_EN |

			 IGU_PF_CONF_SINGLE_ISR_EN);

		val |= (IGU_PF_CONF_FUNC_EN |

			IGU_PF_CONF_MSI_MSIX_EN |

		val |= (IGU_PF_CONF_MSI_MSIX_EN |

			IGU_PF_CONF_ATTN_BIT_EN);



		if (single_msix)

			val |= IGU_PF_CONF_SINGLE_ISR_EN;

	} else if (msi) {

		val &= ~IGU_PF_CONF_INT_LINE_EN;

		val |= (IGU_PF_CONF_FUNC_EN |

			IGU_PF_CONF_MSI_MSIX_EN |

		val |= (IGU_PF_CONF_MSI_MSIX_EN |

			IGU_PF_CONF_ATTN_BIT_EN |

			IGU_PF_CONF_SINGLE_ISR_EN);

	} else {

		val &= ~IGU_PF_CONF_MSI_MSIX_EN;

		val |= (IGU_PF_CONF_FUNC_EN |

			IGU_PF_CONF_INT_LINE_EN |

		val |= (IGU_PF_CONF_INT_LINE_EN |

			IGU_PF_CONF_ATTN_BIT_EN |

			IGU_PF_CONF_SINGLE_ISR_EN);

	}



	/* Clean previous status - need to configure igu prior to ack*/

	if ((!msix) || single_msix) {

		REG_WR(bp, IGU_REG_PF_CONFIGURATION, val);

		bnx2x_ack_int(bp);

	}



	val |= IGU_PF_CONF_FUNC_EN;



	DP(NETIF_MSG_IFUP, "write 0x%x to IGU  mode %s\n",

	   val, (msix ? "MSI-X" : (msi ? "MSI" : "INTx")));