@@ -177,13 +177,13 @@ static void hisi_sas_slot_index_set(struct hisi_hba *hisi_hba, int slot_idx)
}
static int hisi_sas_slot_index_alloc(struct hisi_hba *hisi_hba,
- struct scsi_cmnd *scsi_cmnd)
+ struct sas_task *task)
{
int index;
void *bitmap = hisi_hba->slot_index_tags;
- if (scsi_cmnd)
- return scsi_cmd_to_rq(scsi_cmnd)->tag;
+ if (task)
+ return sas_task_to_unique_tag(task);
spin_lock(&hisi_hba->lock);
index = find_next_zero_bit(bitmap, hisi_hba->slot_index_count,
@@ -572,7 +572,7 @@ static int hisi_sas_queue_command(struct sas_task *task, gfp_t gfp_flags)
if (!internal_abort && hisi_hba->hw->slot_index_alloc)
rc = hisi_hba->hw->slot_index_alloc(hisi_hba, device);
else
- rc = hisi_sas_slot_index_alloc(hisi_hba, scmd);
+ rc = hisi_sas_slot_index_alloc(hisi_hba, task);
if (rc < 0)
goto err_out_dif_dma_unmap;
@@ -1065,6 +1065,20 @@ int sas_execute_internal_abort_dev(struct domain_device *device,
}
EXPORT_SYMBOL_GPL(sas_execute_internal_abort_dev);
+static u32 sas_task_to_rq_unique_tag(struct sas_task *task)
+{
+ return blk_mq_unique_tag(scsi_cmd_to_rq(task->uldd_task));
+}
+
+unsigned int sas_task_to_unique_tag(struct sas_task *task)
+{
+ u32 unique = sas_task_to_rq_unique_tag(task);
+
+ return blk_mq_unique_tag_to_tag(unique);
+
+}
+EXPORT_SYMBOL_GPL(sas_task_to_unique_tag);
+
int sas_execute_tmf(struct domain_device *device, void *parameter,
int para_len, int force_phy_id,
struct sas_tmf_task *tmf)
@@ -625,6 +625,8 @@ struct sas_task {
struct sas_tmf_task *tmf;
};
+unsigned int sas_task_to_unique_tag(struct sas_task *task);
+
struct sas_task_slow {
/* standard/extra infrastructure for slow path commands (SMP and
* internal lldd commands
Add a function to get the unique request tag from a sas_task. Signed-off-by: John Garry <john.garry@huawei.com> --- drivers/scsi/hisi_sas/hisi_sas_main.c | 8 ++++---- drivers/scsi/libsas/sas_scsi_host.c | 14 ++++++++++++++ include/scsi/libsas.h | 2 ++ 3 files changed, 20 insertions(+), 4 deletions(-)