Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reorder some code to reduce diff between ixgbe_legacy_irq() and

Browse Source 
ixgbe_msix_admin. No functional change intended.
This commit is contained in:
msaitoh 2020-12-24 10:37:47 +00:00
parent 075e01eaf1
commit 5c87288a34
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sys/dev/pci/ixgbe/ixgbe.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ixgbe.c,v 1.265 2020/12/24 10:00:36 msaitoh Exp $ */
/* $NetBSD: ixgbe.c,v 1.266 2020/12/24 10:37:47 msaitoh Exp $ */
/******************************************************************************
@ -3108,6 +3108,12 @@ ixgbe_msix_admin(void *arg)
/* Clear all OTHER interrupts with write */
IXGBE_WRITE_REG(hw, IXGBE_EICR, eicr);
/* Link status change */
if (eicr & IXGBE_EICR_LSC) {
IXGBE_WRITE_REG(hw, IXGBE_EIMC, IXGBE_EIMC_LSC);
task_requests |= IXGBE_REQUEST_TASK_LSC;
}
if (ixgbe_is_sfp(hw)) {
/* Pluggable optics-related interrupt */
if (hw->mac.type >= ixgbe_mac_X540)
@ -3136,12 +3142,6 @@ ixgbe_msix_admin(void *arg)
}
}
/* Link status change */
if (eicr & IXGBE_EICR_LSC) {
IXGBE_WRITE_REG(hw, IXGBE_EIMC, IXGBE_EIMC_LSC);
task_requests |= IXGBE_REQUEST_TASK_LSC;
}
if (adapter->hw.mac.type != ixgbe_mac_82598EB) {
if ((adapter->feat_en & IXGBE_FEATURE_FDIR) &&
(eicr & IXGBE_EICR_FLOW_DIR)) {
@ -5207,11 +5207,9 @@ ixgbe_legacy_irq(void *arg)
IXGBE_TX_UNLOCK(txr);
}
/* Check for fan failure */
if (adapter->feat_en & IXGBE_FEATURE_FAN_FAIL) {
ixgbe_check_fan_failure(adapter, eicr, true);
IXGBE_WRITE_REG(hw, IXGBE_EICR, IXGBE_EICR_GPI_SDP1_BY_MAC(hw));
}
/* Link status change */
if (eicr & IXGBE_EICR_LSC)
task_requests |= IXGBE_REQUEST_TASK_LSC;
if (ixgbe_is_sfp(hw)) {
/* Pluggable optics-related interrupt */
@ -5241,9 +5239,11 @@ ixgbe_legacy_irq(void *arg)
}
}
/* Link status change */
if (eicr & IXGBE_EICR_LSC)
task_requests |= IXGBE_REQUEST_TASK_LSC;
/* Check for fan failure */
if (adapter->feat_en & IXGBE_FEATURE_FAN_FAIL) {
ixgbe_check_fan_failure(adapter, eicr, true);
IXGBE_WRITE_REG(hw, IXGBE_EICR, IXGBE_EICR_GPI_SDP1_BY_MAC(hw));
}
/* External PHY interrupt */
if ((hw->phy.type == ixgbe_phy_x550em_ext_t) &&