]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
habanalabs: set ETR as non-secured
authorOded Gabbay <oded.gabbay@gmail.com>
Thu, 24 Oct 2019 07:12:35 +0000 (10:12 +0300)
committerOded Gabbay <oded.gabbay@gmail.com>
Thu, 21 Nov 2019 09:35:45 +0000 (11:35 +0200)
ETR should always be non-secured as it is used by the users to record
profiling/trace data.

Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com>
Reviewed-by: Omer Shpigelman <oshpigelman@habana.ai>
drivers/misc/habanalabs/goya/goya_coresight.c
drivers/misc/habanalabs/include/goya/asic_reg/goya_masks.h

index 16bcd60b111f65a6a5f2e901eabb17751ca30167..c1ee6e2b5dfff495da19e68cba5753adf3c81d72 100644 (file)
@@ -8,6 +8,7 @@
 #include "goyaP.h"
 #include "include/goya/goya_coresight.h"
 #include "include/goya/asic_reg/goya_regs.h"
+#include "include/goya/asic_reg/goya_masks.h"
 
 #include <uapi/misc/habanalabs.h>
 
@@ -425,7 +426,8 @@ static int goya_config_etr(struct hl_device *hdev,
                WREG32(mmPSOC_ETR_BUFWM, 0x3FFC);
                WREG32(mmPSOC_ETR_RSZ, input->buffer_size);
                WREG32(mmPSOC_ETR_MODE, input->sink_mode);
-               WREG32(mmPSOC_ETR_AXICTL, 0x700);
+               WREG32(mmPSOC_ETR_AXICTL,
+                               0x700 | PSOC_ETR_AXICTL_PROTCTRLBIT1_SHIFT);
                WREG32(mmPSOC_ETR_DBALO,
                                lower_32_bits(input->buffer_address));
                WREG32(mmPSOC_ETR_DBAHI,
index 8618891d5afabde368810e30f99f4c103f51ffbb..3c44ef3a23ed8d098d9811ca47d7fd5e49058c15 100644 (file)
 #define DMA_QM_3_GLBL_CFG1_DMA_STOP_SHIFT DMA_QM_0_GLBL_CFG1_DMA_STOP_SHIFT
 #define DMA_QM_4_GLBL_CFG1_DMA_STOP_SHIFT DMA_QM_0_GLBL_CFG1_DMA_STOP_SHIFT
 
+#define PSOC_ETR_AXICTL_PROTCTRLBIT1_SHIFT                           1
+
 #endif /* ASIC_REG_GOYA_MASKS_H_ */