d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/hns3: fix MSI-X interrupt during initialization

Browse Source 
Currently, based on hns3 VF device error may occur during initialization.

The root cause as below:
When the following formula is executed during initialization, the
private variable named hw->tqps_num has not been obtained from PF driver
through mailbox, further causes failure when mapping interrupt and
queues.
  hw->num_msi = (num_msi > hw->tqps_num + 1) ? hw->tqps_num + 1 : num_msi;
We need to use hw->tqp_num after it is correctly assigned.

On the other hand, because the private variable named hw->num_msi, which
represents the number of MSI-x interrupt of hns3 PF/VF device, is used in
the '.get_reg' ops implementation function to dump all interrupt related
registers, it should be obtained from firmware directly and we'd better
not modify it in the driver.

Fixes: ef2e785c36 ("net/hns3: fix Tx interrupt when enabling Rx interrupt")
Fixes: 02a7b55657 ("net/hns3: support Rx interrupt")
Cc: stable@dpdk.org

Signed-off-by: Wei Hu (Xavier) <xavier.huwei@huawei.com>
Signed-off-by: Hao Chen <chenhao164@huawei.com>
Signed-off-by: Min Hu (Connor) <humin29@huawei.com>
This commit is contained in:
Wei Hu (Xavier) 2020-04-29 19:13:27 +08:00 committed by Ferruh Yigit
parent 99d673d5d3
commit 2de74dcfbd
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/hns3/hns3_ethdev.c
View File

@ -2236,7 +2236,8 @@ hns3_init_ring_with_vector(struct hns3_hw *hw)
* Rx interrupt.
*/
vec = hw->num_msi - 1; /* vector 0 for misc interrupt, not for queue */
hw->intr_tqps_num = vec - 1; /* the last interrupt is reserved */
/* vec - 1: the last interrupt is reserved */
hw->intr_tqps_num = vec > hw->tqps_num ? hw->tqps_num : vec - 1;
for (i = 0; i < hw->intr_tqps_num; i++) {
/*
* Set gap limiter and rate limiter configuration of queue's
@ -2625,7 +2626,6 @@ hns3_query_pf_resource(struct hns3_hw *hw)
struct hns3_pf *pf = &hns->pf;
struct hns3_pf_res_cmd *req;
struct hns3_cmd_desc desc;
uint16_t num_msi;
int ret;
hns3_cmd_setup_basic_desc(&desc, HNS3_OPC_QUERY_PF_RSRC, true);
@ -2657,9 +2657,9 @@ hns3_query_pf_resource(struct hns3_hw *hw)
pf->dv_buf_size = roundup(pf->dv_buf_size, HNS3_BUF_SIZE_UNIT);
num_msi = hns3_get_field(rte_le_to_cpu_16(req->pf_intr_vector_number),
HNS3_VEC_NUM_M, HNS3_VEC_NUM_S);
hw->num_msi = (num_msi > hw->tqps_num + 1) ? hw->tqps_num + 1 : num_msi;
hw->num_msi =
hns3_get_field(rte_le_to_cpu_16(req->pf_intr_vector_number),
HNS3_VEC_NUM_M, HNS3_VEC_NUM_S);
return 0;
}

5
drivers/net/hns3/hns3_ethdev_vf.c
View File

@ -713,7 +713,8 @@ hns3vf_init_ring_with_vector(struct hns3_hw *hw)
* Rx interrupt.
*/
vec = hw->num_msi - 1; /* vector 0 for misc interrupt, not for queue */
hw->intr_tqps_num = vec - 1; /* the last interrupt is reserved */
/* vec - 1: the last interrupt is reserved */
hw->intr_tqps_num = vec > hw->tqps_num ? hw->tqps_num : vec - 1;
for (i = 0; i < hw->intr_tqps_num; i++) {
/*
* Set gap limiter and rate limiter configuration of queue's
@ -1473,7 +1474,7 @@ hns3_query_vf_resource(struct hns3_hw *hw)
return -EINVAL;
}
hw->num_msi = (num_msi > hw->tqps_num + 1) ? hw->tqps_num + 1 : num_msi;
hw->num_msi = num_msi;
return 0;
}