Commit 30620698 authored by Ofir Bitton's avatar Ofir Bitton Committed by Oded Gabbay
Browse files

habanalabs: remove redundant gaudi2_sec asic type 



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

Signed-off-by: default avatarOfir Bitton <obitton@habana.ai>
Reviewed-by: default avatarOded Gabbay <ogabbay@kernel.org>
Signed-off-by: default avatarOded Gabbay <ogabbay@kernel.org>
parent bdfef91e

drivers/misc/habanalabs/common/device.c

+0 −3
Original line number Diff line number Diff line
@@ -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",

drivers/misc/habanalabs/common/habanalabs.h

+0 −2
Original line number Diff line number Diff line
@@ -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;

drivers/misc/habanalabs/common/mmu/mmu.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

drivers/misc/habanalabs/common/sysfs.c

+0 −2
Original line number Diff line number Diff line
@@ -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",

drivers/misc/habanalabs/gaudi2/gaudi2.c

+1 −1
Original line number Diff line number Diff line
@@ -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;