diff --git a/drivers/scsi/hisi_sas/hisi_sas.h b/drivers/scsi/hisi_sas/hisi_sas.h
index 34091808601201b73207e4d20129756253d478d3..9ff48904ae2738524222970e5ef8a6590484f91c 100644
--- a/drivers/scsi/hisi_sas/hisi_sas.h
+++ b/drivers/scsi/hisi_sas/hisi_sas.h
@@ -410,8 +410,9 @@ struct hisi_hba {
 	struct dentry *debugfs_bist_dentry;
 
 	bool user_ctl_irq;
-	unsigned int reply_map[NR_CPUS];
+	unsigned int dq_idx[NR_CPUS];
 	int nvecs;
+	unsigned int dq_num_per_node;
 };
 
 /* Generic HW DMA host memory structures */
diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c
index 94c2887a1767d61ee37e8916830b93ad48602f41..4805e8390e71a770e705ef12e50be65a4ea31f8a 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -467,7 +467,10 @@ static int hisi_sas_task_prep(struct sas_task *task,
 	struct hisi_sas_dq *dq;
 	unsigned long flags;
 	int wr_q_index;
-	unsigned int dq_index = hisi_hba->reply_map[raw_smp_processor_id()];
+	unsigned int curr_node_id = numa_node_id();
+	unsigned int dq_index =
+		(hisi_hba->dq_idx[curr_node_id] % hisi_hba->dq_num_per_node) +
+		(hisi_hba->dq_num_per_node * curr_node_id);
 
 	if (DEV_IS_GONE(sas_dev)) {
 		if (sas_dev)
@@ -584,6 +587,7 @@ static int hisi_sas_task_prep(struct sas_task *task,
 	spin_unlock_irqrestore(&task->task_state_lock, flags);
 
 	++(*pass);
+	++hisi_hba->dq_idx[curr_node_id];
 	WRITE_ONCE(slot->ready, 1);
 
 	return 0;
@@ -2328,6 +2332,11 @@ int hisi_sas_alloc(struct hisi_hba *hisi_hba)
 
 	sema_init(&hisi_hba->sem, 1);
 	spin_lock_init(&hisi_hba->lock);
+	hisi_hba->dq_num_per_node = hisi_hba->queue_count/num_online_nodes();
+
+	for (i = 0; i < NR_CPUS; i++)
+		hisi_hba->dq_idx[i] = 0;
+
 	for (i = 0; i < hisi_hba->n_phy; i++) {
 		hisi_sas_phy_init(hisi_hba, i);
 		hisi_hba->port[i].port_attached = 0;
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
index 1d34d849bd3a55f0e47e91b78d31892ddde3e0f4..cb1b72064c73e83b7fbd9c388f80b72ce6510bd9 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@ -2528,27 +2528,6 @@ static irqreturn_t cq_interrupt_v3_hw(int irq_no, void *p)
 	return IRQ_HANDLED;
 }
 
-static void setup_reply_map_v3_hw(struct hisi_hba *hisi_hba, int nvecs)
-{
-	const struct cpumask *mask;
-	int queue, cpu;
-
-	for (queue = 0; queue < nvecs; queue++) {
-		mask = pci_irq_get_affinity(hisi_hba->pci_dev,
-					    queue +
-					    HISI_SAS_CQ_INT_BASE_VECTORS_V3_HW);
-		if (!mask)
-			goto fallback;
-		for_each_cpu(cpu, mask)
-			hisi_hba->reply_map[cpu] = queue;
-	}
-	return;
-
-fallback:
-	for_each_possible_cpu(cpu)
-		hisi_hba->reply_map[cpu] = cpu % hisi_hba->queue_count;
-}
-
 static int interrupt_init_v3_hw(struct hisi_hba *hisi_hba)
 {
 	struct device *dev = hisi_hba->dev;
@@ -2570,8 +2549,6 @@ static int interrupt_init_v3_hw(struct hisi_hba *hisi_hba)
 				PCI_IRQ_MSI |
 				PCI_IRQ_AFFINITY,
 				&desc);
-		setup_reply_map_v3_hw(hisi_hba, vectors -
-				      HISI_SAS_CQ_INT_BASE_VECTORS_V3_HW);
 	}
 
 	if (vectors < HISI_SAS_MIN_VECTORS_V3_HW) {