firmware: stratix10-svc: add FCS polling command

Introduce a new SMC command INTEL_SIP_SMC_FUNCID_SERVICE_COMPLETED
that polls if a previous asynchronous command was completed. This
SMC command is used by the new FPGA Crypto Service (FCS).
A basic example is that the FCS sends an AES data encryption
call to the secure device manager(SDM) and waits for the completion
of the operation by continuously polling the results with the new
command.

Signed-off-by: Ang Tien Sung <tien.sung.ang@intel.com>
Signed-off-by: Dinh Nguyen <dinguyen@kernel.org>
Link: https://lore.kernel.org/r/20220711223140.2307945-2-dinguyen@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/firmware/stratix10-svc.c b/drivers/firmware/stratix10-svc.c
index 1fe748c047df5c235f1daa661d136617172a5d80..439a4bdf8207fd9b7996dd1c232ea248d287b67c 100644 (file)
--- a/drivers/firmware/stratix10-svc.c
+++ b/drivers/firmware/stratix10-svc.c
@@ -248,6 +248,7 @@ static void svc_thread_cmd_config_status(struct stratix10_svc_controller *ctrl,
 {
        struct arm_smccc_res res;
        int count_in_sec;
+       unsigned long a0, a1, a2;
 
        cb_data->kaddr1 = NULL;
        cb_data->kaddr2 = NULL;
@@ -256,24 +257,45 @@ static void svc_thread_cmd_config_status(struct stratix10_svc_controller *ctrl,
 
        pr_debug("%s: polling config status\n", __func__);
 
+       a0 = INTEL_SIP_SMC_FPGA_CONFIG_ISDONE;
+       a1 = (unsigned long)p_data->paddr;
+       a2 = (unsigned long)p_data->size;
+
+       if (p_data->command == COMMAND_POLL_SERVICE_STATUS)
+               a0 = INTEL_SIP_SMC_SERVICE_COMPLETED;
+
        count_in_sec = FPGA_CONFIG_STATUS_TIMEOUT_SEC;
        while (count_in_sec) {
-               ctrl->invoke_fn(INTEL_SIP_SMC_FPGA_CONFIG_ISDONE,
-                               0, 0, 0, 0, 0, 0, 0, &res);
+               ctrl->invoke_fn(a0, a1, a2, 0, 0, 0, 0, 0, &res);
                if ((res.a0 == INTEL_SIP_SMC_STATUS_OK) ||
-                   (res.a0 == INTEL_SIP_SMC_STATUS_ERROR))
+                   (res.a0 == INTEL_SIP_SMC_STATUS_ERROR) ||
+                   (res.a0 == INTEL_SIP_SMC_STATUS_REJECTED))
                        break;
 
                /*
-                * configuration is still in progress, wait one second then
+                * request is still in progress, wait one second then
                 * poll again
                 */
                msleep(1000);
                count_in_sec--;
        }
 
-       if (res.a0 == INTEL_SIP_SMC_STATUS_OK && count_in_sec)
+       if (!count_in_sec) {
+               pr_err("%s: poll status timeout\n", __func__);
+               cb_data->status = BIT(SVC_STATUS_BUSY);
+       } else if (res.a0 == INTEL_SIP_SMC_STATUS_OK) {
                cb_data->status = BIT(SVC_STATUS_COMPLETED);
+               cb_data->kaddr2 = (res.a2) ?
+                                 svc_pa_to_va(res.a2) : NULL;
+               cb_data->kaddr3 = (res.a3) ? &res.a3 : NULL;
+       } else {
+               pr_err("%s: poll status error\n", __func__);
+               cb_data->kaddr1 = &res.a1;
+               cb_data->kaddr2 = (res.a2) ?
+                                 svc_pa_to_va(res.a2) : NULL;
+               cb_data->kaddr3 = (res.a3) ? &res.a3 : NULL;
+               cb_data->status = BIT(SVC_STATUS_ERROR);
+       }
 
        p_data->chan->scl->receive_cb(p_data->chan->scl, cb_data);
 }
@@ -298,6 +320,7 @@ static void svc_thread_recv_status_ok(struct stratix10_svc_data *p_data,
        case COMMAND_RECONFIG:
        case COMMAND_RSU_UPDATE:
        case COMMAND_RSU_NOTIFY:
+       case COMMAND_POLL_SERVICE_STATUS:
                cb_data->status = BIT(SVC_STATUS_OK);
                break;
        case COMMAND_RECONFIG_DATA_SUBMIT:
@@ -430,6 +453,14 @@ static int svc_normal_to_secure_thread(void *data)
                        a1 = 0;
                        a2 = 0;
                        break;
+               /* for polling */
+               case COMMAND_POLL_SERVICE_STATUS:
+                       a0 = INTEL_SIP_SMC_SERVICE_COMPLETED;
+                       a1 = (unsigned long)pdata->paddr;
+                       a2 = (unsigned long)pdata->size;
+
+                       break;
+
                default:
                        pr_warn("it shouldn't happen\n");
                        break;
@@ -470,6 +501,7 @@ static int svc_normal_to_secure_thread(void *data)
                                                          pdata, cbdata);
                                break;
                        case COMMAND_RECONFIG_STATUS:
+                       case COMMAND_POLL_SERVICE_STATUS:
                                svc_thread_cmd_config_status(ctrl,
                                                             pdata, cbdata);
                                break;

diff --git a/include/linux/firmware/intel/stratix10-smc.h b/include/linux/firmware/intel/stratix10-smc.h
index aad497a9ad8bb0bf7185e12d5828adff394b9fd5..0de104009566a79e2879a0f9fdb33c14bf9bdcb6 100644 (file)
--- a/include/linux/firmware/intel/stratix10-smc.h
+++ b/include/linux/firmware/intel/stratix10-smc.h
@@ -403,6 +403,31 @@ INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_FPGA_CONFIG_COMPLETED_WRITE)
 #define INTEL_SIP_SMC_RSU_MAX_RETRY \
        INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_RSU_MAX_RETRY)
 
+/**
+ * Request INTEL_SIP_SMC_SERVICE_COMPLETED
+ * Sync call to check if the secure world have completed service request
+ * or not.
+ *
+ * Call register usage:
+ * a0: INTEL_SIP_SMC_SERVICE_COMPLETED
+ * a1: this register is optional. If used, it is the physical address for
+ *     secure firmware to put output data
+ * a2: this register is optional. If used, it is the size of output data
+ * a3-a7: not used
+ *
+ * Return status:
+ * a0: INTEL_SIP_SMC_STATUS_OK, INTEL_SIP_SMC_STATUS_ERROR,
+ *     INTEL_SIP_SMC_REJECTED or INTEL_SIP_SMC_STATUS_BUSY
+ * a1: mailbox error if a0 is INTEL_SIP_SMC_STATUS_ERROR
+ * a2: physical address containing the process info
+ *     for FCS certificate -- the data contains the certificate status
+ *     for FCS cryption -- the data contains the actual data size FW processes
+ * a3: output data size
+ */
+#define INTEL_SIP_SMC_FUNCID_SERVICE_COMPLETED 30
+#define INTEL_SIP_SMC_SERVICE_COMPLETED \
+       INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_SERVICE_COMPLETED)
+
 /**
  * Request INTEL_SIP_SMC_FIRMWARE_VERSION
  *

diff --git a/include/linux/firmware/intel/stratix10-svc-client.h b/include/linux/firmware/intel/stratix10-svc-client.h
index 24121f8e0d7cade2ffa3cb124c556d159814ca12..5d0e814e0c41005d1a18716d03293f4efa2f6b83 100644 (file)
--- a/include/linux/firmware/intel/stratix10-svc-client.h
+++ b/include/linux/firmware/intel/stratix10-svc-client.h
@@ -106,6 +106,9 @@ struct stratix10_svc_chan;
  * @COMMAND_RSU_DCMF_VERSION: query firmware for the DCMF version, return status
  * is SVC_STATUS_OK or SVC_STATUS_ERROR
  *
+ * @COMMAND_POLL_SERVICE_STATUS: poll if the service request is complete,
+ * return statis is SVC_STATUS_OK, SVC_STATUS_ERROR or SVC_STATUS_BUSY
+ *
  * @COMMAND_FIRMWARE_VERSION: query running firmware version, return status
  * is SVC_STATUS_OK or SVC_STATUS_ERROR
  */
@@ -122,6 +125,8 @@ enum stratix10_svc_command_code {
        COMMAND_RSU_MAX_RETRY,
        COMMAND_RSU_DCMF_VERSION,
        COMMAND_FIRMWARE_VERSION,
+       /* for general status poll */
+       COMMAND_POLL_SERVICE_STATUS = 40,
 };
 
 /**