habanalabs/gaudi: configure QMAN LDMA registers properly
PATCH 1/1 habanalabs/gaudi: configure QMAN LDMA registers properly
From: Ofir Bitton <[email protected]>
LDMA registers are configured with a fixed value. We add new define set which gives the configuration a proper meaning.
Signed-off-by Ofir Bitton <[email protected]>
Reviewed-by Oded Gabbay <[email protected]>
Signed-off-by Oded Gabbay <[email protected]>
--- drivers/misc/habanalabs/gaudi/gaudi.c | 62 +++++++++++++++++--------- drivers/misc/habanalabs/gaudi/gaudiP.h | 8 ++++ 2 files changed, 49 insertions(+), 21 deletions(-)
drivers/misc/habanalabs/gaudi/gaudi.c +41 -21
@@ -1865,9 +1865,11 @@ static void gaudi_init_pci_dma_qman(struct hl_device *hdev, int dma_id,WREG32 (mmDMA0_QM_PQ_PI_0 + q_off,0 );WREG32 (mmDMA0_QM_PQ_CI_0 + q_off,0 ); -WREG32 (mmDMA0_QM_CP_LDMA_TSIZE_OFFSET_0 + q_off,0x74 ); -WREG32 (mmDMA0_QM_CP_LDMA_SRC_BASE_LO_OFFSET_0 + q_off,0x14 ); -WREG32 (mmDMA0_QM_CP_LDMA_DST_BASE_LO_OFFSET_0 + q_off,0x1C ); +WREG32 (mmDMA0_QM_CP_LDMA_TSIZE_OFFSET_0 + q_off,QMAN_LDMA_SIZE_OFFSET ); +WREG32 (mmDMA0_QM_CP_LDMA_SRC_BASE_LO_OFFSET_0 + q_off, +QMAN_LDMA_SRC_OFFSET ); +WREG32 (mmDMA0_QM_CP_LDMA_DST_BASE_LO_OFFSET_0 + q_off, +QMAN_LDMA_DST_OFFSET );WREG32 (mmDMA0_QM_CP_MSG_BASE0_ADDR_LO_0 + q_off, mtr_base_en_lo);WREG32 (mmDMA0_QM_CP_MSG_BASE0_ADDR_HI_0 + q_off, mtr_base_en_hi);
@@ -2025,13 +2027,19 @@ static void gaudi_init_hbm_dma_qman(struct hl_device *hdev, int dma_id,WREG32 (mmDMA0_QM_PQ_PI_0 + q_off,0 );WREG32 (mmDMA0_QM_PQ_CI_0 + q_off,0 ); -WREG32 (mmDMA0_QM_CP_LDMA_TSIZE_OFFSET_0 + q_off,0x81BC ); -WREG32 (mmDMA0_QM_CP_LDMA_SRC_BASE_LO_OFFSET_0 + q_off,0x81B4 ); -WREG32 (mmDMA0_QM_CP_LDMA_DST_BASE_LO_OFFSET_0 + q_off,0x1C ); +WREG32 (mmDMA0_QM_CP_LDMA_TSIZE_OFFSET_0 + q_off, +QMAN_CPDMA_SIZE_OFFSET ); +WREG32 (mmDMA0_QM_CP_LDMA_SRC_BASE_LO_OFFSET_0 + q_off, +QMAN_CPDMA_SRC_OFFSET ); +WREG32 (mmDMA0_QM_CP_LDMA_DST_BASE_LO_OFFSET_0 + q_off, +QMAN_CPDMA_DST_OFFSET ); }else { -WREG32 (mmDMA0_QM_CP_LDMA_TSIZE_OFFSET_0 + q_off,0x74 ); -WREG32 (mmDMA0_QM_CP_LDMA_SRC_BASE_LO_OFFSET_0 + q_off,0x14 ); -WREG32 (mmDMA0_QM_CP_LDMA_DST_BASE_LO_OFFSET_0 + q_off,0x1C ); +WREG32 (mmDMA0_QM_CP_LDMA_TSIZE_OFFSET_0 + q_off, +QMAN_LDMA_SIZE_OFFSET ); +WREG32 (mmDMA0_QM_CP_LDMA_SRC_BASE_LO_OFFSET_0 + q_off, +QMAN_LDMA_SRC_OFFSET ); +WREG32 (mmDMA0_QM_CP_LDMA_DST_BASE_LO_OFFSET_0 + q_off, +QMAN_LDMA_SIZE_OFFSET );/* Configure RAZWI IRQ */ dma_qm_err_cfg =HBM_DMA_QMAN_GLBL_ERR_CFG_MSG_EN_MASK ;
@@ -2135,13 +2143,19 @@ static void gaudi_init_mme_qman(struct hl_device *hdev, u32 mme_offset,WREG32 (mmMME0_QM_PQ_PI_0 + q_off,0 );WREG32 (mmMME0_QM_PQ_CI_0 + q_off,0 ); -WREG32 (mmMME0_QM_CP_LDMA_TSIZE_OFFSET_0 + q_off,0x81BC ); -WREG32 (mmMME0_QM_CP_LDMA_SRC_BASE_LO_OFFSET_0 + q_off,0x81B4 ); -WREG32 (mmMME0_QM_CP_LDMA_DST_BASE_LO_OFFSET_0 + q_off,0x1C ); +WREG32 (mmMME0_QM_CP_LDMA_TSIZE_OFFSET_0 + q_off, +QMAN_CPDMA_SIZE_OFFSET ); +WREG32 (mmMME0_QM_CP_LDMA_SRC_BASE_LO_OFFSET_0 + q_off, +QMAN_CPDMA_SRC_OFFSET ); +WREG32 (mmMME0_QM_CP_LDMA_DST_BASE_LO_OFFSET_0 + q_off, +QMAN_CPDMA_DST_OFFSET ); }else { -WREG32 (mmMME0_QM_CP_LDMA_TSIZE_OFFSET_0 + q_off,0x74 ); -WREG32 (mmMME0_QM_CP_LDMA_SRC_BASE_LO_OFFSET_0 + q_off,0x14 ); -WREG32 (mmMME0_QM_CP_LDMA_DST_BASE_LO_OFFSET_0 + q_off,0x1C ); +WREG32 (mmMME0_QM_CP_LDMA_TSIZE_OFFSET_0 + q_off, +QMAN_LDMA_SIZE_OFFSET ); +WREG32 (mmMME0_QM_CP_LDMA_SRC_BASE_LO_OFFSET_0 + q_off, +QMAN_LDMA_SRC_OFFSET ); +WREG32 (mmMME0_QM_CP_LDMA_DST_BASE_LO_OFFSET_0 + q_off, +QMAN_LDMA_DST_OFFSET );/* Configure RAZWI IRQ */ mme_id = mme_offset /
@@ -2249,13 +2263,19 @@ static void gaudi_init_tpc_qman(struct hl_device *hdev, u32 tpc_offset,WREG32 (mmTPC0_QM_PQ_PI_0 + q_off,0 );WREG32 (mmTPC0_QM_PQ_CI_0 + q_off,0 ); -WREG32 (mmTPC0_QM_CP_LDMA_TSIZE_OFFSET_0 + q_off,0x81BC ); -WREG32 (mmTPC0_QM_CP_LDMA_SRC_BASE_LO_OFFSET_0 + q_off,0x81B4 ); -WREG32 (mmTPC0_QM_CP_LDMA_DST_BASE_LO_OFFSET_0 + q_off,0x1C ); +WREG32 (mmTPC0_QM_CP_LDMA_TSIZE_OFFSET_0 + q_off, +QMAN_CPDMA_SIZE_OFFSET ); +WREG32 (mmTPC0_QM_CP_LDMA_SRC_BASE_LO_OFFSET_0 + q_off, +QMAN_CPDMA_SRC_OFFSET ); +WREG32 (mmTPC0_QM_CP_LDMA_DST_BASE_LO_OFFSET_0 + q_off, +QMAN_CPDMA_DST_OFFSET ); }else { -WREG32 (mmTPC0_QM_CP_LDMA_TSIZE_OFFSET_0 + q_off,0x74 ); -WREG32 (mmTPC0_QM_CP_LDMA_SRC_BASE_LO_OFFSET_0 + q_off,0x14 ); -WREG32 (mmTPC0_QM_CP_LDMA_DST_BASE_LO_OFFSET_0 + q_off,0x1C ); +WREG32 (mmTPC0_QM_CP_LDMA_TSIZE_OFFSET_0 + q_off, +QMAN_LDMA_SIZE_OFFSET ); +WREG32 (mmTPC0_QM_CP_LDMA_SRC_BASE_LO_OFFSET_0 + q_off, +QMAN_LDMA_SRC_OFFSET ); +WREG32 (mmTPC0_QM_CP_LDMA_DST_BASE_LO_OFFSET_0 + q_off, +QMAN_LDMA_DST_OFFSET );/* Configure RAZWI IRQ */ tpc_id = tpc_offset /
drivers/misc/habanalabs/gaudi/gaudiP.h +8 -0
@@ -84,6 +84,14 @@#define DMA_CORE_OFFSET (mmDMA1_CORE_BASE - mmDMA0_CORE_BASE) +#define QMAN_LDMA_SRC_OFFSET (mmDMA0_CORE_SRC_BASE_LO - mmDMA0_CORE_CFG_0) +#define QMAN_LDMA_DST_OFFSET (mmDMA0_CORE_DST_BASE_LO - mmDMA0_CORE_CFG_0) +#define QMAN_LDMA_SIZE_OFFSET (mmDMA0_CORE_DST_TSIZE_0 - mmDMA0_CORE_CFG_0) + +#define QMAN_CPDMA_SRC_OFFSET (mmDMA0_QM_CQ_PTR_LO_4 - mmDMA0_CORE_CFG_0) +#define QMAN_CPDMA_DST_OFFSET (mmDMA0_CORE_DST_BASE_LO - mmDMA0_CORE_CFG_0) +#define QMAN_CPDMA_SIZE_OFFSET (mmDMA0_QM_CQ_TSIZE_4 - mmDMA0_CORE_CFG_0) +#define SIF_RTR_CTRL_OFFSET (mmSIF_RTR_CTRL_1_BASE - mmSIF_RTR_CTRL_0_BASE)#define NIF_RTR_CTRL_OFFSET (mmNIF_RTR_CTRL_1_BASE - mmNIF_RTR_CTRL_0_BASE)
Signature · 1 line
2.17.1