accel/habanalabs: add support for Gaudi2C device

[ Upstream commit 42422993cf28d456778ee9168d73758ec037cd51 ]

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

Signed-off-by: Oded Gabbay <ogabbay@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/accel/habanalabs/common/device.c b/drivers/accel/habanalabs/common/device.c
index b97339d..ebef564 100644 (file)
--- a/drivers/accel/habanalabs/common/device.c
+++ b/drivers/accel/habanalabs/common/device.c
@@ -808,6 +808,9 @@ static int device_early_init(struct hl_device *hdev)
                gaudi2_set_asic_funcs(hdev);
                strscpy(hdev->asic_name, "GAUDI2B", sizeof(hdev->asic_name));
                break;
+       case ASIC_GAUDI2C:
+               gaudi2_set_asic_funcs(hdev);
+               strscpy(hdev->asic_name, "GAUDI2C", sizeof(hdev->asic_name));
                break;
        default:
                dev_err(hdev->dev, "Unrecognized ASIC type %d\n",

diff --git a/drivers/accel/habanalabs/common/habanalabs.h b/drivers/accel/habanalabs/common/habanalabs.h
index 2f027d5..05febd5 100644 (file)
--- a/drivers/accel/habanalabs/common/habanalabs.h
+++ b/drivers/accel/habanalabs/common/habanalabs.h
@@ -1220,6 +1220,7 @@ struct hl_dec {
  * @ASIC_GAUDI_SEC: Gaudi secured device (HL-2000).
  * @ASIC_GAUDI2: Gaudi2 device.
  * @ASIC_GAUDI2B: Gaudi2B device.
+ * @ASIC_GAUDI2C: Gaudi2C device.
  */
 enum hl_asic_type {
        ASIC_INVALID,
@@ -1228,6 +1229,7 @@ enum hl_asic_type {
        ASIC_GAUDI_SEC,
        ASIC_GAUDI2,
        ASIC_GAUDI2B,
+       ASIC_GAUDI2C,
 };
 
 struct hl_cs_parser;

diff --git a/drivers/accel/habanalabs/common/habanalabs_drv.c b/drivers/accel/habanalabs/common/habanalabs_drv.c
index 7263e84..010bf63 100644 (file)
--- a/drivers/accel/habanalabs/common/habanalabs_drv.c
+++ b/drivers/accel/habanalabs/common/habanalabs_drv.c
@@ -101,6 +101,9 @@ static enum hl_asic_type get_asic_type(struct hl_device *hdev)
                case REV_ID_B:
                        asic_type = ASIC_GAUDI2B;
                        break;
+               case REV_ID_C:
+                       asic_type = ASIC_GAUDI2C;
+                       break;
                default:
                        break;
                }

diff --git a/drivers/accel/habanalabs/common/mmu/mmu.c b/drivers/accel/habanalabs/common/mmu/mmu.c
index b214571..b654302 100644 (file)
--- a/drivers/accel/habanalabs/common/mmu/mmu.c
+++ b/drivers/accel/habanalabs/common/mmu/mmu.c
@@ -596,6 +596,7 @@ int hl_mmu_if_set_funcs(struct hl_device *hdev)
                break;
        case ASIC_GAUDI2:
        case ASIC_GAUDI2B:
+       case ASIC_GAUDI2C:
                /* 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/accel/habanalabs/common/sysfs.c b/drivers/accel/habanalabs/common/sysfs.c
index 01f89f0..2786063 100644 (file)
--- a/drivers/accel/habanalabs/common/sysfs.c
+++ b/drivers/accel/habanalabs/common/sysfs.c
@@ -251,6 +251,9 @@ static ssize_t device_type_show(struct device *dev,
        case ASIC_GAUDI2B:
                str = "GAUDI2B";
                break;
+       case ASIC_GAUDI2C:
+               str = "GAUDI2C";
+               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 f5d497d..4f951ca 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,6 +25,7 @@ enum hl_revision_id {
        REV_ID_INVALID                          = 0x00,
        REV_ID_A                                = 0x01,
        REV_ID_B                                = 0x02,
+       REV_ID_C                                = 0x03
 };
 
 #endif /* INCLUDE_PCI_GENERAL_H_ */