|
@@ -2481,20 +2481,17 @@ static irqreturn_t fatal_axi_int_v2_hw(int irq_no, void *p)
|
|
|
return IRQ_HANDLED;
|
|
|
}
|
|
|
|
|
|
-static irqreturn_t cq_interrupt_v2_hw(int irq_no, void *p)
|
|
|
+static void cq_tasklet_v2_hw(unsigned long val)
|
|
|
{
|
|
|
- struct hisi_sas_cq *cq = p;
|
|
|
+ struct hisi_sas_cq *cq = (struct hisi_sas_cq *)val;
|
|
|
struct hisi_hba *hisi_hba = cq->hisi_hba;
|
|
|
struct hisi_sas_slot *slot;
|
|
|
struct hisi_sas_itct *itct;
|
|
|
struct hisi_sas_complete_v2_hdr *complete_queue;
|
|
|
- u32 irq_value, rd_point = cq->rd_point, wr_point, dev_id;
|
|
|
+ u32 rd_point = cq->rd_point, wr_point, dev_id;
|
|
|
int queue = cq->id;
|
|
|
|
|
|
complete_queue = hisi_hba->complete_hdr[queue];
|
|
|
- irq_value = hisi_sas_read32(hisi_hba, OQ_INT_SRC);
|
|
|
-
|
|
|
- hisi_sas_write32(hisi_hba, OQ_INT_SRC, 1 << queue);
|
|
|
|
|
|
wr_point = hisi_sas_read32(hisi_hba, COMPL_Q_0_WR_PTR +
|
|
|
(0x14 * queue));
|
|
@@ -2545,6 +2542,18 @@ static irqreturn_t cq_interrupt_v2_hw(int irq_no, void *p)
|
|
|
/* update rd_point */
|
|
|
cq->rd_point = rd_point;
|
|
|
hisi_sas_write32(hisi_hba, COMPL_Q_0_RD_PTR + (0x14 * queue), rd_point);
|
|
|
+}
|
|
|
+
|
|
|
+static irqreturn_t cq_interrupt_v2_hw(int irq_no, void *p)
|
|
|
+{
|
|
|
+ struct hisi_sas_cq *cq = p;
|
|
|
+ struct hisi_hba *hisi_hba = cq->hisi_hba;
|
|
|
+ int queue = cq->id;
|
|
|
+
|
|
|
+ hisi_sas_write32(hisi_hba, OQ_INT_SRC, 1 << queue);
|
|
|
+
|
|
|
+ tasklet_schedule(&cq->tasklet);
|
|
|
+
|
|
|
return IRQ_HANDLED;
|
|
|
}
|
|
|
|
|
@@ -2726,6 +2735,8 @@ static int interrupt_init_v2_hw(struct hisi_hba *hisi_hba)
|
|
|
|
|
|
for (i = 0; i < hisi_hba->queue_count; i++) {
|
|
|
int idx = i + 96; /* First cq interrupt is irq96 */
|
|
|
+ struct hisi_sas_cq *cq = &hisi_hba->cq[i];
|
|
|
+ struct tasklet_struct *t = &cq->tasklet;
|
|
|
|
|
|
irq = irq_map[idx];
|
|
|
if (!irq) {
|
|
@@ -2742,6 +2753,7 @@ static int interrupt_init_v2_hw(struct hisi_hba *hisi_hba)
|
|
|
irq, rc);
|
|
|
return -ENOENT;
|
|
|
}
|
|
|
+ tasklet_init(t, cq_tasklet_v2_hw, (unsigned long)cq);
|
|
|
}
|
|
|
|
|
|
return 0;
|