Commit 59c56342 authored by Jakub Kicinski's avatar Jakub Kicinski
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-05-26

Jesse Brandeburg says:

In this series I address the C=2 (sparse) warnings. The goal is to be
completely sparse clean in the drivers/net/ethernet/intel directory.
This can help us run this tool for every patch, and helps the kernel
code by reducing technical debt.

NOTE: there is one warning left in ixgbe XDP code using rcu_assign_pointer().

* '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue:
  ixgbe: reduce checker warnings
  ixgbe: use checker safe conversions
  igbvf: convert to strongly typed descriptors
  intel: call csum functions with well formatted arguments
  igb: override two checker warnings
  igb: fix assignment on big endian machines
  igb: handle vlan types with checker enabled
  igb/igc: use strongly typed pointer
  fm10k: move error check
  intel: remove checker warning
  e100: handle eeprom as little endian
====================

Link: https://lore.kernel.org/r/20210526172346.3515587-1-anthony.l.nguyen@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 18c8d304 205523bc

drivers/net/ethernet/intel/e100.c

+6 −6
Original line number Diff line number Diff line
@@ -1395,7 +1395,7 @@ static int e100_phy_check_without_mii(struct nic *nic) 
	u8 phy_type;

	int without_mii;



	phy_type = (nic->eeprom[eeprom_phy_iface] >> 8) & 0x0f;

	phy_type = (le16_to_cpu(nic->eeprom[eeprom_phy_iface]) >> 8) & 0x0f;



	switch (phy_type) {

	case NoSuchPhy: /* Non-MII PHY; UNTESTED! */
@@ -1515,7 +1515,7 @@ static int e100_phy_init(struct nic *nic) 
		mdio_write(netdev, nic->mii.phy_id, MII_BMCR, bmcr);

	} else if ((nic->mac >= mac_82550_D102) || ((nic->flags & ich) &&

	   (mdio_read(netdev, nic->mii.phy_id, MII_TPISTATUS) & 0x8000) &&

		(nic->eeprom[eeprom_cnfg_mdix] & eeprom_mdix_enabled))) {

	   (le16_to_cpu(nic->eeprom[eeprom_cnfg_mdix]) & eeprom_mdix_enabled))) {

		/* enable/disable MDI/MDI-X auto-switching. */

		mdio_write(netdev, nic->mii.phy_id, MII_NCONFIG,

				nic->mii.force_media ? 0 : NCONFIG_AUTO_SWITCH);
@@ -2269,9 +2269,9 @@ static int e100_asf(struct nic *nic) 
{

	/* ASF can be enabled from eeprom */

	return (nic->pdev->device >= 0x1050) && (nic->pdev->device <= 0x1057) &&

	   (nic->eeprom[eeprom_config_asf] & eeprom_asf) &&

	   !(nic->eeprom[eeprom_config_asf] & eeprom_gcl) &&

	   ((nic->eeprom[eeprom_smbus_addr] & 0xFF) != 0xFE);

	   (le16_to_cpu(nic->eeprom[eeprom_config_asf]) & eeprom_asf) &&

	   !(le16_to_cpu(nic->eeprom[eeprom_config_asf]) & eeprom_gcl) &&

	   ((le16_to_cpu(nic->eeprom[eeprom_smbus_addr]) & 0xFF) != 0xFE);

}



static int e100_up(struct nic *nic)
@@ -2926,7 +2926,7 @@ static int e100_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


	/* Wol magic packet can be enabled from eeprom */

	if ((nic->mac >= mac_82558_D101_A4) &&

	   (nic->eeprom[eeprom_id] & eeprom_id_wol)) {

	   (le16_to_cpu(nic->eeprom[eeprom_id]) & eeprom_id_wol)) {

		nic->flags |= wol_magic;

		device_set_wakeup_enable(&pdev->dev, true);

	}

drivers/net/ethernet/intel/e1000/e1000_ethtool.c

+1 −1
Original line number Diff line number Diff line
@@ -513,7 +513,7 @@ static int e1000_set_eeprom(struct net_device *netdev, 
	memcpy(ptr, bytes, eeprom->len);



	for (i = 0; i < last_word - first_word + 1; i++)

		eeprom_buff[i] = cpu_to_le16(eeprom_buff[i]);

		cpu_to_le16s(&eeprom_buff[i]);



	ret_val = e1000_write_eeprom(hw, first_word,

				     last_word - first_word + 1, eeprom_buff);

drivers/net/ethernet/intel/fm10k/fm10k_pci.c

+5 −5
Original line number Diff line number Diff line
@@ -1370,7 +1370,6 @@ static irqreturn_t fm10k_msix_mbx_pf(int __always_unused irq, void *data) 
	struct fm10k_hw *hw = &interface->hw;

	struct fm10k_mbx_info *mbx = &hw->mbx;

	u32 eicr;

	s32 err = 0;



	/* unmask any set bits related to this interrupt */

	eicr = fm10k_read_reg(hw, FM10K_EICR);
@@ -1386,15 +1385,16 @@ static irqreturn_t fm10k_msix_mbx_pf(int __always_unused irq, void *data) 


	/* service mailboxes */

	if (fm10k_mbx_trylock(interface)) {

		err = mbx->ops.process(hw, mbx);

		s32 err = mbx->ops.process(hw, mbx);



		if (err == FM10K_ERR_RESET_REQUESTED)

			set_bit(FM10K_FLAG_RESET_REQUESTED, interface->flags);



		/* handle VFLRE events */

		fm10k_iov_event(interface);

		fm10k_mbx_unlock(interface);

	}



	if (err == FM10K_ERR_RESET_REQUESTED)

		set_bit(FM10K_FLAG_RESET_REQUESTED, interface->flags);



	/* if switch toggled state we should reset GLORTs */

	if (eicr & FM10K_EICR_SWITCHNOTREADY) {

		/* force link down for at least 4 seconds */

drivers/net/ethernet/intel/igb/igb_ethtool.c

+1 −1
Original line number Diff line number Diff line
@@ -831,7 +831,7 @@ static int igb_set_eeprom(struct net_device *netdev, 
	memcpy(ptr, bytes, eeprom->len);



	for (i = 0; i < last_word - first_word + 1; i++)

		eeprom_buff[i] = cpu_to_le16(eeprom_buff[i]);

		cpu_to_le16s(&eeprom_buff[i]);



	ret_val = hw->nvm.ops.write(hw, first_word,

				    last_word - first_word + 1, eeprom_buff);

drivers/net/ethernet/intel/igb/igb_main.c

+6 −5
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ static void igb_dump(struct igb_adapter *adapter) 
	struct igb_reg_info *reginfo;

	struct igb_ring *tx_ring;

	union e1000_adv_tx_desc *tx_desc;

	struct my_u0 { u64 a; u64 b; } *u0;

	struct my_u0 { __le64 a; __le64 b; } *u0;

	struct igb_ring *rx_ring;

	union e1000_adv_rx_desc *rx_desc;

	u32 staterr;
@@ -2643,7 +2643,8 @@ static int igb_parse_cls_flower(struct igb_adapter *adapter, 
			}



			input->filter.match_flags |= IGB_FILTER_FLAG_VLAN_TCI;

			input->filter.vlan_tci = match.key->vlan_priority;

			input->filter.vlan_tci =

				(__force __be16)match.key->vlan_priority;

		}

	}
@@ -6275,12 +6276,12 @@ int igb_xmit_xdp_ring(struct igb_adapter *adapter, 
	cmd_type |= len | IGB_TXD_DCMD;

	tx_desc->read.cmd_type_len = cpu_to_le32(cmd_type);



	olinfo_status = cpu_to_le32(len << E1000_ADVTXD_PAYLEN_SHIFT);

	olinfo_status = len << E1000_ADVTXD_PAYLEN_SHIFT;

	/* 82575 requires a unique index per ring */

	if (test_bit(IGB_RING_FLAG_TX_CTX_IDX, &tx_ring->flags))

		olinfo_status |= tx_ring->reg_idx << 4;



	tx_desc->read.olinfo_status = olinfo_status;

	tx_desc->read.olinfo_status = cpu_to_le32(olinfo_status);



	netdev_tx_sent_queue(txring_txq(tx_ring), tx_buffer->bytecount);
@@ -8597,7 +8598,7 @@ static void igb_process_skb_fields(struct igb_ring *rx_ring, 


		if (igb_test_staterr(rx_desc, E1000_RXDEXT_STATERR_LB) &&

		    test_bit(IGB_RING_FLAG_RX_LB_VLAN_BSWAP, &rx_ring->flags))

			vid = be16_to_cpu(rx_desc->wb.upper.vlan);

			vid = be16_to_cpu((__force __be16)rx_desc->wb.upper.vlan);

		else

			vid = le16_to_cpu(rx_desc->wb.upper.vlan);