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

Commit b9a8f883 authored by Yonglong Liu's avatar Yonglong Liu Committed by David S. Miller
Browse files

net: hns3: bitwise operator should use unsigned type 



There are some bitwise operator used signed type, this patch fixes
them with unsigned type.

Signed-off-by: default avatarYonglong Liu <liuyonglong@huawei.com>
Signed-off-by: default avatarPeng Li <lipeng321@huawei.com>
Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 354d0fab

drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

+5 −4
Original line number Diff line number Diff line
@@ -951,8 +951,9 @@ static int hns3_set_l2l3l4(struct sk_buff *skb, u8 ol4_proto, 
static void hns3_set_txbd_baseinfo(u16 *bdtp_fe_sc_vld_ra_ri, int frag_end)

{

	/* Config bd buffer end */

	hns3_set_field(*bdtp_fe_sc_vld_ra_ri, HNS3_TXD_FE_B, !!frag_end);

	hns3_set_field(*bdtp_fe_sc_vld_ra_ri, HNS3_TXD_VLD_B, 1);

	if (!!frag_end)

		hns3_set_field(*bdtp_fe_sc_vld_ra_ri, HNS3_TXD_FE_B, 1U);

	hns3_set_field(*bdtp_fe_sc_vld_ra_ri, HNS3_TXD_VLD_B, 1U);

}



static int hns3_fill_desc_vtags(struct sk_buff *skb,
@@ -2575,7 +2576,7 @@ static bool hns3_parse_vlan_tag(struct hns3_enet_ring *ring, 
	}

}



static int hns3_alloc_skb(struct hns3_enet_ring *ring, int length,

static int hns3_alloc_skb(struct hns3_enet_ring *ring, unsigned int length,

			  unsigned char *va)

{

#define HNS3_NEED_ADD_FRAG	1
@@ -2818,8 +2819,8 @@ static int hns3_handle_rx_bd(struct hns3_enet_ring *ring, 
	struct sk_buff *skb = ring->skb;

	struct hns3_desc_cb *desc_cb;

	struct hns3_desc *desc;

	unsigned int length;

	u32 bd_base_info;

	int length;

	int ret;



	desc = &ring->desc[ring->next_to_clean];

drivers/net/ethernet/hisilicon/hns3/hns3_enet.h

+1 −1
Original line number Diff line number Diff line
@@ -610,7 +610,7 @@ static inline bool hns3_nic_resetting(struct net_device *netdev) 


#define hnae3_buf_size(_ring) ((_ring)->buf_size)

#define hnae3_page_order(_ring) (get_order(hnae3_buf_size(_ring)))

#define hnae3_page_size(_ring) (PAGE_SIZE << hnae3_page_order(_ring))

#define hnae3_page_size(_ring) (PAGE_SIZE << (u32)hnae3_page_order(_ring))



/* iterator for handling rings in ring group */

#define hns3_for_each_ring(pos, head) \

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c

+23 −20
Original line number Diff line number Diff line
@@ -1360,8 +1360,9 @@ static int hclge_map_tqps_to_func(struct hclge_dev *hdev, u16 func_id, 
	req = (struct hclge_tqp_map_cmd *)desc.data;

	req->tqp_id = cpu_to_le16(tqp_pid);

	req->tqp_vf = func_id;

	req->tqp_flag = !is_pf << HCLGE_TQP_MAP_TYPE_B |

			1 << HCLGE_TQP_MAP_EN_B;

	req->tqp_flag = 1U << HCLGE_TQP_MAP_EN_B;

	if (!is_pf)

		req->tqp_flag |= 1U << HCLGE_TQP_MAP_TYPE_B;

	req->tqp_vid = cpu_to_le16(tqp_vid);



	ret = hclge_cmd_send(&hdev->hw, &desc, 1);
@@ -2320,7 +2321,8 @@ static int hclge_set_autoneg_en(struct hclge_dev *hdev, bool enable) 
	hclge_cmd_setup_basic_desc(&desc, HCLGE_OPC_CONFIG_AN_MODE, false);



	req = (struct hclge_config_auto_neg_cmd *)desc.data;

	hnae3_set_bit(flag, HCLGE_MAC_CFG_AN_EN_B, !!enable);

	if (enable)

		hnae3_set_bit(flag, HCLGE_MAC_CFG_AN_EN_B, 1U);

	req->cfg_an_cmd_flag = cpu_to_le32(flag);



	ret = hclge_cmd_send(&hdev->hw, &desc, 1);
@@ -5935,20 +5937,20 @@ static void hclge_cfg_mac_mode(struct hclge_dev *hdev, bool enable) 
	int ret;



	hclge_cmd_setup_basic_desc(&desc, HCLGE_OPC_CONFIG_MAC_MODE, false);

	hnae3_set_bit(loop_en, HCLGE_MAC_TX_EN_B, enable);

	hnae3_set_bit(loop_en, HCLGE_MAC_RX_EN_B, enable);

	hnae3_set_bit(loop_en, HCLGE_MAC_PAD_TX_B, enable);

	hnae3_set_bit(loop_en, HCLGE_MAC_PAD_RX_B, enable);

	hnae3_set_bit(loop_en, HCLGE_MAC_1588_TX_B, 0);

	hnae3_set_bit(loop_en, HCLGE_MAC_1588_RX_B, 0);

	hnae3_set_bit(loop_en, HCLGE_MAC_APP_LP_B, 0);

	hnae3_set_bit(loop_en, HCLGE_MAC_LINE_LP_B, 0);

	hnae3_set_bit(loop_en, HCLGE_MAC_FCS_TX_B, enable);

	hnae3_set_bit(loop_en, HCLGE_MAC_RX_FCS_B, enable);

	hnae3_set_bit(loop_en, HCLGE_MAC_RX_FCS_STRIP_B, enable);

	hnae3_set_bit(loop_en, HCLGE_MAC_TX_OVERSIZE_TRUNCATE_B, enable);

	hnae3_set_bit(loop_en, HCLGE_MAC_RX_OVERSIZE_TRUNCATE_B, enable);

	hnae3_set_bit(loop_en, HCLGE_MAC_TX_UNDER_MIN_ERR_B, enable);



	if (enable) {

		hnae3_set_bit(loop_en, HCLGE_MAC_TX_EN_B, 1U);

		hnae3_set_bit(loop_en, HCLGE_MAC_RX_EN_B, 1U);

		hnae3_set_bit(loop_en, HCLGE_MAC_PAD_TX_B, 1U);

		hnae3_set_bit(loop_en, HCLGE_MAC_PAD_RX_B, 1U);

		hnae3_set_bit(loop_en, HCLGE_MAC_FCS_TX_B, 1U);

		hnae3_set_bit(loop_en, HCLGE_MAC_RX_FCS_B, 1U);

		hnae3_set_bit(loop_en, HCLGE_MAC_RX_FCS_STRIP_B, 1U);

		hnae3_set_bit(loop_en, HCLGE_MAC_TX_OVERSIZE_TRUNCATE_B, 1U);

		hnae3_set_bit(loop_en, HCLGE_MAC_RX_OVERSIZE_TRUNCATE_B, 1U);

		hnae3_set_bit(loop_en, HCLGE_MAC_TX_UNDER_MIN_ERR_B, 1U);

	}



	req->txrx_pad_fcs_loop_en = cpu_to_le32(loop_en);



	ret = hclge_cmd_send(&hdev->hw, &desc, 1);
@@ -6310,8 +6312,8 @@ static int hclge_update_desc_vfid(struct hclge_desc *desc, int vfid, bool clr) 
{

#define HCLGE_VF_NUM_IN_FIRST_DESC 192



	int word_num;

	int bit_num;

	unsigned int word_num;

	unsigned int bit_num;



	if (vfid > 255 || vfid < 0)

		return -EIO;
@@ -7972,7 +7974,8 @@ static int hclge_send_reset_tqp_cmd(struct hclge_dev *hdev, u16 queue_id, 


	req = (struct hclge_reset_tqp_queue_cmd *)desc.data;

	req->tqp_id = cpu_to_le16(queue_id & HCLGE_RING_ID_MASK);

	hnae3_set_bit(req->reset_req, HCLGE_TQP_RESET_B, enable);

	if (enable)

		hnae3_set_bit(req->reset_req, HCLGE_TQP_RESET_B, 1U);



	ret = hclge_cmd_send(&hdev->hw, &desc, 1);

	if (ret) {