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>
This commit is contained in:
committed by
Oded Gabbay
parent
ab6c08f0d5
commit
6419b5232e
@ -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->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",
|
dev_dbg(hdev->dev, "Firmware preboot boot device status0 %#x\n",
|
||||||
cpu_boot_dev_sts0);
|
cpu_boot_dev_sts0);
|
||||||
|
|
||||||
|
@ -2493,7 +2493,6 @@ static int gaudi2_early_init(struct hl_device *hdev)
|
|||||||
struct asic_fixed_properties *prop = &hdev->asic_prop;
|
struct asic_fixed_properties *prop = &hdev->asic_prop;
|
||||||
struct pci_dev *pdev = hdev->pdev;
|
struct pci_dev *pdev = hdev->pdev;
|
||||||
resource_size_t pci_bar_size;
|
resource_size_t pci_bar_size;
|
||||||
u32 fw_boot_status;
|
|
||||||
int rc;
|
int rc;
|
||||||
|
|
||||||
rc = gaudi2_set_fixed_properties(hdev);
|
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);
|
prop->dram_pci_bar_size = pci_resource_len(pdev, DRAM_BAR_ID);
|
||||||
hdev->dram_pci_bar_start = pci_resource_start(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) {
|
* Only in pldm driver config iATU
|
||||||
hdev->asic_prop.iatu_done_by_fw = true;
|
*/
|
||||||
goto pci_init;
|
if (hdev->pldm)
|
||||||
}
|
hdev->asic_prop.iatu_done_by_fw = false;
|
||||||
|
else
|
||||||
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))
|
|
||||||
hdev->asic_prop.iatu_done_by_fw = true;
|
hdev->asic_prop.iatu_done_by_fw = true;
|
||||||
|
|
||||||
pci_init:
|
|
||||||
rc = hl_pci_init(hdev);
|
rc = hl_pci_init(hdev);
|
||||||
if (rc)
|
if (rc)
|
||||||
goto free_queue_props;
|
goto free_queue_props;
|
||||||
|
Reference in New Issue
Block a user