Skip to content

Conversation

@singalsu
Copy link
Collaborator

No description provided.

@singalsu singalsu requested a review from a team as a code owner March 23, 2020 16:07
@singalsu
Copy link
Collaborator Author

There's an open with ABI minor version. Seems like firmware is ahead by one in minor version and I think the FW and kernel side PRs for DMIC IPC change should propose the same ABI minor version.

@singalsu
Copy link
Collaborator Author

There's good feedback for kernel side PR. I'll soon update both PRs the same way.

@singalsu singalsu added the ABI ABI change involved label Mar 23, 2020
@singalsu singalsu force-pushed the dmic_fixed_length_ipc branch from 7c445bd to 93c20d8 Compare March 23, 2020 17:41
@singalsu
Copy link
Collaborator Author

New version to sync with kernel. I changed the macro name to SOF_DAI_INTEL_DMIC_NUM_CTRL. It helps to avoid to confuse this with microphones or channels count.

Copy link
Member

Choose a reason for hiding this comment

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

Whats the rational behind this change, it's missing from commit message.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yep, need to add.

There's fair amount of comments on kernel side and I'll do the same updates for firmware too.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Commit text is now updated and header file comments are in sync with kernel.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Sorry, diffing revealed a difference of one "." so new version again. There's also lot of other changes but I'll complete my part.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Done. Finally same DMIC configuration headers as in kernel PR version.

Copy link
Member

@lgirdwood lgirdwood left a comment

Choose a reason for hiding this comment

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

Needs ABI classification

@singalsu singalsu force-pushed the dmic_fixed_length_ipc branch 2 times, most recently from b5dbb3a to b87002e Compare March 25, 2020 17:38
This patch was created due to kernel driver code enhancement.
The DMIC was the only DAI type that used variable length arrays for
configuration IPC. It complicated the driver topology parsing more
than necessary. Since the header files for IPC are common also the
firmware side needs similar changes.

The flexible array member pdm[] is changed into a fixed array of
four that is the max. number of stereo PDM controllers in the current
Intel platforms. The DMIC driver code needs minor changes to correctly
handle the changed IPC struct size.

The IPC logic remains as before: The IPC PDM entries do not
correspond to hardware PDM controllers. They are applied per provided
index in each entry. Depending on number of PDM controllers there is
now zeros data after the last defined controller that will be
omitted.

Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
This patch fixes the topo in word "microphone".

Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
Since the SOF kernel and firmware headers need to be the same the
rename is also done on firmware side. The fifo_bits_b parameter was
deprecated in firmware ABI version 3.0.1 and the value has been
ignored. Since the kernel sets this in case of ABI version 3.0.0 or
earlier the name reserved_2 is not appropriate.

Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
@lgirdwood
Copy link
Member

SOFCI TEST

* version number used in configuration data is checked vs. version used by
* device driver src/drivers/dmic.c need to match. It is incremented from
* initial value 1 if updates done for the to driver would alter the operation
* of the microhone.
Copy link
Collaborator

Choose a reason for hiding this comment

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

This I found hilarious :) you left a typo in the word typo itself in the commit message

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Haha, I only now noticed it!! Can I still fix this without restarting the approval process?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@lgirdwood @kv2019i Should I fix this?

Copy link
Collaborator

Choose a reason for hiding this comment

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

@singalsu no need I think. its just the commit message.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Good, I'll leave this funny bit into the history.

Copy link
Collaborator

@ranj063 ranj063 left a comment

Choose a reason for hiding this comment

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

looks good @singalsu. I commented on a minor typo on the commit message in the second patch. But no biggie!

@lgirdwood
Copy link
Member

Jenkins all green

@lgirdwood
Copy link
Member

SOFCI TEST

@lgirdwood
Copy link
Member

@singalsu if both this PR and kernel one are approved we can merge at 15 ? Providing bot PRs dont change the ABI minor (which is already at 15). @kv2019i kernel PR good for you at 15 too ?

@kv2019i
Copy link
Collaborator

kv2019i commented Apr 3, 2020

@lgirdwood wrote:

@singalsu if both this PR and kernel one are approved we can merge at 15 ? Providing bot PRs dont change the ABI minor (which is already at 15). @kv2019i kernel PR good for you at 15 too ?

Ack, the kernel side PR (thesofproject/linux#1924) is all good to go. Just needs to be refreshed on latest sof-dev.
UPDATE: @lgirdwood kernel PR now updated to ABI15 and ready to go after tests complete.

@kv2019i
Copy link
Collaborator

kv2019i commented Apr 8, 2020

@lgirdwood Are we good to go? Kernel side is approved and ready thesofproject/linux#1924

@lgirdwood
Copy link
Member

SOFCI TEST

@lgirdwood
Copy link
Member

@kv2019i sorry, it looks like this one was missing from full CI tests. rerunning.

@lgirdwood
Copy link
Member

Travis all green, but showing pending. Jenkins known issues. @kv2019i merged, good for kernel side now.

@lgirdwood lgirdwood merged commit 37850f5 into thesofproject:master Apr 8, 2020
@kv2019i
Copy link
Collaborator

kv2019i commented Apr 9, 2020

Travis all green, but showing pending. Jenkins known issues. @kv2019i merged, good for kernel side now.

Thanks @lgirdwood , kernel merged now as well.

@lgirdwood
Copy link
Member

@kv2019i great :) I will tag v1.5-rc1 now.

@singalsu singalsu deleted the dmic_fixed_length_ipc branch September 15, 2022 13:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ABI ABI change involved

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants