habanalabs/gaudi2: change device f/w security check

On Gaudi2 the f/w always configures the PCIe iATU and allows access to
scratchpad registers. Therefore, we can know if the f/w is secured
by reading a status bit from the f/w registers.

Signed-off-by: farah kassabri <fkassabri@habana.ai>
Reviewed-by: Oded Gabbay <ogabbay@kernel.org>
Signed-off-by: Oded Gabbay <ogabbay@kernel.org>

diff --git a/drivers/misc/habanalabs/common/firmware_if.c b/drivers/misc/habanalabs/common/firmware_if.c
index 58c1eff16df6c1fcae937d978290da7aee46ad9f..cbcb9442bdcac1c5d0585b06811c35f6a9ef3e7d 100644 (file)
--- a/drivers/misc/habanalabs/common/firmware_if.c
+++ b/drivers/misc/habanalabs/common/firmware_if.c
@@ -1476,6 +1476,8 @@ static void hl_fw_preboot_update_state(struct hl_device *hdev)
         */
        prop->hard_reset_done_by_fw = !!(cpu_boot_dev_sts0 & CPU_BOOT_DEV_STS0_FW_HARD_RST_EN);
 
+       prop->fw_security_enabled = !!(cpu_boot_dev_sts0 & CPU_BOOT_DEV_STS0_SECURITY_EN);
+
        dev_dbg(hdev->dev, "Firmware preboot boot device status0 %#x\n",
                                                        cpu_boot_dev_sts0);
 

diff --git a/drivers/misc/habanalabs/gaudi2/gaudi2.c b/drivers/misc/habanalabs/gaudi2/gaudi2.c
index 68ab407fa6ba283d171e6df97c8e46610c51d2b0..9ccde0258ecadbe24148ece193b4d60431aa85d3 100644 (file)
--- a/drivers/misc/habanalabs/gaudi2/gaudi2.c
+++ b/drivers/misc/habanalabs/gaudi2/gaudi2.c
@@ -2493,7 +2493,6 @@ static int gaudi2_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;
 
        rc = gaudi2_set_fixed_properties(hdev);
@@ -2521,22 +2520,14 @@ static int gaudi2_early_init(struct hl_device *hdev)
        prop->dram_pci_bar_size = pci_resource_len(pdev, DRAM_BAR_ID);
        hdev->dram_pci_bar_start = pci_resource_start(pdev, DRAM_BAR_ID);
 
-       /* If FW security is enabled at this point it means no access to ELBI */
-       if (hdev->asic_prop.fw_security_enabled) {
-               hdev->asic_prop.iatu_done_by_fw = true;
-               goto pci_init;
-       }
-
-       rc = hl_pci_elbi_read(hdev, CFG_BASE + mmCPU_BOOT_DEV_STS0, &fw_boot_status);
-       if (rc)
-               goto free_queue_props;
-
-       /* Check whether FW is configuring iATU */
-       if ((fw_boot_status & CPU_BOOT_DEV_STS0_ENABLED) &&
-                       (fw_boot_status & CPU_BOOT_DEV_STS0_FW_IATU_CONF_EN))
+       /*
+        * Only in pldm driver config iATU
+        */
+       if (hdev->pldm)
+               hdev->asic_prop.iatu_done_by_fw = false;
+       else
                hdev->asic_prop.iatu_done_by_fw = true;
 
-pci_init:
        rc = hl_pci_init(hdev);
        if (rc)
                goto free_queue_props;