Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next (7f83560d) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/net/ethernet/intel/e100.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1759,6 +1759,7 @@ static void e100_xmit_prepare(struct nic nic, struct cb cb,
	skb->data, skb->len, PCI_DMA_TODEVICE));		skb->data, skb->len, PCI_DMA_TODEVICE));
	/* check for mapping failure? */		/* check for mapping failure? */
	cb->u.tcb.tbd.size = cpu_to_le16(skb->len);		cb->u.tcb.tbd.size = cpu_to_le16(skb->len);
			skb_tx_timestamp(skb);
	}		}

	static netdev_tx_t e100_xmit_frame(struct sk_buff *skb,		static netdev_tx_t e100_xmit_frame(struct sk_buff *skb,
	@@ -2733,6 +2734,7 @@ static const struct ethtool_ops e100_ethtool_ops = {
	.set_phys_id = e100_set_phys_id,		.set_phys_id = e100_set_phys_id,
	.get_ethtool_stats = e100_get_ethtool_stats,		.get_ethtool_stats = e100_get_ethtool_stats,
	.get_sset_count = e100_get_sset_count,		.get_sset_count = e100_get_sset_count,
			.get_ts_info = ethtool_op_get_ts_info,
	};		};

	static int e100_do_ioctl(struct net_device netdev, struct ifreq ifr, int cmd)		static int e100_do_ioctl(struct net_device netdev, struct ifreq ifr, int cmd)

drivers/net/ethernet/intel/e1000e/80003es2lan.c

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -228,9 +228,7 @@ static s32 e1000_init_mac_params_80003es2lan(struct e1000_hw *hw)
	/* FWSM register */		/* FWSM register */
	mac->has_fwsm = true;		mac->has_fwsm = true;
	/* ARC supported; valid only if manageability features are enabled. */		/* ARC supported; valid only if manageability features are enabled. */
	mac->arc_subsystem_valid =		mac->arc_subsystem_valid = !!(er32(FWSM) & E1000_FWSM_MODE_MASK);
	(er32(FWSM) & E1000_FWSM_MODE_MASK)
	? true : false;
	/* Adaptive IFS not supported */		/* Adaptive IFS not supported */
	mac->adaptive_ifs = false;		mac->adaptive_ifs = false;

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

+4 −5

Original line number	Original line	Diff line number	Diff line
	@@ -295,9 +295,8 @@ static s32 e1000_init_mac_params_82571(struct e1000_hw *hw)
	* ARC supported; valid only if manageability features are		* ARC supported; valid only if manageability features are
	* enabled.		* enabled.
	*/		*/
	mac->arc_subsystem_valid =		mac->arc_subsystem_valid = !!(er32(FWSM) &
	(er32(FWSM) & E1000_FWSM_MODE_MASK)		E1000_FWSM_MODE_MASK);
	? true : false;
	break;		break;
	case e1000_82574:		case e1000_82574:
	case e1000_82583:		case e1000_82583:
	@@ -798,7 +797,7 @@ static s32 e1000_update_nvm_checksum_82571(struct e1000_hw *hw)
	/* Check for pending operations. */		/* Check for pending operations. */
	for (i = 0; i < E1000_FLASH_UPDATES; i++) {		for (i = 0; i < E1000_FLASH_UPDATES; i++) {
	usleep_range(1000, 2000);		usleep_range(1000, 2000);
	if ((er32(EECD) & E1000_EECD_FLUPD) == 0)		if (!(er32(EECD) & E1000_EECD_FLUPD))
	break;		break;
	}		}

	@@ -822,7 +821,7 @@ static s32 e1000_update_nvm_checksum_82571(struct e1000_hw *hw)

	for (i = 0; i < E1000_FLASH_UPDATES; i++) {		for (i = 0; i < E1000_FLASH_UPDATES; i++) {
	usleep_range(1000, 2000);		usleep_range(1000, 2000);
	if ((er32(EECD) & E1000_EECD_FLUPD) == 0)		if (!(er32(EECD) & E1000_EECD_FLUPD))
	break;		break;
	}		}

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

+8 −11

Original line number	Original line	Diff line number	Diff line
	@@ -259,8 +259,7 @@ static int e1000_set_settings(struct net_device *netdev,
	* cannot be changed		* cannot be changed
	*/		*/
	if (hw->phy.ops.check_reset_block(hw)) {		if (hw->phy.ops.check_reset_block(hw)) {
	e_err("Cannot change link characteristics when SoL/IDER is "		e_err("Cannot change link characteristics when SoL/IDER is active.\n");
	"active.\n");
	return -EINVAL;		return -EINVAL;
	}		}

	@@ -727,9 +726,8 @@ static bool reg_pattern_test(struct e1000_adapter adapter, u64 data,
	(test[pat] & write));		(test[pat] & write));
	val = E1000_READ_REG_ARRAY(&adapter->hw, reg, offset);		val = E1000_READ_REG_ARRAY(&adapter->hw, reg, offset);
	if (val != (test[pat] & write & mask)) {		if (val != (test[pat] & write & mask)) {
	e_err("pattern test reg %04X failed: got 0x%08X "		e_err("pattern test reg %04X failed: got 0x%08X expected 0x%08X\n",
	"expected 0x%08X\n", reg + offset, val,		reg + offset, val, (test[pat] & write & mask));
	(test[pat] & write & mask));
	*data = reg;		*data = reg;
	return 1;		return 1;
	}		}
	@@ -744,8 +742,8 @@ static bool reg_set_and_check(struct e1000_adapter adapter, u64 data,
	__ew32(&adapter->hw, reg, write & mask);		__ew32(&adapter->hw, reg, write & mask);
	val = __er32(&adapter->hw, reg);		val = __er32(&adapter->hw, reg);
	if ((write & mask) != (val & mask)) {		if ((write & mask) != (val & mask)) {
	e_err("set/check reg %04X test failed: got 0x%08X "		e_err("set/check reg %04X test failed: got 0x%08X expected 0x%08X\n",
	"expected 0x%08X\n", reg, (val & mask), (write & mask));		reg, (val & mask), (write & mask));
	*data = reg;		*data = reg;
	return 1;		return 1;
	}		}
	@@ -797,8 +795,8 @@ static int e1000_reg_test(struct e1000_adapter adapter, u64 data)
	ew32(STATUS, toggle);		ew32(STATUS, toggle);
	after = er32(STATUS) & toggle;		after = er32(STATUS) & toggle;
	if (value != after) {		if (value != after) {
	e_err("failed STATUS register test got: 0x%08X expected: "		e_err("failed STATUS register test got: 0x%08X expected: 0x%08X\n",
	"0x%08X\n", after, value);		after, value);
	*data = 1;		*data = 1;
	return 1;		return 1;
	}		}
	@@ -1791,8 +1789,7 @@ static void e1000_get_wol(struct net_device *netdev,
	wol->supported &= ~WAKE_UCAST;		wol->supported &= ~WAKE_UCAST;

	if (adapter->wol & E1000_WUFC_EX)		if (adapter->wol & E1000_WUFC_EX)
	e_err("Interface does not support directed (unicast) "		e_err("Interface does not support directed (unicast) frame wake-up packets\n");
	"frame wake-up packets\n");
	}		}

	if (adapter->wol & E1000_WUFC_EX)		if (adapter->wol & E1000_WUFC_EX)

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

+13 −13

Original line number	Original line	Diff line number	Diff line
	@@ -2212,7 +2212,7 @@ static s32 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw)
	hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);		hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);

	/* Check if the flash descriptor is valid */		/* Check if the flash descriptor is valid */
	if (hsfsts.hsf_status.fldesvalid == 0) {		if (!hsfsts.hsf_status.fldesvalid) {
	e_dbg("Flash descriptor invalid. SW Sequencing must be used.\n");		e_dbg("Flash descriptor invalid. SW Sequencing must be used.\n");
	return -E1000_ERR_NVM;		return -E1000_ERR_NVM;
	}		}
	@@ -2232,7 +2232,7 @@ static s32 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw)
	* completed.		* completed.
	*/		*/

	if (hsfsts.hsf_status.flcinprog == 0) {		if (!hsfsts.hsf_status.flcinprog) {
	/*		/*
	* There is no cycle running at present,		* There is no cycle running at present,
	* so we can start a cycle.		* so we can start a cycle.
	@@ -2250,7 +2250,7 @@ static s32 e1000_flash_cycle_init_ich8lan(struct e1000_hw *hw)
	*/		*/
	for (i = 0; i < ICH_FLASH_READ_COMMAND_TIMEOUT; i++) {		for (i = 0; i < ICH_FLASH_READ_COMMAND_TIMEOUT; i++) {
	hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);		hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);
	if (hsfsts.hsf_status.flcinprog == 0) {		if (!hsfsts.hsf_status.flcinprog) {
	ret_val = 0;		ret_val = 0;
	break;		break;
	}		}
	@@ -2292,12 +2292,12 @@ static s32 e1000_flash_cycle_ich8lan(struct e1000_hw *hw, u32 timeout)
	/* wait till FDONE bit is set to 1 */		/* wait till FDONE bit is set to 1 */
	do {		do {
	hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);		hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);
	if (hsfsts.hsf_status.flcdone == 1)		if (hsfsts.hsf_status.flcdone)
	break;		break;
	udelay(1);		udelay(1);
	} while (i++ < timeout);		} while (i++ < timeout);

	if (hsfsts.hsf_status.flcdone == 1 && hsfsts.hsf_status.flcerr == 0)		if (hsfsts.hsf_status.flcdone && !hsfsts.hsf_status.flcerr)
	return 0;		return 0;

	return -E1000_ERR_NVM;		return -E1000_ERR_NVM;
	@@ -2408,10 +2408,10 @@ static s32 e1000_read_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
	* ICH_FLASH_CYCLE_REPEAT_COUNT times.		* ICH_FLASH_CYCLE_REPEAT_COUNT times.
	*/		*/
	hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);		hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);
	if (hsfsts.hsf_status.flcerr == 1) {		if (hsfsts.hsf_status.flcerr) {
	/* Repeat for some time before giving up. */		/* Repeat for some time before giving up. */
	continue;		continue;
	} else if (hsfsts.hsf_status.flcdone == 0) {		} else if (!hsfsts.hsf_status.flcdone) {
	e_dbg("Timeout error - flash cycle did not complete.\n");		e_dbg("Timeout error - flash cycle did not complete.\n");
	break;		break;
	}		}
	@@ -2641,7 +2641,7 @@ static s32 e1000_validate_nvm_checksum_ich8lan(struct e1000_hw *hw)
	if (ret_val)		if (ret_val)
	return ret_val;		return ret_val;

	if ((data & 0x40) == 0) {		if (!(data & 0x40)) {
	data \|= 0x40;		data \|= 0x40;
	ret_val = e1000_write_nvm(hw, 0x19, 1, &data);		ret_val = e1000_write_nvm(hw, 0x19, 1, &data);
	if (ret_val)		if (ret_val)
	@@ -2759,10 +2759,10 @@ static s32 e1000_write_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
	* try...ICH_FLASH_CYCLE_REPEAT_COUNT times.		* try...ICH_FLASH_CYCLE_REPEAT_COUNT times.
	*/		*/
	hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);		hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);
	if (hsfsts.hsf_status.flcerr == 1)		if (hsfsts.hsf_status.flcerr)
	/* Repeat for some time before giving up. */		/* Repeat for some time before giving up. */
	continue;		continue;
	if (hsfsts.hsf_status.flcdone == 0) {		if (!hsfsts.hsf_status.flcdone) {
	e_dbg("Timeout error - flash cycle did not complete.\n");		e_dbg("Timeout error - flash cycle did not complete.\n");
	break;		break;
	}		}
	@@ -2914,10 +2914,10 @@ static s32 e1000_erase_flash_bank_ich8lan(struct e1000_hw *hw, u32 bank)
	* a few more times else Done		* a few more times else Done
	*/		*/
	hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);		hsfsts.regval = er16flash(ICH_FLASH_HSFSTS);
	if (hsfsts.hsf_status.flcerr == 1)		if (hsfsts.hsf_status.flcerr)
	/* repeat for some time before giving up */		/* repeat for some time before giving up */
	continue;		continue;
	else if (hsfsts.hsf_status.flcdone == 0)		else if (!hsfsts.hsf_status.flcdone)
	return ret_val;		return ret_val;
	} while (++count < ICH_FLASH_CYCLE_REPEAT_COUNT);		} while (++count < ICH_FLASH_CYCLE_REPEAT_COUNT);
	}		}
	@@ -3916,7 +3916,7 @@ static s32 e1000_get_cfg_done_ich8lan(struct e1000_hw *hw)

	/* If EEPROM is not marked present, init the IGP 3 PHY manually */		/* If EEPROM is not marked present, init the IGP 3 PHY manually */
	if (hw->mac.type <= e1000_ich9lan) {		if (hw->mac.type <= e1000_ich9lan) {
	if (((er32(EECD) & E1000_EECD_PRES) == 0) &&		if (!(er32(EECD) & E1000_EECD_PRES) &&
	(hw->phy.type == e1000_phy_igp_3)) {		(hw->phy.type == e1000_phy_igp_3)) {
	e1000e_phy_init_script_igp3(hw);		e1000e_phy_init_script_igp3(hw);
	}		}