Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c70d7ce authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Jeff Kirsher
Browse files

i40e: fix 32 bit build warnings 



Sparse found some issues with 32 bit compilation, which probably should
at least work without warning.  Not only that, but the code was wrong.
Thanks sparse!!

And thanks to the kbuild robot zero day testing for finding this issue.

$ make ARCH=i386 M=drivers/net/ethernet/intel/i40e C=2 CF="-D__CHECK_ENDIAN__"
  CHECK   drivers/net/ethernet/intel/i40e/i40e_main.c
  include/linux/etherdevice.h:79:32: warning: restricted __be16 degrades to integer
  drivers/net/ethernet/intel/i40e/i40e_main.c:7565:17: warning: shift too big (32) for type unsigned long
  drivers/net/ethernet/intel/i40e/i40e_main.c:7565:17: warning: shift too big (42) for type unsigned long
  drivers/net/ethernet/intel/i40e/i40e_main.c:7565:17: warning: shift too big (39) for type unsigned long
  drivers/net/ethernet/intel/i40e/i40e_main.c:7565:17: warning: shift too big (40) for type unsigned long

CC: kbuild-all@01.org
Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent e88ae667

drivers/net/ethernet/intel/i40e/i40e_common.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -442,9 +442,6 @@ static i40e_status i40e_aq_get_set_rss_lut(struct i40e_hw *hw, 
					I40E_AQC_SET_RSS_LUT_TABLE_TYPE_SHIFT) &

					I40E_AQC_SET_RSS_LUT_TABLE_TYPE_SHIFT) &

					I40E_AQC_SET_RSS_LUT_TABLE_TYPE_MASK));

					I40E_AQC_SET_RSS_LUT_TABLE_TYPE_MASK));





	cmd_resp->addr_high = cpu_to_le32(high_16_bits((u64)lut));

	cmd_resp->addr_low = cpu_to_le32(lower_32_bits((u64)lut));



	status = i40e_asq_send_command(hw, &desc, lut, lut_size, NULL);

	status = i40e_asq_send_command(hw, &desc, lut, lut_size, NULL);





	return status;

	return status;
@@ -519,8 +516,6 @@ static i40e_status i40e_aq_get_set_rss_key(struct i40e_hw *hw, 
					  I40E_AQC_SET_RSS_KEY_VSI_ID_SHIFT) &

					  I40E_AQC_SET_RSS_KEY_VSI_ID_SHIFT) &

					  I40E_AQC_SET_RSS_KEY_VSI_ID_MASK));

					  I40E_AQC_SET_RSS_KEY_VSI_ID_MASK));

	cmd_resp->vsi_id |= cpu_to_le16((u16)I40E_AQC_SET_RSS_KEY_VSI_VALID);

	cmd_resp->vsi_id |= cpu_to_le16((u16)I40E_AQC_SET_RSS_KEY_VSI_VALID);

	cmd_resp->addr_high = cpu_to_le32(high_16_bits((u64)key));

	cmd_resp->addr_low = cpu_to_le32(lower_32_bits((u64)key));





	status = i40e_asq_send_command(hw, &desc, key, key_size, NULL);

	status = i40e_asq_send_command(hw, &desc, key, key_size, NULL);

drivers/net/ethernet/intel/i40e/i40e_txrx.h

+6 −6
Original line number Original line Diff line number Diff line
@@ -79,12 +79,12 @@ enum i40e_dyn_idx_t { 
	BIT_ULL(I40E_FILTER_PCTYPE_L2_PAYLOAD))

	BIT_ULL(I40E_FILTER_PCTYPE_L2_PAYLOAD))





#define I40E_DEFAULT_RSS_HENA_EXPANDED (I40E_DEFAULT_RSS_HENA | \

#define I40E_DEFAULT_RSS_HENA_EXPANDED (I40E_DEFAULT_RSS_HENA | \

	BIT(I40E_FILTER_PCTYPE_NONF_IPV4_TCP_SYN_NO_ACK) | \

	BIT_ULL(I40E_FILTER_PCTYPE_NONF_IPV4_TCP_SYN_NO_ACK) | \

	BIT(I40E_FILTER_PCTYPE_NONF_UNICAST_IPV4_UDP) | \

	BIT_ULL(I40E_FILTER_PCTYPE_NONF_UNICAST_IPV4_UDP) | \

	BIT(I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV4_UDP) | \

	BIT_ULL(I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV4_UDP) | \

	BIT(I40E_FILTER_PCTYPE_NONF_IPV6_TCP_SYN_NO_ACK) | \

	BIT_ULL(I40E_FILTER_PCTYPE_NONF_IPV6_TCP_SYN_NO_ACK) | \

	BIT(I40E_FILTER_PCTYPE_NONF_UNICAST_IPV6_UDP) | \

	BIT_ULL(I40E_FILTER_PCTYPE_NONF_UNICAST_IPV6_UDP) | \

	BIT(I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV6_UDP))

	BIT_ULL(I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV6_UDP))





#define i40e_pf_get_default_rss_hena(pf) \

#define i40e_pf_get_default_rss_hena(pf) \

	(((pf)->flags & I40E_FLAG_MULTIPLE_TCP_UDP_RSS_PCTYPE) ? \

	(((pf)->flags & I40E_FLAG_MULTIPLE_TCP_UDP_RSS_PCTYPE) ? \