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

Commit 6a7f2277 authored by Nikita Danilov's avatar Nikita Danilov Committed by David S. Miller
Browse files

net: aquantia: replace AQ_HW_WAIT_FOR with readx_poll_timeout_atomic 



David noticed the original define was hiding 'err' variable
reference. Thats confusing and counterintuitive.

Andrew noted the whole macro could be replaced with standard readx_poll
kernel macro. This makes code more readable.

Signed-off-by: default avatarNikita Danilov <nikita.danilov@aquantia.com>
Signed-off-by: default avatarIgor Russkikh <igor.russkikh@aquantia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8006e373

drivers/net/ethernet/aquantia/atlantic/aq_hw_utils.h

+2 −12
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
#ifndef AQ_HW_UTILS_H

#define AQ_HW_UTILS_H



#include <linux/iopoll.h>



#include "aq_common.h"



#ifndef HIDWORD
@@ -23,18 +25,6 @@ 


#define AQ_HW_SLEEP(_US_) mdelay(_US_)



#define AQ_HW_WAIT_FOR(_B_, _US_, _N_) \

do { \

	unsigned int AQ_HW_WAIT_FOR_i; \

	for (AQ_HW_WAIT_FOR_i = _N_; (!(_B_)) && (AQ_HW_WAIT_FOR_i);\

	--AQ_HW_WAIT_FOR_i) {\

		udelay(_US_); \

	} \

	if (!AQ_HW_WAIT_FOR_i) {\

		err = -ETIME; \

	} \

} while (0)



#define aq_pr_err(...) pr_err(AQ_CFG_DRV_NAME ": " __VA_ARGS__)

#define aq_pr_trace(...) pr_info(AQ_CFG_DRV_NAME ": " __VA_ARGS__)

drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c

+15 −6
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ const struct aq_hw_caps_s hw_atl_a0_caps_aqc109 = { 
static int hw_atl_a0_hw_reset(struct aq_hw_s *self)

{

	int err = 0;

	u32 val;



	hw_atl_glb_glb_reg_res_dis_set(self, 1U);

	hw_atl_pci_pci_reg_res_dis_set(self, 0U);
@@ -95,7 +96,9 @@ static int hw_atl_a0_hw_reset(struct aq_hw_s *self) 
	hw_atl_glb_soft_res_set(self, 1);



	/* check 10 times by 1ms */

	AQ_HW_WAIT_FOR(hw_atl_glb_soft_res_get(self) == 0, 1000U, 10U);

	err = readx_poll_timeout_atomic(hw_atl_glb_soft_res_get,

					self, val, val == 0,

					1000U, 10000U);

	if (err < 0)

		goto err_exit;
@@ -103,7 +106,9 @@ static int hw_atl_a0_hw_reset(struct aq_hw_s *self) 
	hw_atl_itr_res_irq_set(self, 1U);



	/* check 10 times by 1ms */

	AQ_HW_WAIT_FOR(hw_atl_itr_res_irq_get(self) == 0, 1000U, 10U);

	err = readx_poll_timeout_atomic(hw_atl_itr_res_irq_get,

					self, val, val == 0,

					1000U, 10000U);

	if (err < 0)

		goto err_exit;
@@ -181,6 +186,7 @@ static int hw_atl_a0_hw_rss_hash_set(struct aq_hw_s *self, 
	int err = 0;

	unsigned int i = 0U;

	unsigned int addr = 0U;

	u32 val;



	for (i = 10, addr = 0U; i--; ++addr) {

		u32 key_data = cfg->is_rss ?
@@ -188,8 +194,9 @@ static int hw_atl_a0_hw_rss_hash_set(struct aq_hw_s *self, 
		hw_atl_rpf_rss_key_wr_data_set(self, key_data);

		hw_atl_rpf_rss_key_addr_set(self, addr);

		hw_atl_rpf_rss_key_wr_en_set(self, 1U);

		AQ_HW_WAIT_FOR(hw_atl_rpf_rss_key_wr_en_get(self) == 0,

			       1000U, 10U);

		err = readx_poll_timeout_atomic(hw_atl_rpf_rss_key_wr_en_get,

						self, val, val == 0,

						1000U, 10000U);

		if (err < 0)

			goto err_exit;

	}
@@ -209,6 +216,7 @@ static int hw_atl_a0_hw_rss_set(struct aq_hw_s *self, 
	int err = 0;

	u16 bitary[1 + (HW_ATL_A0_RSS_REDIRECTION_MAX *

		   HW_ATL_A0_RSS_REDIRECTION_BITS / 16U)];

	u32 val;



	memset(bitary, 0, sizeof(bitary));
@@ -222,8 +230,9 @@ static int hw_atl_a0_hw_rss_set(struct aq_hw_s *self, 
		hw_atl_rpf_rss_redir_tbl_wr_data_set(self, bitary[i]);

		hw_atl_rpf_rss_redir_tbl_addr_set(self, i);

		hw_atl_rpf_rss_redir_wr_en_set(self, 1U);

		AQ_HW_WAIT_FOR(hw_atl_rpf_rss_redir_wr_en_get(self) == 0,

			       1000U, 10U);

		err = readx_poll_timeout_atomic(hw_atl_rpf_rss_redir_wr_en_get,

						self, val, val == 0,

						1000U, 10000U);

		if (err < 0)

			goto err_exit;

	}

drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c

+8 −4
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ static int hw_atl_b0_hw_rss_hash_set(struct aq_hw_s *self, 
	int err = 0;

	unsigned int i = 0U;

	unsigned int addr = 0U;

	u32 val;



	for (i = 10, addr = 0U; i--; ++addr) {

		u32 key_data = cfg->is_rss ?
@@ -180,8 +181,9 @@ static int hw_atl_b0_hw_rss_hash_set(struct aq_hw_s *self, 
		hw_atl_rpf_rss_key_wr_data_set(self, key_data);

		hw_atl_rpf_rss_key_addr_set(self, addr);

		hw_atl_rpf_rss_key_wr_en_set(self, 1U);

		AQ_HW_WAIT_FOR(hw_atl_rpf_rss_key_wr_en_get(self) == 0,

			       1000U, 10U);

		err = readx_poll_timeout_atomic(hw_atl_rpf_rss_key_wr_en_get,

						self, val, val == 0,

						1000U, 10000U);

		if (err < 0)

			goto err_exit;

	}
@@ -201,6 +203,7 @@ static int hw_atl_b0_hw_rss_set(struct aq_hw_s *self, 
	int err = 0;

	u16 bitary[1 + (HW_ATL_B0_RSS_REDIRECTION_MAX *

		   HW_ATL_B0_RSS_REDIRECTION_BITS / 16U)];

	u32 val;



	memset(bitary, 0, sizeof(bitary));
@@ -214,8 +217,9 @@ static int hw_atl_b0_hw_rss_set(struct aq_hw_s *self, 
		hw_atl_rpf_rss_redir_tbl_wr_data_set(self, bitary[i]);

		hw_atl_rpf_rss_redir_tbl_addr_set(self, i);

		hw_atl_rpf_rss_redir_wr_en_set(self, 1U);

		AQ_HW_WAIT_FOR(hw_atl_rpf_rss_redir_wr_en_get(self) == 0,

			       1000U, 10U);

		err = readx_poll_timeout_atomic(hw_atl_rpf_rss_redir_wr_en_get,

						self, val, val == 0,

						1000U, 10000U);

		if (err < 0)

			goto err_exit;

	}

drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c

+21 −0
Original line number Diff line number Diff line
@@ -1585,3 +1585,24 @@ void hw_atl_rpfl3l4_ipv6_dest_addr_set(struct aq_hw_s *aq_hw, u8 location, 
				HW_ATL_RPF_L3_DSTA_ADR(location + i),

				ipv6_dest[i]);

}



u32 hw_atl_sem_ram_get(struct aq_hw_s *self)

{

	return hw_atl_reg_glb_cpu_sem_get(self, HW_ATL_FW_SM_RAM);

}



u32 hw_atl_scrpad_get(struct aq_hw_s *aq_hw, u32 scratch_scp)

{

	return aq_hw_read_reg(aq_hw,

			      HW_ATL_GLB_CPU_SCRATCH_SCP_ADR(scratch_scp));

}



u32 hw_atl_scrpad12_get(struct aq_hw_s *self)

{

	return  hw_atl_scrpad_get(self, 0xB);

}



u32 hw_atl_scrpad25_get(struct aq_hw_s *self)

{

	return hw_atl_scrpad_get(self, 0x18);

}

drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h

+12 −0
Original line number Diff line number Diff line
@@ -752,4 +752,16 @@ void hw_atl_rpfl3l4_ipv6_src_addr_set(struct aq_hw_s *aq_hw, u8 location, 
void hw_atl_rpfl3l4_ipv6_dest_addr_set(struct aq_hw_s *aq_hw, u8 location,

				       u32 *ipv6_dest);



/* get global microprocessor ram semaphore */

u32 hw_atl_sem_ram_get(struct aq_hw_s *self);



/* get global microprocessor scratch pad register */

u32 hw_atl_scrpad_get(struct aq_hw_s *aq_hw, u32 scratch_scp);



/* get global microprocessor scratch pad 12 register */

u32 hw_atl_scrpad12_get(struct aq_hw_s *self);



/* get global microprocessor scratch pad 25 register */

u32 hw_atl_scrpad25_get(struct aq_hw_s *self);



#endif /* HW_ATL_LLH_H */