Commit 6ba2c0ce authored by Oded Gabbay's avatar Oded Gabbay
Browse files

habanalabs: use common wrapper for MMU cache invalidation 



We have a common function that wraps the call to the MMU cache
invalidation function, which is ASIC-specific. The wrapper checks
the return value and prints error if necessary. For consistency, try
to use the wrapper when possible.

Signed-off-by: default avatarOded Gabbay <ogabbay@kernel.org>
parent 24915338

drivers/misc/habanalabs/gaudi/gaudi.c

+3 −3
Original line number Diff line number Diff line
@@ -3855,7 +3855,7 @@ static int gaudi_mmu_init(struct hl_device *hdev) 
	/* mem cache invalidation */

	WREG32(mmSTLB_MEM_CACHE_INVALIDATION, 1);



	hdev->asic_funcs->mmu_invalidate_cache(hdev, true, 0);

	hl_mmu_invalidate_cache(hdev, true, 0);



	WREG32(mmMMU_UP_MMU_ENABLE, 1);

	WREG32(mmMMU_UP_SPI_MASK, 0xF);
@@ -8595,7 +8595,7 @@ static int gaudi_internal_cb_pool_init(struct hl_device *hdev, 
			hdev->internal_cb_pool_dma_addr,

			HOST_SPACE_INTERNAL_CB_SZ);



	hdev->asic_funcs->mmu_invalidate_cache(hdev, false, MMU_OP_USERPTR);

	hl_mmu_invalidate_cache(hdev, false, MMU_OP_USERPTR);

	mutex_unlock(&ctx->mmu_lock);



	if (rc)
@@ -8630,7 +8630,7 @@ static void gaudi_internal_cb_pool_fini(struct hl_device *hdev, 
			HOST_SPACE_INTERNAL_CB_SZ);

	hl_unreserve_va_block(hdev, ctx, hdev->internal_cb_va_base,

			HOST_SPACE_INTERNAL_CB_SZ);

	hdev->asic_funcs->mmu_invalidate_cache(hdev, true, MMU_OP_USERPTR);

	hl_mmu_invalidate_cache(hdev, true, MMU_OP_USERPTR);

	mutex_unlock(&ctx->mmu_lock);



	gen_pool_destroy(hdev->internal_cb_pool);

drivers/misc/habanalabs/goya/goya.c

+2 −3
Original line number Diff line number Diff line
@@ -2700,8 +2700,7 @@ int goya_mmu_init(struct hl_device *hdev) 
	WREG32_AND(mmSTLB_STLB_FEATURE_EN,

			(~STLB_STLB_FEATURE_EN_FOLLOWER_EN_MASK));



	hdev->asic_funcs->mmu_invalidate_cache(hdev, true,

					MMU_OP_USERPTR | MMU_OP_PHYS_PACK);

	hl_mmu_invalidate_cache(hdev, true, MMU_OP_USERPTR | MMU_OP_PHYS_PACK);



	WREG32(mmMMU_MMU_ENABLE, 1);

	WREG32(mmMMU_SPI_MASK, 0xF);
@@ -5341,7 +5340,7 @@ static int goya_mmu_invalidate_cache_range(struct hl_device *hdev, 
	/* Treat as invalidate all because there is no range invalidation

	 * in Goya

	 */

	return hdev->asic_funcs->mmu_invalidate_cache(hdev, is_hard, flags);

	return hl_mmu_invalidate_cache(hdev, is_hard, flags);

}



int goya_send_heartbeat(struct hl_device *hdev)