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

Commit fcdb0a99 authored by Bruce Allan's avatar Bruce Allan Committed by Jeff Kirsher
Browse files

fm10k: cleanup remaining right-bit-shifted 1 



Use BIT() macro instead.

Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Tested-by: default avatarKrishneil Singh <Krishneil.k.singh@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 1aab144c

drivers/net/ethernet/intel/fm10k/fm10k.h

+6 −6
Original line number Diff line number Diff line
@@ -262,12 +262,12 @@ struct fm10k_intfc { 
	unsigned long state;



	u32 flags;

#define FM10K_FLAG_RESET_REQUESTED		(u32)(1 << 0)

#define FM10K_FLAG_RSS_FIELD_IPV4_UDP		(u32)(1 << 1)

#define FM10K_FLAG_RSS_FIELD_IPV6_UDP		(u32)(1 << 2)

#define FM10K_FLAG_RX_TS_ENABLED		(u32)(1 << 3)

#define FM10K_FLAG_SWPRI_CONFIG			(u32)(1 << 4)

#define FM10K_FLAG_DEBUG_STATS			(u32)(1 << 5)

#define FM10K_FLAG_RESET_REQUESTED		(u32)(BIT(0))

#define FM10K_FLAG_RSS_FIELD_IPV4_UDP		(u32)(BIT(1))

#define FM10K_FLAG_RSS_FIELD_IPV6_UDP		(u32)(BIT(2))

#define FM10K_FLAG_RX_TS_ENABLED		(u32)(BIT(3))

#define FM10K_FLAG_SWPRI_CONFIG			(u32)(BIT(4))

#define FM10K_FLAG_DEBUG_STATS			(u32)(BIT(5))

	int xcast_mode;



	/* Tx fast path data */

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

+9 −11
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ static void fm10k_get_regs(struct net_device *netdev, 
	u32 *buff = p;

	u16 i;



	regs->version = (1 << 24) | (hw->revision_id << 16) | hw->device_id;

	regs->version = BIT(24) | (hw->revision_id << 16) | hw->device_id;



	switch (hw->mac.type) {

	case fm10k_mac_pf:
@@ -942,8 +942,8 @@ static int fm10k_mbx_test(struct fm10k_intfc *interface, u64 *data) 
		return 0;



	/* loop through both nested and unnested attribute types */

	for (attr_flag = (1 << FM10K_TEST_MSG_UNSET);

	     attr_flag < (1 << (2 * FM10K_TEST_MSG_NESTED));

	for (attr_flag = BIT(FM10K_TEST_MSG_UNSET);

	     attr_flag < BIT(2 * FM10K_TEST_MSG_NESTED);

	     attr_flag += attr_flag) {

		/* generate message to be tested */

		fm10k_tlv_msg_test_create(test_msg, attr_flag);
@@ -1005,7 +1005,7 @@ static u32 fm10k_get_priv_flags(struct net_device *netdev) 
	u32 priv_flags = 0;



	if (interface->flags & FM10K_FLAG_DEBUG_STATS)

		priv_flags |= 1 << FM10K_PRV_FLAG_DEBUG_STATS;

		priv_flags |= BIT(FM10K_PRV_FLAG_DEBUG_STATS);



	return priv_flags;

}
@@ -1014,10 +1014,10 @@ static int fm10k_set_priv_flags(struct net_device *netdev, u32 priv_flags) 
{

	struct fm10k_intfc *interface = netdev_priv(netdev);



	if (priv_flags >= (1 << FM10K_PRV_FLAG_LEN))

	if (priv_flags >= BIT(FM10K_PRV_FLAG_LEN))

		return -EINVAL;



	if (priv_flags & (1 << FM10K_PRV_FLAG_DEBUG_STATS))

	if (priv_flags & BIT(FM10K_PRV_FLAG_DEBUG_STATS))

		interface->flags |= FM10K_FLAG_DEBUG_STATS;

	else

		interface->flags &= ~FM10K_FLAG_DEBUG_STATS;
@@ -1145,7 +1145,7 @@ static unsigned int fm10k_max_channels(struct net_device *dev) 


	/* For QoS report channels per traffic class */

	if (tcs > 1)

		max_combined = 1 << (fls(max_combined / tcs) - 1);

		max_combined = BIT((fls(max_combined / tcs) - 1));



	return max_combined;

}
@@ -1210,11 +1210,9 @@ static int fm10k_get_ts_info(struct net_device *dev, 
	else

		info->phc_index = -1;



	info->tx_types = (1 << HWTSTAMP_TX_OFF) |

			 (1 << HWTSTAMP_TX_ON);

	info->tx_types = BIT(HWTSTAMP_TX_OFF) | BIT(HWTSTAMP_TX_ON);



	info->rx_filters = (1 << HWTSTAMP_FILTER_NONE) |

			   (1 << HWTSTAMP_FILTER_ALL);

	info->rx_filters = BIT(HWTSTAMP_FILTER_NONE) | BIT(HWTSTAMP_FILTER_ALL);



	return 0;

}

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

+10 −10
Original line number Diff line number Diff line
@@ -401,10 +401,10 @@ static inline void fm10k_rx_checksum(struct fm10k_ring *ring, 
}



#define FM10K_RSS_L4_TYPES_MASK \

	((1ul << FM10K_RSSTYPE_IPV4_TCP) | \

	 (1ul << FM10K_RSSTYPE_IPV4_UDP) | \

	 (1ul << FM10K_RSSTYPE_IPV6_TCP) | \

	 (1ul << FM10K_RSSTYPE_IPV6_UDP))

	(BIT(FM10K_RSSTYPE_IPV4_TCP) | \

	 BIT(FM10K_RSSTYPE_IPV4_UDP) | \

	 BIT(FM10K_RSSTYPE_IPV6_TCP) | \

	 BIT(FM10K_RSSTYPE_IPV6_UDP))



static inline void fm10k_rx_hash(struct fm10k_ring *ring,

				 union fm10k_rx_desc *rx_desc,
@@ -420,7 +420,7 @@ static inline void fm10k_rx_hash(struct fm10k_ring *ring, 
		return;



	skb_set_hash(skb, le32_to_cpu(rx_desc->d.rss),

		     ((1ul << rss_type) & FM10K_RSS_L4_TYPES_MASK) ?

		     (BIT(rss_type) & FM10K_RSS_L4_TYPES_MASK) ?

		     PKT_HASH_TYPE_L4 : PKT_HASH_TYPE_L3);

}
@@ -1409,7 +1409,7 @@ static void fm10k_update_itr(struct fm10k_ring_container *ring_container) 
	 * accounts for changes in the ITR due to PCIe link speed.

	 */

	itr_round = ACCESS_ONCE(ring_container->itr_scale) + 8;

	avg_wire_size += (1 << itr_round) - 1;

	avg_wire_size += BIT(itr_round) - 1;

	avg_wire_size >>= itr_round;



	/* write back value and retain adaptive flag */
@@ -1511,17 +1511,17 @@ static bool fm10k_set_qos_queues(struct fm10k_intfc *interface) 
	/* set QoS mask and indices */

	f = &interface->ring_feature[RING_F_QOS];

	f->indices = pcs;

	f->mask = (1 << fls(pcs - 1)) - 1;

	f->mask = BIT(fls(pcs - 1)) - 1;



	/* determine the upper limit for our current DCB mode */

	rss_i = interface->hw.mac.max_queues / pcs;

	rss_i = 1 << (fls(rss_i) - 1);

	rss_i = BIT(fls(rss_i) - 1);



	/* set RSS mask and indices */

	f = &interface->ring_feature[RING_F_RSS];

	rss_i = min_t(u16, rss_i, f->limit);

	f->indices = rss_i;

	f->mask = (1 << fls(rss_i - 1)) - 1;

	f->mask = BIT(fls(rss_i - 1)) - 1;



	/* configure pause class to queue mapping */

	for (i = 0; i < pcs; i++)
@@ -1551,7 +1551,7 @@ static bool fm10k_set_rss_queues(struct fm10k_intfc *interface) 


	/* record indices and power of 2 mask for RSS */

	f->indices = rss_i;

	f->mask = (1 << fls(rss_i - 1)) - 1;

	f->mask = BIT(fls(rss_i - 1)) - 1;



	interface->num_rx_queues = rss_i;

	interface->num_tx_queues = rss_i;

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

+1 −1
Original line number Diff line number Diff line
@@ -1429,7 +1429,7 @@ struct net_device *fm10k_alloc_netdev(const struct fm10k_info *info) 


	/* configure default debug level */

	interface = netdev_priv(dev);

	interface->msg_enable = (1 << DEFAULT_DEBUG_LEVEL_SHIFT) - 1;

	interface->msg_enable = BIT(DEFAULT_DEBUG_LEVEL_SHIFT) - 1;



	/* configure default features */

	dev->features |= NETIF_F_IP_CSUM |

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

+4 −4
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ static void fm10k_configure_tx_ring(struct fm10k_intfc *interface, 
	u64 tdba = ring->dma;

	u32 size = ring->count * sizeof(struct fm10k_tx_desc);

	u32 txint = FM10K_INT_MAP_DISABLE;

	u32 txdctl = (1 << FM10K_TXDCTL_MAX_TIME_SHIFT) | FM10K_TXDCTL_ENABLE;

	u32 txdctl = BIT(FM10K_TXDCTL_MAX_TIME_SHIFT) | FM10K_TXDCTL_ENABLE;

	u8 reg_idx = ring->reg_idx;



	/* disable queue to avoid issues while updating state */
@@ -730,7 +730,7 @@ static void fm10k_configure_rx_ring(struct fm10k_intfc *interface, 
	if (interface->pfc_en)

		rx_pause = interface->pfc_en;

#endif

	if (!(rx_pause & (1 << ring->qos_pc)))

	if (!(rx_pause & BIT(ring->qos_pc)))

		rxdctl |= FM10K_RXDCTL_DROP_ON_EMPTY;



	fm10k_write_reg(hw, FM10K_RXDCTL(reg_idx), rxdctl);
@@ -779,7 +779,7 @@ void fm10k_update_rx_drop_en(struct fm10k_intfc *interface) 
		u32 rxdctl = FM10K_RXDCTL_WRITE_BACK_MIN_DELAY;

		u8 reg_idx = ring->reg_idx;



		if (!(rx_pause & (1 << ring->qos_pc)))

		if (!(rx_pause & BIT(ring->qos_pc)))

			rxdctl |= FM10K_RXDCTL_DROP_ON_EMPTY;



		fm10k_write_reg(hw, FM10K_RXDCTL(reg_idx), rxdctl);
@@ -1065,7 +1065,7 @@ static void fm10k_reset_drop_on_empty(struct fm10k_intfc *interface, u32 eicr) 
	if (maxholdq)

		fm10k_write_reg(hw, FM10K_MAXHOLDQ(7), maxholdq);

	for (q = 255;;) {

		if (maxholdq & (1 << 31)) {

		if (maxholdq & BIT(31)) {

			if (q < FM10K_MAX_QUEUES_PF) {

				interface->rx_overrun_pf++;

				fm10k_write_reg(hw, FM10K_RXDCTL(q), rxdctl);