accel/habanalabs/gaudi2 : remove psoc_arc access
Oded Gabbay
maintainerPATCH 1/2 accel/habanalabs/gaudi2 : remove psoc_arc access
From: Benjamin Dotan <[email protected]>
Because firmware is blocking PSOC_ARC_DBG, we need to disable access to this block.
Signed-off-by Benjamin Dotan <[email protected]>
Reviewed-by Oded Gabbay <[email protected]>
Signed-off-by Oded Gabbay <[email protected]>
--- .../habanalabs/gaudi2/gaudi2_coresight.c | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-)
drivers/accel/habanalabs/gaudi2/gaudi2_coresight.c +12 -12
@@ -151,8 +151,8 @@ static u64 debug_stm_regs[GAUDI2_STM_LAST + 1] = { [GAUDI2_STM_DCORE3_VDEC1_CS] = mmDCORE3_VDEC1_CS_STM_BASE, [GAUDI2_STM_PCIE] = mmPCIE_STM_BASE, [GAUDI2_STM_PSOC] = mmPSOC_STM_BASE, - [GAUDI2_STM_PSOC_ARC0_CS] = mmPSOC_ARC0_CS_STM_BASE, - [GAUDI2_STM_PSOC_ARC1_CS] = mmPSOC_ARC1_CS_STM_BASE, + [GAUDI2_STM_PSOC_ARC0_CS] = 0, + [GAUDI2_STM_PSOC_ARC1_CS] = 0, [GAUDI2_STM_PDMA0_CS] = mmPDMA0_CS_STM_BASE, [GAUDI2_STM_PDMA1_CS] = mmPDMA1_CS_STM_BASE, [GAUDI2_STM_CPU] = mmCPU_STM_BASE,
@@ -293,8 +293,8 @@ static u64 debug_etf_regs[GAUDI2_ETF_LAST + 1] = { [GAUDI2_ETF_DCORE3_VDEC1_CS] = mmDCORE3_VDEC1_CS_ETF_BASE, [GAUDI2_ETF_PCIE] = mmPCIE_ETF_BASE, [GAUDI2_ETF_PSOC] = mmPSOC_ETF_BASE, - [GAUDI2_ETF_PSOC_ARC0_CS] = mmPSOC_ARC0_CS_ETF_BASE, - [GAUDI2_ETF_PSOC_ARC1_CS] = mmPSOC_ARC1_CS_ETF_BASE, + [GAUDI2_ETF_PSOC_ARC0_CS] = 0, + [GAUDI2_ETF_PSOC_ARC1_CS] = 0, [GAUDI2_ETF_PDMA0_CS] = mmPDMA0_CS_ETF_BASE, [GAUDI2_ETF_PDMA1_CS] = mmPDMA1_CS_ETF_BASE, [GAUDI2_ETF_CPU_0] = mmCPU_ETF_0_BASE,
@@ -436,8 +436,8 @@ static u64 debug_funnel_regs[GAUDI2_FUNNEL_LAST + 1] = { [GAUDI2_FUNNEL_DCORE3_RTR6] = mmDCORE3_RTR6_FUNNEL_BASE, [GAUDI2_FUNNEL_DCORE3_RTR7] = mmDCORE3_RTR7_FUNNEL_BASE, [GAUDI2_FUNNEL_PSOC] = mmPSOC_FUNNEL_BASE, - [GAUDI2_FUNNEL_PSOC_ARC0] = mmPSOC_ARC0_FUNNEL_BASE, - [GAUDI2_FUNNEL_PSOC_ARC1] = mmPSOC_ARC1_FUNNEL_BASE, + [GAUDI2_FUNNEL_PSOC_ARC0] = 0, + [GAUDI2_FUNNEL_PSOC_ARC1] = 0, [GAUDI2_FUNNEL_XDMA] = mmXDMA_FUNNEL_BASE, [GAUDI2_FUNNEL_CPU] = mmCPU_FUNNEL_BASE, [GAUDI2_FUNNEL_PMMU] = mmPMMU_FUNNEL_BASE,
@@ -766,10 +766,10 @@ static u64 debug_bmon_regs[GAUDI2_BMON_LAST + 1] = { [GAUDI2_BMON_PCIE_MSTR_RD] = mmPCIE_BMON_MSTR_RD_BASE, [GAUDI2_BMON_PCIE_SLV_WR] = mmPCIE_BMON_SLV_WR_BASE, [GAUDI2_BMON_PCIE_SLV_RD] = mmPCIE_BMON_SLV_RD_BASE, - [GAUDI2_BMON_PSOC_ARC0_0] = mmPSOC_ARC0_BMON_0_BASE, - [GAUDI2_BMON_PSOC_ARC0_1] = mmPSOC_ARC0_BMON_1_BASE, - [GAUDI2_BMON_PSOC_ARC1_0] = mmPSOC_ARC1_BMON_0_BASE, - [GAUDI2_BMON_PSOC_ARC1_1] = mmPSOC_ARC1_BMON_1_BASE, + [GAUDI2_BMON_PSOC_ARC0_0] = 0, + [GAUDI2_BMON_PSOC_ARC0_1] = 0, + [GAUDI2_BMON_PSOC_ARC1_0] = 0, + [GAUDI2_BMON_PSOC_ARC1_1] = 0, [GAUDI2_BMON_PDMA0_0] = mmPDMA0_BMON_0_BASE, [GAUDI2_BMON_PDMA0_1] = mmPDMA0_BMON_1_BASE, [GAUDI2_BMON_PDMA1_0] = mmPDMA1_BMON_0_BASE,
@@ -968,8 +968,8 @@ static u64 debug_spmu_regs[GAUDI2_SPMU_LAST + 1] = { [GAUDI2_SPMU_DCORE3_VDEC0_CS] = mmDCORE3_VDEC0_CS_SPMU_BASE, [GAUDI2_SPMU_DCORE3_VDEC1_CS] = mmDCORE3_VDEC1_CS_SPMU_BASE, [GAUDI2_SPMU_PCIE] = mmPCIE_SPMU_BASE, - [GAUDI2_SPMU_PSOC_ARC0_CS] = mmPSOC_ARC0_CS_SPMU_BASE, - [GAUDI2_SPMU_PSOC_ARC1_CS] = mmPSOC_ARC1_CS_SPMU_BASE, + [GAUDI2_SPMU_PSOC_ARC0_CS] = 0, + [GAUDI2_SPMU_PSOC_ARC1_CS] = 0, [GAUDI2_SPMU_PDMA0_CS] = mmPDMA0_CS_SPMU_BASE, [GAUDI2_SPMU_PDMA1_CS] = mmPDMA1_CS_SPMU_BASE, [GAUDI2_SPMU_PMMU_CS] = mmPMMU_CS_SPMU_BASE,
Signature · 1 line
2.34.1
Oded Gabbay
maintainerPATCH 2/2 accel/habanalabs: fix ETR/ETF flush logic
From: Benjamin Dotan <[email protected]>
When config_etr or config_etf are called we need to validate the parameters that are passed into them to make sure the requested operation is valid.
Signed-off-by Benjamin Dotan <[email protected]>
Reviewed-by Oded Gabbay <[email protected]>
Signed-off-by Oded Gabbay <[email protected]>
--- drivers/accel/habanalabs/gaudi/gaudi_coresight.c | 12 ++++++++++++ drivers/accel/habanalabs/gaudi2/gaudi2_coresight.c | 10 ++++++++++ drivers/accel/habanalabs/goya/goya_coresight.c | 10 ++++++++++ 3 files changed, 32 insertions(+)
drivers/accel/habanalabs/gaudi/gaudi_coresight.c +12 -0
@@ -482,6 +482,11 @@ static int gaudi_config_etf(struct hl_device *hdev,WREG32 (base_reg +0xFB0 ,CORESIGHT_UNLOCK ); + val =RREG32 (base_reg +0x20 ); + +if ((!params->enable && val ==0x0 ) || (params->enable && val !=0x0 )) +return 0 ; + val =RREG32 (base_reg +0x304 ); val |=0x1000 ;WREG32 (base_reg +0x304 , val);
@@ -580,6 +585,13 @@ static int gaudi_config_etr(struct hl_device *hdev,WREG32 (mmPSOC_ETR_LAR,CORESIGHT_UNLOCK ); + val =RREG32 (mmPSOC_ETR_CTL); + +if ((!params->enable && val ==0x0 ) || (params->enable && val !=0x0 )) +return 0 ; + + + val =RREG32 (mmPSOC_ETR_FFCR); val |=0x1000 ;WREG32 (mmPSOC_ETR_FFCR, val);
drivers/accel/habanalabs/gaudi2/gaudi2_coresight.c +10 -0
@@ -2092,6 +2092,11 @@ static int gaudi2_config_etf(struct hl_device *hdev, struct hl_debug_params *parif (rc)return -EIO ; + val =RREG32 (base_reg + mmETF_CTL_OFFSET); + +if ((!params->enable && val ==0x0 ) || (params->enable && val !=0x0 )) +return 0 ; + val =RREG32 (base_reg + mmETF_FFCR_OFFSET); val |=0x1000 ;WREG32 (base_reg + mmETF_FFCR_OFFSET, val);
@@ -2189,6 +2194,11 @@ static int gaudi2_config_etr(struct hl_device *hdev, struct hl_ctx *ctx,if (rc)return -EIO ; + val =RREG32 (mmPSOC_ETR_CTL); + +if ((!params->enable && val ==0x0 ) || (params->enable && val !=0x0 )) +return 0 ; + val =RREG32 (mmPSOC_ETR_FFCR); val |=0x1000 ;WREG32 (mmPSOC_ETR_FFCR, val);
drivers/accel/habanalabs/goya/goya_coresight.c +10 -0
@@ -315,6 +315,11 @@ static int goya_config_etf(struct hl_device *hdev,WREG32 (base_reg +0xFB0 ,CORESIGHT_UNLOCK ); + val =RREG32 (base_reg +0x20 ); + +if ((!params->enable && val ==0x0 ) || (params->enable && val !=0x0 )) +return 0 ; + val =RREG32 (base_reg +0x304 ); val |=0x1000 ;WREG32 (base_reg +0x304 , val);
@@ -386,6 +391,11 @@ static int goya_config_etr(struct hl_device *hdev,WREG32 (mmPSOC_ETR_LAR,CORESIGHT_UNLOCK ); + val =RREG32 (mmPSOC_ETR_CTL); + +if ((!params->enable && val ==0x0 ) || (params->enable && val !=0x0 )) +return 0 ; + val =RREG32 (mmPSOC_ETR_FFCR); val |=0x1000 ;WREG32 (mmPSOC_ETR_FFCR, val);
Signature · 1 line
2.34.1