| Message ID | 1418230039-13219-1-git-send-email-hariprasad@chelsio.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Hariprasad Shenai > Fixes sparse warnings introduced in commit e85c9a7abfa407ed ("cxgb4/cxgb4vf: Add > code to calculate T5 BAR2 Offsets for SGE Queue Registers") and > df64e4d38c904dd3 ("cxgb4/cxgb4vf: Use new interfaces to calculate BAR2 SGE Queue > Register addresses") and few old ones > ... > diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c > b/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c > index 02e8833..62bd251 100644 > --- a/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c > +++ b/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c > @@ -209,10 +209,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); Better to byteswap the constant. Also, it looks like the types of 'rpl' and 'cmd' should be fixed so that the casts themselves aren't needed. > } > t4_write_reg(adapter, mbox_ctl, > @@ -486,7 +486,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); That doesn't look like the right place for a cast to u64. Not that it is at all clear why you've added it. David > bar2_qid = qid & qpp_mask; > bar2_qid_offset = bar2_qid * SGE_UDB_SIZE; > > -- > 1.7.1 > > -- > To unsubscribe from this list: send the line "unsubscribe netdev" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c index f7fd131..c47ef3d 100644 --- a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c +++ b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c @@ -1002,8 +1002,8 @@ static inline void ring_tx_db(struct adapter *adapter, struct sge_txq *tq, unsigned int index = (tq->pidx ? (tq->pidx - 1) : (tq->size - 1)); - __be64 *src = (__be64 *)&tq->desc[index]; - __be64 __iomem *dst = (__be64 *)(tq->bar2_addr + + u64 *src = (u64 *)&tq->desc[index]; + __be64 __iomem *dst = (__be64 __iomem *)(tq->bar2_addr + SGE_UDB_WCDOORBELL); unsigned int count = EQ_UNIT / sizeof(__be64); @@ -1251,8 +1251,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; diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c b/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c index 02e8833..62bd251 100644 --- a/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c +++ b/drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c @@ -209,10 +209,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, @@ -486,7 +486,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;
Fixes sparse warnings introduced in commit e85c9a7abfa407ed ("cxgb4/cxgb4vf: Add code to calculate T5 BAR2 Offsets for SGE Queue Registers") and df64e4d38c904dd3 ("cxgb4/cxgb4vf: Use new interfaces to calculate BAR2 SGE Queue Register addresses") and few old ones Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Reported-by: kbuild test robot <fengguang.wu@intel.com> Signed-off-by: Hariprasad Shenai <hariprasad@chelsio.com> --- drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 8 ++++---- drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-)