Skip to content
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.

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

Fixes for compilation errors with the SOF plugin #8489

Merged
merged 6 commits into from
Nov 22, 2023

Conversation

ranj063
Copy link
Collaborator

@ranj063 ranj063 commented Nov 17, 2023

No description provided.

Add a couple of missing definitions.

Signed-off-by: Ranjani Sridharan <[email protected]>
Make the mixout bind/unbind functions static.

Signed-off-by: Ranjani Sridharan <[email protected]>
…ERS is not set

Use 2 separate signatures when CONFIG_ZEPHYR_NATIVE_DRIVERS is set vs
not set.

Signed-off-by: Ranjani Sridharan <[email protected]>
These dont exist anymore.

Signed-off-by: Ranjani Sridharan <[email protected]>
…IG_LIBRARY is set

This is already defined in logging.c when a known logging method is not
set.

Signed-off-by: Ranjani Sridharan <[email protected]>
Fix the typecasting in a couple of places and compiler attributes to
prevent the following compilation errors:

ipc4/handler.c:1007:45: error: pointer targets in initialization of ‘const uint8_t *’
			{aka ‘const unsigned char *’} from ‘const char *’ differ in signedness [-Werror=pointer-sign]
 1007 |                 const uint8_t *end_offset = data + data_off_size;
      |                                             ^~~~
ipc4/handler.c:1040:57: note: expected ‘const char *’ but argument is of type ‘uint8_t *’ {aka ‘unsigned char *’}

ipc4/module.h:67:12: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘__aligned’
   67 | } __packed __aligned(4);

Signed-off-by: Ranjani Sridharan <[email protected]>
Copy link
Collaborator

@RanderWang RanderWang left a comment

Choose a reason for hiding this comment

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

LGTM

@lgirdwood
Copy link
Member

@lrudyX @wszypelt not expecting this to fail as it's build fixes (and IIUC would fail on all platforms if broken). Good to merge ?

@lrudyX
Copy link

lrudyX commented Nov 17, 2023

@lrudyX @wszypelt not expecting this to fail as it's build fixes (and IIUC would fail on all platforms if broken). Good to merge ?

It looks like QB problem, I will rerun this.

@@ -64,7 +64,7 @@ union ipc4_extended_param_id {
uint32_t parameter_type : 8;
uint32_t parameter_instance : 24;
} part;
} __packed __aligned(4);
} __attribute__((packed, aligned(4)));
Copy link
Contributor

Choose a reason for hiding this comment

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

I noticed kernel use left expression for alignment, and sof fw use right ones, any history on this?

Copy link
Collaborator

Choose a reason for hiding this comment

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

"__packed" is a linux kernel shortcut, not necessarily available in generic toolchains (like for SOF plugin).

Copy link
Collaborator

@kv2019i kv2019i left a comment

Choose a reason for hiding this comment

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

We really need to add a CI test to check the SOF plugin build. Otherwise this will be continuous....

@@ -64,7 +64,7 @@ union ipc4_extended_param_id {
uint32_t parameter_type : 8;
uint32_t parameter_instance : 24;
} part;
} __packed __aligned(4);
} __attribute__((packed, aligned(4)));
Copy link
Collaborator

Choose a reason for hiding this comment

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

"__packed" is a linux kernel shortcut, not necessarily available in generic toolchains (like for SOF plugin).

@lgirdwood
Copy link
Member

@lrudyX any update on the rerun ?

@kv2019i kv2019i merged commit 2c8b76a into thesofproject:main Nov 22, 2023
41 of 44 checks passed
@ranj063 ranj063 deleted the main-11162023 branch November 27, 2023 22:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants