habanalabs: get card type, location from F/W

For Gaudi the driver gets two new additional properties from the F/W:
1. The card's type - PCI or PMC
2. The card's location in the Gaudi's box (relevant only for PMC).

The card's location is also passed to the user in the HW IP info structure
as it needs this property for establishing communication between Gaudis.

Signed-off-by: Omer Shpigelman <oshpigelman@habana.ai>
Reviewed-by: Oded Gabbay <oded.gabbay@gmail.com>
Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com>

diff --git a/drivers/misc/habanalabs/habanalabs_ioctl.c b/drivers/misc/habanalabs/habanalabs_ioctl.c
index f5993698d315aad734e83176ee43d0fa35352d32..52eedd3a6c3adfca49a9c44d0fc7d9993287f074 100644 (file)
--- a/drivers/misc/habanalabs/habanalabs_ioctl.c
+++ b/drivers/misc/habanalabs/habanalabs_ioctl.c
@@ -71,6 +71,8 @@ static int hw_ip_info(struct hl_device *hdev, struct hl_info_args *args)
                min(CARD_NAME_MAX_LEN, HL_INFO_CARD_NAME_MAX_LEN));
 
        hw_ip.armcp_cpld_version = le32_to_cpu(prop->armcp_info.cpld_version);
+       hw_ip.module_id = le32_to_cpu(prop->armcp_info.card_location);
+
        hw_ip.psoc_pci_pll_nr = prop->psoc_pci_pll_nr;
        hw_ip.psoc_pci_pll_nf = prop->psoc_pci_pll_nf;
        hw_ip.psoc_pci_pll_od = prop->psoc_pci_pll_od;

diff --git a/drivers/misc/habanalabs/include/armcp_if.h b/drivers/misc/habanalabs/include/armcp_if.h
index 9e3bc21f20a0538bf9f819735d79b1ad66525678..a34fc39ad87e8862f69e4b187bb4317840bfaf87 100644 (file)
--- a/drivers/misc/habanalabs/include/armcp_if.h
+++ b/drivers/misc/habanalabs/include/armcp_if.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0
  *
- * Copyright 2016-2019 HabanaLabs, Ltd.
+ * Copyright 2016-2020 HabanaLabs, Ltd.
  * All Rights Reserved.
  *
  */
@@ -35,7 +35,8 @@ struct hl_eq_entry {
 enum pq_init_status {
        PQ_INIT_STATUS_NA = 0,
        PQ_INIT_STATUS_READY_FOR_CP,
-       PQ_INIT_STATUS_READY_FOR_HOST
+       PQ_INIT_STATUS_READY_FOR_HOST,
+       PQ_INIT_STATUS_READY_FOR_CP_SINGLE_MSI
 };
 
 /*
@@ -350,11 +351,24 @@ struct armcp_sensor {
        __le32 flags;
 };
 
+/**
+ * struct armcp_card_types - ASIC card type.
+ * @armcp_card_type_pci: PCI card.
+ * @armcp_card_type_pmc: PCI Mezzanine Card.
+ */
+enum armcp_card_types {
+       armcp_card_type_pci,
+       armcp_card_type_pmc
+};
+
 /**
  * struct armcp_info - Info from ArmCP that is necessary to the host's driver
  * @sensors: available sensors description.
  * @kernel_version: ArmCP linux kernel version.
  * @reserved: reserved field.
+ * @card_type: card configuration type.
+ * @card_location: in a server, each card has different connections topology
+ *                 depending on its location (relevant for PMC card type)
  * @cpld_version: CPLD programmed F/W version.
  * @infineon_version: Infineon main DC-DC version.
  * @fuse_version: silicon production FUSE information.
@@ -366,7 +380,9 @@ struct armcp_sensor {
 struct armcp_info {
        struct armcp_sensor sensors[ARMCP_MAX_SENSORS];
        __u8 kernel_version[VERSION_MAX_LEN];
-       __le32 reserved[3];
+       __le32 reserved;
+       __le32 card_type;
+       __le32 card_location;
        __le32 cpld_version;
        __le32 infineon_version;
        __u8 fuse_version[VERSION_MAX_LEN];

diff --git a/include/uapi/misc/habanalabs.h b/include/uapi/misc/habanalabs.h
index 70dfccea703810ada13246aa5350c1c34e61f5b6..079613dd7aaebb1874a3d5069d6d69a0723565d8 100644 (file)
--- a/include/uapi/misc/habanalabs.h
+++ b/include/uapi/misc/habanalabs.h
@@ -125,7 +125,8 @@ struct hl_info_hw_ip_info {
        __u32 sram_size;
        __u32 num_of_events;
        __u32 device_id; /* PCI Device ID */
-       __u32 reserved[3];
+       __u32 module_id; /* For mezzanine cards in servers (From OCP spec.) */
+       __u32 reserved[2];
        __u32 armcp_cpld_version;
        __u32 psoc_pci_pll_nr;
        __u32 psoc_pci_pll_nf;