habanalabs: sysfs support for two infineon versions

Currently sysfs support dumping a single infineon version, in
future asics we will have two infineon versions.

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/sysfs.c b/drivers/misc/habanalabs/common/sysfs.c
index 15e4ae65e515164ca247737ccbf58dd040dbf90e..6f575032f675028485a10d1c964284d6f92c5332 100644 (file)
--- a/drivers/misc/habanalabs/common/sysfs.c
+++ b/drivers/misc/habanalabs/common/sysfs.c
@@ -163,8 +163,13 @@ static ssize_t infineon_ver_show(struct device *dev,
 {
        struct hl_device *hdev = dev_get_drvdata(dev);
 
-       return sprintf(buf, "0x%04x\n",
-                       hdev->asic_prop.cpucp_info.infineon_version);
+       if (hdev->asic_prop.cpucp_info.infineon_second_stage_version)
+               return sprintf(buf, "%#04x %#04x\n",
+                       le32_to_cpu(hdev->asic_prop.cpucp_info.infineon_version),
+                       le32_to_cpu(hdev->asic_prop.cpucp_info.infineon_second_stage_version));
+       else
+               return sprintf(buf, "%#04x\n",
+                       le32_to_cpu(hdev->asic_prop.cpucp_info.infineon_version));
 }
 
 static ssize_t fuse_ver_show(struct device *dev, struct device_attribute *attr,

diff --git a/drivers/misc/habanalabs/include/common/cpucp_if.h b/drivers/misc/habanalabs/include/common/cpucp_if.h
index 078fb4bd0316e9e414f99c8685a3cecde3ebf8e4..0114cb52faadbc154852790a4d9df1140ccb455e 100644 (file)
--- a/drivers/misc/habanalabs/include/common/cpucp_if.h
+++ b/drivers/misc/habanalabs/include/common/cpucp_if.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0
  *
- * Copyright 2021 HabanaLabs, Ltd.
+ * Copyright 2020-2021 HabanaLabs, Ltd.
  * All Rights Reserved.
  *
  */
@@ -761,6 +761,7 @@ struct cpucp_security_info {
  * @fuse_version: silicon production FUSE information.
  * @thermal_version: thermald S/W version.
  * @cpucp_version: CpuCP S/W version.
+ * @infineon_second_stage_version: Infineon 2nd stage DC-DC version.
  * @dram_size: available DRAM size.
  * @card_name: card name that will be displayed in HWMON subsystem on the host
  * @sec_info: security information
@@ -770,6 +771,10 @@ struct cpucp_security_info {
  * @dram_binning_mask: DRAM binning mask, 1 bit per dram instance
  *                     (0 = functional 1 = binned)
  * @memory_repair_flag: eFuse flag indicating memory repair
+ * @edma_binning_mask: EDMA binning mask, 1 bit per EDMA instance
+ *                     (0 = functional 1 = binned)
+ * @xbar_binning_mask: Xbar binning mask, 1 bit per Xbar instance
+ *                     (0 = functional 1 = binned)
  */
 struct cpucp_info {
        struct cpucp_sensor sensors[CPUCP_MAX_SENSORS];
@@ -782,7 +787,7 @@ struct cpucp_info {
        __u8 fuse_version[VERSION_MAX_LEN];
        __u8 thermal_version[VERSION_MAX_LEN];
        __u8 cpucp_version[VERSION_MAX_LEN];
-       __le32 reserved2;
+       __le32 infineon_second_stage_version;
        __le64 dram_size;
        char card_name[CARD_NAME_MAX_LEN];
        __le64 reserved3;
@@ -790,7 +795,9 @@ struct cpucp_info {
        __u8 reserved5;
        __u8 dram_binning_mask;
        __u8 memory_repair_flag;
-       __u8 pad[5];
+       __u8 edma_binning_mask;
+       __u8 xbar_binning_mask;
+       __u8 pad[3];
        struct cpucp_security_info sec_info;
        __le32 reserved6;
        __u8 pll_map[PLL_MAP_LEN];