habanalabs: don't send addr and size to scrub_device_mem cb

We use scrub_device_mem only to scrub the entire SRAM and entire
DRAM. Therefore there is no need to send addr and size
args to the callback.

Signed-off-by: Dafna Hirschfeld <dhirschfeld@habana.ai>
Reviewed-by: Oded Gabbay <ogabbay@kernel.org>
Signed-off-by: Oded Gabbay <ogabbay@kernel.org>

diff --git a/drivers/misc/habanalabs/common/context.c b/drivers/misc/habanalabs/common/context.c
index 64ac65d9268bd93dd853c7bed49c7f6ed3b93cac..60e3e3125fbcfb090a061bac1cd43d7b54f1efce 100644 (file)
--- a/drivers/misc/habanalabs/common/context.c
+++ b/drivers/misc/habanalabs/common/context.c
@@ -108,7 +108,7 @@ static void hl_ctx_fini(struct hl_ctx *ctx)
                hl_encaps_sig_mgr_fini(hdev, &ctx->sig_mgr);
 
                /* Scrub both SRAM and DRAM */
-               hdev->asic_funcs->scrub_device_mem(hdev, 0, 0);
+               hdev->asic_funcs->scrub_device_mem(hdev);
        } else {
                dev_dbg(hdev->dev, "closing kernel context\n");
                hdev->asic_funcs->ctx_fini(ctx);

diff --git a/drivers/misc/habanalabs/common/habanalabs.h b/drivers/misc/habanalabs/common/habanalabs.h
index 44752e5954cafc0c2bf17778bf0a3a48d494067d..4d2f69fb4b9dbb84659d0b83dcd10e4660e7439c 100644 (file)
--- a/drivers/misc/habanalabs/common/habanalabs.h
+++ b/drivers/misc/habanalabs/common/habanalabs.h
@@ -1248,7 +1248,7 @@ struct fw_load_mgr {
  *                           dma_free_coherent(). This is ASIC function because
  *                           its implementation is not trivial when the driver
  *                           is loaded in simulation mode (not upstreamed).
- * @scrub_device_mem: Scrub device memory given an address and size
+ * @scrub_device_mem: Scrub the entire SRAM and DRAM.
  * @scrub_device_dram: Scrub the dram memory of the device.
  * @get_int_queue_base: get the internal queue base address.
  * @test_queues: run simple test on all queues for sanity check.
@@ -1359,7 +1359,7 @@ struct hl_asic_funcs {
                                        dma_addr_t *dma_handle, gfp_t flag);
        void (*asic_dma_free_coherent)(struct hl_device *hdev, size_t size,
                                        void *cpu_addr, dma_addr_t dma_handle);
-       int (*scrub_device_mem)(struct hl_device *hdev, u64 addr, u64 size);
+       int (*scrub_device_mem)(struct hl_device *hdev);
        int (*scrub_device_dram)(struct hl_device *hdev, u64 val);
        void* (*get_int_queue_base)(struct hl_device *hdev, u32 queue_id,
                                dma_addr_t *dma_handle, u16 *queue_len);

diff --git a/drivers/misc/habanalabs/gaudi/gaudi.c b/drivers/misc/habanalabs/gaudi/gaudi.c
index 453de3d27d0c97a1099a10e64a7acc0f55bba62a..bc5e74505d0398ef3555db5cae18f0b2e2966793 100644 (file)
--- a/drivers/misc/habanalabs/gaudi/gaudi.c
+++ b/drivers/misc/habanalabs/gaudi/gaudi.c
@@ -1657,7 +1657,7 @@ static int gaudi_late_init(struct hl_device *hdev)
        }
 
        /* Scrub both SRAM and DRAM */
-       rc = hdev->asic_funcs->scrub_device_mem(hdev, 0, 0);
+       rc = hdev->asic_funcs->scrub_device_mem(hdev);
        if (rc)
                goto disable_pci_access;
 
@@ -4846,51 +4846,49 @@ static int gaudi_scrub_device_dram(struct hl_device *hdev, u64 val)
        return 0;
 }
 
-static int gaudi_scrub_device_mem(struct hl_device *hdev, u64 addr, u64 size)
+static int gaudi_scrub_device_mem(struct hl_device *hdev)
 {
        struct asic_fixed_properties *prop = &hdev->asic_prop;
+       u64 addr, size, dummy_val;
        int rc = 0;
        u64 val = 0;
 
        if (!hdev->memory_scrub)
                return 0;
 
-       if (!addr && !size) {
-               /* Wait till device is idle */
-               rc = hl_poll_timeout(
-                               hdev,
-                               mmDMA0_CORE_STS0/* dummy */,
-                               val/* dummy */,
-                               (hdev->asic_funcs->is_device_idle(hdev, NULL,
-                                               0, NULL)),
-                                               1000,
-                                               HBM_SCRUBBING_TIMEOUT_US);
-               if (rc) {
-                       dev_err(hdev->dev, "waiting for idle timeout\n");
-                       return -EIO;
-               }
+       /* Wait till device is idle */
+       rc = hl_poll_timeout(hdev,
+                       mmDMA0_CORE_STS0 /* dummy */,
+                       dummy_val /* dummy */,
+                       (hdev->asic_funcs->is_device_idle(hdev, NULL, 0, NULL)),
+                       1000,
+                       HBM_SCRUBBING_TIMEOUT_US);
+       if (rc) {
+               dev_err(hdev->dev, "waiting for idle timeout\n");
+               return -EIO;
+       }
 
-               /* Scrub SRAM */
-               addr = prop->sram_user_base_address;
-               size = hdev->pldm ? 0x10000 :
-                               (prop->sram_size - SRAM_USER_BASE_OFFSET);
-               val = 0x7777777777777777ull;
+       /* Scrub SRAM */
+       addr = prop->sram_user_base_address;
+       size = hdev->pldm ? 0x10000 : prop->sram_size - SRAM_USER_BASE_OFFSET;
+       val = 0x7777777777777777ull;
 
-               rc = gaudi_memset_device_memory(hdev, addr, size, val);
-               if (rc) {
-                       dev_err(hdev->dev,
-                               "Failed to clear SRAM in mem scrub all\n");
-                       return rc;
-               }
+       dev_dbg(hdev->dev, "Scrubing SRAM: 0x%09llx - 0x%09llx val: 0x%llx\n",
+                       addr, addr + size, val);
+       rc = gaudi_memset_device_memory(hdev, addr, size, val);
+       if (rc) {
+               dev_err(hdev->dev, "Failed to clear SRAM (%d)\n", rc);
+               return rc;
+       }
 
-               /* Scrub HBM using all DMA channels in parallel */
-               rc = gaudi_scrub_device_dram(hdev, 0xdeadbeaf);
-               if (rc)
-                       dev_err(hdev->dev,
-                               "Failed to clear HBM in mem scrub all\n");
+       /* Scrub HBM using all DMA channels in parallel */
+       rc = gaudi_scrub_device_dram(hdev, 0xdeadbeaf);
+       if (rc) {
+               dev_err(hdev->dev, "Failed to clear HBM (%d)\n", rc);
+               return rc;
        }
 
-       return rc;
+       return 0;
 }
 
 static void *gaudi_get_int_queue_base(struct hl_device *hdev,

diff --git a/drivers/misc/habanalabs/goya/goya.c b/drivers/misc/habanalabs/goya/goya.c
index 40c082cafbd792273d45d9b5895ced8b3fe61b24..25b1e3e139e859bd53f380fdc4391dbef375e43a 100644 (file)
--- a/drivers/misc/habanalabs/goya/goya.c
+++ b/drivers/misc/habanalabs/goya/goya.c
@@ -3019,7 +3019,7 @@ static void goya_dma_free_coherent(struct hl_device *hdev, size_t size,
        dma_free_coherent(&hdev->pdev->dev, size, cpu_addr, fixed_dma_handle);
 }
 
-int goya_scrub_device_mem(struct hl_device *hdev, u64 addr, u64 size)
+int goya_scrub_device_mem(struct hl_device *hdev)
 {
        return 0;
 }

diff --git a/drivers/misc/habanalabs/goya/goyaP.h b/drivers/misc/habanalabs/goya/goyaP.h
index 54b5b6125df51f3450f4f537348c704ebe8faf73..d6ec43d6f6b0d4fd79fcdca85cdb3dc5c7e89775 100644 (file)
--- a/drivers/misc/habanalabs/goya/goyaP.h
+++ b/drivers/misc/habanalabs/goya/goyaP.h
@@ -233,7 +233,7 @@ void goya_add_end_of_cb_packets(struct hl_device *hdev, void *kernel_address,
                                u32 len, u32 original_len, u64 cq_addr, u32 cq_val,
                                u32 msix_vec, bool eb);
 int goya_cs_parser(struct hl_device *hdev, struct hl_cs_parser *parser);
-int goya_scrub_device_mem(struct hl_device *hdev, u64 addr, u64 size);
+int goya_scrub_device_mem(struct hl_device *hdev);
 void *goya_get_int_queue_base(struct hl_device *hdev, u32 queue_id,
                                dma_addr_t *dma_handle, u16 *queue_len);
 u32 goya_get_dma_desc_list_size(struct hl_device *hdev, struct sg_table *sgt);