habanalabs: remove redundant gaudi2_sec asic type

As Gaudi2 has a single PCI id, the secured asic type is redundant.

Signed-off-by: Ofir Bitton <obitton@habana.ai>
Reviewed-by: Oded Gabbay <ogabbay@kernel.org>
Signed-off-by: Oded Gabbay <ogabbay@kernel.org>

diff --git a/drivers/misc/habanalabs/common/device.c b/drivers/misc/habanalabs/common/device.c
index cb8ecc17bba14657a4b2abad06cca0a2c208108e..3ea1ee1ec8ef3db6b297dfec4e7169b9474717cf 100644 (file)
--- a/drivers/misc/habanalabs/common/device.c
+++ b/drivers/misc/habanalabs/common/device.c
@@ -748,9 +748,6 @@ static int device_early_init(struct hl_device *hdev)
                gaudi2_set_asic_funcs(hdev);
                strscpy(hdev->asic_name, "GAUDI2", sizeof(hdev->asic_name));
                break;
-       case ASIC_GAUDI2_SEC:
-               gaudi2_set_asic_funcs(hdev);
-               strscpy(hdev->asic_name, "GAUDI2 SEC", sizeof(hdev->asic_name));
                break;
        default:
                dev_err(hdev->dev, "Unrecognized ASIC type %d\n",

diff --git a/drivers/misc/habanalabs/common/habanalabs.h b/drivers/misc/habanalabs/common/habanalabs.h
index bfaaa9daa7501b7c13766e1a4214e952079f6add..7d191f388953f24833a5250f9d8e6931fc3fd122 100644 (file)
--- a/drivers/misc/habanalabs/common/habanalabs.h
+++ b/drivers/misc/habanalabs/common/habanalabs.h
@@ -1192,7 +1192,6 @@ struct hl_dec {
  * @ASIC_GAUDI: Gaudi device (HL-2000).
  * @ASIC_GAUDI_SEC: Gaudi secured device (HL-2000).
  * @ASIC_GAUDI2: Gaudi2 device.
- * @ASIC_GAUDI2_SEC: Gaudi2 secured device.
  */
 enum hl_asic_type {
        ASIC_INVALID,
@@ -1200,7 +1199,6 @@ enum hl_asic_type {
        ASIC_GAUDI,
        ASIC_GAUDI_SEC,
        ASIC_GAUDI2,
-       ASIC_GAUDI2_SEC,
 };
 
 struct hl_cs_parser;

diff --git a/drivers/misc/habanalabs/common/mmu/mmu.c b/drivers/misc/habanalabs/common/mmu/mmu.c
index 589179f8cd41be1aeba3b9408012a910d08115ed..67d3e70cf57143c4a545f5add8403053011b6422 100644 (file)
--- a/drivers/misc/habanalabs/common/mmu/mmu.c
+++ b/drivers/misc/habanalabs/common/mmu/mmu.c
@@ -635,7 +635,6 @@ int hl_mmu_if_set_funcs(struct hl_device *hdev)
                hl_mmu_v1_set_funcs(hdev, &hdev->mmu_func[MMU_DR_PGT]);
                break;
        case ASIC_GAUDI2:
-       case ASIC_GAUDI2_SEC:
                /* MMUs in Gaudi2 are always host resident */
                hl_mmu_v2_hr_set_funcs(hdev, &hdev->mmu_func[MMU_HR_PGT]);
                break;

diff --git a/drivers/misc/habanalabs/common/sysfs.c b/drivers/misc/habanalabs/common/sysfs.c
index 36e9814139d172c8faa35c099445d8c454d70c4b..c924fc994bd96c62c3291ca17f7dc6177835062f 100644 (file)
--- a/drivers/misc/habanalabs/common/sysfs.c
+++ b/drivers/misc/habanalabs/common/sysfs.c
@@ -248,8 +248,6 @@ static ssize_t device_type_show(struct device *dev,
        case ASIC_GAUDI2:
                str = "GAUDI2";
                break;
-       case ASIC_GAUDI2_SEC:
-               str = "GAUDI2 SEC";
                break;
        default:
                dev_err(hdev->dev, "Unrecognized ASIC type %d\n",

diff --git a/drivers/misc/habanalabs/gaudi2/gaudi2.c b/drivers/misc/habanalabs/gaudi2/gaudi2.c
index 22f5445fe71c24824d2385c3e37726ea85d85294..03f8cf9bb136d813b4fe16b037ccf0df29c1f9b0 100644 (file)
--- a/drivers/misc/habanalabs/gaudi2/gaudi2.c
+++ b/drivers/misc/habanalabs/gaudi2/gaudi2.c
@@ -3969,7 +3969,7 @@ static void gaudi2_init_firmware_loader(struct hl_device *hdev)
        fw_loader->sram_bar_id = SRAM_CFG_BAR_ID;
        fw_loader->dram_bar_id = DRAM_BAR_ID;
 
-       if (hdev->asic_type == ASIC_GAUDI2 || hdev->asic_type == ASIC_GAUDI2_SEC)
+       if (hdev->asic_type == ASIC_GAUDI2)
                fw_loader->cpu_timeout = GAUDI2_CPU_TIMEOUT_USEC;
        else /* ASIC_GAUDI2_FPGA */
                fw_loader->cpu_timeout = GAUDI2_FPGA_CPU_TIMEOUT;