Skip to content

DO NOT MERGE - pipeline: disable xrun recovery #748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
slawblauciak wants to merge 1 commit into from
Closed

DO NOT MERGE - pipeline: disable xrun recovery #748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/include/sof/audio/pipeline.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,15 @@

/*
* This flag disables firmware-side xrun recovery.
* It should remain enabled in the situation when the
* It should remain set in the situation when the
* recovery is delegated to the outside of firmware.

@plbossart plbossart Jan 9, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this wording is award "this flag disables... should remain enabled". "outside of firmware" isn't very nice either

*/
#define NO_XRUN_RECOVERY 0
#define NO_XRUN_RECOVERY 1
Comment thread
slawblauciak marked this conversation as resolved.
Resolved

#define PIPELINE_SET_FW_READY_FLAGS \
( \
(NO_XRUN_RECOVERY ? SOF_IPC_INFO_EXTERN_XRUN_RECOV : 0) \
)

/* pipeline tracing */
#define trace_pipe(format, ...) \
Expand Down
2 changes: 1 addition & 1 deletion src/include/uapi/abi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@

/** \brief SOF ABI version major, minor and patch numbers */
#define SOF_ABI_MAJOR 3
#define SOF_ABI_MINOR 7
#define SOF_ABI_MINOR 8
#define SOF_ABI_PATCH 0

/** \brief SOF ABI version number. Format within 32bit word is MMmmmppp */
Expand Down
1 change: 1 addition & 0 deletions src/include/uapi/ipc/info.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
#define SOF_IPC_INFO_LOCKS BIT(1)
#define SOF_IPC_INFO_LOCKSV BIT(2)
#define SOF_IPC_INFO_GDB BIT(3)
#define SOF_IPC_INFO_EXTERN_XRUN_RECOV BIT(4)

/* extended data types that can be appended onto end of sof_ipc_fw_ready */
enum sof_ipc_ext_data {
Expand Down
2 changes: 1 addition & 1 deletion src/platform/baytrail/platform.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ static const struct sof_ipc_fw_ready ready
.tag = SOF_TAG,
.abi_version = SOF_ABI_VERSION,
},
.flags = DEBUG_SET_FW_READY_FLAGS
.flags = DEBUG_SET_FW_READY_FLAGS | PIPELINE_SET_FW_READY_FLAGS,
};

#define NUM_BYT_WINDOWS 6
Expand Down
2 changes: 1 addition & 1 deletion src/platform/haswell/platform.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ static const struct sof_ipc_fw_ready ready
.tag = SOF_TAG,
.abi_version = SOF_ABI_VERSION,
},
.flags = DEBUG_SET_FW_READY_FLAGS,
.flags = DEBUG_SET_FW_READY_FLAGS | PIPELINE_SET_FW_READY_FLAGS,
};

#define NUM_HSW_WINDOWS 6
Expand Down
2 changes: 1 addition & 1 deletion src/platform/intel/cavs/platform.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ static const struct sof_ipc_fw_ready ready
.tag = SOF_TAG,
.abi_version = SOF_ABI_VERSION,
},
.flags = DEBUG_SET_FW_READY_FLAGS,
.flags = DEBUG_SET_FW_READY_FLAGS | PIPELINE_SET_FW_READY_FLAGS,
};

#if defined(CONFIG_MEM_WND)
Expand Down