Commit 3bb99fe2 authored by Bruce Allan's avatar Bruce Allan Committed by David S. Miller

e1000e: consolidate two dbug macros into one simpler one

This patch depends on a previous one that cleans up redundant #includes.
Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d8014dbc
...@@ -309,7 +309,7 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter) ...@@ -309,7 +309,7 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter)
* indicates that the bootagent or EFI code has * indicates that the bootagent or EFI code has
* improperly left this bit enabled * improperly left this bit enabled
*/ */
hw_dbg(hw, "Please update your 82571 Bootagent\n"); e_dbg("Please update your 82571 Bootagent\n");
} }
ew32(SWSM, swsm & ~E1000_SWSM_SMBI); ew32(SWSM, swsm & ~E1000_SWSM_SMBI);
} }
...@@ -483,7 +483,7 @@ static s32 e1000_get_hw_semaphore_82571(struct e1000_hw *hw) ...@@ -483,7 +483,7 @@ static s32 e1000_get_hw_semaphore_82571(struct e1000_hw *hw)
} }
if (i == sw_timeout) { if (i == sw_timeout) {
hw_dbg(hw, "Driver can't access device - SMBI bit is set.\n"); e_dbg("Driver can't access device - SMBI bit is set.\n");
hw->dev_spec.e82571.smb_counter++; hw->dev_spec.e82571.smb_counter++;
} }
/* Get the FW semaphore. */ /* Get the FW semaphore. */
...@@ -501,7 +501,7 @@ static s32 e1000_get_hw_semaphore_82571(struct e1000_hw *hw) ...@@ -501,7 +501,7 @@ static s32 e1000_get_hw_semaphore_82571(struct e1000_hw *hw)
if (i == fw_timeout) { if (i == fw_timeout) {
/* Release semaphores */ /* Release semaphores */
e1000_put_hw_semaphore_82571(hw); e1000_put_hw_semaphore_82571(hw);
hw_dbg(hw, "Driver can't access the NVM\n"); e_dbg("Driver can't access the NVM\n");
return -E1000_ERR_NVM; return -E1000_ERR_NVM;
} }
...@@ -708,7 +708,7 @@ static s32 e1000_write_nvm_eewr_82571(struct e1000_hw *hw, u16 offset, ...@@ -708,7 +708,7 @@ static s32 e1000_write_nvm_eewr_82571(struct e1000_hw *hw, u16 offset,
*/ */
if ((offset >= nvm->word_size) || (words > (nvm->word_size - offset)) || if ((offset >= nvm->word_size) || (words > (nvm->word_size - offset)) ||
(words == 0)) { (words == 0)) {
hw_dbg(hw, "nvm parameter(s) out of bounds\n"); e_dbg("nvm parameter(s) out of bounds\n");
return -E1000_ERR_NVM; return -E1000_ERR_NVM;
} }
...@@ -749,7 +749,7 @@ static s32 e1000_get_cfg_done_82571(struct e1000_hw *hw) ...@@ -749,7 +749,7 @@ static s32 e1000_get_cfg_done_82571(struct e1000_hw *hw)
timeout--; timeout--;
} }
if (!timeout) { if (!timeout) {
hw_dbg(hw, "MNG configuration cycle has not completed.\n"); e_dbg("MNG configuration cycle has not completed.\n");
return -E1000_ERR_RESET; return -E1000_ERR_RESET;
} }
...@@ -848,9 +848,9 @@ static s32 e1000_reset_hw_82571(struct e1000_hw *hw) ...@@ -848,9 +848,9 @@ static s32 e1000_reset_hw_82571(struct e1000_hw *hw)
*/ */
ret_val = e1000e_disable_pcie_master(hw); ret_val = e1000e_disable_pcie_master(hw);
if (ret_val) if (ret_val)
hw_dbg(hw, "PCI-E Master disable polling has failed.\n"); e_dbg("PCI-E Master disable polling has failed.\n");
hw_dbg(hw, "Masking off all interrupts\n"); e_dbg("Masking off all interrupts\n");
ew32(IMC, 0xffffffff); ew32(IMC, 0xffffffff);
ew32(RCTL, 0); ew32(RCTL, 0);
...@@ -889,7 +889,7 @@ static s32 e1000_reset_hw_82571(struct e1000_hw *hw) ...@@ -889,7 +889,7 @@ static s32 e1000_reset_hw_82571(struct e1000_hw *hw)
ctrl = er32(CTRL); ctrl = er32(CTRL);
hw_dbg(hw, "Issuing a global reset to MAC\n"); e_dbg("Issuing a global reset to MAC\n");
ew32(CTRL, ctrl | E1000_CTRL_RST); ew32(CTRL, ctrl | E1000_CTRL_RST);
if (hw->nvm.type == e1000_nvm_flash_hw) { if (hw->nvm.type == e1000_nvm_flash_hw) {
...@@ -955,12 +955,12 @@ static s32 e1000_init_hw_82571(struct e1000_hw *hw) ...@@ -955,12 +955,12 @@ static s32 e1000_init_hw_82571(struct e1000_hw *hw)
/* Initialize identification LED */ /* Initialize identification LED */
ret_val = e1000e_id_led_init(hw); ret_val = e1000e_id_led_init(hw);
if (ret_val) { if (ret_val) {
hw_dbg(hw, "Error initializing identification LED\n"); e_dbg("Error initializing identification LED\n");
return ret_val; return ret_val;
} }
/* Disabling VLAN filtering */ /* Disabling VLAN filtering */
hw_dbg(hw, "Initializing the IEEE VLAN\n"); e_dbg("Initializing the IEEE VLAN\n");
e1000e_clear_vfta(hw); e1000e_clear_vfta(hw);
/* Setup the receive address. */ /* Setup the receive address. */
...@@ -974,7 +974,7 @@ static s32 e1000_init_hw_82571(struct e1000_hw *hw) ...@@ -974,7 +974,7 @@ static s32 e1000_init_hw_82571(struct e1000_hw *hw)
e1000e_init_rx_addrs(hw, rar_count); e1000e_init_rx_addrs(hw, rar_count);
/* Zero out the Multicast HASH table */ /* Zero out the Multicast HASH table */
hw_dbg(hw, "Zeroing the MTA\n"); e_dbg("Zeroing the MTA\n");
for (i = 0; i < mac->mta_reg_count; i++) for (i = 0; i < mac->mta_reg_count; i++)
E1000_WRITE_REG_ARRAY(hw, E1000_MTA, i, 0); E1000_WRITE_REG_ARRAY(hw, E1000_MTA, i, 0);
...@@ -1383,7 +1383,7 @@ static s32 e1000_check_for_serdes_link_82571(struct e1000_hw *hw) ...@@ -1383,7 +1383,7 @@ static s32 e1000_check_for_serdes_link_82571(struct e1000_hw *hw)
*/ */
mac->serdes_link_state = mac->serdes_link_state =
e1000_serdes_link_autoneg_progress; e1000_serdes_link_autoneg_progress;
hw_dbg(hw, "AN_UP -> AN_PROG\n"); e_dbg("AN_UP -> AN_PROG\n");
} }
break; break;
...@@ -1401,7 +1401,7 @@ static s32 e1000_check_for_serdes_link_82571(struct e1000_hw *hw) ...@@ -1401,7 +1401,7 @@ static s32 e1000_check_for_serdes_link_82571(struct e1000_hw *hw)
(ctrl & ~E1000_CTRL_SLU)); (ctrl & ~E1000_CTRL_SLU));
mac->serdes_link_state = mac->serdes_link_state =
e1000_serdes_link_autoneg_progress; e1000_serdes_link_autoneg_progress;
hw_dbg(hw, "FORCED_UP -> AN_PROG\n"); e_dbg("FORCED_UP -> AN_PROG\n");
} }
break; break;
...@@ -1415,7 +1415,7 @@ static s32 e1000_check_for_serdes_link_82571(struct e1000_hw *hw) ...@@ -1415,7 +1415,7 @@ static s32 e1000_check_for_serdes_link_82571(struct e1000_hw *hw)
if (status & E1000_STATUS_LU) { if (status & E1000_STATUS_LU) {
mac->serdes_link_state = mac->serdes_link_state =
e1000_serdes_link_autoneg_complete; e1000_serdes_link_autoneg_complete;
hw_dbg(hw, "AN_PROG -> AN_UP\n"); e_dbg("AN_PROG -> AN_UP\n");
} else { } else {
/* /*
* Disable autoneg, force link up and * Disable autoneg, force link up and
...@@ -1430,12 +1430,12 @@ static s32 e1000_check_for_serdes_link_82571(struct e1000_hw *hw) ...@@ -1430,12 +1430,12 @@ static s32 e1000_check_for_serdes_link_82571(struct e1000_hw *hw)
ret_val = ret_val =
e1000e_config_fc_after_link_up(hw); e1000e_config_fc_after_link_up(hw);
if (ret_val) { if (ret_val) {
hw_dbg(hw, "Error config flow control\n"); e_dbg("Error config flow control\n");
break; break;
} }
mac->serdes_link_state = mac->serdes_link_state =
e1000_serdes_link_forced_up; e1000_serdes_link_forced_up;
hw_dbg(hw, "AN_PROG -> FORCED_UP\n"); e_dbg("AN_PROG -> FORCED_UP\n");
} }
mac->serdes_has_link = true; mac->serdes_has_link = true;
break; break;
...@@ -1450,14 +1450,14 @@ static s32 e1000_check_for_serdes_link_82571(struct e1000_hw *hw) ...@@ -1450,14 +1450,14 @@ static s32 e1000_check_for_serdes_link_82571(struct e1000_hw *hw)
(ctrl & ~E1000_CTRL_SLU)); (ctrl & ~E1000_CTRL_SLU));
mac->serdes_link_state = mac->serdes_link_state =
e1000_serdes_link_autoneg_progress; e1000_serdes_link_autoneg_progress;
hw_dbg(hw, "DOWN -> AN_PROG\n"); e_dbg("DOWN -> AN_PROG\n");
break; break;
} }
} else { } else {
if (!(rxcw & E1000_RXCW_SYNCH)) { if (!(rxcw & E1000_RXCW_SYNCH)) {
mac->serdes_has_link = false; mac->serdes_has_link = false;
mac->serdes_link_state = e1000_serdes_link_down; mac->serdes_link_state = e1000_serdes_link_down;
hw_dbg(hw, "ANYSTATE -> DOWN\n"); e_dbg("ANYSTATE -> DOWN\n");
} else { } else {
/* /*
* We have sync, and can tolerate one * We have sync, and can tolerate one
...@@ -1469,7 +1469,7 @@ static s32 e1000_check_for_serdes_link_82571(struct e1000_hw *hw) ...@@ -1469,7 +1469,7 @@ static s32 e1000_check_for_serdes_link_82571(struct e1000_hw *hw)
if (rxcw & E1000_RXCW_IV) { if (rxcw & E1000_RXCW_IV) {
mac->serdes_link_state = e1000_serdes_link_down; mac->serdes_link_state = e1000_serdes_link_down;
mac->serdes_has_link = false; mac->serdes_has_link = false;
hw_dbg(hw, "ANYSTATE -> DOWN\n"); e_dbg("ANYSTATE -> DOWN\n");
} }
} }
} }
...@@ -1491,7 +1491,7 @@ static s32 e1000_valid_led_default_82571(struct e1000_hw *hw, u16 *data) ...@@ -1491,7 +1491,7 @@ static s32 e1000_valid_led_default_82571(struct e1000_hw *hw, u16 *data)
ret_val = e1000_read_nvm(hw, NVM_ID_LED_SETTINGS, 1, data); ret_val = e1000_read_nvm(hw, NVM_ID_LED_SETTINGS, 1, data);
if (ret_val) { if (ret_val) {
hw_dbg(hw, "NVM Read Error\n"); e_dbg("NVM Read Error\n");
return ret_val; return ret_val;
} }
......
...@@ -48,9 +48,9 @@ struct e1000_info; ...@@ -48,9 +48,9 @@ struct e1000_info;
#ifdef DEBUG #ifdef DEBUG
#define e_dbg(format, arg...) \ #define e_dbg(format, arg...) \
e_printk(KERN_DEBUG , adapter, format, ## arg) e_printk(KERN_DEBUG , hw->adapter, format, ## arg)
#else #else
#define e_dbg(format, arg...) do { (void)(adapter); } while (0) #define e_dbg(format, arg...) do { (void)(hw); } while (0)
#endif #endif
#define e_err(format, arg...) \ #define e_err(format, arg...) \
......
...@@ -394,8 +394,7 @@ static s32 e1000_acquire_swfw_sync_80003es2lan(struct e1000_hw *hw, u16 mask) ...@@ -394,8 +394,7 @@ static s32 e1000_acquire_swfw_sync_80003es2lan(struct e1000_hw *hw, u16 mask)
} }
if (i == timeout) { if (i == timeout) {
hw_dbg(hw, e_dbg("Driver can't access resource, SW_FW_SYNC timeout.\n");
"Driver can't access resource, SW_FW_SYNC timeout.\n");
return -E1000_ERR_SWFW_SYNC; return -E1000_ERR_SWFW_SYNC;
} }
...@@ -597,7 +596,7 @@ static s32 e1000_get_cfg_done_80003es2lan(struct e1000_hw *hw) ...@@ -597,7 +596,7 @@ static s32 e1000_get_cfg_done_80003es2lan(struct e1000_hw *hw)
timeout--; timeout--;
} }
if (!timeout) { if (!timeout) {
hw_dbg(hw, "MNG configuration cycle has not completed.\n"); e_dbg("MNG configuration cycle has not completed.\n");
return -E1000_ERR_RESET; return -E1000_ERR_RESET;
} }
...@@ -630,7 +629,7 @@ static s32 e1000_phy_force_speed_duplex_80003es2lan(struct e1000_hw *hw) ...@@ -630,7 +629,7 @@ static s32 e1000_phy_force_speed_duplex_80003es2lan(struct e1000_hw *hw)
if (ret_val) if (ret_val)
return ret_val; return ret_val;
hw_dbg(hw, "GG82563 PSCR: %X\n", phy_data); e_dbg("GG82563 PSCR: %X\n", phy_data);
ret_val = e1e_rphy(hw, PHY_CONTROL, &phy_data); ret_val = e1e_rphy(hw, PHY_CONTROL, &phy_data);
if (ret_val) if (ret_val)
...@@ -648,7 +647,7 @@ static s32 e1000_phy_force_speed_duplex_80003es2lan(struct e1000_hw *hw) ...@@ -648,7 +647,7 @@ static s32 e1000_phy_force_speed_duplex_80003es2lan(struct e1000_hw *hw)
udelay(1); udelay(1);
if (hw->phy.autoneg_wait_to_complete) { if (hw->phy.autoneg_wait_to_complete) {
hw_dbg(hw, "Waiting for forced speed/duplex link " e_dbg("Waiting for forced speed/duplex link "
"on GG82563 phy.\n"); "on GG82563 phy.\n");
ret_val = e1000e_phy_has_link_generic(hw, PHY_FORCE_LIMIT, ret_val = e1000e_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
...@@ -771,9 +770,9 @@ static s32 e1000_reset_hw_80003es2lan(struct e1000_hw *hw) ...@@ -771,9 +770,9 @@ static s32 e1000_reset_hw_80003es2lan(struct e1000_hw *hw)
*/ */
ret_val = e1000e_disable_pcie_master(hw); ret_val = e1000e_disable_pcie_master(hw);
if (ret_val) if (ret_val)
hw_dbg(hw, "PCI-E Master disable polling has failed.\n"); e_dbg("PCI-E Master disable polling has failed.\n");
hw_dbg(hw, "Masking off all interrupts\n"); e_dbg("Masking off all interrupts\n");
ew32(IMC, 0xffffffff); ew32(IMC, 0xffffffff);
ew32(RCTL, 0); ew32(RCTL, 0);
...@@ -785,7 +784,7 @@ static s32 e1000_reset_hw_80003es2lan(struct e1000_hw *hw) ...@@ -785,7 +784,7 @@ static s32 e1000_reset_hw_80003es2lan(struct e1000_hw *hw)
ctrl = er32(CTRL); ctrl = er32(CTRL);
ret_val = e1000_acquire_phy_80003es2lan(hw); ret_val = e1000_acquire_phy_80003es2lan(hw);
hw_dbg(hw, "Issuing a global reset to MAC\n"); e_dbg("Issuing a global reset to MAC\n");
ew32(CTRL, ctrl | E1000_CTRL_RST); ew32(CTRL, ctrl | E1000_CTRL_RST);
e1000_release_phy_80003es2lan(hw); e1000_release_phy_80003es2lan(hw);
...@@ -820,19 +819,19 @@ static s32 e1000_init_hw_80003es2lan(struct e1000_hw *hw) ...@@ -820,19 +819,19 @@ static s32 e1000_init_hw_80003es2lan(struct e1000_hw *hw)
/* Initialize identification LED */ /* Initialize identification LED */
ret_val = e1000e_id_led_init(hw); ret_val = e1000e_id_led_init(hw);
if (ret_val) { if (ret_val) {
hw_dbg(hw, "Error initializing identification LED\n"); e_dbg("Error initializing identification LED\n");
return ret_val; return ret_val;
} }
/* Disabling VLAN filtering */ /* Disabling VLAN filtering */
hw_dbg(hw, "Initializing the IEEE VLAN\n"); e_dbg("Initializing the IEEE VLAN\n");
e1000e_clear_vfta(hw); e1000e_clear_vfta(hw);
/* Setup the receive address. */ /* Setup the receive address. */
e1000e_init_rx_addrs(hw, mac->rar_entry_count); e1000e_init_rx_addrs(hw, mac->rar_entry_count);
/* Zero out the Multicast HASH table */ /* Zero out the Multicast HASH table */
hw_dbg(hw, "Zeroing the MTA\n"); e_dbg("Zeroing the MTA\n");
for (i = 0; i < mac->mta_reg_count; i++) for (i = 0; i < mac->mta_reg_count; i++)
E1000_WRITE_REG_ARRAY(hw, E1000_MTA, i, 0); E1000_WRITE_REG_ARRAY(hw, E1000_MTA, i, 0);
...@@ -989,7 +988,7 @@ static s32 e1000_copper_link_setup_gg82563_80003es2lan(struct e1000_hw *hw) ...@@ -989,7 +988,7 @@ static s32 e1000_copper_link_setup_gg82563_80003es2lan(struct e1000_hw *hw)
/* SW Reset the PHY so all changes take effect */ /* SW Reset the PHY so all changes take effect */
ret_val = e1000e_commit_phy(hw); ret_val = e1000e_commit_phy(hw);
if (ret_val) { if (ret_val) {
hw_dbg(hw, "Error Resetting the PHY\n"); e_dbg("Error Resetting the PHY\n");
return ret_val; return ret_val;
} }
......
...@@ -925,15 +925,4 @@ struct e1000_hw { ...@@ -925,15 +925,4 @@ struct e1000_hw {
} dev_spec; } dev_spec;
}; };
#ifdef DEBUG
#define hw_dbg(hw, format, arg...) \
printk(KERN_DEBUG "%s: " format, e1000e_get_hw_dev_name(hw), ##arg)
#else
static inline int __attribute__ ((format (printf, 2, 3)))
hw_dbg(struct e1000_hw *hw, const char *format, ...)
{
return 0;
}
#endif
#endif #endif
This diff is collapsed.
This diff is collapsed.
...@@ -65,17 +65,6 @@ static const struct e1000_info *e1000_info_tbl[] = { ...@@ -65,17 +65,6 @@ static const struct e1000_info *e1000_info_tbl[] = {
[board_pchlan] = &e1000_pch_info, [board_pchlan] = &e1000_pch_info,
}; };
#ifdef DEBUG
/**
* e1000_get_hw_dev_name - return device name string
* used by hardware layer to print debugging information
**/
char *e1000e_get_hw_dev_name(struct e1000_hw *hw)
{
return hw->adapter->netdev->name;
}
#endif
/** /**
* e1000_desc_unused - calculate if we have unused descriptors * e1000_desc_unused - calculate if we have unused descriptors
**/ **/
...@@ -415,6 +404,7 @@ static bool e1000_clean_rx_irq(struct e1000_adapter *adapter, ...@@ -415,6 +404,7 @@ static bool e1000_clean_rx_irq(struct e1000_adapter *adapter,
{ {
struct net_device *netdev = adapter->netdev; struct net_device *netdev = adapter->netdev;
struct pci_dev *pdev = adapter->pdev; struct pci_dev *pdev = adapter->pdev;
struct e1000_hw *hw = &adapter->hw;
struct e1000_ring *rx_ring = adapter->rx_ring; struct e1000_ring *rx_ring = adapter->rx_ring;
struct e1000_rx_desc *rx_desc, *next_rxd; struct e1000_rx_desc *rx_desc, *next_rxd;
struct e1000_buffer *buffer_info, *next_buffer; struct e1000_buffer *buffer_info, *next_buffer;
...@@ -464,8 +454,7 @@ static bool e1000_clean_rx_irq(struct e1000_adapter *adapter, ...@@ -464,8 +454,7 @@ static bool e1000_clean_rx_irq(struct e1000_adapter *adapter,
* packet, also make sure the frame isn't just CRC only */ * packet, also make sure the frame isn't just CRC only */
if (!(status & E1000_RXD_STAT_EOP) || (length <= 4)) { if (!(status & E1000_RXD_STAT_EOP) || (length <= 4)) {
/* All receives must fit into a single buffer */ /* All receives must fit into a single buffer */
e_dbg("%s: Receive packet consumed multiple buffers\n", e_dbg("Receive packet consumed multiple buffers\n");
netdev->name);
/* recycle */ /* recycle */
buffer_info->skb = skb; buffer_info->skb = skb;
goto next_desc; goto next_desc;
...@@ -682,6 +671,7 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter) ...@@ -682,6 +671,7 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter)
static bool e1000_clean_rx_irq_ps(struct e1000_adapter *adapter, static bool e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,
int *work_done, int work_to_do) int *work_done, int work_to_do)
{ {
struct e1000_hw *hw = &adapter->hw;
union e1000_rx_desc_packet_split *rx_desc, *next_rxd; union e1000_rx_desc_packet_split *rx_desc, *next_rxd;
struct net_device *netdev = adapter->netdev; struct net_device *netdev = adapter->netdev;
struct pci_dev *pdev = adapter->pdev; struct pci_dev *pdev = adapter->pdev;
...@@ -725,8 +715,8 @@ static bool e1000_clean_rx_irq_ps(struct e1000_adapter *adapter, ...@@ -725,8 +715,8 @@ static bool e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,
buffer_info->dma = 0; buffer_info->dma = 0;
if (!(staterr & E1000_RXD_STAT_EOP)) { if (!(staterr & E1000_RXD_STAT_EOP)) {
e_dbg("%s: Packet Split buffers didn't pick up the " e_dbg("Packet Split buffers didn't pick up the full "
"full packet\n", netdev->name); "packet\n");
dev_kfree_skb_irq(skb); dev_kfree_skb_irq(skb);
goto next_desc; goto next_desc;
} }
...@@ -739,8 +729,8 @@ static bool e1000_clean_rx_irq_ps(struct e1000_adapter *adapter, ...@@ -739,8 +729,8 @@ static bool e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,
length = le16_to_cpu(rx_desc->wb.middle.length0); length = le16_to_cpu(rx_desc->wb.middle.length0);
if (!length) { if (!length) {
e_dbg("%s: Last part of the packet spanning multiple " e_dbg("Last part of the packet spanning multiple "
"descriptors\n", netdev->name); "descriptors\n");
dev_kfree_skb_irq(skb); dev_kfree_skb_irq(skb);
goto next_desc; goto next_desc;
} }
...@@ -2931,7 +2921,7 @@ static irqreturn_t e1000_intr_msi_test(int irq, void *data) ...@@ -2931,7 +2921,7 @@ static irqreturn_t e1000_intr_msi_test(int irq, void *data)
struct e1000_hw *hw = &adapter->hw; struct e1000_hw *hw = &adapter->hw;
u32 icr = er32(ICR); u32 icr = er32(ICR);
e_dbg("%s: icr is %08X\n", netdev->name, icr); e_dbg("icr is %08X\n", icr);
if (icr & E1000_ICR_RXSEQ) { if (icr & E1000_ICR_RXSEQ) {
adapter->flags &= ~FLAG_MSI_TEST_FAILED; adapter->flags &= ~FLAG_MSI_TEST_FAILED;
wmb(); wmb();
...@@ -3001,7 +2991,7 @@ static int e1000_test_msi_interrupt(struct e1000_adapter *adapter) ...@@ -3001,7 +2991,7 @@ static int e1000_test_msi_interrupt(struct e1000_adapter *adapter)
goto msi_test_failed; goto msi_test_failed;
/* okay so the test worked, restore settings */ /* okay so the test worked, restore settings */
e_dbg("%s: MSI interrupt test succeeded!\n", netdev->name); e_dbg("MSI interrupt test succeeded!\n");
msi_test_failed: msi_test_failed:
e1000e_set_interrupt_capability(adapter); e1000e_set_interrupt_capability(adapter);
e1000_request_irq(adapter); e1000_request_irq(adapter);
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment