firmware: fpga: replace the error codes with the standard ones

The Intel service layer driver has defined error codes for the specific services, which started from FPGA configuration then RSU (Remote Status Update). Intel service layer driver should define the standard error codes rather than keep adding more error codes for the new services. The standard error codes will be used by all the clients of Intel service layer driver. Replace FPGA and RSU specific error codes with Intel service layer’s Common error codes.

Richard Gong committed 6 years ago

Commit 7536ad81 parent 2a4542e5 files · +84 −133Browse files

Showing the changes to include/linux (2 of 5 files). Show all

Unified · Split

2 files

include/linux/firmware/intel/stratix10-smc.h +21 −28
include/linux/firmware/intel/stratix10-svc-client.h +30 −41

include/linux/firmware/intel/stratix10-smc.h+21−28

@@ -54,32 +54,25 @@ · 53 unmodified lines
54	54	* Secure monitor software doesn't recognize the request.
55	55	*
56	56	* INTEL_SIP_SMC_STATUS_OK:
57		− * FPGA configuration completed successfully,
58		− * In case of FPGA configuration write operation, it means secure monitor
59		− * software can accept the next chunk of FPGA configuration data.
	57	+ * Secure monitor software accepts the service client's request.
60	58	*
61		− * INTEL_SIP_SMC_FPGA_CONFIG_STATUS_BUSY:
62		− * In case of FPGA configuration write operation, it means secure monitor
63		− * software is still processing previous data & can't accept the next chunk
64		− * of data. Service driver needs to issue
65		− * INTEL_SIP_SMC_FPGA_CONFIG_COMPLETED_WRITE call to query the
66		− * completed block(s).
	59	+ * INTEL_SIP_SMC_STATUS_BUSY:
	60	+ * Secure monitor software is still processing service client's request.
67	61	*
68		− * INTEL_SIP_SMC_FPGA_CONFIG_STATUS_ERROR:
69		− * There is error during the FPGA configuration process.
	62	+ * INTEL_SIP_SMC_STATUS_REJECTED:
	63	+ * Secure monitor software reject the service client's request.
70	64	*
71		− * INTEL_SIP_SMC_REG_ERROR:
72		− * There is error during a read or write operation of the protected registers.
	65	+ * INTEL_SIP_SMC_STATUS_ERROR:
	66	+ * There is error during the process of service request.
73	67	*
74	68	* INTEL_SIP_SMC_RSU_ERROR:
75		− * There is error during a remote status update.
	69	+ * There is error during the process of remote status update request.
76	70	*/
77	71	#define INTEL_SIP_SMC_RETURN_UNKNOWN_FUNCTION 0xFFFFFFFF
78	72	#define INTEL_SIP_SMC_STATUS_OK 0x0
79		−#define INTEL_SIP_SMC_FPGA_CONFIG_STATUS_BUSY 0x1
80		−#define INTEL_SIP_SMC_FPGA_CONFIG_STATUS_REJECTED 0x2
81		−#define INTEL_SIP_SMC_FPGA_CONFIG_STATUS_ERROR 0x4
82		−#define INTEL_SIP_SMC_REG_ERROR 0x5
	73	+#define INTEL_SIP_SMC_STATUS_BUSY 0x1
	74	+#define INTEL_SIP_SMC_STATUS_REJECTED 0x2
	75	+#define INTEL_SIP_SMC_STATUS_ERROR 0x4
83	76	#define INTEL_SIP_SMC_RSU_ERROR 0x7
84	77
85	78	/**
@@ -95,7 +88,7 @@ · 9 unmodified lines
95	88	* a2-7: not used.
96	89	*
97	90	* Return status:
98		− * a0: INTEL_SIP_SMC_STATUS_OK, or INTEL_SIP_SMC_FPGA_CONFIG_STATUS_ERROR.
	91	+ * a0: INTEL_SIP_SMC_STATUS_OK, or INTEL_SIP_SMC_STATUS_ERROR.
99	92	* a1-3: not used.
100	93	*/
101	94	#define INTEL_SIP_SMC_FUNCID_FPGA_CONFIG_START 1
@@ -115,8 +108,8 @@ · 13 unmodified lines
115	108	* a3-7: not used.
116	109	*
117	110	* Return status:
118		− * a0: INTEL_SIP_SMC_STATUS_OK, INTEL_SIP_SMC_FPGA_CONFIG_STATUS_BUSY or
119		− * INTEL_SIP_SMC_FPGA_CONFIG_STATUS_ERROR.
	111	+ * a0: INTEL_SIP_SMC_STATUS_OK, INTEL_SIP_SMC_STATUS_BUSY or
	112	+ * INTEL_SIP_SMC_STATUS_ERROR.
120	113	* a1: 64bit physical address of 1st completed memory block if any completed
121	114	* block, otherwise zero value.
122	115	* a2: 64bit physical address of 2nd completed memory block if any completed
@@ -133,15 +126,15 @@ · 10 unmodified lines
133	126	*
134	127	* Sync call used by service driver at EL1 to track the completed write
135	128	* transactions. This request is called after INTEL_SIP_SMC_FPGA_CONFIG_WRITE
136		− * call returns INTEL_SIP_SMC_FPGA_CONFIG_STATUS_BUSY.
	129	+ * call returns INTEL_SIP_SMC_STATUS_BUSY.
137	130	*
138	131	* Call register usage:
139	132	* a0: INTEL_SIP_SMC_FPGA_CONFIG_COMPLETED_WRITE.
140	133	* a1-7: not used.
141	134	*
142	135	* Return status:
143		− * a0: INTEL_SIP_SMC_STATUS_OK, INTEL_SIP_SMC_FPGA_CONFIG_STATUS_BUSY or
144		− * INTEL_SIP_SMC_FPGA_CONFIG_STATUS_ERROR.
	136	+ * a0: INTEL_SIP_SMC_STATUS_OK, INTEL_SIP_SMC_FPGA_BUSY or
	137	+ * INTEL_SIP_SMC_STATUS_ERROR.
145	138	* a1: 64bit physical address of 1st completed memory block.
146	139	* a2: 64bit physical address of 2nd completed memory block if
147	140	* any completed block, otherwise zero value.
@@ -164,8 +157,8 @@ INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_FPGA_CONFIG_COMPLETED_WRITE) · 16 unmodified lines
164	157	* a1-7: not used.
165	158	*
166	159	* Return status:
167		− * a0: INTEL_SIP_SMC_STATUS_OK, INTEL_SIP_SMC_FPGA_CONFIG_STATUS_BUSY or
168		− * INTEL_SIP_SMC_FPGA_CONFIG_STATUS_ERROR.
	160	+ * a0: INTEL_SIP_SMC_STATUS_OK, INTEL_SIP_SMC_STATUS_BUSY or
	161	+ * INTEL_SIP_SMC_STATUS_ERROR.
169	162	* a1-3: not used.
170	163	*/
171	164	#define INTEL_SIP_SMC_FUNCID_FPGA_CONFIG_ISDONE 4
@@ -183,7 +176,7 @@ INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_FPGA_CONFIG_COMPLETED_WRITE) · 11 unmodified lines
183	176	* a1-7: not used.
184	177	*
185	178	* Return status:
186		− * a0: INTEL_SIP_SMC_STATUS_OK or INTEL_SIP_SMC_FPGA_CONFIG_STATUS_ERROR.
	179	+ * a0: INTEL_SIP_SMC_STATUS_OK or INTEL_SIP_SMC_STATUS_ERROR.
187	180	* a1: start of physical address of reserved memory block.
188	181	* a2: size of reserved memory block.
189	182	* a3: not used.
@@ -203,7 +196,7 @@ INTEL_SIP_SMC_FAST_CALL_VAL(INTEL_SIP_SMC_FUNCID_FPGA_CONFIG_COMPLETED_WRITE) · 13 unmodified lines
203	196	* a1-7: not used.
204	197	*
205	198	* Return status:
206		− * a0: INTEL_SIP_SMC_STATUS_OK or INTEL_SIP_SMC_FPGA_CONFIG_STATUS_ERROR.
	199	+ * a0: INTEL_SIP_SMC_STATUS_OK or INTEL_SIP_SMC_STATUS_ERROR.
207	200	* a1-3: not used.
208	201	*/
209	202	#define INTEL_SIP_SMC_FUNCID_FPGA_CONFIG_LOOPBACK 6

include/linux/firmware/intel/stratix10-svc-client.h+30−41

@@ -18,45 +18,37 @@ · 17 unmodified lines
18	18	/**
19	19	* Status of the sent command, in bit number
20	20	*
21		− * SVC_COMMAND_STATUS_RECONFIG_REQUEST_OK:
22		− * Secure firmware accepts the request of FPGA reconfiguration.
	21	+ * SVC_STATUS_OK:
	22	+ * Secure firmware accepts the request issued by one of service clients.
23	23	*
24		− * SVC_STATUS_RECONFIG_BUFFER_SUBMITTED:
25		− * Service client successfully submits FPGA configuration
26		− * data buffer to secure firmware.
	24	+ * SVC_STATUS_BUFFER_SUBMITTED:
	25	+ * Service client successfully submits data buffer to secure firmware.
27	26	*
28		− * SVC_COMMAND_STATUS_RECONFIG_BUFFER_DONE:
	27	+ * SVC_STATUS_BUFFER_DONE:
29	28	* Secure firmware completes data process, ready to accept the
30	29	* next WRITE transaction.
31	30	*
32		− * SVC_COMMAND_STATUS_RECONFIG_COMPLETED:
33		− * Secure firmware completes FPGA configuration successfully, FPGA should
34		− * be in user mode.
	31	+ * SVC_STATUS_COMPLETED:
	32	+ * Secure firmware completes service request successfully. In case of
	33	+ * FPGA configuration, FPGA should be in user mode.
35	34	*
36		− * SVC_COMMAND_STATUS_RECONFIG_BUSY:
37		− * FPGA configuration is still in process.
	35	+ * SVC_COMMAND_STATUS_BUSY:
	36	+ * Service request is still in process.
38	37	*
39		− * SVC_COMMAND_STATUS_RECONFIG_ERROR:
40		− * Error encountered during FPGA configuration.
	38	+ * SVC_COMMAND_STATUS_ERROR:
	39	+ * Error encountered during the process of the service request.
41	40	*
42		− * SVC_STATUS_RSU_OK:
43		− * Secure firmware accepts the request of remote status update (RSU).
44		− *
45		− * SVC_STATUS_RSU_ERROR:
46		− * Error encountered during remote system update.
47		− *
48		− * SVC_STATUS_RSU_NO_SUPPORT:
49		− * Secure firmware doesn't support RSU retry or notify feature.
	41	+ * SVC_STATUS_NO_SUPPORT:
	42	+ * Secure firmware doesn't support requested features such as RSU retry
	43	+ * or RSU notify.
50	44	*/
51		−#define SVC_STATUS_RECONFIG_REQUEST_OK 0
52		−#define SVC_STATUS_RECONFIG_BUFFER_SUBMITTED 1
53		−#define SVC_STATUS_RECONFIG_BUFFER_DONE 2
54		−#define SVC_STATUS_RECONFIG_COMPLETED 3
55		−#define SVC_STATUS_RECONFIG_BUSY 4
56		−#define SVC_STATUS_RECONFIG_ERROR 5
57		−#define SVC_STATUS_RSU_OK 6
58		−#define SVC_STATUS_RSU_ERROR 7
59		−#define SVC_STATUS_RSU_NO_SUPPORT 8
	45	+#define SVC_STATUS_OK 0
	46	+#define SVC_STATUS_BUFFER_SUBMITTED 1
	47	+#define SVC_STATUS_BUFFER_DONE 2
	48	+#define SVC_STATUS_COMPLETED 3
	49	+#define SVC_STATUS_BUSY 4
	50	+#define SVC_STATUS_ERROR 5
	51	+#define SVC_STATUS_NO_SUPPORT 6
60	52
61	53	/**
62	54	* Flag bit for COMMAND_RECONFIG
@@ -84,32 +76,29 @@ struct stratix10_svc_chan; · 21 unmodified lines
84	76	* @COMMAND_NOOP: do 'dummy' request for integration/debug/trouble-shooting
85	77	*
86	78	* @COMMAND_RECONFIG: ask for FPGA configuration preparation, return status
87		− * is SVC_STATUS_RECONFIG_REQUEST_OK
	79	+ * is SVC_STATUS_OK
88	80	*
89	81	* @COMMAND_RECONFIG_DATA_SUBMIT: submit buffer(s) of bit-stream data for the
90		− * FPGA configuration, return status is SVC_STATUS_RECONFIG_BUFFER_SUBMITTED,
91		− * or SVC_STATUS_RECONFIG_ERROR
	82	+ * FPGA configuration, return status is SVC_STATUS_SUBMITTED or SVC_STATUS_ERROR
92	83	*
93	84	* @COMMAND_RECONFIG_DATA_CLAIM: check the status of the configuration, return
94		− * status is SVC_STATUS_RECONFIG_COMPLETED, or SVC_STATUS_RECONFIG_BUSY, or
95		− * SVC_STATUS_RECONFIG_ERROR
	85	+ * status is SVC_STATUS_COMPLETED, or SVC_STATUS_BUSY, or SVC_STATUS_ERROR
96	86	*
97	87	* @COMMAND_RECONFIG_STATUS: check the status of the configuration, return
98		− * status is SVC_STATUS_RECONFIG_COMPLETED, or SVC_STATUS_RECONFIG_BUSY, or
99		− * SVC_STATUS_RECONFIG_ERROR
	88	+ * status is SVC_STATUS_COMPLETED, or SVC_STATUS_BUSY, or SVC_STATUS_ERROR
100	89	*
101	90	* @COMMAND_RSU_STATUS: request remote system update boot log, return status
102	91	* is log data or SVC_STATUS_RSU_ERROR
103	92	*
104	93	* @COMMAND_RSU_UPDATE: set the offset of the bitstream to boot after reboot,
105		− * return status is SVC_STATUS_RSU_OK or SVC_STATUS_RSU_ERROR
	94	+ * return status is SVC_STATUS_OK or SVC_STATUS_ERROR
106	95	*
107	96	* @COMMAND_RSU_NOTIFY: report the status of hard processor system
108		− * software to firmware, return status is SVC_STATUS_RSU_OK or
109		− * SVC_STATUS_RSU_ERROR
	97	+ * software to firmware, return status is SVC_STATUS_OK or
	98	+ * SVC_STATUS_ERROR
110	99	*
111	100	* @COMMAND_RSU_RETRY: query firmware for the current image's retry counter,
112		− * return status is SVC_STATUS_RSU_OK or SVC_STATUS_RSU_ERROR
	101	+ * return status is SVC_STATUS_OK or SVC_STATUS_ERROR
113	102	*/
114	103	enum stratix10_svc_command_code {
115	104	COMMAND_NOOP = 0,