Skip to content

Commit 3282479

Browse files
authored
Misc. patches to v1.9 release (#278)
- Add missing enumerations to programming guides - Add numWaitEvents parameter to mutable command list update wait events API (needed for loader) - Add range to phCommandLists description in append command lists extension - Fix spelling error in sysman subdevice properties structure type name - Fix immediate command list append API parameter description to work around script limitation - Convert fixed-length character array parameters to constant pointers in programmable metrics and firmware security version extensions Signed-off-by: Will Damon <will.damon@intel.com>
1 parent 05880d1 commit 3282479

9 files changed

Lines changed: 34 additions & 19 deletions

scripts/core/EXT_Exp_CommandListClone.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ from templates import helper as th
1717
API
1818
----
1919

20+
* Enumerations
21+
22+
* ${x}_command_list_clone_exp_version_t
23+
2024
* Functions
2125

2226
* ${x}CommandListCreateCloneExp

scripts/core/EXT_Exp_ImmediateCommandListAppend.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ from templates import helper as th
1717
API
1818
----
1919

20+
* Enumerations
21+
22+
* ${x}_immediate_command_list_append_exp_version_t
23+
2024
* Functions
2125

2226
* ${x}CommandListImmediateAppendCommandListsExp

scripts/core/EXT_Exp_MutableCommandList.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ The application may subsequently mutate specific commands, as follows:
176176
${x}CommandListUpdateMutableCommandSignalEventExp(hCommandList, commandId, hNewLaunchKernelSignalEvent);
177177
178178
// Update the wait events for the launch kernel command
179-
${x}CommandListUpdateMutableCommandWaitEventsExp(hCommandList, commandId, &hNewLaunchKernelWaitEvent);
179+
${x}CommandListUpdateMutableCommandWaitEventsExp(hCommandList, commandId, 1, &hNewLaunchKernelWaitEvent);
180180
181181
// Close the command list
182182
${x}CommandListClose(hCommandList);

scripts/core/immediateCommandListAppend.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ params:
4444
desc: "[in] number of command lists"
4545
- type: "$x_command_list_handle_t*"
4646
name: phCommandLists
47-
desc: "[in] handle(s) of command list(s)"
47+
desc: "[in][range(0, numCommandLists)] handles of command lists"
4848
- type: $x_event_handle_t
4949
name: hSignalEvent
5050
desc: |

scripts/core/mutableCommandList.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,12 @@ params:
264264
- type: uint64_t
265265
name: commandId
266266
desc: "[in] command identifier"
267+
- type: uint32_t
268+
name: numWaitEvents
269+
desc: "[in][optional] the number of wait events"
267270
- type: "$x_event_handle_t*"
268271
name: phWaitEvents
269272
desc: "[in][optional][range(0, numWaitEvents)] handle of the events to wait on before launching"
273+
returns:
274+
- $X_RESULT_ERROR_INVALID_SIZE:
275+
- "The `numWaitEvents` parameter does not match that of the original command."

scripts/sysman/EXT_Exp_FirmwareSecurityVersion.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ higher SVN for security considerations.
3737
3838
// Fetch current security version from the fuses
3939
char* version = allocate(version_size);
40-
${s}FirmwareGetSecurityVersionExp(hFirmware, &version);
40+
${s}FirmwareGetSecurityVersionExp(hFirmware, version);
4141
4242
// Set security version
4343
${s}FirmwareSetSecurityVersionExp(hFirmware);

scripts/sysman/common.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ etors:
229229
value: "0x00020003"
230230
desc: $s_mem_page_offline_state_exp_t
231231
version: "1.8"
232-
- name: SUB_DEVICE_EXP_PROPERTIES
232+
- name: SUBDEVICE_EXP_PROPERTIES
233233
value: "0x00020004"
234234
desc: $s_subdevice_exp_properties_t
235235
version: "1.9"

scripts/sysman/firmwareSecurityVersion.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,16 @@ version: "1.9"
3131
class: $sFirmware
3232
name: GetSecurityVersionExp
3333
details:
34+
- "The application should create a character array of size $S_STRING_PROPERTY_SIZE and reference it for the `pVersion` parameter."
3435
- "The application may call this function from simultaneous threads."
3536
- "The implementation of this function should be lock-free."
3637
params:
3738
- type: $s_firmware_handle_t
3839
name: hFirmware
3940
desc: "[in] Handle for the component."
40-
- type: char
41-
name: "version[$S_STRING_PROPERTY_SIZE]"
42-
desc: "[out] NULL terminated string value. The string \"unknown\" will be returned if this property cannot be determined."
41+
- type: "char*"
42+
name: "pVersion"
43+
desc: "[in,out] NULL terminated string value. The string \"unknown\" will be returned if this property cannot be determined."
4344
--- #--------------------------------------------------------------------------
4445
type: function
4546
desc: "Set the firmware security version number"

scripts/tools/metricProgrammable.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -352,12 +352,12 @@ params:
352352
- type: uint32_t
353353
name: parameterCount
354354
desc: "[in] Count of parameters to set."
355-
- type: const char
356-
name: "name[ZET_MAX_METRIC_NAME]"
357-
desc: "[in] Metric name to be used."
358-
- type: const char
359-
name: "description[ZET_MAX_METRIC_DESCRIPTION]"
360-
desc: "[in] Metric description to be used."
355+
- type: "const char*"
356+
name: "pName"
357+
desc: "[in] pointer to metric name to be used. Must point to a null-terminated character array no longer than $T_MAX_METRIC_NAME."
358+
- type: "const char*"
359+
name: "pDescription"
360+
desc: "[in] pointer to metric description to be used. Must point to a null-terminated character array no longer than $T_MAX_METRIC_DESCRIPTION."
361361
- type: "uint32_t*"
362362
name: pMetricHandleCount
363363
desc: |
@@ -382,12 +382,12 @@ params:
382382
- type: $t_device_handle_t
383383
name: hDevice
384384
desc: "[in] handle of the device"
385-
- type: const char
386-
name: name[ZET_MAX_METRIC_GROUP_NAME]
387-
desc: "[in] Metric group name."
388-
- type: const char
389-
name: description[ZET_MAX_METRIC_GROUP_DESCRIPTION]
390-
desc: "[in] Metric group description."
385+
- type: "const char*"
386+
name: pName
387+
desc: "[in] pointer to metric group name. Must point to a null-terminated character array no longer than $T_MAX_METRIC_GROUP_NAME."
388+
- type: "const char*"
389+
name: pDescription
390+
desc: "[in] pointer to metric group description. Must point to a null-terminated character array no longer than $T_MAX_METRIC_GROUP_DESCRIPTION."
391391
- type: $t_metric_group_sampling_type_flags_t
392392
name: samplingType
393393
desc: "[in] Sampling type for the metric group."

0 commit comments

Comments
 (0)