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

Commit ce4dad2c authored by Jacob Keller's avatar Jacob Keller Committed by Jeff Kirsher
Browse files

fm10k: prefer READ_ONCE instead of ACCESS_ONCE 



While technically not needed, as all our uses of ACCESS_ONCE are scalar
types, we already use READ_ONCE in a few places, and for code
readability we can swap all the uses of the older ACCESS_ONCE into
READ_ONCE.

Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Tested-by: default avatarKrishneil Singh <Krishneil.k.singh@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 88cdcfec

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

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ u32 fm10k_read_reg(struct fm10k_hw *hw, int reg); 
/* write operations, indexed using DWORDS */

#define fm10k_write_reg(hw, reg, val) \

do { \

	u32 __iomem *hw_addr = ACCESS_ONCE((hw)->hw_addr); \

	u32 __iomem *hw_addr = READ_ONCE((hw)->hw_addr); \

	if (!FM10K_REMOVED(hw_addr)) \

		writel((val), &hw_addr[(reg)]); \

} while (0)
@@ -42,7 +42,7 @@ do { \ 
/* Switch register write operations, index using DWORDS */

#define fm10k_write_sw_reg(hw, reg, val) \

do { \

	u32 __iomem *sw_addr = ACCESS_ONCE((hw)->sw_addr); \

	u32 __iomem *sw_addr = READ_ONCE((hw)->sw_addr); \

	if (!FM10K_REMOVED(sw_addr)) \

		writel((val), &sw_addr[(reg)]); \

} while (0)

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

+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ s32 fm10k_iov_event(struct fm10k_intfc *interface) 
	int i;



	/* if there is no iov_data then there is no mailbox to process */

	if (!ACCESS_ONCE(interface->iov_data))

	if (!READ_ONCE(interface->iov_data))

		return 0;



	rcu_read_lock();
@@ -99,7 +99,7 @@ s32 fm10k_iov_mbx(struct fm10k_intfc *interface) 
	int i;



	/* if there is no iov_data then there is no mailbox to process */

	if (!ACCESS_ONCE(interface->iov_data))

	if (!READ_ONCE(interface->iov_data))

		return 0;



	rcu_read_lock();

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

+1 −1
Original line number Diff line number Diff line
@@ -1408,7 +1408,7 @@ static void fm10k_update_itr(struct fm10k_ring_container *ring_container) 
	 * that the calculation will never get below a 1. The bit shift

	 * accounts for changes in the ITR due to PCIe link speed.

	 */

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

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

	avg_wire_size += BIT(itr_round) - 1;

	avg_wire_size >>= itr_round;

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

+3 −3
Original line number Diff line number Diff line
@@ -1098,7 +1098,7 @@ static struct rtnl_link_stats64 *fm10k_get_stats64(struct net_device *netdev, 
	rcu_read_lock();



	for (i = 0; i < interface->num_rx_queues; i++) {

		ring = ACCESS_ONCE(interface->rx_ring[i]);

		ring = READ_ONCE(interface->rx_ring[i]);



		if (!ring)

			continue;
@@ -1114,7 +1114,7 @@ static struct rtnl_link_stats64 *fm10k_get_stats64(struct net_device *netdev, 
	}



	for (i = 0; i < interface->num_tx_queues; i++) {

		ring = ACCESS_ONCE(interface->tx_ring[i]);

		ring = READ_ONCE(interface->tx_ring[i]);



		if (!ring)

			continue;
@@ -1299,7 +1299,7 @@ static void *fm10k_dfwd_add_station(struct net_device *dev, 
static void fm10k_dfwd_del_station(struct net_device *dev, void *priv)

{

	struct fm10k_intfc *interface = netdev_priv(dev);

	struct fm10k_l2_accel *l2_accel = ACCESS_ONCE(interface->l2_accel);

	struct fm10k_l2_accel *l2_accel = READ_ONCE(interface->l2_accel);

	struct fm10k_dglort_cfg dglort = { 0 };

	struct fm10k_hw *hw = &interface->hw;

	struct net_device *sdev = priv;

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

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ u16 fm10k_read_pci_cfg_word(struct fm10k_hw *hw, u32 reg) 


u32 fm10k_read_reg(struct fm10k_hw *hw, int reg)

{

	u32 __iomem *hw_addr = ACCESS_ONCE(hw->hw_addr);

	u32 __iomem *hw_addr = READ_ONCE(hw->hw_addr);

	u32 value = 0;



	if (FM10K_REMOVED(hw_addr))