Commit 6ae87626 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-aquantia-minor-bug-fixes-after-static-analysis' 



Igor Russkikh says:

====================
net: aquantia: minor bug fixes after static analysis

This patchset fixes minor errors and warnings found by smatch and kasan.

Extra patch is to replace AQ_HW_WAIT_FOR with readx_poll_timeout
to improve readability.

V2:
use readx_poll
resubmitted to net-next since the changeset became quite big.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 699be715 0b926d46

drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ static void aq_ethtool_get_strings(struct net_device *ndev, 
	u8 *p = data;



	if (stringset == ETH_SS_STATS) {

		memcpy(p, *aq_ethtool_stat_names,

		memcpy(p, aq_ethtool_stat_names,

		       sizeof(aq_ethtool_stat_names));

		p = p + sizeof(aq_ethtool_stat_names);

		for (i = 0; i < cfg->vecs; i++) {

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/aq_pci_func.c

+2 −0
Original line number Diff line number Diff line
@@ -170,6 +170,8 @@ void aq_pci_func_free_irqs(struct aq_nic_s *self) 
	for (i = 32U; i--;) {

		if (!((1U << i) & self->msix_entry_mask))

			continue;

		if (i >= AQ_CFG_VECS_MAX)

			continue;



		if (pdev->msix_enabled)

			irq_set_affinity_hint(pci_irq_vector(pdev, i), NULL);

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

+17 −8
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;

	}
@@ -207,8 +214,9 @@ static int hw_atl_a0_hw_rss_set(struct aq_hw_s *self, 
	u32 i = 0U;

	u32 num_rss_queues = max(1U, self->aq_nic_cfg->num_rss_queues);

	int err = 0;

	u16 bitary[(HW_ATL_A0_RSS_REDIRECTION_MAX *

	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

+10 −6
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;

	}
@@ -199,8 +201,9 @@ static int hw_atl_b0_hw_rss_set(struct aq_hw_s *self, 
	u32 i = 0U;

	u32 num_rss_queues = max(1U, self->aq_nic_cfg->num_rss_queues);

	int err = 0;

	u16 bitary[(HW_ATL_B0_RSS_REDIRECTION_MAX *

	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;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE