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

Merge branch 'hinic-BugFixes' 



Luo bin says:

====================
hinic: BugFixes

the bug fixed in patch #2 has been present since the first commit.
the bugs fixed in patch #1 and patch #3 have been present since the
following commits:
patch #1: 352f58b0 ("net-next/hinic: Set Rxq irq to specific cpu for NUMA")
patch #3: 421e9526 ("hinic: add rss support")
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a2f2ef4a 386d4716

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

+1 −0
Original line number Diff line number Diff line
@@ -297,6 +297,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
@@ -151,8 +151,8 @@ struct hinic_cmd_hw_ioctxt { 


	u8      lro_en;

	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
@@ -137,6 +137,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)

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

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ struct hinic_rq { 


	struct hinic_wq         *wq;



	struct cpumask		affinity_mask;

	u32                     irq;

	u16                     msix_entry;

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

+2 −1
Original line number Diff line number Diff line
@@ -356,7 +356,8 @@ static void hinic_enable_rss(struct hinic_dev *nic_dev) 
	if (!num_cpus)

		num_cpus = num_online_cpus();



	nic_dev->num_qps = min_t(u16, nic_dev->max_qps, num_cpus);

	nic_dev->num_qps = hinic_hwdev_num_qps(hwdev);

	nic_dev->num_qps = min_t(u16, nic_dev->num_qps, num_cpus);



	nic_dev->rss_limit = nic_dev->num_qps;

	nic_dev->num_rss = nic_dev->num_qps;

CRA Git | Maintained and supported by SUSTech CRA and CCSE