accel/habanalabs/gaudi2: add GAUDI2D revision support

Gaudi2 with PCI revision ID with the value of '4' represents Gaudi2D
device and should be detected and initialized as Gaudi2.

Signed-off-by: Farah Kassabri <fkassabri@habana.ai>
Reviewed-by: Ofir Bitton <obitton@habana.ai>
Signed-off-by: Ofir Bitton <obitton@habana.ai>

diff --git a/drivers/accel/habanalabs/common/device.c b/drivers/accel/habanalabs/common/device.c
index f9b8601c4396ba1ced4a3af035730e01d85f6290..fd117489a05ae9c598c59f52a7efe17c6977c723 100644 (file)
--- a/drivers/accel/habanalabs/common/device.c
+++ b/drivers/accel/habanalabs/common/device.c
@@ -862,6 +862,10 @@ static int device_early_init(struct hl_device *hdev)
                gaudi2_set_asic_funcs(hdev);
                strscpy(hdev->asic_name, "GAUDI2C", sizeof(hdev->asic_name));
                break;
+       case ASIC_GAUDI2D:
+               gaudi2_set_asic_funcs(hdev);
+               strscpy(hdev->asic_name, "GAUDI2D", sizeof(hdev->asic_name));
+               break;
        default:
                dev_err(hdev->dev, "Unrecognized ASIC type %d\n",
                        hdev->asic_type);

diff --git a/drivers/accel/habanalabs/common/habanalabs.h b/drivers/accel/habanalabs/common/habanalabs.h
index 057087dc8592594ec7e19f952a50f7667043481c..0d16b5310adde9c8a47a7fe9c260a43c003f9810 100644 (file)
--- a/drivers/accel/habanalabs/common/habanalabs.h
+++ b/drivers/accel/habanalabs/common/habanalabs.h
@@ -1273,15 +1273,18 @@ struct hl_dec {
  * @ASIC_GAUDI2: Gaudi2 device.
  * @ASIC_GAUDI2B: Gaudi2B device.
  * @ASIC_GAUDI2C: Gaudi2C device.
+ * @ASIC_GAUDI2D: Gaudi2D device.
  */
 enum hl_asic_type {
        ASIC_INVALID,
+
        ASIC_GOYA,
        ASIC_GAUDI,
        ASIC_GAUDI_SEC,
        ASIC_GAUDI2,
        ASIC_GAUDI2B,
        ASIC_GAUDI2C,
+       ASIC_GAUDI2D,
 };
 
 struct hl_cs_parser;

diff --git a/drivers/accel/habanalabs/common/habanalabs_drv.c b/drivers/accel/habanalabs/common/habanalabs_drv.c
index e542fd40e16c6d8011b5cc87c2d3b35e2039c2f7..b1613a82c7f294560ccf21828d69da989246fdb3 100644 (file)
--- a/drivers/accel/habanalabs/common/habanalabs_drv.c
+++ b/drivers/accel/habanalabs/common/habanalabs_drv.c
@@ -144,6 +144,9 @@ static enum hl_asic_type get_asic_type(struct hl_device *hdev)
                case REV_ID_C:
                        asic_type = ASIC_GAUDI2C;
                        break;
+               case REV_ID_D:
+                       asic_type = ASIC_GAUDI2D;
+                       break;
                default:
                        break;
                }

diff --git a/drivers/accel/habanalabs/common/mmu/mmu.c b/drivers/accel/habanalabs/common/mmu/mmu.c
index a9813ffcde14dd67569b336a1c69d3457f3dc4f1..79823facce7fef2965d700faa096ecaad7811f58 100644 (file)
--- a/drivers/accel/habanalabs/common/mmu/mmu.c
+++ b/drivers/accel/habanalabs/common/mmu/mmu.c
@@ -600,6 +600,7 @@ int hl_mmu_if_set_funcs(struct hl_device *hdev)
        case ASIC_GAUDI2:
        case ASIC_GAUDI2B:
        case ASIC_GAUDI2C:
+       case ASIC_GAUDI2D:
                hl_mmu_v2_set_funcs(hdev, &hdev->mmu_func[MMU_DR_PGT]);
                if (prop->pmmu.host_resident)
                        hl_mmu_v2_hr_set_funcs(hdev, &hdev->mmu_func[MMU_HR_PGT]);

diff --git a/drivers/accel/habanalabs/common/sysfs.c b/drivers/accel/habanalabs/common/sysfs.c
index 8a9f9883215765b0dab610960358156ff87af8ae..b6c63f8a0c1b9ae4d4bfac60a7d672925de54d72 100644 (file)
--- a/drivers/accel/habanalabs/common/sysfs.c
+++ b/drivers/accel/habanalabs/common/sysfs.c
@@ -270,6 +270,9 @@ static ssize_t device_type_show(struct device *dev,
        case ASIC_GAUDI2C:
                str = "GAUDI2C";
                break;
+       case ASIC_GAUDI2D:
+               str = "GAUDI2D";
+               break;
        default:
                dev_err(hdev->dev, "Unrecognized ASIC type %d\n",
                                hdev->asic_type);

diff --git a/drivers/accel/habanalabs/include/hw_ip/pci/pci_general.h b/drivers/accel/habanalabs/include/hw_ip/pci/pci_general.h
index 4f951cada07766f367ba926c20e6d99b6d9aa07d..a75faa00197fd27b625ebfd7c982f314eb6f44e3 100644 (file)
--- a/drivers/accel/habanalabs/include/hw_ip/pci/pci_general.h
+++ b/drivers/accel/habanalabs/include/hw_ip/pci/pci_general.h
@@ -25,7 +25,8 @@ enum hl_revision_id {
        REV_ID_INVALID                          = 0x00,
        REV_ID_A                                = 0x01,
        REV_ID_B                                = 0x02,
-       REV_ID_C                                = 0x03
+       REV_ID_C                                = 0x03,
+       REV_ID_D                                = 0x04
 };
 
 #endif /* INCLUDE_PCI_GENERAL_H_ */