Commit 3f8ad007 authored by Manish Rangankar's avatar Manish Rangankar Committed by Martin K. Petersen

scsi: qedi: Use qed count from set_fp_int in msix allocation

To avoid unnecessary vector allocation when the number of fast-path queues
is less then available msix vectors, use return count from module
qed->set_fp_int.

Link: https://lore.kernel.org/r/20200908095657.26821-2-mrangankar@marvell.comSigned-off-by: default avatarManish Rangankar <mrangankar@marvell.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 5476b7f5
...@@ -305,6 +305,7 @@ struct qedi_ctx { ...@@ -305,6 +305,7 @@ struct qedi_ctx {
u32 max_sqes; u32 max_sqes;
u8 num_queues; u8 num_queues;
u32 max_active_conns; u32 max_active_conns;
s32 msix_count;
struct iscsi_cid_queue cid_que; struct iscsi_cid_queue cid_que;
struct qedi_endpoint **ep_tbl; struct qedi_endpoint **ep_tbl;
......
...@@ -1356,7 +1356,7 @@ static int qedi_request_msix_irq(struct qedi_ctx *qedi) ...@@ -1356,7 +1356,7 @@ static int qedi_request_msix_irq(struct qedi_ctx *qedi)
u16 idx; u16 idx;
cpu = cpumask_first(cpu_online_mask); cpu = cpumask_first(cpu_online_mask);
for (i = 0; i < qedi->int_info.msix_cnt; i++) { for (i = 0; i < qedi->msix_count; i++) {
idx = i * qedi->dev_info.common.num_hwfns + idx = i * qedi->dev_info.common.num_hwfns +
qedi_ops->common->get_affin_hwfn_idx(qedi->cdev); qedi_ops->common->get_affin_hwfn_idx(qedi->cdev);
...@@ -1386,7 +1386,12 @@ static int qedi_setup_int(struct qedi_ctx *qedi) ...@@ -1386,7 +1386,12 @@ static int qedi_setup_int(struct qedi_ctx *qedi)
{ {
int rc = 0; int rc = 0;
rc = qedi_ops->common->set_fp_int(qedi->cdev, num_online_cpus()); rc = qedi_ops->common->set_fp_int(qedi->cdev, qedi->num_queues);
if (rc < 0)
goto exit_setup_int;
qedi->msix_count = rc;
rc = qedi_ops->common->get_fp_int(qedi->cdev, &qedi->int_info); rc = qedi_ops->common->get_fp_int(qedi->cdev, &qedi->int_info);
if (rc) if (rc)
goto exit_setup_int; goto exit_setup_int;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment