habanalabs/gaudi2: remove configurations to access the MSI-X doorbell
authorTomer Tayar <ttayar@habana.ai>
Thu, 20 Oct 2022 08:29:03 +0000 (11:29 +0300)
committerOded Gabbay <ogabbay@kernel.org>
Wed, 23 Nov 2022 14:13:43 +0000 (16:13 +0200)
The virtual MSI-X doorbell is supported now in F/W, so all
configurations to access the PCIE_DBI MSI-X doorbell can be removed.

Signed-off-by: Tomer Tayar <ttayar@habana.ai>
Reviewed-by: Oded Gabbay <ogabbay@kernel.org>
Signed-off-by: Oded Gabbay <ogabbay@kernel.org>
drivers/misc/habanalabs/gaudi2/gaudi2.c

index a4e3586f1a1254e2f53426dc19fc4ca6b1f0d303..9208f69dd7f813d41398999682cebf954cd267a3 100644 (file)
@@ -4473,23 +4473,9 @@ static void gaudi2_init_sm(struct hl_device *hdev)
        reg_val = FIELD_PREP(DCORE0_SYNC_MNGR_OBJS_MON_CONFIG_CQ_EN_MASK, 1);
        WREG32(mmDCORE0_SYNC_MNGR_OBJS_MON_CONFIG_0 + (4 * i), reg_val);
 
-       /* Init CQ0 DB */
-       /* Configure the monitor to trigger MSI-X interrupt */
-       /* TODO:
-        * Remove the if statement when virtual MSI-X doorbell is supported in simulator (SW-93022)
-        * and in F/W (SW-93024).
-        */
-       if (!hdev->pdev || hdev->asic_prop.fw_security_enabled) {
-               u64 msix_db_reg = CFG_BASE + mmPCIE_DBI_MSIX_DOORBELL_OFF;
-
-               WREG32(mmDCORE0_SYNC_MNGR_GLBL_LBW_ADDR_L_0, lower_32_bits(msix_db_reg));
-               WREG32(mmDCORE0_SYNC_MNGR_GLBL_LBW_ADDR_H_0, upper_32_bits(msix_db_reg));
-       } else {
-               WREG32(mmDCORE0_SYNC_MNGR_GLBL_LBW_ADDR_L_0,
-                               lower_32_bits(gaudi2->virt_msix_db_dma_addr));
-               WREG32(mmDCORE0_SYNC_MNGR_GLBL_LBW_ADDR_H_0,
-                               upper_32_bits(gaudi2->virt_msix_db_dma_addr));
-       }
+       /* Init CQ0 DB - configure the monitor to trigger MSI-X interrupt */
+       WREG32(mmDCORE0_SYNC_MNGR_GLBL_LBW_ADDR_L_0, lower_32_bits(gaudi2->virt_msix_db_dma_addr));
+       WREG32(mmDCORE0_SYNC_MNGR_GLBL_LBW_ADDR_H_0, upper_32_bits(gaudi2->virt_msix_db_dma_addr));
        WREG32(mmDCORE0_SYNC_MNGR_GLBL_LBW_DATA_0, GAUDI2_IRQ_NUM_COMPLETION);
 
        for (i = 0 ; i < GAUDI2_RESERVED_CQ_NUMBER ; i++) {
@@ -4657,20 +4643,6 @@ static void gaudi2_init_vdec_brdg_ctrl(struct hl_device *hdev, u64 base_addr, u3
 {
        u32 sob_id;
 
-       /* TODO:
-        * Remove when virtual MSI-X doorbell is supported in simulator (SW-93022) and in F/W
-        * (SW-93024).
-        */
-       if (!hdev->pdev || hdev->asic_prop.fw_security_enabled) {
-               u32 interrupt_id = GAUDI2_IRQ_NUM_DCORE0_DEC0_NRM + 2 * decoder_id;
-
-               WREG32(base_addr + BRDG_CTRL_NRM_MSIX_LBW_AWADDR, mmPCIE_DBI_MSIX_DOORBELL_OFF);
-               WREG32(base_addr + BRDG_CTRL_NRM_MSIX_LBW_WDATA, interrupt_id);
-               WREG32(base_addr + BRDG_CTRL_ABNRM_MSIX_LBW_AWADDR, mmPCIE_DBI_MSIX_DOORBELL_OFF);
-               WREG32(base_addr + BRDG_CTRL_ABNRM_MSIX_LBW_WDATA, interrupt_id + 1);
-               return;
-       }
-
        /* VCMD normal interrupt */
        sob_id = GAUDI2_RESERVED_SOB_DEC_NRM_FIRST + decoder_id;
        WREG32(base_addr + BRDG_CTRL_NRM_MSIX_LBW_AWADDR,