From: Oded Gabbay Date: Wed, 8 May 2019 09:22:41 +0000 (+0300) Subject: habanalabs: check to load F/W before boot status X-Git-Tag: v5.3-rc1~127^2~3^2~25 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0c169b8afd1def63d95702cad45a0908c643a8c8;p=users%2Fjedix%2Flinux-maple.git habanalabs: check to load F/W before boot status This patch changes the order of checks when initializing the device CPU. We want first to check if we need to load the F/W, and only if we need to, then we want to check the status of the CPU boot program. Signed-off-by: Oded Gabbay --- diff --git a/drivers/misc/habanalabs/goya/goya.c b/drivers/misc/habanalabs/goya/goya.c index aaa88d442ffed..ccf9d925b6ed6 100644 --- a/drivers/misc/habanalabs/goya/goya.c +++ b/drivers/misc/habanalabs/goya/goya.c @@ -2277,14 +2277,14 @@ static int goya_init_cpu(struct hl_device *hdev, u32 cpu_timeout) goya_read_device_fw_version(hdev, FW_COMP_UBOOT); goya_read_device_fw_version(hdev, FW_COMP_PREBOOT); - if (status == CPU_BOOT_STATUS_SRAM_AVAIL) - goto out; - if (!hdev->fw_loading) { dev_info(hdev->dev, "Skip loading FW\n"); goto out; } + if (status == CPU_BOOT_STATUS_SRAM_AVAIL) + goto out; + rc = goya_push_linux_to_device(hdev); if (rc) return rc;