Commit d773b795 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue 



Tony Nguyen says:

====================
1GbE Intel Wired LAN Driver Updates 2021-03-19

This series contains updates to igc and e1000e drivers.

Sasha removes unused defines in igc driver.

Jiapeng Zhong changes bool assignments from 0/1 to false/true for igc.

Wei Yongjun marks e1000e_pm_prepare() as __maybe_unused to resolve a
defined but not used warning under certain configurations.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 919067cc f2d75b17

drivers/net/ethernet/intel/e1000e/netdev.c

+1 −1
Original line number Diff line number Diff line
@@ -6919,7 +6919,7 @@ static int __e1000_resume(struct pci_dev *pdev) 
	return 0;

}



static int e1000e_pm_prepare(struct device *dev)

static __maybe_unused int e1000e_pm_prepare(struct device *dev)

{

	return pm_runtime_suspended(dev) &&

		pm_suspend_via_firmware();

drivers/net/ethernet/intel/igc/igc_defines.h

+0 −5
Original line number Diff line number Diff line
@@ -441,11 +441,6 @@ 
#define MII_CR_RESTART_AUTO_NEG	0x0200  /* Restart auto negotiation */

#define MII_CR_POWER_DOWN	0x0800  /* Power down */

#define MII_CR_AUTO_NEG_EN	0x1000  /* Auto Neg Enable */

#define MII_CR_LOOPBACK		0x4000  /* 0 = normal, 1 = loopback */

#define MII_CR_RESET		0x8000  /* 0 = normal, 1 = PHY reset */

#define MII_CR_SPEED_1000	0x0040

#define MII_CR_SPEED_100	0x2000

#define MII_CR_SPEED_10		0x0000



/* PHY Status Register */

#define MII_SR_LINK_STATUS	0x0004 /* Link Status 1 = link */

drivers/net/ethernet/intel/igc/igc_main.c

+8 −8
Original line number Diff line number Diff line
@@ -3580,7 +3580,7 @@ void igc_up(struct igc_adapter *adapter) 
	netif_tx_start_all_queues(adapter->netdev);



	/* start the watchdog. */

	hw->mac.get_link_status = 1;

	hw->mac.get_link_status = true;

	schedule_work(&adapter->watchdog_task);

}
@@ -4000,7 +4000,7 @@ static irqreturn_t igc_msix_other(int irq, void *data) 
	}



	if (icr & IGC_ICR_LSC) {

		hw->mac.get_link_status = 1;

		hw->mac.get_link_status = true;

		/* guard against interrupt when we're going down */

		if (!test_bit(__IGC_DOWN, &adapter->state))

			mod_timer(&adapter->watchdog_timer, jiffies + 1);
@@ -4378,7 +4378,7 @@ static irqreturn_t igc_intr_msi(int irq, void *data) 
	}



	if (icr & (IGC_ICR_RXSEQ | IGC_ICR_LSC)) {

		hw->mac.get_link_status = 1;

		hw->mac.get_link_status = true;

		if (!test_bit(__IGC_DOWN, &adapter->state))

			mod_timer(&adapter->watchdog_timer, jiffies + 1);

	}
@@ -4420,7 +4420,7 @@ static irqreturn_t igc_intr(int irq, void *data) 
	}



	if (icr & (IGC_ICR_RXSEQ | IGC_ICR_LSC)) {

		hw->mac.get_link_status = 1;

		hw->mac.get_link_status = true;

		/* guard against interrupt when we're going down */

		if (!test_bit(__IGC_DOWN, &adapter->state))

			mod_timer(&adapter->watchdog_timer, jiffies + 1);
@@ -4574,7 +4574,7 @@ static int __igc_open(struct net_device *netdev, bool resuming) 
	netif_tx_start_all_queues(netdev);



	/* start the watchdog. */

	hw->mac.get_link_status = 1;

	hw->mac.get_link_status = true;

	schedule_work(&adapter->watchdog_task);



	return IGC_SUCCESS;
@@ -4915,7 +4915,7 @@ int igc_set_spd_dplx(struct igc_adapter *adapter, u32 spd, u8 dplx) 
{

	struct igc_mac_info *mac = &adapter->hw.mac;



	mac->autoneg = 0;

	mac->autoneg = false;



	/* Make sure dplx is at most 1 bit and lsb of speed is not set

	 * for the switch() below to work
@@ -4937,13 +4937,13 @@ int igc_set_spd_dplx(struct igc_adapter *adapter, u32 spd, u8 dplx) 
		mac->forced_speed_duplex = ADVERTISE_100_FULL;

		break;

	case SPEED_1000 + DUPLEX_FULL:

		mac->autoneg = 1;

		mac->autoneg = true;

		adapter->hw.phy.autoneg_advertised = ADVERTISE_1000_FULL;

		break;

	case SPEED_1000 + DUPLEX_HALF: /* not supported */

		goto err_inval;

	case SPEED_2500 + DUPLEX_FULL:

		mac->autoneg = 1;

		mac->autoneg = true;

		adapter->hw.phy.autoneg_advertised = ADVERTISE_2500_FULL;

		break;

	case SPEED_2500 + DUPLEX_HALF: /* not supported */