habanalabs/gaudi: replace hl_poll_timeout with while loop
PATCH 1/2 habanalabs/gaudi: replace hl_poll_timeout with while loop
From: Dafna Hirschfeld <[email protected]>
in gaudi_scrub_device_mem, replace call to hl_poll_timeout with a while loop to avoid using dummy variables.
Reported-by kernel test robot <[email protected]>
Signed-off-by Dafna Hirschfeld <[email protected]>
Reviewed-by Oded Gabbay <[email protected]>
Signed-off-by Oded Gabbay <[email protected]>
--- drivers/misc/habanalabs/gaudi/gaudi.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-)
drivers/misc/habanalabs/gaudi/gaudi.c +11 -12
@@ -4827,23 +4827,22 @@ static int gaudi_scrub_device_dram(struct hl_device *hdev, u64 val)static int gaudi_scrub_device_mem (struct hl_device *hdev) {struct asic_fixed_properties *prop = &hdev->asic_prop; -u64 addr, size, dummy_val; +u64 wait_to_idle_time = hdev->pdev ?HBM_SCRUBBING_TIMEOUT_US : +min_t (u64,HBM_SCRUBBING_TIMEOUT_US *10 ,HL_SIM_MAX_TIMEOUT_US ); +u64 addr, size, val = hdev->memory_scrub_val; +ktime_t timeout;int rc =0 ; -u64 val = hdev->memory_scrub_val;if (!hdev->memory_scrub)return 0 ; -/* 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 ; + timeout =ktime_add_us (ktime_get (), wait_to_idle_time); +while (!hdev->asic_funcs->is_device_idle (hdev,NULL ,0 ,NULL )) { +if (ktime_compare (ktime_get (), timeout) >0 ) { +dev_err (hdev->dev,"waiting for idle timeout\n" ); +return -ETIMEDOUT ; + } +usleep_range ((1000 >>2 ) +1 ,1000 ); }/* Scrub SRAM */
Signature · 1 line
2.25.1
PATCH 2/2 habanalabs: use %pa to print pci bar size
PCI bar size is resource_size_t so we should use %pa to make it work correctly on all architectures.
Signed-off-by Oded Gabbay <[email protected]>
--- drivers/misc/habanalabs/gaudi/gaudi.c | 25 +++++++++++-------------- drivers/misc/habanalabs/goya/goya.c | 25 +++++++++++-------------- 2 files changed, 22 insertions(+), 28 deletions(-)
drivers/misc/habanalabs/gaudi/gaudi.c +11 -14
@@ -801,6 +801,7 @@ static int gaudi_early_init(struct hl_device *hdev) {struct asic_fixed_properties *prop = &hdev->asic_prop;struct pci_dev *pdev = hdev->pdev; +resource_size_t pci_bar_size;u32 fw_boot_status;int rc;
@@ -811,24 +812,20 @@ static int gaudi_early_init(struct hl_device *hdev) }/* Check BAR sizes */ -if (pci_resource_len (pdev,SRAM_BAR_ID ) !=SRAM_BAR_SIZE ) { -dev_err (hdev->dev, -"Not " HL_NAME "? BAR %d size %llu, expecting %llu\n" , -SRAM_BAR_ID , - (unsigned long long )pci_resource_len (pdev, -SRAM_BAR_ID ), -SRAM_BAR_SIZE ); + pci_bar_size =pci_resource_len (pdev,SRAM_BAR_ID ); + +if (pci_bar_size !=SRAM_BAR_SIZE ) { +dev_err (hdev->dev,"Not " HL_NAME "? BAR %d size %pa, expecting %llu\n" , +SRAM_BAR_ID , &pci_bar_size,SRAM_BAR_SIZE ); rc = -ENODEV ; goto free_queue_props; } -if (pci_resource_len (pdev,CFG_BAR_ID ) !=CFG_BAR_SIZE ) { -dev_err (hdev->dev, -"Not " HL_NAME "? BAR %d size %llu, expecting %llu\n" , -CFG_BAR_ID , - (unsigned long long )pci_resource_len (pdev, -CFG_BAR_ID ), -CFG_BAR_SIZE ); + pci_bar_size =pci_resource_len (pdev,CFG_BAR_ID ); + +if (pci_bar_size !=CFG_BAR_SIZE ) { +dev_err (hdev->dev,"Not " HL_NAME "? BAR %d size %pa, expecting %llu\n" , +CFG_BAR_ID , &pci_bar_size,CFG_BAR_SIZE ); rc = -ENODEV ; goto free_queue_props; }
drivers/misc/habanalabs/goya/goya.c +11 -14
@@ -608,6 +608,7 @@ static int goya_early_init(struct hl_device *hdev) {struct asic_fixed_properties *prop = &hdev->asic_prop;struct pci_dev *pdev = hdev->pdev; +resource_size_t pci_bar_size;u32 fw_boot_status, val;int rc;
@@ -618,24 +619,20 @@ static int goya_early_init(struct hl_device *hdev) }/* Check BAR sizes */ -if (pci_resource_len (pdev,SRAM_CFG_BAR_ID ) !=CFG_BAR_SIZE ) { -dev_err (hdev->dev, -"Not " HL_NAME "? BAR %d size %llu, expecting %llu\n" , -SRAM_CFG_BAR_ID , - (unsigned long long )pci_resource_len (pdev, -SRAM_CFG_BAR_ID ), -CFG_BAR_SIZE ); + pci_bar_size =pci_resource_len (pdev,SRAM_CFG_BAR_ID ); + +if (pci_bar_size !=CFG_BAR_SIZE ) { +dev_err (hdev->dev,"Not " HL_NAME "? BAR %d size %pa, expecting %llu\n" , +SRAM_CFG_BAR_ID , &pci_bar_size,CFG_BAR_SIZE ); rc = -ENODEV ; goto free_queue_props; } -if (pci_resource_len (pdev,MSIX_BAR_ID ) !=MSIX_BAR_SIZE ) { -dev_err (hdev->dev, -"Not " HL_NAME "? BAR %d size %llu, expecting %llu\n" , -MSIX_BAR_ID , - (unsigned long long )pci_resource_len (pdev, -MSIX_BAR_ID ), -MSIX_BAR_SIZE ); + pci_bar_size =pci_resource_len (pdev,MSIX_BAR_ID ); + +if (pci_bar_size !=MSIX_BAR_SIZE ) { +dev_err (hdev->dev,"Not " HL_NAME "? BAR %d size %pa, expecting %llu\n" , +MSIX_BAR_ID , &pci_bar_size,MSIX_BAR_SIZE ); rc = -ENODEV ; goto free_queue_props; }
Signature · 1 line
2.25.1