Skip to content

[RFC]align mismatch ABI in info.h #1929

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
xiulipan wants to merge 2 commits into from
Closed

[RFC]align mismatch ABI in info.h #1929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf08f08
ASoC: SOF: add probe support extend data
xiulipan Mar 24, 2020
d134201
ASoC: SOF: add debug ABI version
xiulipan Mar 24, 2020
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
20 changes: 20 additions & 0 deletions include/sound/sof/info.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ enum sof_ipc_ext_data {
SOF_IPC_EXT_UNUSED = 0,
SOF_IPC_EXT_WINDOW = 1,
SOF_IPC_EXT_CC_INFO = 2,
SOF_IPC_EXT_PROBE_INFO = 3,
Copy link
Collaborator

@kv2019i kv2019i Mar 24, 2020

Choose a reason for hiding this comment

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

@lgirdwood @jajanusz It really would be better to do the kernel PRs at the same time and have the person doing the change write a git commit message that explains the change. This "late-bound" sync of changes to kernel is not fun. Thanks for @xiulipan doing the patch, but I again have to ask for some improvements to the commit message:

  • "add support for probe extended data"
  • add explanation to commit body about the feature.. you should be able to copy this from the FW commit

Copy link
Member

@plbossart plbossart Mar 24, 2020

Choose a reason for hiding this comment

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

agree with @kv2019i , this is a complete fail of the ABI change process.

Copy link
Member

@lgirdwood lgirdwood Mar 25, 2020

Choose a reason for hiding this comment

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

The kernel and FW PRs must be done together and mention each other. It is up to maintainers to label as ABI and then to align both PRs using the classifier. So this is several steps taken by at least 3 people and is not being fully processed by everybody.

I am now wondering whether we should now be moving to a ABI minor bump only for every FW release (when the regular FW releases start soon). This would allow the kernel team to plan each merge window in advance to a specific FW version. @lbetlej fyi - regular FW releases would help here.
There is also complexity about bumping ABI in relation to kernel releases and FW releases. i.e. when do we close the ABI minor merge window for new kernel and FW releases (and use the next minor).

SOF_IPC_EXT_USER_ABI_INFO = 4,
};

/* FW version - SOF_IPC_GLB_VERSION */
Expand Down Expand Up @@ -114,4 +116,22 @@ struct sof_ipc_cc_version {
char desc[]; /* null terminated compiler description */
} __packed;

/* extended data: Probe setup */
struct sof_ipc_probe_support {
struct sof_ipc_ext_data_hdr ext_hdr;

uint32_t probe_points_max;
uint32_t injection_dmas_max;

/* reserved for future use */
uint32_t reserved[2];
} __packed;

/* extended data: user abi version(s) */
struct sof_ipc_user_abi_version {
Copy link
Collaborator

@kv2019i kv2019i Mar 24, 2020

Choose a reason for hiding this comment

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

"user abi" is a bit weird name, but alas this was already merged to FW, so it's what it is.

struct sof_ipc_ext_data_hdr ext_hdr;

uint32_t abi_dbg_version;
} __packed;

#endif
2 changes: 1 addition & 1 deletion include/uapi/sound/sof/abi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

/* SOF ABI version major, minor and patch numbers */
#define SOF_ABI_MAJOR 3
#define SOF_ABI_MINOR 13
#define SOF_ABI_MINOR 14
#define SOF_ABI_PATCH 0

/* SOF ABI version number. Format within 32bit word is MMmmmppp */
Expand Down