From: Oded Gabbay <oded.gabbay@gmail.com>
To: Mike Rapoport <rppt@linux.ibm.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"Linux-Kernel@Vger. Kernel. Org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 08/15] habanalabs: add event queue and interrupts
Date: Mon, 28 Jan 2019 13:14:26 +0200 [thread overview]
Message-ID: <CAFCwf12mJPk+06OCNOSHV_PanT94dCn0mYM6KCa3Of9bfeR5Ag@mail.gmail.com> (raw)
In-Reply-To: <20190125075137.GD31519@rapoport-lnx>
On Fri, Jan 25, 2019 at 9:51 AM Mike Rapoport <rppt@linux.ibm.com> wrote:
>
> On Wed, Jan 23, 2019 at 02:00:50AM +0200, Oded Gabbay wrote:
> > This patch adds support for receiving events from Goya's control CPU and
> > for receiving MSI-X interrupts from Goya's DMA engines and CPU.
> >
> > Goya's PCI controller supports up to 8 MSI-X interrupts, which only 6 of
> > them are currently used. The first 5 interrupts are dedicated for Goya's
> > DMA engine queues. The 6th interrupt is dedicated for Goya's control CPU.
> >
> > The DMA queue will signal its MSI-X entry upon each completion of a command
> > buffer that was placed on its primary queue. The driver will then mark that
> > CB as completed and free the related resources. It will also update the
> > command submission object which that CB belongs to.
> >
> > There is a dedicated event queue (EQ) between the driver and Goya's control
> > CPU. The EQ is located on the Host memory. The control CPU writes a new
> > entry to the EQ for various reasons, such as ECC error, MMU page fault, Hot
> > temperature. After writing the new entry to the EQ, the control CPU will
> > trigger its dedicated MSI-X entry to signal the driver that there is a new
> > entry in the EQ. The driver will then read the entry and act accordingly.
> >
> > Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com>
> > ---
> > drivers/misc/habanalabs/device.c | 35 +-
> > drivers/misc/habanalabs/goya/goya.c | 522 +++++++++++++++++++-
> > drivers/misc/habanalabs/goya/goyaP.h | 1 +
> > drivers/misc/habanalabs/habanalabs.h | 37 ++
> > drivers/misc/habanalabs/include/goya/goya.h | 1 -
> > drivers/misc/habanalabs/irq.c | 144 ++++++
> > 6 files changed, 729 insertions(+), 11 deletions(-)
> >
> > diff --git a/drivers/misc/habanalabs/device.c b/drivers/misc/habanalabs/device.c
> > index 98220628a467..9199e070e79e 100644
> > --- a/drivers/misc/habanalabs/device.c
> > +++ b/drivers/misc/habanalabs/device.c
> > @@ -173,9 +173,17 @@ static int device_early_init(struct hl_device *hdev)
> > hdev->cq_wq = alloc_workqueue("hl-free-jobs", WQ_UNBOUND, 0);
> > if (hdev->cq_wq == NULL) {
> > dev_err(hdev->dev, "Failed to allocate CQ workqueue\n");
> > + rc = -ENOMEM;
>
> Apparently, it should have been in one of the earlier patches
>
Correct, fixed
> > goto asid_fini;
> > }
> >
> > + hdev->eq_wq = alloc_workqueue("hl-events", WQ_UNBOUND, 0);
> > + if (hdev->eq_wq == NULL) {
> > + dev_err(hdev->dev, "Failed to allocate EQ workqueue\n");
> > + rc = -ENOMEM;
> > + goto free_cq_wq;
> > + }
> > +
> > hl_cb_mgr_init(&hdev->kernel_cb_mgr);
> >
> > mutex_init(&hdev->device_open);
> > @@ -184,6 +192,8 @@ static int device_early_init(struct hl_device *hdev)
> >
> > return 0;
> >
> > +free_cq_wq:
> > + destroy_workqueue(hdev->cq_wq);
> > asid_fini:
> > hl_asid_fini(hdev);
> > early_fini:
> > @@ -205,6 +215,7 @@ static void device_early_fini(struct hl_device *hdev)
> >
> > hl_cb_mgr_fini(hdev, &hdev->kernel_cb_mgr);
> >
> > + destroy_workqueue(hdev->eq_wq);
> > destroy_workqueue(hdev->cq_wq);
> >
> > hl_asid_fini(hdev);
> > @@ -343,11 +354,22 @@ int hl_device_init(struct hl_device *hdev, struct class *hclass)
> > }
> > }
> >
> > + /*
> > + * Initialize the event queue. Must be done before hw_init,
> > + * because there the address of the event queue is being
> > + * passed as argument to request_irq
> > + */
> > + rc = hl_eq_init(hdev, &hdev->event_queue);
> > + if (rc) {
> > + dev_err(hdev->dev, "failed to initialize event queue\n");
> > + goto cq_fini;
> > + }
> > +
> > /* Allocate the kernel context */
> > hdev->kernel_ctx = kzalloc(sizeof(*hdev->kernel_ctx), GFP_KERNEL);
> > if (!hdev->kernel_ctx) {
> > rc = -ENOMEM;
> > - goto cq_fini;
> > + goto eq_fini;
> > }
> >
> > hdev->user_ctx = NULL;
> > @@ -392,6 +414,8 @@ int hl_device_init(struct hl_device *hdev, struct class *hclass)
> > "kernel ctx is still alive on initialization failure\n");
> > free_ctx:
> > kfree(hdev->kernel_ctx);
> > +eq_fini:
> > + hl_eq_fini(hdev, &hdev->event_queue);
> > cq_fini:
> > for (i = 0 ; i < cq_ready_cnt ; i++)
> > hl_cq_fini(hdev, &hdev->completion_queue[i]);
> > @@ -433,6 +457,13 @@ void hl_device_fini(struct hl_device *hdev)
> > /* Mark device as disabled */
> > hdev->disabled = true;
> >
> > + /*
> > + * Halt the engines and disable interrupts so we won't get any more
> > + * completions from H/W and we won't have any accesses from the
> > + * H/W to the host machine
> > + */
> > + hdev->asic_funcs->halt_engines(hdev, true);
> > +
> > hl_cb_pool_fini(hdev);
> >
> > /* Release kernel context */
> > @@ -442,6 +473,8 @@ void hl_device_fini(struct hl_device *hdev)
> > /* Reset the H/W. It will be in idle state after this returns */
> > hdev->asic_funcs->hw_fini(hdev, true);
> >
> > + hl_eq_fini(hdev, &hdev->event_queue);
> > +
> > for (i = 0 ; i < hdev->asic_prop.completion_queues_count ; i++)
> > hl_cq_fini(hdev, &hdev->completion_queue[i]);
> > kfree(hdev->completion_queue);
> > diff --git a/drivers/misc/habanalabs/goya/goya.c b/drivers/misc/habanalabs/goya/goya.c
> > index 08d5227eaf1d..6c04277ae0fa 100644
> > --- a/drivers/misc/habanalabs/goya/goya.c
> > +++ b/drivers/misc/habanalabs/goya/goya.c
> > @@ -92,9 +92,41 @@
> >
> > #define GOYA_MAX_INITIATORS 20
> >
> > +#define GOYA_MAX_STRING_LEN 20
> > +
> > #define GOYA_CB_POOL_CB_CNT 512
> > #define GOYA_CB_POOL_CB_SIZE 0x20000 /* 128KB */
> >
> > +static const char goya_irq_name[GOYA_MSIX_ENTRIES][GOYA_MAX_STRING_LEN] = {
> > + "goya cq 0", "goya cq 1", "goya cq 2", "goya cq 3",
> > + "goya cq 4", "goya cpu eq"
> > +};
> > +
> > +static const char *goya_axi_name[GOYA_MAX_INITIATORS] = {
> > + "MME0",
> > + "MME1",
> > + "MME2",
> > + "MME3",
> > + "MME4",
> > + "MME5",
> > + "TPC0",
> > + "TPC1",
> > + "TPC2",
> > + "TPC3",
> > + "TPC4",
> > + "TPC5",
> > + "TPC6",
> > + "TPC7",
> > + "PCI",
> > + "DMA", /* HBW */
> > + "DMA", /* LBW */
> > + "PSOC",
> > + "CPU",
> > + "MMU"
> > +};
> > +
> > +#define GOYA_ASYC_EVENT_GROUP_NON_FATAL_SIZE 121
> > +
> > static void goya_get_fixed_properties(struct hl_device *hdev)
> > {
> > struct asic_fixed_properties *prop = &hdev->asic_prop;
> > @@ -139,6 +171,7 @@ static void goya_get_fixed_properties(struct hl_device *hdev)
> > prop->va_space_dram_end_address = VA_DDR_SPACE_END;
> > prop->cfg_size = CFG_SIZE;
> > prop->max_asid = MAX_ASID;
> > + prop->num_of_events = GOYA_ASYNC_EVENT_ID_SIZE;
> > prop->cb_pool_cb_cnt = GOYA_CB_POOL_CB_CNT;
> > prop->cb_pool_cb_size = GOYA_CB_POOL_CB_SIZE;
> > prop->tpc_enabled_mask = TPC_ENABLED_MASK;
> > @@ -668,15 +701,10 @@ static void goya_init_dma_qman(struct hl_device *hdev, int dma_id,
> > WREG32(mmDMA_QM_0_PQ_CFG1 + reg_off, 0x00020002);
> > WREG32(mmDMA_QM_0_CQ_CFG1 + reg_off, 0x00080008);
> >
> > - if (dma_id == 0)
> > - WREG32(mmDMA_QM_0_GLBL_PROT + reg_off, QMAN_DMA_FULLY_TRUSTED);
> > + if (goya->hw_cap_initialized & HW_CAP_MMU)
> > + WREG32(mmDMA_QM_0_GLBL_PROT + reg_off, QMAN_DMA_PARTLY_TRUSTED);
> > else
> > - if (goya->hw_cap_initialized & HW_CAP_MMU)
> > - WREG32(mmDMA_QM_0_GLBL_PROT + reg_off,
> > - QMAN_DMA_PARTLY_TRUSTED);
> > - else
> > - WREG32(mmDMA_QM_0_GLBL_PROT + reg_off,
> > - QMAN_DMA_FULLY_TRUSTED);
> > + WREG32(mmDMA_QM_0_GLBL_PROT + reg_off, QMAN_DMA_FULLY_TRUSTED);
> >
> > WREG32(mmDMA_QM_0_GLBL_ERR_CFG + reg_off, QMAN_DMA_ERR_MSG_EN);
> > WREG32(mmDMA_QM_0_GLBL_CFG0 + reg_off, QMAN_DMA_ENABLE);
> > @@ -870,6 +898,7 @@ static void goya_resume_external_queues(struct hl_device *hdev)
> > int goya_init_cpu_queues(struct hl_device *hdev)
> > {
> > struct goya_device *goya = hdev->asic_specific;
> > + struct hl_eq *eq;
> > dma_addr_t bus_address;
> > u32 status;
> > struct hl_hw_queue *cpu_pq = &hdev->kernel_queues[GOYA_QUEUE_ID_CPU_PQ];
> > @@ -881,17 +910,24 @@ int goya_init_cpu_queues(struct hl_device *hdev)
> > if (goya->hw_cap_initialized & HW_CAP_CPU_Q)
> > return 0;
> >
> > + eq = &hdev->event_queue;
> > +
> > bus_address = cpu_pq->bus_address +
> > hdev->asic_prop.host_phys_base_address;
> > WREG32(mmPSOC_GLOBAL_CONF_SCRATCHPAD_0, lower_32_bits(bus_address));
> > WREG32(mmPSOC_GLOBAL_CONF_SCRATCHPAD_1, upper_32_bits(bus_address));
> >
> > + bus_address = eq->bus_address + hdev->asic_prop.host_phys_base_address;
> > + WREG32(mmPSOC_GLOBAL_CONF_SCRATCHPAD_2, lower_32_bits(bus_address));
> > + WREG32(mmPSOC_GLOBAL_CONF_SCRATCHPAD_3, upper_32_bits(bus_address));
> > +
> > bus_address = hdev->cpu_accessible_dma_address +
> > hdev->asic_prop.host_phys_base_address;
> > WREG32(mmPSOC_GLOBAL_CONF_SCRATCHPAD_8, lower_32_bits(bus_address));
> > WREG32(mmPSOC_GLOBAL_CONF_SCRATCHPAD_9, upper_32_bits(bus_address));
> >
> > WREG32(mmPSOC_GLOBAL_CONF_SCRATCHPAD_5, HL_QUEUE_SIZE_IN_BYTES);
> > + WREG32(mmPSOC_GLOBAL_CONF_SCRATCHPAD_4, HL_EQ_SIZE_IN_BYTES);
> > WREG32(mmPSOC_GLOBAL_CONF_SCRATCHPAD_10, CPU_ACCESSIBLE_MEM_SIZE);
> >
> > /* Used for EQ CI */
> > @@ -2781,6 +2817,163 @@ static void goya_resume_internal_queues(struct hl_device *hdev)
> > WREG32(mmTPC7_CMDQ_GLBL_CFG1, 0);
> > }
> >
> > +static void goya_dma_stall(struct hl_device *hdev)
> > +{
> > + WREG32(mmDMA_QM_0_GLBL_CFG1, 1 << DMA_QM_0_GLBL_CFG1_DMA_STOP_SHIFT);
> > + WREG32(mmDMA_QM_1_GLBL_CFG1, 1 << DMA_QM_1_GLBL_CFG1_DMA_STOP_SHIFT);
> > + WREG32(mmDMA_QM_2_GLBL_CFG1, 1 << DMA_QM_2_GLBL_CFG1_DMA_STOP_SHIFT);
> > + WREG32(mmDMA_QM_3_GLBL_CFG1, 1 << DMA_QM_3_GLBL_CFG1_DMA_STOP_SHIFT);
> > + WREG32(mmDMA_QM_4_GLBL_CFG1, 1 << DMA_QM_4_GLBL_CFG1_DMA_STOP_SHIFT);
> > +}
> > +
> > +static void goya_tpc_stall(struct hl_device *hdev)
> > +{
> > + WREG32(mmTPC0_CFG_TPC_STALL, 1 << TPC0_CFG_TPC_STALL_V_SHIFT);
> > + WREG32(mmTPC1_CFG_TPC_STALL, 1 << TPC1_CFG_TPC_STALL_V_SHIFT);
> > + WREG32(mmTPC2_CFG_TPC_STALL, 1 << TPC2_CFG_TPC_STALL_V_SHIFT);
> > + WREG32(mmTPC3_CFG_TPC_STALL, 1 << TPC3_CFG_TPC_STALL_V_SHIFT);
> > + WREG32(mmTPC4_CFG_TPC_STALL, 1 << TPC4_CFG_TPC_STALL_V_SHIFT);
> > + WREG32(mmTPC5_CFG_TPC_STALL, 1 << TPC5_CFG_TPC_STALL_V_SHIFT);
> > + WREG32(mmTPC6_CFG_TPC_STALL, 1 << TPC6_CFG_TPC_STALL_V_SHIFT);
> > + WREG32(mmTPC7_CFG_TPC_STALL, 1 << TPC7_CFG_TPC_STALL_V_SHIFT);
> > +}
> > +
> > +static void goya_mme_stall(struct hl_device *hdev)
> > +{
> > + WREG32(mmMME_STALL, 0xFFFFFFFF);
> > +}
> > +
> > +static int goya_enable_msix(struct hl_device *hdev)
> > +{
> > + struct goya_device *goya = hdev->asic_specific;
> > + int cq_cnt = hdev->asic_prop.completion_queues_count;
> > + int rc, i, irq_cnt_init, irq;
> > +
> > + if (goya->hw_cap_initialized & HW_CAP_MSIX)
> > + return 0;
> > +
> > + rc = pci_alloc_irq_vectors(hdev->pdev, GOYA_MSIX_ENTRIES,
> > + GOYA_MSIX_ENTRIES, PCI_IRQ_MSIX);
> > + if (rc < 0) {
> > + dev_err(hdev->dev,
> > + "MSI-X: Failed to enable support -- %d/%d\n",
> > + GOYA_MSIX_ENTRIES, rc);
> > + return rc;
> > + }
> > +
> > + for (i = 0, irq_cnt_init = 0 ; i < cq_cnt ; i++, irq_cnt_init++) {
> > + irq = pci_irq_vector(hdev->pdev, i);
> > + rc = request_irq(irq, hl_irq_handler_cq, 0, goya_irq_name[i],
> > + &hdev->completion_queue[i]);
> > + if (rc) {
> > + dev_err(hdev->dev, "Failed to request IRQ %d", irq);
> > + goto free_irqs;
> > + }
> > + }
> > +
> > + irq = pci_irq_vector(hdev->pdev, EVENT_QUEUE_MSIX_IDX);
> > +
> > + rc = request_irq(irq, hl_irq_handler_eq, 0,
> > + goya_irq_name[EVENT_QUEUE_MSIX_IDX],
> > + &hdev->event_queue);
> > + if (rc) {
> > + dev_err(hdev->dev, "Failed to request IRQ %d", irq);
> > + goto free_irqs;
> > + }
> > +
> > + goya->hw_cap_initialized |= HW_CAP_MSIX;
> > + return 0;
> > +
> > +free_irqs:
> > + for (i = 0 ; i < irq_cnt_init ; i++)
> > + free_irq(pci_irq_vector(hdev->pdev, i),
> > + &hdev->completion_queue[i]);
> > +
> > + pci_free_irq_vectors(hdev->pdev);
> > + return rc;
> > +}
> > +
> > +static void goya_sync_irqs(struct hl_device *hdev)
> > +{
> > + struct goya_device *goya = hdev->asic_specific;
> > + int i;
> > +
> > + if (!(goya->hw_cap_initialized & HW_CAP_MSIX))
> > + return;
> > +
> > + /* Wait for all pending IRQs to be finished */
> > + for (i = 0 ; i < hdev->asic_prop.completion_queues_count ; i++)
> > + synchronize_irq(pci_irq_vector(hdev->pdev, i));
> > +
> > + synchronize_irq(pci_irq_vector(hdev->pdev, EVENT_QUEUE_MSIX_IDX));
> > +}
> > +
> > +static void goya_disable_msix(struct hl_device *hdev)
> > +{
> > + struct goya_device *goya = hdev->asic_specific;
> > + int i, irq;
> > +
> > + if (!(goya->hw_cap_initialized & HW_CAP_MSIX))
> > + return;
> > +
> > + goya_sync_irqs(hdev);
> > +
> > + irq = pci_irq_vector(hdev->pdev, EVENT_QUEUE_MSIX_IDX);
> > + free_irq(irq, &hdev->event_queue);
> > +
> > + for (i = 0 ; i < hdev->asic_prop.completion_queues_count ; i++) {
> > + irq = pci_irq_vector(hdev->pdev, i);
> > + free_irq(irq, &hdev->completion_queue[i]);
> > + }
> > +
> > + pci_free_irq_vectors(hdev->pdev);
> > +
> > + goya->hw_cap_initialized &= ~HW_CAP_MSIX;
> > +}
> > +
> > +static void goya_halt_engines(struct hl_device *hdev, bool hard_reset)
> > +{
> > + struct goya_device *goya = hdev->asic_specific;
> > + u32 wait_timeout_ms, cpu_timeout_ms;
> > +
> > + dev_info(hdev->dev,
> > + "Halting compute engines and disabling interrupts\n");
> > +
> > + if (hdev->pldm) {
> > + wait_timeout_ms = GOYA_PLDM_RESET_WAIT_MSEC;
> > + cpu_timeout_ms = GOYA_PLDM_RESET_WAIT_MSEC;
> > + } else {
> > + wait_timeout_ms = GOYA_RESET_WAIT_MSEC;
> > + cpu_timeout_ms = GOYA_CPU_RESET_WAIT_MSEC;
> > + }
> > +
> > + if ((hard_reset) && (goya->hw_cap_initialized & HW_CAP_CPU)) {
> > + WREG32(mmPSOC_GLOBAL_CONF_UBOOT_MAGIC, KMD_MSG_GOTO_WFE);
> > + if (hdev->fw_loading)
> > + WREG32(mmGIC_DISTRIBUTOR__5_GICD_SETSPI_NSR,
> > + GOYA_ASYNC_EVENT_ID_HALT_MACHINE);
> > + msleep(cpu_timeout_ms);
> > + }
> > +
> > + goya_stop_external_queues(hdev);
> > + goya_stop_internal_queues(hdev);
> > +
> > + msleep(wait_timeout_ms);
> > +
> > + goya_dma_stall(hdev);
> > + goya_tpc_stall(hdev);
> > + goya_mme_stall(hdev);
> > +
> > + msleep(wait_timeout_ms);
> > +
> > + goya_disable_external_queues(hdev);
> > + goya_disable_internal_queues(hdev);
> > +
> > + if (hard_reset)
> > + goya_disable_msix(hdev);
> > + else
> > + goya_sync_irqs(hdev);
> > +}
> >
> > /**
> > * goya_push_uboot_to_device - Push u-boot FW code to device
> > @@ -3166,11 +3359,16 @@ static int goya_hw_init(struct hl_device *hdev)
> >
> > goya_init_tpc_qmans(hdev);
> >
> > + /* MSI-X must be enabled before CPU queues are initialized */
> > + rc = goya_enable_msix(hdev);
> > + if (rc)
> > + goto disable_queues;
> > +
> > rc = goya_init_cpu_queues(hdev);
> > if (rc) {
> > dev_err(hdev->dev, "failed to initialize CPU H/W queues %d\n",
> > rc);
> > - goto disable_queues;
> > + goto disable_msix;
> > }
> >
> > /* CPU initialization is finished, we can now move to 48 bit DMA mask */
> > @@ -3204,6 +3402,8 @@ static int goya_hw_init(struct hl_device *hdev)
> >
> > disable_pci_access:
> > goya_send_pci_access_msg(hdev, ARMCP_PACKET_DISABLE_PCI_ACCESS);
> > +disable_msix:
> > + goya_disable_msix(hdev);
> > disable_queues:
> > goya_disable_internal_queues(hdev);
> > goya_disable_external_queues(hdev);
> > @@ -3287,6 +3487,7 @@ static void goya_hw_fini(struct hl_device *hdev, bool hard_reset)
> > HW_CAP_DMA | HW_CAP_MME |
> > HW_CAP_MMU | HW_CAP_TPC_MBIST |
> > HW_CAP_GOLDEN | HW_CAP_TPC);
> > + memset(goya->events_stat, 0, sizeof(goya->events_stat));
> >
> > if (!hdev->pldm) {
> > int rc;
> > @@ -3772,6 +3973,305 @@ void goya_cpu_accessible_dma_pool_free(struct hl_device *hdev, size_t size,
> > gen_pool_free(hdev->cpu_accessible_dma_pool, (u64) vaddr, size);
> > }
> >
> > +static void goya_update_eq_ci(struct hl_device *hdev, u32 val)
> > +{
> > + WREG32(mmPSOC_GLOBAL_CONF_SCRATCHPAD_6, val);
> > +}
> > +
> > +static void goya_get_axi_name(struct hl_device *hdev, u32 agent_id,
> > + u16 event_type, char *axi_name, int len)
> > +{
> > + if (!strcmp(goya_axi_name[agent_id], "DMA"))
> > + if (event_type >= GOYA_ASYNC_EVENT_ID_DMA0_CH)
> > + snprintf(axi_name, len, "DMA %d",
> > + event_type - GOYA_ASYNC_EVENT_ID_DMA0_CH);
> > + else
> > + snprintf(axi_name, len, "DMA %d",
> > + event_type - GOYA_ASYNC_EVENT_ID_DMA0_QM);
> > + else
> > + snprintf(axi_name, len, "%s", goya_axi_name[agent_id]);
> > +}
> > +
> > +static void goya_print_razwi_info(struct hl_device *hdev, u64 reg,
> > + bool is_hbw, bool is_read, u16 event_type)
> > +{
> > + u32 val, id, internal_id, agent_id, y, x;
> > + char axi_name[10] = {0};
> > +
> > + val = RREG32(reg);
> > +
> > + if (is_hbw) {
> > + id = (val & GOYA_IRQ_HBW_ID_MASK) >> GOYA_IRQ_HBW_ID_SHIFT;
> > + internal_id = (val & GOYA_IRQ_HBW_INTERNAL_ID_MASK) >>
> > + GOYA_IRQ_HBW_INTERNAL_ID_SHIFT;
> > + agent_id = (val & GOYA_IRQ_HBW_AGENT_ID_MASK) >>
> > + GOYA_IRQ_HBW_AGENT_ID_SHIFT;
> > + y = (val & GOYA_IRQ_HBW_Y_MASK) >> GOYA_IRQ_HBW_Y_SHIFT;
> > + x = (val & GOYA_IRQ_HBW_X_MASK) >> GOYA_IRQ_HBW_X_SHIFT;
> > + } else {
> > + id = (val & GOYA_IRQ_LBW_ID_MASK) >> GOYA_IRQ_LBW_ID_SHIFT;
> > + internal_id = (val & GOYA_IRQ_LBW_INTERNAL_ID_MASK) >>
> > + GOYA_IRQ_LBW_INTERNAL_ID_SHIFT;
> > + agent_id = (val & GOYA_IRQ_LBW_AGENT_ID_MASK) >>
> > + GOYA_IRQ_LBW_AGENT_ID_SHIFT;
> > + y = (val & GOYA_IRQ_LBW_Y_MASK) >> GOYA_IRQ_LBW_Y_SHIFT;
> > + x = (val & GOYA_IRQ_LBW_X_MASK) >> GOYA_IRQ_LBW_X_SHIFT;
> > + }
>
> It seems that only agent_id is used
>
Fixed
> > +
> > + if (agent_id >= GOYA_MAX_INITIATORS) {
> > + dev_err(hdev->dev,
> > + "Illegal %s %s with wrong initiator id %d, H/W IRQ %d\n",
> > + is_read ? "read from" : "write to",
> > + is_hbw ? "HBW" : "LBW",
> > + agent_id,
> > + event_type);
> > + } else {
> > + goya_get_axi_name(hdev, agent_id, event_type, axi_name,
> > + sizeof(axi_name));
> > + dev_err(hdev->dev, "Illegal %s by %s %s %s, H/W IRQ %d\n",
> > + is_read ? "read" : "write",
> > + axi_name,
> > + is_read ? "from" : "to",
> > + is_hbw ? "HBW" : "LBW",
> > + event_type);
> > + }
> > +}
> > +
> > +static void goya_print_irq_info(struct hl_device *hdev, u16 event_type)
> > +{
> > + struct goya_device *goya = hdev->asic_specific;
> > + bool is_hbw = false, is_read = false, is_info = false;
> > +
> > + if (RREG32(mmDMA_MACRO_RAZWI_LBW_WT_VLD)) {
> > + goya_print_razwi_info(hdev, mmDMA_MACRO_RAZWI_LBW_WT_ID, is_hbw,
> > + is_read, event_type);
> > + WREG32(mmDMA_MACRO_RAZWI_LBW_WT_VLD, 0);
> > + is_info = true;
> > + }
> > + if (RREG32(mmDMA_MACRO_RAZWI_LBW_RD_VLD)) {
> > + is_read = true;
> > + goya_print_razwi_info(hdev, mmDMA_MACRO_RAZWI_LBW_RD_ID, is_hbw,
> > + is_read, event_type);
> > + WREG32(mmDMA_MACRO_RAZWI_LBW_RD_VLD, 0);
> > + is_info = true;
> > + }
> > + if (RREG32(mmDMA_MACRO_RAZWI_HBW_WT_VLD)) {
> > + is_hbw = true;
> > + goya_print_razwi_info(hdev, mmDMA_MACRO_RAZWI_HBW_WT_ID, is_hbw,
> > + is_read, event_type);
> > + WREG32(mmDMA_MACRO_RAZWI_HBW_WT_VLD, 0);
> > + is_info = true;
> > + }
> > + if (RREG32(mmDMA_MACRO_RAZWI_HBW_RD_VLD)) {
> > + is_hbw = true;
> > + is_read = true;
> > + goya_print_razwi_info(hdev, mmDMA_MACRO_RAZWI_HBW_RD_ID, is_hbw,
> > + is_read, event_type);
> > + WREG32(mmDMA_MACRO_RAZWI_HBW_RD_VLD, 0);
> > + is_info = true;
> > + }
> > + if (!is_info) {
> > + dev_err(hdev->dev,
> > + "Received H/W interrupt %d, no additional info\n",
> > + event_type);
> > + return;
> > + }
> > +
> > + if (goya->hw_cap_initialized & HW_CAP_MMU) {
> > + u32 val = RREG32(mmMMU_PAGE_ERROR_CAPTURE);
> > + u64 addr;
> > +
> > + if (val & MMU_PAGE_ERROR_CAPTURE_ENTRY_VALID_MASK) {
> > + addr = val & MMU_PAGE_ERROR_CAPTURE_VA_49_32_MASK;
> > + addr <<= 32;
> > + addr |= RREG32(mmMMU_PAGE_ERROR_CAPTURE_VA);
> > +
> > + dev_err(hdev->dev, "MMU page fault on va 0x%llx\n",
> > + addr);
> > +
> > + WREG32(mmMMU_PAGE_ERROR_CAPTURE, 0);
> > + }
> > + }
> > +}
> > +
> > +static int goya_unmask_irq(struct hl_device *hdev, u16 event_type)
> > +{
> > + struct armcp_packet pkt;
> > + long result;
> > + int rc;
> > +
> > + memset(&pkt, 0, sizeof(pkt));
> > +
> > + pkt.opcode = ARMCP_PACKET_UNMASK_RAZWI_IRQ;
> > + pkt.value = event_type;
> > +
> > + rc = hdev->asic_funcs->send_cpu_message(hdev, (u32 *) &pkt, sizeof(pkt),
> > + HL_DEVICE_TIMEOUT_USEC, &result);
> > +
> > + if (rc)
> > + dev_err(hdev->dev, "failed to unmask RAZWI IRQ %d", event_type);
> > +
> > + return rc;
> > +}
> > +
> > +void goya_handle_eqe(struct hl_device *hdev, struct hl_eq_entry *eq_entry)
> > +{
> > + u16 event_type = ((eq_entry->hdr.ctl & EQ_CTL_EVENT_TYPE_MASK)
> > + >> EQ_CTL_EVENT_TYPE_SHIFT);
> > + struct goya_device *goya = hdev->asic_specific;
> > +
> > + goya->events_stat[event_type]++;
> > +
> > + switch (event_type) {
> > + case GOYA_ASYNC_EVENT_ID_PCIE_IF:
> > + case GOYA_ASYNC_EVENT_ID_TPC0_ECC:
> > + case GOYA_ASYNC_EVENT_ID_TPC1_ECC:
> > + case GOYA_ASYNC_EVENT_ID_TPC2_ECC:
> > + case GOYA_ASYNC_EVENT_ID_TPC3_ECC:
> > + case GOYA_ASYNC_EVENT_ID_TPC4_ECC:
> > + case GOYA_ASYNC_EVENT_ID_TPC5_ECC:
> > + case GOYA_ASYNC_EVENT_ID_TPC6_ECC:
> > + case GOYA_ASYNC_EVENT_ID_TPC7_ECC:
> > + case GOYA_ASYNC_EVENT_ID_MME_ECC:
> > + case GOYA_ASYNC_EVENT_ID_MME_ECC_EXT:
> > + case GOYA_ASYNC_EVENT_ID_MMU_ECC:
> > + case GOYA_ASYNC_EVENT_ID_DMA_MACRO:
> > + case GOYA_ASYNC_EVENT_ID_DMA_ECC:
> > + case GOYA_ASYNC_EVENT_ID_CPU_IF_ECC:
> > + case GOYA_ASYNC_EVENT_ID_PSOC_MEM:
> > + case GOYA_ASYNC_EVENT_ID_PSOC_CORESIGHT:
> > + case GOYA_ASYNC_EVENT_ID_SRAM0:
> > + case GOYA_ASYNC_EVENT_ID_SRAM1:
> > + case GOYA_ASYNC_EVENT_ID_SRAM2:
> > + case GOYA_ASYNC_EVENT_ID_SRAM3:
> > + case GOYA_ASYNC_EVENT_ID_SRAM4:
> > + case GOYA_ASYNC_EVENT_ID_SRAM5:
> > + case GOYA_ASYNC_EVENT_ID_SRAM6:
> > + case GOYA_ASYNC_EVENT_ID_SRAM7:
> > + case GOYA_ASYNC_EVENT_ID_SRAM8:
> > + case GOYA_ASYNC_EVENT_ID_SRAM9:
> > + case GOYA_ASYNC_EVENT_ID_SRAM10:
> > + case GOYA_ASYNC_EVENT_ID_SRAM11:
> > + case GOYA_ASYNC_EVENT_ID_SRAM12:
> > + case GOYA_ASYNC_EVENT_ID_SRAM13:
> > + case GOYA_ASYNC_EVENT_ID_SRAM14:
> > + case GOYA_ASYNC_EVENT_ID_SRAM15:
> > + case GOYA_ASYNC_EVENT_ID_SRAM16:
> > + case GOYA_ASYNC_EVENT_ID_SRAM17:
> > + case GOYA_ASYNC_EVENT_ID_SRAM18:
> > + case GOYA_ASYNC_EVENT_ID_SRAM19:
> > + case GOYA_ASYNC_EVENT_ID_SRAM20:
> > + case GOYA_ASYNC_EVENT_ID_SRAM21:
> > + case GOYA_ASYNC_EVENT_ID_SRAM22:
> > + case GOYA_ASYNC_EVENT_ID_SRAM23:
> > + case GOYA_ASYNC_EVENT_ID_SRAM24:
> > + case GOYA_ASYNC_EVENT_ID_SRAM25:
> > + case GOYA_ASYNC_EVENT_ID_SRAM26:
> > + case GOYA_ASYNC_EVENT_ID_SRAM27:
> > + case GOYA_ASYNC_EVENT_ID_SRAM28:
> > + case GOYA_ASYNC_EVENT_ID_SRAM29:
> > + case GOYA_ASYNC_EVENT_ID_GIC500:
> > + case GOYA_ASYNC_EVENT_ID_PLL0:
> > + case GOYA_ASYNC_EVENT_ID_PLL1:
> > + case GOYA_ASYNC_EVENT_ID_PLL3:
> > + case GOYA_ASYNC_EVENT_ID_PLL4:
> > + case GOYA_ASYNC_EVENT_ID_PLL5:
> > + case GOYA_ASYNC_EVENT_ID_PLL6:
> > + case GOYA_ASYNC_EVENT_ID_AXI_ECC:
> > + case GOYA_ASYNC_EVENT_ID_L2_RAM_ECC:
> > + case GOYA_ASYNC_EVENT_ID_PSOC_GPIO_05_SW_RESET:
> > + case GOYA_ASYNC_EVENT_ID_PSOC_GPIO_10_VRHOT_ICRIT:
> > + dev_err(hdev->dev,
> > + "Received H/W interrupt %d, reset the chip\n",
> > + event_type);
> > + break;
>
> Looks tough. Any chance some of these values are consecutive and can be
> grouped, e.g
>
> case GOYA_ASYNC_EVENT_ID_SRAM0 ... GOYA_ASYNC_EVENT_ID_SRAM29:
> ?
Fixed (did what I could)
>
> > +
> > + case GOYA_ASYNC_EVENT_ID_PCIE_DEC:
> > + case GOYA_ASYNC_EVENT_ID_TPC0_DEC:
> > + case GOYA_ASYNC_EVENT_ID_TPC1_DEC:
> > + case GOYA_ASYNC_EVENT_ID_TPC2_DEC:
> > + case GOYA_ASYNC_EVENT_ID_TPC3_DEC:
> > + case GOYA_ASYNC_EVENT_ID_TPC4_DEC:
> > + case GOYA_ASYNC_EVENT_ID_TPC5_DEC:
> > + case GOYA_ASYNC_EVENT_ID_TPC6_DEC:
> > + case GOYA_ASYNC_EVENT_ID_TPC7_DEC:
> > + case GOYA_ASYNC_EVENT_ID_MME_WACS:
> > + case GOYA_ASYNC_EVENT_ID_MME_WACSD:
> > + case GOYA_ASYNC_EVENT_ID_CPU_AXI_SPLITTER:
> > + case GOYA_ASYNC_EVENT_ID_PSOC_AXI_DEC:
> > + case GOYA_ASYNC_EVENT_ID_PSOC:
> > + case GOYA_ASYNC_EVENT_ID_TPC0_KRN_ERR:
> > + case GOYA_ASYNC_EVENT_ID_TPC1_KRN_ERR:
> > + case GOYA_ASYNC_EVENT_ID_TPC2_KRN_ERR:
> > + case GOYA_ASYNC_EVENT_ID_TPC3_KRN_ERR:
> > + case GOYA_ASYNC_EVENT_ID_TPC4_KRN_ERR:
> > + case GOYA_ASYNC_EVENT_ID_TPC5_KRN_ERR:
> > + case GOYA_ASYNC_EVENT_ID_TPC6_KRN_ERR:
> > + case GOYA_ASYNC_EVENT_ID_TPC7_KRN_ERR:
> > + case GOYA_ASYNC_EVENT_ID_TPC0_CMDQ:
> > + case GOYA_ASYNC_EVENT_ID_TPC1_CMDQ:
> > + case GOYA_ASYNC_EVENT_ID_TPC2_CMDQ:
> > + case GOYA_ASYNC_EVENT_ID_TPC3_CMDQ:
> > + case GOYA_ASYNC_EVENT_ID_TPC4_CMDQ:
> > + case GOYA_ASYNC_EVENT_ID_TPC5_CMDQ:
> > + case GOYA_ASYNC_EVENT_ID_TPC6_CMDQ:
> > + case GOYA_ASYNC_EVENT_ID_TPC7_CMDQ:
> > + case GOYA_ASYNC_EVENT_ID_TPC0_QM:
> > + case GOYA_ASYNC_EVENT_ID_TPC1_QM:
> > + case GOYA_ASYNC_EVENT_ID_TPC2_QM:
> > + case GOYA_ASYNC_EVENT_ID_TPC3_QM:
> > + case GOYA_ASYNC_EVENT_ID_TPC4_QM:
> > + case GOYA_ASYNC_EVENT_ID_TPC5_QM:
> > + case GOYA_ASYNC_EVENT_ID_TPC6_QM:
> > + case GOYA_ASYNC_EVENT_ID_TPC7_QM:
> > + case GOYA_ASYNC_EVENT_ID_MME_QM:
> > + case GOYA_ASYNC_EVENT_ID_MME_CMDQ:
> > + case GOYA_ASYNC_EVENT_ID_DMA0_QM:
> > + case GOYA_ASYNC_EVENT_ID_DMA1_QM:
> > + case GOYA_ASYNC_EVENT_ID_DMA2_QM:
> > + case GOYA_ASYNC_EVENT_ID_DMA3_QM:
> > + case GOYA_ASYNC_EVENT_ID_DMA4_QM:
> > + case GOYA_ASYNC_EVENT_ID_DMA0_CH:
> > + case GOYA_ASYNC_EVENT_ID_DMA1_CH:
> > + case GOYA_ASYNC_EVENT_ID_DMA2_CH:
> > + case GOYA_ASYNC_EVENT_ID_DMA3_CH:
> > + case GOYA_ASYNC_EVENT_ID_DMA4_CH:
> > + goya_print_irq_info(hdev, event_type);
> > + goya_unmask_irq(hdev, event_type);
> > + break;
> > +
> > + case GOYA_ASYNC_EVENT_ID_TPC0_BMON_SPMU:
> > + case GOYA_ASYNC_EVENT_ID_TPC1_BMON_SPMU:
> > + case GOYA_ASYNC_EVENT_ID_TPC2_BMON_SPMU:
> > + case GOYA_ASYNC_EVENT_ID_TPC3_BMON_SPMU:
> > + case GOYA_ASYNC_EVENT_ID_TPC4_BMON_SPMU:
> > + case GOYA_ASYNC_EVENT_ID_TPC5_BMON_SPMU:
> > + case GOYA_ASYNC_EVENT_ID_TPC6_BMON_SPMU:
> > + case GOYA_ASYNC_EVENT_ID_TPC7_BMON_SPMU:
> > + case GOYA_ASYNC_EVENT_ID_DMA_BM_CH0:
> > + case GOYA_ASYNC_EVENT_ID_DMA_BM_CH1:
> > + case GOYA_ASYNC_EVENT_ID_DMA_BM_CH2:
> > + case GOYA_ASYNC_EVENT_ID_DMA_BM_CH3:
> > + case GOYA_ASYNC_EVENT_ID_DMA_BM_CH4:
> > + dev_info(hdev->dev, "Received H/W interrupt %d\n", event_type);
> > + break;
> > +
> > + default:
> > + dev_err(hdev->dev, "Received invalid H/W interrupt %d\n",
> > + event_type);
> > + break;
> > + }
> > +}
> > +
> > +void *goya_get_events_stat(struct hl_device *hdev, u32 *size)
> > +{
> > + struct goya_device *goya = hdev->asic_specific;
> > +
> > + *size = (u32) sizeof(goya->events_stat);
> > +
> > + return goya->events_stat;
> > +}
> > +
> >
> > static void goya_hw_queues_lock(struct hl_device *hdev)
> > {
> > @@ -3794,6 +4294,7 @@ static const struct hl_asic_funcs goya_funcs = {
> > .sw_fini = goya_sw_fini,
> > .hw_init = goya_hw_init,
> > .hw_fini = goya_hw_fini,
> > + .halt_engines = goya_halt_engines,
> > .suspend = goya_suspend,
> > .resume = goya_resume,
> > .mmap = goya_mmap,
> > @@ -3808,6 +4309,9 @@ static const struct hl_asic_funcs goya_funcs = {
> > .dma_pool_free = goya_dma_pool_free,
> > .cpu_accessible_dma_pool_alloc = goya_cpu_accessible_dma_pool_alloc,
> > .cpu_accessible_dma_pool_free = goya_cpu_accessible_dma_pool_free,
> > + .update_eq_ci = goya_update_eq_ci,
> > + .handle_eqe = goya_handle_eqe,
> > + .get_events_stat = goya_get_events_stat,
> > .hw_queues_lock = goya_hw_queues_lock,
> > .hw_queues_unlock = goya_hw_queues_unlock,
> > .send_cpu_message = goya_send_cpu_message
> > diff --git a/drivers/misc/habanalabs/goya/goyaP.h b/drivers/misc/habanalabs/goya/goyaP.h
> > index 598a718d3df1..c6bfcb6c6905 100644
> > --- a/drivers/misc/habanalabs/goya/goyaP.h
> > +++ b/drivers/misc/habanalabs/goya/goyaP.h
> > @@ -123,6 +123,7 @@ struct goya_device {
> > /* TODO: remove hw_queues_lock after moving to scheduler code */
> > spinlock_t hw_queues_lock;
> > u64 ddr_bar_cur_addr;
> > + u32 events_stat[GOYA_ASYNC_EVENT_ID_SIZE];
> > u32 hw_cap_initialized;
> > };
> >
> > diff --git a/drivers/misc/habanalabs/habanalabs.h b/drivers/misc/habanalabs/habanalabs.h
> > index 8232e2259463..899bf98eb002 100644
> > --- a/drivers/misc/habanalabs/habanalabs.h
> > +++ b/drivers/misc/habanalabs/habanalabs.h
> > @@ -83,6 +83,7 @@ struct hw_queue_properties {
> > * @cfg_size: configuration space size on SRAM.
> > * @sram_size: total size of SRAM.
> > * @max_asid: maximum number of open contexts (ASIDs).
> > + * @num_of_events: number of possible internal H/W IRQs.
> > * @completion_queues_count: number of completion queues.
> > * @high_pll: high PLL frequency used by the device.
> > * @cb_pool_cb_cnt: number of CBs in the CB pool.
> > @@ -109,6 +110,7 @@ struct asic_fixed_properties {
> > u32 cfg_size;
> > u32 sram_size;
> > u32 max_asid;
> > + u32 num_of_events;
> > u32 high_pll;
> > u32 cb_pool_cb_cnt;
> > u32 cb_pool_cb_size;
> > @@ -209,6 +211,9 @@ struct hl_cs_job;
> > #define HL_CQ_LENGTH HL_QUEUE_LENGTH
> > #define HL_CQ_SIZE_IN_BYTES (HL_CQ_LENGTH * HL_CQ_ENTRY_SIZE)
> >
> > +/* Must be power of 2 (HL_PAGE_SIZE / HL_EQ_ENTRY_SIZE) */
> > +#define HL_EQ_LENGTH 64
> > +#define HL_EQ_SIZE_IN_BYTES (HL_EQ_LENGTH * HL_EQ_ENTRY_SIZE)
> >
> >
> > /**
> > @@ -256,6 +261,20 @@ struct hl_cq {
> > atomic_t free_slots_cnt;
> > };
> >
> > +/**
> > + * struct hl_eq - describes the event queue (single one per device)
> > + * @hdev: pointer to the device structure
> > + * @kernel_address: holds the queue's kernel virtual address
> > + * @bus_address: holds the queue's DMA address
> > + * @ci: ci inside the queue
> > + */
> > +struct hl_eq {
> > + struct hl_device *hdev;
> > + u64 kernel_address;
> > + dma_addr_t bus_address;
> > + u32 ci;
> > +};
> > +
> >
> >
> >
> > @@ -288,6 +307,9 @@ enum hl_asic_type {
> > * @sw_fini: tears down driver state, does not configure H/W.
> > * @hw_init: sets up the H/W state.
> > * @hw_fini: tears down the H/W state.
> > + * @halt_engines: halt engines, needed for reset sequence. This also disables
> > + * interrupts from the device. Should be called before
> > + * hw_fini and before CS rollback.
> > * @suspend: handles IP specific H/W or SW changes for suspend.
> > * @resume: handles IP specific H/W or SW changes for resume.
> > * @mmap: mmap function, does nothing.
> > @@ -303,6 +325,9 @@ enum hl_asic_type {
> > * @dma_pool_free: free small DMA allocation from pool.
> > * @cpu_accessible_dma_pool_alloc: allocate CPU PQ packet from DMA pool.
> > * @cpu_accessible_dma_pool_free: free CPU PQ packet from DMA pool.
> > + * @update_eq_ci: update event queue CI.
> > + * @handle_eqe: handle event queue entry (IRQ) from ArmCP.
> > + * @get_events_stat: retrieve event queue entries histogram.
> > * @hw_queues_lock: acquire H/W queues lock.
> > * @hw_queues_unlock: release H/W queues lock.
> > * @send_cpu_message: send buffer to ArmCP.
> > @@ -314,6 +339,7 @@ struct hl_asic_funcs {
> > int (*sw_fini)(struct hl_device *hdev);
> > int (*hw_init)(struct hl_device *hdev);
> > void (*hw_fini)(struct hl_device *hdev, bool hard_reset);
> > + void (*halt_engines)(struct hl_device *hdev, bool hard_reset);
> > int (*suspend)(struct hl_device *hdev);
> > int (*resume)(struct hl_device *hdev);
> > int (*mmap)(struct hl_fpriv *hpriv, struct vm_area_struct *vma);
> > @@ -336,6 +362,10 @@ struct hl_asic_funcs {
> > size_t size, dma_addr_t *dma_handle);
> > void (*cpu_accessible_dma_pool_free)(struct hl_device *hdev,
> > size_t size, void *vaddr);
> > + void (*update_eq_ci)(struct hl_device *hdev, u32 val);
> > + void (*handle_eqe)(struct hl_device *hdev,
> > + struct hl_eq_entry *eq_entry);
> > + void* (*get_events_stat)(struct hl_device *hdev, u32 *size);
> > void (*hw_queues_lock)(struct hl_device *hdev);
> > void (*hw_queues_unlock)(struct hl_device *hdev);
> > int (*send_cpu_message)(struct hl_device *hdev, u32 *msg,
> > @@ -474,6 +504,7 @@ void hl_wreg(struct hl_device *hdev, u32 reg, u32 val);
> > * @kernel_ctx: KMD context structure.
> > * @kernel_queues: array of hl_hw_queue.
> > * @kernel_cb_mgr: command buffer manager for creating/destroying/handling CGs.
> > + * @event_queue: event queue for IRQ from ArmCP.
> > * @dma_pool: DMA pool for small allocations.
> > * @cpu_accessible_dma_mem: KMD <-> ArmCP shared memory CPU address.
> > * @cpu_accessible_dma_address: KMD <-> ArmCP shared memory DMA address.
> > @@ -504,9 +535,11 @@ struct hl_device {
> > enum hl_asic_type asic_type;
> > struct hl_cq *completion_queue;
> > struct workqueue_struct *cq_wq;
> > + struct workqueue_struct *eq_wq;
> > struct hl_ctx *kernel_ctx;
> > struct hl_hw_queue *kernel_queues;
> > struct hl_cb_mgr kernel_cb_mgr;
> > + struct hl_eq event_queue;
> > struct dma_pool *dma_pool;
> > void *cpu_accessible_dma_mem;
> > dma_addr_t cpu_accessible_dma_address;
> > @@ -593,6 +626,10 @@ void hl_hw_queue_inc_ci_kernel(struct hl_device *hdev, u32 hw_queue_id);
> >
> > int hl_cq_init(struct hl_device *hdev, struct hl_cq *q, u32 hw_queue_id);
> > void hl_cq_fini(struct hl_device *hdev, struct hl_cq *q);
> > +int hl_eq_init(struct hl_device *hdev, struct hl_eq *q);
> > +void hl_eq_fini(struct hl_device *hdev, struct hl_eq *q);
> > +irqreturn_t hl_irq_handler_cq(int irq, void *arg);
> > +irqreturn_t hl_irq_handler_eq(int irq, void *arg);
> > int hl_asid_init(struct hl_device *hdev);
> > void hl_asid_fini(struct hl_device *hdev);
> > unsigned long hl_asid_alloc(struct hl_device *hdev);
> > diff --git a/drivers/misc/habanalabs/include/goya/goya.h b/drivers/misc/habanalabs/include/goya/goya.h
> > index 2d0efb7b44bb..bcc461760e5f 100644
> > --- a/drivers/misc/habanalabs/include/goya/goya.h
> > +++ b/drivers/misc/habanalabs/include/goya/goya.h
> > @@ -65,7 +65,6 @@
> >
> > #define GOYA_MSIX_ENTRIES 8
> > #define EVENT_QUEUE_MSIX_IDX 5
> > -#define ARMCP_RESET_MSIX_IDX 6
> >
> > #define QMAN_PQ_ENTRY_SIZE 16 /* Bytes */
> >
> > diff --git a/drivers/misc/habanalabs/irq.c b/drivers/misc/habanalabs/irq.c
> > index 97b0de7ea5c2..9586323e7dfb 100644
> > --- a/drivers/misc/habanalabs/irq.c
> > +++ b/drivers/misc/habanalabs/irq.c
> > @@ -9,6 +9,18 @@
> >
> > #include <linux/dma-mapping.h>
> >
> > +/**
> > + * This structure is used to schedule work of EQ entry and armcp_reset event
> > + *
> > + * @eq_work - workqueue object to run when EQ entry is received
> > + * @hdev - pointer to device structure
> > + * @eq_entry - copy of the EQ entry
> > + */
> > +struct hl_eqe_work {
> > + struct work_struct eq_work;
> > + struct hl_device *hdev;
> > + struct hl_eq_entry eq_entry;
> > +};
> >
> > /**
> > * hl_cq_inc_ptr - increment ci or pi of cq
> > @@ -26,6 +38,33 @@ inline u32 hl_cq_inc_ptr(u32 ptr)
> > return ptr;
> > }
> >
> > +/**
> > + * hl_eq_inc_ptr - increment ci of eq
> > + *
> > + * @ptr: the current ci value of the event queue
> > + *
> > + * Increment ptr by 1. If it reaches the number of event queue
> > + * entries, set it to 0
> > + */
> > +inline u32 hl_eq_inc_ptr(u32 ptr)
> > +{
> > + ptr++;
> > + if (unlikely(ptr == HL_EQ_LENGTH))
> > + ptr = 0;
> > + return ptr;
> > +}
> > +
> > +static void irq_handle_eqe(struct work_struct *work)
> > +{
> > + struct hl_eqe_work *eqe_work = container_of(work, struct hl_eqe_work,
> > + eq_work);
> > + struct hl_device *hdev = eqe_work->hdev;
> > +
> > + hdev->asic_funcs->handle_eqe(hdev, &eqe_work->eq_entry);
> > +
> > + kfree(eqe_work);
> > +}
> > +
> > /**
> > * hl_irq_handler_cq - irq handler for completion queue
> > *
> > @@ -103,6 +142,68 @@ irqreturn_t hl_irq_handler_cq(int irq, void *arg)
> > return IRQ_HANDLED;
> > }
> >
> > +/**
> > + * hl_irq_handler_eq - irq handler for event queue
> > + *
> > + * @irq: irq number
> > + * @arg: pointer to event queue structure
> > + *
> > + */
> > +irqreturn_t hl_irq_handler_eq(int irq, void *arg)
> > +{
> > + struct hl_eq *eq = arg;
> > + struct hl_device *hdev = eq->hdev;
> > + struct hl_eq_entry *eq_entry;
> > + struct hl_eq_entry *eq_base;
> > + struct hl_eqe_work *handle_eqe_work;
> > +
> > + eq_base = (struct hl_eq_entry *) eq->kernel_address;
> > +
> > + while (1) {
> > + bool entry_ready =
> > + ((eq_base[eq->ci].hdr.ctl & EQ_CTL_READY_MASK)
> > + >> EQ_CTL_READY_SHIFT);
> > +
> > + if (!entry_ready)
> > + break;
> > +
> > + eq_entry = &eq_base[eq->ci];
> > +
> > + /*
> > + * Make sure we read EQ entry contents after we've
> > + * checked the ownership bit.
> > + */
> > + dma_rmb();
> > +
> > + if (hdev->disabled) {
> > + dev_warn(hdev->dev,
> > + "Device disabled but received IRQ %d for EQ\n",
> > + irq);
> > + goto skip_irq;
> > + }
> > +
> > + handle_eqe_work = kmalloc(sizeof(*handle_eqe_work), GFP_ATOMIC);
> > + if (handle_eqe_work) {
>
> I couldn't find where is it freed
In irq_handle_eqe()
>
> > + INIT_WORK(&handle_eqe_work->eq_work, irq_handle_eqe);
> > + handle_eqe_work->hdev = hdev;
> > +
> > + memcpy(&handle_eqe_work->eq_entry, eq_entry,
> > + sizeof(*eq_entry));
> > +
> > + queue_work(hdev->eq_wq, &handle_eqe_work->eq_work);
> > + }
> > +skip_irq:
> > + /* Clear EQ entry ready bit */
> > + eq_entry->hdr.ctl &= ~EQ_CTL_READY_MASK;
> > +
> > + eq->ci = hl_eq_inc_ptr(eq->ci);
> > +
> > + hdev->asic_funcs->update_eq_ci(hdev, eq->ci);
> > + }
> > +
> > + return IRQ_HANDLED;
> > +}
> > +
> > /**
> > * hl_cq_init - main initialization function for an cq object
> > *
> > @@ -148,3 +249,46 @@ void hl_cq_fini(struct hl_device *hdev, struct hl_cq *q)
> > hdev->asic_funcs->dma_free_coherent(hdev, HL_CQ_SIZE_IN_BYTES,
> > (void *) q->kernel_address, q->bus_address);
> > }
> > +
> > +/**
> > + * hl_eq_init - main initialization function for an event queue object
> > + *
> > + * @hdev: pointer to device structure
> > + * @q: pointer to eq structure
> > + *
> > + * Allocate dma-able memory for the event queue and initialize fields
> > + * Returns 0 on success
> > + */
> > +int hl_eq_init(struct hl_device *hdev, struct hl_eq *q)
> > +{
> > + void *p;
> > +
> > + BUILD_BUG_ON(HL_EQ_SIZE_IN_BYTES > HL_PAGE_SIZE);
> > +
> > + p = hdev->asic_funcs->dma_alloc_coherent(hdev, HL_EQ_SIZE_IN_BYTES,
> > + &q->bus_address, GFP_KERNEL | __GFP_ZERO);
> > + if (!p)
> > + return -ENOMEM;
> > +
> > + q->hdev = hdev;
> > + q->kernel_address = (u64) p;
> > + q->ci = 0;
> > +
> > + return 0;
> > +}
> > +
> > +/**
> > + * hl_eq_fini - destroy event queue
> > + *
> > + * @hdev: pointer to device structure
> > + * @q: pointer to eq structure
> > + *
> > + * Free the event queue memory
> > + */
> > +void hl_eq_fini(struct hl_device *hdev, struct hl_eq *q)
> > +{
> > + flush_workqueue(hdev->eq_wq);
> > +
> > + hdev->asic_funcs->dma_free_coherent(hdev, HL_EQ_SIZE_IN_BYTES,
> > + (void *) q->kernel_address, q->bus_address);
> > +}
> > --
> > 2.17.1
> >
>
> --
> Sincerely yours,
> Mike.
>
next prev parent reply other threads:[~2019-01-28 11:13 UTC|newest]
Thread overview: 103+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-23 0:00 [PATCH 00/15] Habana Labs kernel driver Oded Gabbay
2019-01-23 0:00 ` [PATCH 01/15] habanalabs: add skeleton driver Oded Gabbay
2019-01-23 0:49 ` Joe Perches
2019-01-25 19:18 ` Oded Gabbay
2019-01-23 12:28 ` Mike Rapoport
2019-01-23 12:40 ` Greg KH
2019-01-23 12:55 ` Mike Rapoport
2019-01-25 20:09 ` Oded Gabbay
2019-01-25 20:05 ` Oded Gabbay
2019-01-26 16:05 ` Arnd Bergmann
2019-01-26 16:24 ` Oded Gabbay
2019-01-26 21:14 ` Arnd Bergmann
2019-01-26 21:48 ` Oded Gabbay
2019-01-27 8:32 ` gregkh
2019-01-29 22:49 ` Oded Gabbay
2019-01-23 0:00 ` [PATCH 03/15] habanalabs: add basic Goya support Oded Gabbay
2019-01-23 12:28 ` Mike Rapoport
2019-01-25 20:32 ` Oded Gabbay
2019-01-27 6:39 ` Mike Rapoport
2019-01-28 7:44 ` Oded Gabbay
2019-01-23 0:00 ` [PATCH 04/15] habanalabs: add context and ASID modules Oded Gabbay
2019-01-23 12:28 ` Mike Rapoport
2019-01-25 21:07 ` Oded Gabbay
2019-01-23 0:00 ` [PATCH 05/15] habanalabs: add command buffer module Oded Gabbay
2019-01-23 12:28 ` Mike Rapoport
2019-01-25 21:47 ` Oded Gabbay
2019-01-27 6:49 ` Mike Rapoport
2019-01-28 7:55 ` Oded Gabbay
2019-01-28 8:41 ` Mike Rapoport
2019-01-23 0:00 ` [PATCH 06/15] habanalabs: add basic Goya h/w initialization Oded Gabbay
2019-01-25 7:46 ` Mike Rapoport
2019-01-28 10:35 ` Oded Gabbay
2019-01-23 0:00 ` [PATCH 07/15] habanalabs: add h/w queues module Oded Gabbay
2019-01-25 7:50 ` Mike Rapoport
2019-01-28 10:50 ` Oded Gabbay
2019-01-23 0:00 ` [PATCH 08/15] habanalabs: add event queue and interrupts Oded Gabbay
2019-01-25 7:51 ` Mike Rapoport
2019-01-28 11:14 ` Oded Gabbay [this message]
2019-01-23 0:00 ` [PATCH 09/15] habanalabs: add sysfs and hwmon support Oded Gabbay
2019-01-25 7:54 ` Mike Rapoport
2019-01-28 11:26 ` Oded Gabbay
2019-01-23 0:00 ` [PATCH 10/15] habanalabs: add device reset support Oded Gabbay
2019-01-27 7:51 ` Mike Rapoport
2019-01-28 12:53 ` Oded Gabbay
2019-01-23 0:00 ` [PATCH 11/15] habanalabs: add command submission module Oded Gabbay
2019-01-27 15:11 ` Mike Rapoport
2019-01-28 13:51 ` Oded Gabbay
2019-01-23 0:00 ` [PATCH 12/15] habanalabs: add virtual memory and MMU modules Oded Gabbay
2019-01-27 16:13 ` Mike Rapoport
2019-01-30 10:34 ` Oded Gabbay
2019-01-23 0:00 ` [PATCH 13/15] habanalabs: implement INFO IOCTL Oded Gabbay
2019-01-23 0:00 ` [PATCH 14/15] habanalabs: add debugfs support Oded Gabbay
2019-01-23 0:00 ` [PATCH 15/15] Update MAINTAINERS and CREDITS with habanalabs info Oded Gabbay
2019-01-23 12:27 ` [PATCH 00/15] Habana Labs kernel driver Mike Rapoport
2019-01-23 22:43 ` Oded Gabbay
2019-01-23 21:52 ` Olof Johansson
2019-01-23 22:40 ` Oded Gabbay
2019-01-23 23:16 ` Olof Johansson
2019-01-24 1:03 ` Andrew Donnellan
2019-01-24 11:59 ` Jonathan Cameron
2019-01-25 17:13 ` Olof Johansson
2019-02-24 22:23 ` Pavel Machek
2019-01-23 21:57 ` Dave Airlie
2019-01-23 22:02 ` Dave Airlie
2019-01-23 22:31 ` Oded Gabbay
2019-01-23 22:45 ` Dave Airlie
2019-01-23 23:04 ` Olof Johansson
2019-01-23 23:20 ` Jerome Glisse
2019-01-23 23:35 ` Oded Gabbay
2019-01-23 23:41 ` Olof Johansson
2019-01-23 23:40 ` Olof Johansson
2019-01-23 23:48 ` Jerome Glisse
2019-01-24 7:35 ` Daniel Vetter
2019-01-24 9:50 ` Oded Gabbay
2019-01-24 10:22 ` Dave Airlie
2019-01-25 0:13 ` Olof Johansson
2019-01-25 7:43 ` Daniel Vetter
2019-01-25 15:02 ` Olof Johansson
2019-01-25 16:00 ` Daniel Vetter
2019-01-24 23:51 ` Olof Johansson
2019-01-23 23:23 ` Oded Gabbay
2019-01-25 7:37 ` Greg Kroah-Hartman
2019-01-25 15:33 ` Olof Johansson
2019-01-25 16:06 ` Greg Kroah-Hartman
2019-01-25 17:12 ` Olof Johansson
2019-01-25 18:16 ` [PATCH/RFC 0/5] HW accel subsystem Olof Johansson
2019-01-25 18:16 ` [PATCH 1/5] drivers/accel: Introduce subsystem Olof Johansson
2019-01-25 21:13 ` [PATCH v2 " Olof Johansson
2019-01-26 17:09 ` Randy Dunlap
2019-01-27 4:31 ` Andrew Donnellan
2019-01-28 19:36 ` Frederic Barrat
2019-01-25 22:23 ` [PATCH " Daniel Vetter
2019-01-27 16:31 ` Daniel Vetter
2019-01-25 18:16 ` [PATCH 2/5] cxl: Move to drivers/accel Olof Johansson
2019-01-25 18:16 ` [PATCH 3/5] drivers/accel: cxl: Move non-uapi include files Olof Johansson
2019-01-25 18:16 ` [PATCH 4/5] ocxl: Move to drivers/accel Olof Johansson
2019-01-25 18:16 ` [PATCH 5/5] drivers/accel: ocxl: Move non-uapi include files Olof Johansson
2019-01-26 13:51 ` Greg Kroah-Hartman
2019-01-26 21:11 ` [PATCH/RFC 0/5] HW accel subsystem Arnd Bergmann
2019-02-01 9:10 ` Kenneth Lee
2019-02-01 10:07 ` Greg Kroah-Hartman
2019-02-01 12:09 ` Kenneth Lee
2019-01-26 13:52 ` [PATCH 00/15] Habana Labs kernel driver Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAFCwf12mJPk+06OCNOSHV_PanT94dCn0mYM6KCa3Of9bfeR5Ag@mail.gmail.com \
--to=oded.gabbay@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rppt@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).