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

Commit 2ff2acf1 authored by Hariprasad Shenai's avatar Hariprasad Shenai Committed by David S. Miller
Browse files

cxgb4vf: Fix sparse warnings 



Fixes sparse warnings introduced in commit e85c9a7a ("cxgb4/cxgb4vf: Add
code to calculate T5 BAR2 Offsets for SGE Queue Registers") and
df64e4d3 ("cxgb4/cxgb4vf: Use new interfaces to calculate BAR2 SGE Queue
Register addresses") and few old ones

sparse warnings:
>> drivers/net/ethernet/chelsio/cxgb4vf/sge.c:1006:48: sparse: cast removes
>> address space of expression
>> drivers/net/ethernet/chelsio/cxgb4vf/sge.c:1006:48: sparse: incorrect type in
>> initializer (different address space)
>> drivers/net/ethernet/chelsio/cxgb4vf/sge.c:1020:40: sparse: incorrect type in
>> argument 1 (different base types)

Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
Signed-off-by: default avatarHariprasad Shenai <hariprasad@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4217291e

drivers/net/ethernet/chelsio/cxgb4vf/sge.c

+8 −4
Original line number Diff line number Diff line
@@ -1004,7 +1004,7 @@ static inline void ring_tx_db(struct adapter *adapter, struct sge_txq *tq, 
					      ? (tq->pidx - 1)

					      : (tq->size - 1));

			__be64 *src = (__be64 *)&tq->desc[index];

			__be64 __iomem *dst = (__be64 *)(tq->bar2_addr +

			__be64 __iomem *dst = (__be64 __iomem *)(tq->bar2_addr +

							 SGE_UDB_WCDOORBELL);

			unsigned int count = EQ_UNIT / sizeof(__be64);
@@ -1018,7 +1018,11 @@ static inline void ring_tx_db(struct adapter *adapter, struct sge_txq *tq, 
			 * DMA.

			 */

			while (count) {

				writeq(*src, dst);

				/* the (__force u64) is because the compiler

				 * doesn't understand the endian swizzling

				 * going on

				 */

				writeq((__force u64)*src, dst);

				src++;

				dst++;

				count--;
@@ -1252,8 +1256,8 @@ int t4vf_eth_xmit(struct sk_buff *skb, struct net_device *dev) 
	BUG_ON(DIV_ROUND_UP(ETHTXQ_MAX_HDR, TXD_PER_EQ_UNIT) > 1);

	wr = (void *)&txq->q.desc[txq->q.pidx];

	wr->equiq_to_len16 = cpu_to_be32(wr_mid);

	wr->r3[0] = cpu_to_be64(0);

	wr->r3[1] = cpu_to_be64(0);

	wr->r3[0] = cpu_to_be32(0);

	wr->r3[1] = cpu_to_be32(0);

	skb_copy_from_linear_data(skb, (void *)wr->ethmacdst, fw_hdr_copy_len);

	end = (u64 *)wr + flits;

drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c

+3 −3
Original line number Diff line number Diff line
@@ -210,10 +210,10 @@ int t4vf_wr_mbox_core(struct adapter *adapter, const void *cmd, int size, 


			if (rpl) {

				/* request bit in high-order BE word */

				WARN_ON((be32_to_cpu(*(const u32 *)cmd)

				WARN_ON((be32_to_cpu(*(const __be32 *)cmd)

					 & FW_CMD_REQUEST_F) == 0);

				get_mbox_rpl(adapter, rpl, size, mbox_data);

				WARN_ON((be32_to_cpu(*(u32 *)rpl)

				WARN_ON((be32_to_cpu(*(__be32 *)rpl)

					 & FW_CMD_REQUEST_F) != 0);

			}

			t4_write_reg(adapter, mbox_ctl,
@@ -484,7 +484,7 @@ int t4_bar2_sge_qregs(struct adapter *adapter, 
	 *  o The BAR2 Queue ID.

	 *  o The BAR2 Queue ID Offset into the BAR2 page.

	 */

	bar2_page_offset = ((qid >> qpp_shift) << page_shift);

	bar2_page_offset = ((u64)(qid >> qpp_shift) << page_shift);

	bar2_qid = qid & qpp_mask;

	bar2_qid_offset = bar2_qid * SGE_UDB_SIZE;