Skip to content

smart amp: added support for static DSM library - #3373

Merged
lgirdwood merged 3 commits into
thesofproject:masterfrom
ryans-lee:dsm_static_library_support
Sep 9, 2020
Merged

smart amp: added support for static DSM library#3373
lgirdwood merged 3 commits into
thesofproject:masterfrom
ryans-lee:dsm_static_library_support

Conversation

@ryans-lee

@ryans-leeryans-lee commented Sep 1, 2020

Copy link
Copy Markdown

Added support for static DSM library

Added Maxim DSM(Dyanmic Speaker Management) static library and its integration code.

  • License information of the Maxim DSM library can be found in src/audio/smart_amp/dsm_lib/LICENSE.dsm
  • Library usage and ISA information can be found in src/audio/smart_amp/dsm_lib/README.dsm
  • Library do not have dependency with SOF version. This information was added to README.dsm.

Signed-off-by: Ryan Lee ryans.lee@maximintegrated.com

@ryans-lee

ryans-lee commented Sep 1, 2020

Copy link
Copy Markdown
Author

This PR was originally discussed from another PR#3302 to different branch.
Now created new PR to the master.

@RDharageswariRDharageswari mentioned this pull request Sep 2, 2020
Merged
lgirdwood
lgirdwood requested changes Sep 2, 2020
View reviewed changes

@lgirdwoodlgirdwood left a comment

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.

@ryans-lee thanks, can you split this into more patches as it looks like a mix of fixes are included with the binary. I will have someone check the license to make sure its good here too.

Comment threadsrc/audio/smart_amp/smart_amp_maxim_dsm.c Outdated

@lgirdwoodlgirdwoodSep 2, 2020

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.

Should this be removed ? It will make the build non reproducible.

@ryans-leeryans-leeSep 2, 2020

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Agreed. It should be removed.

Comment threadsrc/audio/smart_amp/smart_amp_maxim_dsm.c Outdated
@ryans-lee
ryans-leeforce-pushed the dsm_static_library_support branch from 489a780 to 7433575CompareSeptember 2, 2020 17:04
@ryans-lee

ryans-lee commented Sep 2, 2020

Copy link
Copy Markdown
Author

@lgirdwood I split the patch in three. Added comments on each commit. Thanks.

@lgirdwood

lgirdwood commented Sep 4, 2020

Copy link
Copy Markdown
Member

@ryans-lee can you remove the binary and licence parts and we can merge the code changes only. I'm still checking the licence.

@ryans-lee

ryans-lee commented Sep 4, 2020

Copy link
Copy Markdown
Author

@ryans-lee can you remove the binary and licence parts and we can merge the code changes only. I'm still checking the licence.

@lgirdwood I can do it, but I concern about the compile error if the library is removed. What do you think?

@lgirdwood

lgirdwood commented Sep 7, 2020

Copy link
Copy Markdown
Member

@ryans-lee I guess the cmake part that links to the binary library can also be removed and form a new PR with the binary and license. This will minimise any parts that depend on the license.

@ryans-lee

ryans-lee commented Sep 8, 2020

Copy link
Copy Markdown
Author

@ryans-lee I guess the cmake part that links to the binary library can also be removed and form a new PR with the binary and license. This will minimise any parts that depend on the license.

@lgirdwood APIs in the binary library are used for the integration and this will cause link error without the library. Another option is making DSM component disabled as default from Kconfig to avoid build error until library and license file is merged. Let me update PR to apply this modification.

Ryan Lee added 3 commits September 8, 2020 11:02
Ryan Lee
smart amp: Disable Maxim smart amp component as default
b0d8b24
This commit disable Maxim smart amp component as default.
This change will remain until DSM library and its license file are merged.
Signed-off-by: Ryan Lee <ryans.lee@maximintegrated.com>
Ryan Lee
smart amp: Integrated Maxim DSM library functions
dbda7dd
Added Maxim DSM integration code.
Signed-off-by: Ryan Lee <ryans.lee@maximintegrated.com>
Ryan Lee
smart amp: VI data seqeunce swap
a07523e
Sequence of VI(Voltage and current) sensing data is changed from
IVIV to VIVI. Swapped VI sequence to supply proper data format
to DSM library.
Signed-off-by: Ryan Lee <ryans.lee@maximintegrated.com>
@ryans-lee
ryans-leeforce-pushed the dsm_static_library_support branch from 7433575 to a07523eCompareSeptember 8, 2020 18:06
@ryans-leeryans-lee mentioned this pull request Sep 8, 2020
Closed
@ryans-lee

ryans-lee commented Sep 8, 2020

Copy link
Copy Markdown
Author

@lgirdwood Removed binary library and license part from this PR. Created new PR for this. 3397

@lgirdwood

lgirdwood commented Sep 9, 2020

Copy link
Copy Markdown
Member

Jenkins CI on ICL is known issue.

@lgirdwood
lgirdwood merged commit d4109e0 into thesofproject:masterSep 9, 2020
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lgirdwoodlgirdwoodlgirdwood approved these changes
@dbalutadbalutaAwaiting requested review from dbaluta
@jajanuszjajanuszAwaiting requested review from jajanusz
@lbetlejlbetlejAwaiting requested review from lbetlej
@mmaka1mmaka1Awaiting requested review from mmaka1
@plbossartplbossartAwaiting requested review from plbossart
@tlaudatlaudaAwaiting requested review from tlauda

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@ryans-lee@lgirdwood