habanalabs: generalize COMMS message sending procedure
authorAlon Mizrahi <amizrahi@habana.ai>
Wed, 1 Sep 2021 15:05:00 +0000 (18:05 +0300)
committerOded Gabbay <ogabbay@kernel.org>
Mon, 18 Oct 2021 09:05:46 +0000 (12:05 +0300)
Instead of having dedicated function per message that we want to send
to the firmware in COMMS protocol, have a generic function that we can
call to from other parts of the driver

Signed-off-by: Alon Mizrahi <amizrahi@habana.ai>
Reviewed-by: Oded Gabbay <ogabbay@kernel.org>
Signed-off-by: Oded Gabbay <ogabbay@kernel.org>
drivers/misc/habanalabs/common/firmware_if.c

index 8d2568c..4e68fb9 100644 (file)
@@ -2162,18 +2162,17 @@ static void hl_fw_linux_update_state(struct hl_device *hdev,
 }
 
 /**
- * hl_fw_dynamic_report_reset_cause - send a COMMS message with the cause
- *                                    of the newly triggered hard reset
+ * hl_fw_dynamic_send_msg - send a COMMS message with attached data
  *
  * @hdev: pointer to the habanalabs device structure
  * @fw_loader: managing structure for loading device's FW
- * @reset_cause: enumerated cause for the recent hard reset
+ * @msg_type: message type
+ * @data: data to be sent
  *
  * @return 0 on success, otherwise non-zero error code
  */
-static int hl_fw_dynamic_report_reset_cause(struct hl_device *hdev,
-               struct fw_load_mgr *fw_loader,
-               enum comms_reset_cause reset_cause)
+static int hl_fw_dynamic_send_msg(struct hl_device *hdev,
+               struct fw_load_mgr *fw_loader, u8 msg_type, void *data)
 {
        struct lkd_msg_comms msg;
        int rc;
@@ -2181,11 +2180,20 @@ static int hl_fw_dynamic_report_reset_cause(struct hl_device *hdev,
        memset(&msg, 0, sizeof(msg));
 
        /* create message to be sent */
-       msg.header.type = HL_COMMS_RESET_CAUSE_TYPE;
+       msg.header.type = msg_type;
        msg.header.size = cpu_to_le16(sizeof(struct comms_msg_header));
        msg.header.magic = cpu_to_le32(HL_COMMS_MSG_MAGIC);
 
-       msg.reset_cause = reset_cause;
+       switch (msg_type) {
+       case HL_COMMS_RESET_CAUSE_TYPE:
+               msg.reset_cause = *(__u8 *) data;
+               break;
+       default:
+               dev_err(hdev->dev,
+                       "Send COMMS message - invalid message type %u\n",
+                       msg_type);
+               return -EINVAL;
+       }
 
        rc = hl_fw_dynamic_request_descriptor(hdev, fw_loader,
                        sizeof(struct lkd_msg_comms));
@@ -2252,8 +2260,8 @@ static int hl_fw_dynamic_init_cpu(struct hl_device *hdev,
                goto protocol_err;
 
        if (hdev->curr_reset_cause) {
-               rc = hl_fw_dynamic_report_reset_cause(hdev, fw_loader,
-                               hdev->curr_reset_cause);
+               rc = hl_fw_dynamic_send_msg(hdev, fw_loader,
+                               HL_COMMS_RESET_CAUSE_TYPE, &hdev->curr_reset_cause);
                if (rc)
                        goto protocol_err;