lkml.org 
[lkml]   [2021]   [Jan]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/5] scsi: hisi_sas: Don't check .nr_hw_queues in hisi_sas_task_prep()
    Date
    Now that v2 and v3 hw expose their HW queues (and so shost.nr_hw_queues is
    set), remove the conditional checks in hisi_sas_task_prep().

    This change would affect v1 HW performance (as it does not expose HW
    queues), but nobody uses it and support may be dropped soon.

    Reviewed-by: Xiang Chen <chenxiang66@hisilicon.com>
    Signed-off-by: John Garry <john.garry@huawei.com>
    ---
    drivers/scsi/hisi_sas/hisi_sas_main.c | 6 ++----
    1 file changed, 2 insertions(+), 4 deletions(-)

    diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c
    index 625327e99b06..d469ffda9008 100644
    --- a/drivers/scsi/hisi_sas/hisi_sas_main.c
    +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
    @@ -445,21 +445,19 @@ static int hisi_sas_task_prep(struct sas_task *task,
    }
    }

    - if (scmd && hisi_hba->shost->nr_hw_queues) {
    + if (scmd) {
    unsigned int dq_index;
    u32 blk_tag;

    blk_tag = blk_mq_unique_tag(scmd->request);
    dq_index = blk_mq_unique_tag_to_hwq(blk_tag);
    *dq_pointer = dq = &hisi_hba->dq[dq_index];
    - } else if (hisi_hba->shost->nr_hw_queues) {
    + } else {
    struct Scsi_Host *shost = hisi_hba->shost;
    struct blk_mq_queue_map *qmap = &shost->tag_set.map[HCTX_TYPE_DEFAULT];
    int queue = qmap->mq_map[raw_smp_processor_id()];

    *dq_pointer = dq = &hisi_hba->dq[queue];
    - } else {
    - *dq_pointer = dq = sas_dev->dq;
    }

    port = to_hisi_sas_port(sas_port);
    --
    2.26.2
    \
     
     \ /
      Last update: 2021-01-26 13:14    [W:2.559 / U:0.496 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site