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

Commit 6bd688f3 authored by Luo bin's avatar Luo bin Committed by Greg Kroah-Hartman
Browse files

hinic: fix a bug of setting hw_ioctxt 



[ Upstream commit d2ed69ce9ed3477e2a9527e6b89fe4689d99510e ]

a reserved field is used to signify prime physical function index
in the latest firmware version, so we must assign a value to it
correctly

Signed-off-by: default avatarLuo bin <luobin9@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent e78ae003

drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c

+1 −0
Original line number Diff line number Diff line
@@ -309,6 +309,7 @@ static int set_hw_ioctxt(struct hinic_hwdev *hwdev, unsigned int rq_depth, 
	}



	hw_ioctxt.func_idx = HINIC_HWIF_FUNC_IDX(hwif);

	hw_ioctxt.ppf_idx = HINIC_HWIF_PPF_IDX(hwif);



	hw_ioctxt.set_cmdq_depth = HW_IOCTXT_SET_CMDQ_DEPTH_DEFAULT;

	hw_ioctxt.cmdq_depth = 0;

drivers/net/ethernet/huawei/hinic/hinic_hw_dev.h

+1 −1
Original line number Diff line number Diff line
@@ -104,8 +104,8 @@ struct hinic_cmd_hw_ioctxt { 


	u8      rsvd2;

	u8      rsvd3;

	u8      ppf_idx;

	u8      rsvd4;

	u8      rsvd5;



	u16     rq_depth;

	u16     rx_buf_sz_idx;

drivers/net/ethernet/huawei/hinic/hinic_hw_if.h

+1 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ 
#define HINIC_HWIF_FUNC_IDX(hwif)       ((hwif)->attr.func_idx)

#define HINIC_HWIF_PCI_INTF(hwif)       ((hwif)->attr.pci_intf_idx)

#define HINIC_HWIF_PF_IDX(hwif)         ((hwif)->attr.pf_idx)

#define HINIC_HWIF_PPF_IDX(hwif)        ((hwif)->attr.ppf_idx)



#define HINIC_FUNC_TYPE(hwif)           ((hwif)->attr.func_type)

#define HINIC_IS_PF(hwif)               (HINIC_FUNC_TYPE(hwif) == HINIC_PF)