Commit afa9e267 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:

====================
intel: use bitfield operations

Jesse Brandeburg says:

After repeatedly getting review comments on new patches, and sporadic
patches to fix parts of our drivers, we should just convert the Intel code
to use FIELD_PREP() and FIELD_GET().  It's then "common" in the code and
hopefully future change-sets will see the context and do-the-right-thing.

This conversion was done with a coccinelle script which is mentioned in the
commit messages. Generally there were only a couple conversions that were
"undone" after the automatic changes because they tried to convert a
non-contiguous mask.

Patch 1 is required at the beginning of this series to fix a "forever"
issue in the e1000e driver that fails the compilation test after conversion
because the shift / mask was out of range.

The second patch just adds all the new #includes in one go.

The patch titled: "ice: fix pre-shifted bit usage" is needed to allow the
use of the FIELD_* macros and fix up the unexpected "shifts included"
defines found while creating this series.

The rest are the conversion to use FIELD_PREP()/FIELD_GET(), and the
occasional leXX_{get,set,encode}_bits() call, as suggested by Alex.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 56794e53 6aa7ca3c

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

+20 −26
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
 * Shared functions for accessing and configuring the MAC

 */



#include <linux/bitfield.h>

#include "e1000.h"



static s32 e1000_check_downshift(struct e1000_hw *hw);
@@ -3260,8 +3261,7 @@ static s32 e1000_phy_igp_get_info(struct e1000_hw *hw, 
		return ret_val;



	phy_info->mdix_mode =

	    (e1000_auto_x_mode) ((phy_data & IGP01E1000_PSSR_MDIX) >>

				 IGP01E1000_PSSR_MDIX_SHIFT);

	    (e1000_auto_x_mode)FIELD_GET(IGP01E1000_PSSR_MDIX, phy_data);



	if ((phy_data & IGP01E1000_PSSR_SPEED_MASK) ==

	    IGP01E1000_PSSR_SPEED_1000MBPS) {
@@ -3272,11 +3272,11 @@ static s32 e1000_phy_igp_get_info(struct e1000_hw *hw, 
		if (ret_val)

			return ret_val;



		phy_info->local_rx = ((phy_data & SR_1000T_LOCAL_RX_STATUS) >>

				      SR_1000T_LOCAL_RX_STATUS_SHIFT) ?

		phy_info->local_rx = FIELD_GET(SR_1000T_LOCAL_RX_STATUS,

					       phy_data) ?

		    e1000_1000t_rx_status_ok : e1000_1000t_rx_status_not_ok;

		phy_info->remote_rx = ((phy_data & SR_1000T_REMOTE_RX_STATUS) >>

				       SR_1000T_REMOTE_RX_STATUS_SHIFT) ?

		phy_info->remote_rx = FIELD_GET(SR_1000T_REMOTE_RX_STATUS,

						phy_data) ?

		    e1000_1000t_rx_status_ok : e1000_1000t_rx_status_not_ok;



		/* Get cable length */
@@ -3326,14 +3326,12 @@ static s32 e1000_phy_m88_get_info(struct e1000_hw *hw, 
		return ret_val;



	phy_info->extended_10bt_distance =

	    ((phy_data & M88E1000_PSCR_10BT_EXT_DIST_ENABLE) >>

	     M88E1000_PSCR_10BT_EXT_DIST_ENABLE_SHIFT) ?

	    FIELD_GET(M88E1000_PSCR_10BT_EXT_DIST_ENABLE, phy_data) ?

	    e1000_10bt_ext_dist_enable_lower :

	    e1000_10bt_ext_dist_enable_normal;



	phy_info->polarity_correction =

	    ((phy_data & M88E1000_PSCR_POLARITY_REVERSAL) >>

	     M88E1000_PSCR_POLARITY_REVERSAL_SHIFT) ?

	    FIELD_GET(M88E1000_PSCR_POLARITY_REVERSAL, phy_data) ?

	    e1000_polarity_reversal_disabled : e1000_polarity_reversal_enabled;



	/* Check polarity status */
@@ -3347,27 +3345,25 @@ static s32 e1000_phy_m88_get_info(struct e1000_hw *hw, 
		return ret_val;



	phy_info->mdix_mode =

	    (e1000_auto_x_mode) ((phy_data & M88E1000_PSSR_MDIX) >>

				 M88E1000_PSSR_MDIX_SHIFT);

	    (e1000_auto_x_mode)FIELD_GET(M88E1000_PSSR_MDIX, phy_data);



	if ((phy_data & M88E1000_PSSR_SPEED) == M88E1000_PSSR_1000MBS) {

		/* Cable Length Estimation and Local/Remote Receiver Information

		 * are only valid at 1000 Mbps.

		 */

		phy_info->cable_length =

		    (e1000_cable_length) ((phy_data &

					   M88E1000_PSSR_CABLE_LENGTH) >>

					  M88E1000_PSSR_CABLE_LENGTH_SHIFT);

		    (e1000_cable_length)FIELD_GET(M88E1000_PSSR_CABLE_LENGTH,

						  phy_data);



		ret_val = e1000_read_phy_reg(hw, PHY_1000T_STATUS, &phy_data);

		if (ret_val)

			return ret_val;



		phy_info->local_rx = ((phy_data & SR_1000T_LOCAL_RX_STATUS) >>

				      SR_1000T_LOCAL_RX_STATUS_SHIFT) ?

		phy_info->local_rx = FIELD_GET(SR_1000T_LOCAL_RX_STATUS,

					       phy_data) ?

		    e1000_1000t_rx_status_ok : e1000_1000t_rx_status_not_ok;

		phy_info->remote_rx = ((phy_data & SR_1000T_REMOTE_RX_STATUS) >>

				       SR_1000T_REMOTE_RX_STATUS_SHIFT) ?

		phy_info->remote_rx = FIELD_GET(SR_1000T_REMOTE_RX_STATUS,

						phy_data) ?

		    e1000_1000t_rx_status_ok : e1000_1000t_rx_status_not_ok;

	}
@@ -3515,7 +3511,7 @@ s32 e1000_init_eeprom_params(struct e1000_hw *hw) 
		if (ret_val)

			return ret_val;

		eeprom_size =

		    (eeprom_size & EEPROM_SIZE_MASK) >> EEPROM_SIZE_SHIFT;

		    FIELD_GET(EEPROM_SIZE_MASK, eeprom_size);

		/* 256B eeprom size was not supported in earlier hardware, so we

		 * bump eeprom_size up one to ensure that "1" (which maps to

		 * 256B) is never the result used in the shifting logic below.
@@ -4891,8 +4887,7 @@ static s32 e1000_get_cable_length(struct e1000_hw *hw, u16 *min_length, 
					     &phy_data);

		if (ret_val)

			return ret_val;

		cable_length = (phy_data & M88E1000_PSSR_CABLE_LENGTH) >>

		    M88E1000_PSSR_CABLE_LENGTH_SHIFT;

		cable_length = FIELD_GET(M88E1000_PSSR_CABLE_LENGTH, phy_data);



		/* Convert the enum value to ranged values */

		switch (cable_length) {
@@ -5001,8 +4996,7 @@ static s32 e1000_check_polarity(struct e1000_hw *hw, 
					     &phy_data);

		if (ret_val)

			return ret_val;

		*polarity = ((phy_data & M88E1000_PSSR_REV_POLARITY) >>

			     M88E1000_PSSR_REV_POLARITY_SHIFT) ?

		*polarity = FIELD_GET(M88E1000_PSSR_REV_POLARITY, phy_data) ?

		    e1000_rev_polarity_reversed : e1000_rev_polarity_normal;



	} else if (hw->phy_type == e1000_phy_igp) {
@@ -5072,8 +5066,8 @@ static s32 e1000_check_downshift(struct e1000_hw *hw) 
		if (ret_val)

			return ret_val;



		hw->speed_downgraded = (phy_data & M88E1000_PSSR_DOWNSHIFT) >>

		    M88E1000_PSSR_DOWNSHIFT_SHIFT;

		hw->speed_downgraded = FIELD_GET(M88E1000_PSSR_DOWNSHIFT,

						 phy_data);

	}



	return E1000_SUCCESS;

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

+11 −12
Original line number Diff line number Diff line
@@ -92,8 +92,7 @@ static s32 e1000_init_nvm_params_80003es2lan(struct e1000_hw *hw) 


	nvm->type = e1000_nvm_eeprom_spi;



	size = (u16)((eecd & E1000_EECD_SIZE_EX_MASK) >>

		     E1000_EECD_SIZE_EX_SHIFT);

	size = (u16)FIELD_GET(E1000_EECD_SIZE_EX_MASK, eecd);



	/* Added to a constant, "size" becomes the left-shift value

	 * for setting word_size.
@@ -1035,17 +1034,18 @@ static s32 e1000_setup_copper_link_80003es2lan(struct e1000_hw *hw) 
	 * iteration and increase the max iterations when

	 * polling the phy; this fixes erroneous timeouts at 10Mbps.

	 */

	ret_val = e1000_write_kmrn_reg_80003es2lan(hw, GG82563_REG(0x34, 4),

						   0xFFFF);

	/* these next three accesses were always meant to use page 0x34 using

	 * GG82563_REG(0x34, N) but never did, so we've just corrected the call

	 * to not drop bits

	 */

	ret_val = e1000_write_kmrn_reg_80003es2lan(hw, 4, 0xFFFF);

	if (ret_val)

		return ret_val;

	ret_val = e1000_read_kmrn_reg_80003es2lan(hw, GG82563_REG(0x34, 9),

						  &reg_data);

	ret_val = e1000_read_kmrn_reg_80003es2lan(hw, 9, &reg_data);

	if (ret_val)

		return ret_val;

	reg_data |= 0x3F;

	ret_val = e1000_write_kmrn_reg_80003es2lan(hw, GG82563_REG(0x34, 9),

						   reg_data);

	ret_val = e1000_write_kmrn_reg_80003es2lan(hw, 9, reg_data);

	if (ret_val)

		return ret_val;

	ret_val =
@@ -1209,8 +1209,8 @@ static s32 e1000_read_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset, 
	if (ret_val)

		return ret_val;



	kmrnctrlsta = ((offset << E1000_KMRNCTRLSTA_OFFSET_SHIFT) &

		       E1000_KMRNCTRLSTA_OFFSET) | E1000_KMRNCTRLSTA_REN;

	kmrnctrlsta = FIELD_PREP(E1000_KMRNCTRLSTA_OFFSET, offset) |

		      E1000_KMRNCTRLSTA_REN;

	ew32(KMRNCTRLSTA, kmrnctrlsta);

	e1e_flush();
@@ -1244,8 +1244,7 @@ static s32 e1000_write_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset, 
	if (ret_val)

		return ret_val;



	kmrnctrlsta = ((offset << E1000_KMRNCTRLSTA_OFFSET_SHIFT) &

		       E1000_KMRNCTRLSTA_OFFSET) | data;

	kmrnctrlsta = FIELD_PREP(E1000_KMRNCTRLSTA_OFFSET, offset) | data;

	ew32(KMRNCTRLSTA, kmrnctrlsta);

	e1e_flush();

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

+1 −2
Original line number Diff line number Diff line
@@ -157,8 +157,7 @@ static s32 e1000_init_nvm_params_82571(struct e1000_hw *hw) 
		fallthrough;

	default:

		nvm->type = e1000_nvm_eeprom_spi;

		size = (u16)((eecd & E1000_EECD_SIZE_EX_MASK) >>

			     E1000_EECD_SIZE_EX_SHIFT);

		size = (u16)FIELD_GET(E1000_EECD_SIZE_EX_MASK, eecd);

		/* Added to a constant, "size" becomes the left-shift value

		 * for setting word_size.

		 */

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

+3 −4
Original line number Diff line number Diff line
@@ -654,8 +654,8 @@ static void e1000_get_drvinfo(struct net_device *netdev, 
	 */

	snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version),

		 "%d.%d-%d",

		 (adapter->eeprom_vers & 0xF000) >> 12,

		 (adapter->eeprom_vers & 0x0FF0) >> 4,

		 FIELD_GET(0xF000, adapter->eeprom_vers),

		 FIELD_GET(0x0FF0, adapter->eeprom_vers),

		 (adapter->eeprom_vers & 0x000F));



	strscpy(drvinfo->bus_info, pci_name(adapter->pdev),
@@ -925,8 +925,7 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data) 
	}



	if (mac->type >= e1000_pch_lpt)

		wlock_mac = (er32(FWSM) & E1000_FWSM_WLOCK_MAC_MASK) >>

		    E1000_FWSM_WLOCK_MAC_SHIFT;

		wlock_mac = FIELD_GET(E1000_FWSM_WLOCK_MAC_MASK, er32(FWSM));



	for (i = 0; i < mac->rar_entry_count; i++) {

		if (mac->type >= e1000_pch_lpt) {

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

+7 −11
Original line number Diff line number Diff line
@@ -1072,13 +1072,11 @@ static s32 e1000_platform_pm_pch_lpt(struct e1000_hw *hw, bool link) 


		lat_enc_d = (lat_enc & E1000_LTRV_VALUE_MASK) *

			     (1U << (E1000_LTRV_SCALE_FACTOR *

			     ((lat_enc & E1000_LTRV_SCALE_MASK)

			     >> E1000_LTRV_SCALE_SHIFT)));

			     FIELD_GET(E1000_LTRV_SCALE_MASK, lat_enc)));



		max_ltr_enc_d = (max_ltr_enc & E1000_LTRV_VALUE_MASK) *

			(1U << (E1000_LTRV_SCALE_FACTOR *

				 ((max_ltr_enc & E1000_LTRV_SCALE_MASK)

				 >> E1000_LTRV_SCALE_SHIFT)));

				FIELD_GET(E1000_LTRV_SCALE_MASK, max_ltr_enc)));



		if (lat_enc_d > max_ltr_enc_d)

			lat_enc = max_ltr_enc;
@@ -2075,8 +2073,7 @@ static s32 e1000_write_smbus_addr(struct e1000_hw *hw) 
{

	u16 phy_data;

	u32 strap = er32(STRAP);

	u32 freq = (strap & E1000_STRAP_SMT_FREQ_MASK) >>

	    E1000_STRAP_SMT_FREQ_SHIFT;

	u32 freq = FIELD_GET(E1000_STRAP_SMT_FREQ_MASK, strap);

	s32 ret_val;



	strap &= E1000_STRAP_SMBUS_ADDRESS_MASK;
@@ -2562,8 +2559,7 @@ void e1000_copy_rx_addrs_to_phy_ich8lan(struct e1000_hw *hw) 
		hw->phy.ops.write_reg_page(hw, BM_RAR_H(i),

					   (u16)(mac_reg & 0xFFFF));

		hw->phy.ops.write_reg_page(hw, BM_RAR_CTRL(i),

					   (u16)((mac_reg & E1000_RAH_AV)

						 >> 16));

					   FIELD_GET(E1000_RAH_AV, mac_reg));

	}



	e1000_disable_phy_wakeup_reg_access_bm(hw, &phy_reg);
@@ -3205,7 +3201,7 @@ static s32 e1000_valid_nvm_bank_detect_ich8lan(struct e1000_hw *hw, u32 *bank) 
							 &nvm_dword);

		if (ret_val)

			return ret_val;

		sig_byte = (u8)((nvm_dword & 0xFF00) >> 8);

		sig_byte = FIELD_GET(0xFF00, nvm_dword);

		if ((sig_byte & E1000_ICH_NVM_VALID_SIG_MASK) ==

		    E1000_ICH_NVM_SIG_VALUE) {

			*bank = 0;
@@ -3218,7 +3214,7 @@ static s32 e1000_valid_nvm_bank_detect_ich8lan(struct e1000_hw *hw, u32 *bank) 
							 &nvm_dword);

		if (ret_val)

			return ret_val;

		sig_byte = (u8)((nvm_dword & 0xFF00) >> 8);

		sig_byte = FIELD_GET(0xFF00, nvm_dword);

		if ((sig_byte & E1000_ICH_NVM_VALID_SIG_MASK) ==

		    E1000_ICH_NVM_SIG_VALUE) {

			*bank = 1;