diff mbox series

[1/2,RESEND] firmware: stratix10-svc: Generic Mailbox Command

Message ID 20230707080305.1722983-1-kah.jing.lee@intel.com
State New
Headers
Series Query the RSU SPT table offset to determine RSU page size |

Commit Message

Lee, Kah Jing July 7, 2023, 8:03 a.m. UTC 
  From: Teh Wen Ping <wen.ping.teh@intel.com>

Add generic mailbox command that can support SDM command. User can use this
command to send SDM mailbox command. User have to specified an input file
which contain the command data and an output file for SDM response to be
copied over.

Signed-off-by: Teh Wen Ping <wen.ping.teh@intel.com>
Signed-off-by: Kah Jing Lee <kah.jing.lee@intel.com>
---
 drivers/firmware/stratix10-svc.c              | 18 +++++++++++++
 include/linux/firmware/intel/stratix10-smc.h  | 25 +++++++++++++++++++
 .../firmware/intel/stratix10-svc-client.h     |  5 ++++
 3 files changed, 48 insertions(+)

Comments

Dinh Nguyen July 7, 2023, 7:53 p.m. UTC | #1 
On 7/7/23 03:03, kah.jing.lee@intel.com wrote:
> From: Teh Wen Ping <wen.ping.teh@intel.com>
> 
> Add generic mailbox command that can support SDM command. User can use this
> command to send SDM mailbox command. User have to specified an input file
> which contain the command data and an output file for SDM response to be
> copied over.
> 
> Signed-off-by: Teh Wen Ping <wen.ping.teh@intel.com>
> Signed-off-by: Kah Jing Lee <kah.jing.lee@intel.com>
> ---
>   drivers/firmware/stratix10-svc.c              | 18 +++++++++++++
>   include/linux/firmware/intel/stratix10-smc.h  | 25 +++++++++++++++++++
>   .../firmware/intel/stratix10-svc-client.h     |  5 ++++
>   3 files changed, 48 insertions(+)
> 
> diff --git a/drivers/firmware/stratix10-svc.c b/drivers/firmware/stratix10-svc.c
> index 2d674126160f..430e8bf0bca9 100644
> --- a/drivers/firmware/stratix10-svc.c
> +++ b/drivers/firmware/stratix10-svc.c
> @@ -37,6 +37,7 @@
>   #define SVC_NUM_CHANNEL				3
>   #define FPGA_CONFIG_DATA_CLAIM_TIMEOUT_MS	200
>   #define FPGA_CONFIG_STATUS_TIMEOUT_SEC		30
> +#define BYTE_TO_WORD_SIZE              4
>   
>   /* stratix10 service layer clients */
>   #define STRATIX10_RSU				"stratix10-rsu"
> @@ -361,6 +362,13 @@ static void svc_thread_recv_status_ok(struct stratix10_svc_data *p_data,
>   		cb_data->kaddr2 = svc_pa_to_va(res.a2);
>   		cb_data->kaddr3 = &res.a3;
>   		break;
> +	case COMMAND_MBOX_SEND_CMD:
> +		cb_data->status = BIT(SVC_STATUS_OK);
> +		cb_data->kaddr1 = &res.a1;
> +		/* SDM return size in u32 word. Convert size to u8 */

Check this comment. I don't see how this is accurate.
> +		res.a2 = res.a2 * BYTE_TO_WORD_SIZE;
> +		cb_data->kaddr2 = &res.a2;
> +		break;
>   	default:
>   		pr_warn("it shouldn't happen\n");
>   		break;
> @@ -534,6 +542,15 @@ static int svc_normal_to_secure_thread(void *data)
>   			a1 = 0;
>   			a2 = 0;
>   			break;
> +		case COMMAND_MBOX_SEND_CMD:
> +			a0 = INTEL_SIP_SMC_MBOX_SEND_CMD;
> +			a1 = pdata->arg[0];
> +			a2 = (unsigned long)pdata->paddr;
> +			a3 = (unsigned long)pdata->size / BYTE_TO_WORD_SIZE;
> +			a4 = pdata->arg[1];
> +			a5 = (unsigned long)pdata->paddr_output;
> +			a6 = (unsigned long)pdata->size_output / BYTE_TO_WORD_SIZE;
> +			break;
>   		default:
>   			pr_warn("it shouldn't happen\n");
>   			break;
> @@ -597,6 +614,7 @@ static int svc_normal_to_secure_thread(void *data)
>   			case COMMAND_FCS_DATA_ENCRYPTION:
>   			case COMMAND_FCS_DATA_DECRYPTION:
>   			case COMMAND_FCS_RANDOM_NUMBER_GEN:
> +			case COMMAND_MBOX_SEND_CMD:
>   				cbdata->status = BIT(SVC_STATUS_INVALID_PARAM);
>   				cbdata->kaddr1 = NULL;
>   				cbdata->kaddr2 = NULL;
> diff --git a/include/linux/firmware/intel/stratix10-smc.h b/include/linux/firmware/intel/stratix10-smc.h
> index a718f853d457..ee80ca4bb0d0 100644
> --- a/include/linux/firmware/intel/stratix10-smc.h
> +++ b/include/linux/firmware/intel/stratix10-smc.h
> @@ -466,6 +466,31 @@ INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_FPGA_CONFIG_COMPLETED_WRITE)
>   #define INTEL_SIP_SMC_FIRMWARE_VERSION \
>           INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_FIRMWARE_VERSION)
>   
> +/**
> + * SMC call protocol for Mailbox, starting FUNCID from 60
> + *
> + * Call register usage:
> + * a0 INTEL_SIP_SMC_MBOX_SEND_CMD
> + * a1 mailbox command code
> + * a2 physical address that contain mailbox command data (not include header)
> + * a3 mailbox command data size in word
> + * a4 set to 0 for CASUAL, set to 1 for URGENT
> + * a5 physical address for secure firmware to put response data
> + *    (not include header)
> + * a6 maximum size in word of physical address to store response data
> + * a7 not used
> + *
> + * Return status
> + * a0 INTEL_SIP_SMC_STATUS_OK, INTEL_SIP_SMC_STATUS_REJECTED or
> + *    INTEL_SIP_SMC_STATUS_ERROR
> + * a1 mailbox error code
> + * a2 response data length in word
> + * a3 not used
> + */
> +#define INTEL_SIP_SMC_FUNCID_MBOX_SEND_CMD 60
> +	#define INTEL_SIP_SMC_MBOX_SEND_CMD \
> +	INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_MBOX_SEND_CMD)
> +
>   /**
>    * Request INTEL_SIP_SMC_SVC_VERSION
>    *
> diff --git a/include/linux/firmware/intel/stratix10-svc-client.h b/include/linux/firmware/intel/stratix10-svc-client.h
> index 0c16037fd08d..60ed82112680 100644
> --- a/include/linux/firmware/intel/stratix10-svc-client.h
> +++ b/include/linux/firmware/intel/stratix10-svc-client.h
> @@ -118,6 +118,9 @@ struct stratix10_svc_chan;
>    * @COMMAND_SMC_SVC_VERSION: Non-mailbox SMC SVC API Version,
>    * return status is SVC_STATUS_OK
>    *
> + * @COMMAND_MBOX_SEND_CMD: send generic mailbox command, return status is
> + * SVC_STATUS_OK or SVC_STATUS_ERROR
> + *
>    * @COMMAND_RSU_DCMF_STATUS: query firmware for the DCMF status
>    * return status is SVC_STATUS_OK or SVC_STATUS_ERROR
>    *
> @@ -164,6 +167,8 @@ enum stratix10_svc_command_code {
>   	COMMAND_FCS_RANDOM_NUMBER_GEN,
>   	/* for general status poll */
>   	COMMAND_POLL_SERVICE_STATUS = 40,
> +	/* for generic mailbox send command */
> +	COMMAND_MBOX_SEND_CMD = 100,
>   	/* Non-mailbox SMC Call */
>   	COMMAND_SMC_SVC_VERSION = 200,
>   };
Lee, Kah Jing July 16, 2023, 6:50 a.m. UTC | #2 
> On 7/7/23 03:03, kah.jing.lee@intel.com wrote:
> > From: Teh Wen Ping <wen.ping.teh@intel.com>
> >
> > Add generic mailbox command that can support SDM command. User can
> use
> > this command to send SDM mailbox command. User have to specified an
> > input file which contain the command data and an output file for SDM
> > response to be copied over.
> >
> > Signed-off-by: Teh Wen Ping <wen.ping.teh@intel.com>
> > Signed-off-by: Kah Jing Lee <kah.jing.lee@intel.com>
> > ---
> >   drivers/firmware/stratix10-svc.c              | 18 +++++++++++++
> >   include/linux/firmware/intel/stratix10-smc.h  | 25
> +++++++++++++++++++
> >   .../firmware/intel/stratix10-svc-client.h     |  5 ++++
> >   3 files changed, 48 insertions(+)
> >
> > diff --git a/drivers/firmware/stratix10-svc.c
> > b/drivers/firmware/stratix10-svc.c
> > index 2d674126160f..430e8bf0bca9 100644
> > --- a/drivers/firmware/stratix10-svc.c
> > +++ b/drivers/firmware/stratix10-svc.c
> > @@ -37,6 +37,7 @@
> >   #define SVC_NUM_CHANNEL				3
> >   #define FPGA_CONFIG_DATA_CLAIM_TIMEOUT_MS	200
> >   #define FPGA_CONFIG_STATUS_TIMEOUT_SEC		30
> > +#define BYTE_TO_WORD_SIZE              4
> >
> >   /* stratix10 service layer clients */
> >   #define STRATIX10_RSU				"stratix10-rsu"
> > @@ -361,6 +362,13 @@ static void svc_thread_recv_status_ok(struct
> stratix10_svc_data *p_data,
> >   		cb_data->kaddr2 = svc_pa_to_va(res.a2);
> >   		cb_data->kaddr3 = &res.a3;
> >   		break;
> > +	case COMMAND_MBOX_SEND_CMD:
> > +		cb_data->status = BIT(SVC_STATUS_OK);
> > +		cb_data->kaddr1 = &res.a1;
> > +		/* SDM return size in u32 word. Convert size to u8 */
> 
> Check this comment. I don't see how this is accurate.
Updated comment in v2. 
/* SDM return size in u8. Convert size to u32 word */
> > +		res.a2 = res.a2 * BYTE_TO_WORD_SIZE;
> > +		cb_data->kaddr2 = &res.a2;
> > +		break;
> >   	default:
> >   		pr_warn("it shouldn't happen\n");
> >   		break;
> > @@ -534,6 +542,15 @@ static int svc_normal_to_secure_thread(void
> *data)
> >   			a1 = 0;
> >   			a2 = 0;
> >   			break;
> > +		case COMMAND_MBOX_SEND_CMD:
> > +			a0 = INTEL_SIP_SMC_MBOX_SEND_CMD;
> > +			a1 = pdata->arg[0];
> > +			a2 = (unsigned long)pdata->paddr;
> > +			a3 = (unsigned long)pdata->size /
> BYTE_TO_WORD_SIZE;
> > +			a4 = pdata->arg[1];
> > +			a5 = (unsigned long)pdata->paddr_output;
> > +			a6 = (unsigned long)pdata->size_output /
> BYTE_TO_WORD_SIZE;
> > +			break;
> >   		default:
> >   			pr_warn("it shouldn't happen\n");
> >   			break;
> > @@ -597,6 +614,7 @@ static int svc_normal_to_secure_thread(void *data)
> >   			case COMMAND_FCS_DATA_ENCRYPTION:
> >   			case COMMAND_FCS_DATA_DECRYPTION:
> >   			case COMMAND_FCS_RANDOM_NUMBER_GEN:
> > +			case COMMAND_MBOX_SEND_CMD:
> >   				cbdata->status =
> BIT(SVC_STATUS_INVALID_PARAM);
> >   				cbdata->kaddr1 = NULL;
> >   				cbdata->kaddr2 = NULL;
> > diff --git a/include/linux/firmware/intel/stratix10-smc.h
> > b/include/linux/firmware/intel/stratix10-smc.h
> > index a718f853d457..ee80ca4bb0d0 100644
> > --- a/include/linux/firmware/intel/stratix10-smc.h
> > +++ b/include/linux/firmware/intel/stratix10-smc.h
> > @@ -466,6 +466,31 @@
> INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_FPGA_CONFIG_
> COMPLETED_WRITE)
> >   #define INTEL_SIP_SMC_FIRMWARE_VERSION \
> >
> >
> INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_FIRMWARE_VE
> RSION)
> >
> > +/**
> > + * SMC call protocol for Mailbox, starting FUNCID from 60
> > + *
> > + * Call register usage:
> > + * a0 INTEL_SIP_SMC_MBOX_SEND_CMD
> > + * a1 mailbox command code
> > + * a2 physical address that contain mailbox command data (not include
> > +header)
> > + * a3 mailbox command data size in word
> > + * a4 set to 0 for CASUAL, set to 1 for URGENT
> > + * a5 physical address for secure firmware to put response data
> > + *    (not include header)
> > + * a6 maximum size in word of physical address to store response data
> > + * a7 not used
> > + *
> > + * Return status
> > + * a0 INTEL_SIP_SMC_STATUS_OK, INTEL_SIP_SMC_STATUS_REJECTED or
> > + *    INTEL_SIP_SMC_STATUS_ERROR
> > + * a1 mailbox error code
> > + * a2 response data length in word
> > + * a3 not used
> > + */
> > +#define INTEL_SIP_SMC_FUNCID_MBOX_SEND_CMD 60
> > +	#define INTEL_SIP_SMC_MBOX_SEND_CMD \
> > +
> 	INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_MBOX_
> SEND_CMD)
> > +
> >   /**
> >    * Request INTEL_SIP_SMC_SVC_VERSION
> >    *
> > diff --git a/include/linux/firmware/intel/stratix10-svc-client.h
> > b/include/linux/firmware/intel/stratix10-svc-client.h
> > index 0c16037fd08d..60ed82112680 100644
> > --- a/include/linux/firmware/intel/stratix10-svc-client.h
> > +++ b/include/linux/firmware/intel/stratix10-svc-client.h
> > @@ -118,6 +118,9 @@ struct stratix10_svc_chan;
> >    * @COMMAND_SMC_SVC_VERSION: Non-mailbox SMC SVC API Version,
> >    * return status is SVC_STATUS_OK
> >    *
> > + * @COMMAND_MBOX_SEND_CMD: send generic mailbox command,
> return
> > + status is
> > + * SVC_STATUS_OK or SVC_STATUS_ERROR
> > + *
> >    * @COMMAND_RSU_DCMF_STATUS: query firmware for the DCMF
> status
> >    * return status is SVC_STATUS_OK or SVC_STATUS_ERROR
> >    *
> > @@ -164,6 +167,8 @@ enum stratix10_svc_command_code {
> >   	COMMAND_FCS_RANDOM_NUMBER_GEN,
> >   	/* for general status poll */
> >   	COMMAND_POLL_SERVICE_STATUS = 40,
> > +	/* for generic mailbox send command */
> > +	COMMAND_MBOX_SEND_CMD = 100,
> >   	/* Non-mailbox SMC Call */
> >   	COMMAND_SMC_SVC_VERSION = 200,
> >   };
diff mbox series

Patch

diff --git a/drivers/firmware/stratix10-svc.c b/drivers/firmware/stratix10-svc.c
index 2d674126160f..430e8bf0bca9 100644
--- a/drivers/firmware/stratix10-svc.c
+++ b/drivers/firmware/stratix10-svc.c
@@ -37,6 +37,7 @@ 
 #define SVC_NUM_CHANNEL				3
 #define FPGA_CONFIG_DATA_CLAIM_TIMEOUT_MS	200
 #define FPGA_CONFIG_STATUS_TIMEOUT_SEC		30
+#define BYTE_TO_WORD_SIZE              4
 
 /* stratix10 service layer clients */
 #define STRATIX10_RSU				"stratix10-rsu"
@@ -361,6 +362,13 @@  static void svc_thread_recv_status_ok(struct stratix10_svc_data *p_data,
 		cb_data->kaddr2 = svc_pa_to_va(res.a2);
 		cb_data->kaddr3 = &res.a3;
 		break;
+	case COMMAND_MBOX_SEND_CMD:
+		cb_data->status = BIT(SVC_STATUS_OK);
+		cb_data->kaddr1 = &res.a1;
+		/* SDM return size in u32 word. Convert size to u8 */
+		res.a2 = res.a2 * BYTE_TO_WORD_SIZE;
+		cb_data->kaddr2 = &res.a2;
+		break;
 	default:
 		pr_warn("it shouldn't happen\n");
 		break;
@@ -534,6 +542,15 @@  static int svc_normal_to_secure_thread(void *data)
 			a1 = 0;
 			a2 = 0;
 			break;
+		case COMMAND_MBOX_SEND_CMD:
+			a0 = INTEL_SIP_SMC_MBOX_SEND_CMD;
+			a1 = pdata->arg[0];
+			a2 = (unsigned long)pdata->paddr;
+			a3 = (unsigned long)pdata->size / BYTE_TO_WORD_SIZE;
+			a4 = pdata->arg[1];
+			a5 = (unsigned long)pdata->paddr_output;
+			a6 = (unsigned long)pdata->size_output / BYTE_TO_WORD_SIZE;
+			break;
 		default:
 			pr_warn("it shouldn't happen\n");
 			break;
@@ -597,6 +614,7 @@  static int svc_normal_to_secure_thread(void *data)
 			case COMMAND_FCS_DATA_ENCRYPTION:
 			case COMMAND_FCS_DATA_DECRYPTION:
 			case COMMAND_FCS_RANDOM_NUMBER_GEN:
+			case COMMAND_MBOX_SEND_CMD:
 				cbdata->status = BIT(SVC_STATUS_INVALID_PARAM);
 				cbdata->kaddr1 = NULL;
 				cbdata->kaddr2 = NULL;
diff --git a/include/linux/firmware/intel/stratix10-smc.h b/include/linux/firmware/intel/stratix10-smc.h
index a718f853d457..ee80ca4bb0d0 100644
--- a/include/linux/firmware/intel/stratix10-smc.h
+++ b/include/linux/firmware/intel/stratix10-smc.h
@@ -466,6 +466,31 @@  INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_FPGA_CONFIG_COMPLETED_WRITE)
 #define INTEL_SIP_SMC_FIRMWARE_VERSION \
         INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_FIRMWARE_VERSION)
 
+/**
+ * SMC call protocol for Mailbox, starting FUNCID from 60
+ *
+ * Call register usage:
+ * a0 INTEL_SIP_SMC_MBOX_SEND_CMD
+ * a1 mailbox command code
+ * a2 physical address that contain mailbox command data (not include header)
+ * a3 mailbox command data size in word
+ * a4 set to 0 for CASUAL, set to 1 for URGENT
+ * a5 physical address for secure firmware to put response data
+ *    (not include header)
+ * a6 maximum size in word of physical address to store response data
+ * a7 not used
+ *
+ * Return status
+ * a0 INTEL_SIP_SMC_STATUS_OK, INTEL_SIP_SMC_STATUS_REJECTED or
+ *    INTEL_SIP_SMC_STATUS_ERROR
+ * a1 mailbox error code
+ * a2 response data length in word
+ * a3 not used
+ */
+#define INTEL_SIP_SMC_FUNCID_MBOX_SEND_CMD 60
+	#define INTEL_SIP_SMC_MBOX_SEND_CMD \
+	INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_MBOX_SEND_CMD)
+
 /**
  * Request INTEL_SIP_SMC_SVC_VERSION
  *
diff --git a/include/linux/firmware/intel/stratix10-svc-client.h b/include/linux/firmware/intel/stratix10-svc-client.h
index 0c16037fd08d..60ed82112680 100644
--- a/include/linux/firmware/intel/stratix10-svc-client.h
+++ b/include/linux/firmware/intel/stratix10-svc-client.h
@@ -118,6 +118,9 @@  struct stratix10_svc_chan;
  * @COMMAND_SMC_SVC_VERSION: Non-mailbox SMC SVC API Version,
  * return status is SVC_STATUS_OK
  *
+ * @COMMAND_MBOX_SEND_CMD: send generic mailbox command, return status is
+ * SVC_STATUS_OK or SVC_STATUS_ERROR
+ *
  * @COMMAND_RSU_DCMF_STATUS: query firmware for the DCMF status
  * return status is SVC_STATUS_OK or SVC_STATUS_ERROR
  *
@@ -164,6 +167,8 @@  enum stratix10_svc_command_code {
 	COMMAND_FCS_RANDOM_NUMBER_GEN,
 	/* for general status poll */
 	COMMAND_POLL_SERVICE_STATUS = 40,
+	/* for generic mailbox send command */
+	COMMAND_MBOX_SEND_CMD = 100,
 	/* Non-mailbox SMC Call */
 	COMMAND_SMC_SVC_VERSION = 200,
 };