Open-AMP update to SHA 5fce292fd447 #17

iuliana-prodan · 2023-09-29T12:17:47Z

Open-AMP update to SHA 5fce292fd447c2396731efeb7852ab7d84454aa1 - https://github.com/OpenAMP/open-amp/commits/main

iuliana-prodan · 2023-09-29T12:21:34Z

@carlocaione @arnopo please review
Thanks

iuliana-prodan · 2023-09-29T12:27:43Z

In this PR I've taken also this commit : OpenAMP/open-amp@e63d07d and I get the following warnings:

[5/168] Generating include/generated/version.h
-- Zephyr version: 3.4.99 (/home/nxa06898/data/zephyrproject/zephyr), build: zephyr-v3.4.0-4679-g8f0d319d8f2b
[66/168] Building C object zephyr/CMakeFiles/zephyr.dir/lib/open-amp/resource_table.c.obj
In file included from /home/nxa06898/data/zephyrproject/zephyr/lib/open-amp/resource_table.c:30:
/home/nxa06898/data/zephyrproject/zephyr/lib/open-amp/./resource_table.h:29: warning: "VRING_ALIGNMENT" redefined
   29 | #define VRING_ALIGNMENT         16  /* fixed to match with Linux constraint */
      | 
In file included from /home/nxa06898/data/zephyrproject/zephyr/lib/open-amp/./resource_table.h:11:
/home/nxa06898/data/zephyrproject/modules/lib/open-amp/open-amp/lib/include/openamp/virtio.h:139: note: this is the location of the previous definition
  139 | #define VRING_ALIGNMENT           4096
      | 
[158/168] Building C object CMakeFiles/app.dir/src/main_remote.c.obj
In file included from /home/nxa06898/data/zephyrproject/zephyr/samples/subsys/ipc/openamp_rsc_table/src/main_remote.c:18:
/home/nxa06898/data/zephyrproject/zephyr/lib/open-amp/./resource_table.h:29: warning: "VRING_ALIGNMENT" redefined
   29 | #define VRING_ALIGNMENT         16  /* fixed to match with Linux constraint */
      | 
In file included from /home/nxa06898/data/zephyrproject/modules/lib/open-amp/open-amp/lib/include/openamp/rpmsg_virtio.h:19,
                 from /home/nxa06898/data/zephyrproject/modules/lib/open-amp/open-amp/lib/include/openamp/open_amp.h:12,
                 from /home/nxa06898/data/zephyrproject/zephyr/samples/subsys/ipc/openamp_rsc_table/src/main_remote.c:16:
/home/nxa06898/data/zephyrproject/modules/lib/open-amp/open-amp/lib/include/openamp/virtio.h:139: note: this is the location of the previous definition
  139 | #define VRING_ALIGNMENT           4096
      |

when compiling openamp_rsc_table sample for nxp_adsp_imx8m: west build -p always -b nxp_adsp_imx8m samples/subsys/ipc/openamp_rsc_table

Not quite sure how to fix this.
Why was VRING_ALIGNMENT added here in this OpenAMP/open-amp@e63d07d ?

carlocaione · 2023-10-02T07:42:57Z

Probably @arnopo must take a look here but it looks a name clash to me. Maybe we can rename the zephyr define?

arnopo · 2023-10-02T11:40:57Z

Probably @arnopo must take a look here but it looks a name clash to me. Maybe we can rename the zephyr define?

The issue is in open-amp lib. the VRING_ALIGNMENT is a system definition that should be common to the main and the coprocessor.
Could you send a patch on open-amp that removes VRING_ALIGNMENT and VRING_DECLARE definition?
They are not used yet and generate a regression, so should be removed for the coming release.

iuliana-prodan · 2023-10-02T13:55:33Z

Probably @arnopo must take a look here but it looks a name clash to me. Maybe we can rename the zephyr define?

The issue is in open-amp lib. the VRING_ALIGNMENT is a system definition that should be common to the main and the coprocessor. Could you send a patch on open-amp that removes VRING_ALIGNMENT and VRING_DECLARE definition? They are not used yet and generate a regression, so should be removed for the coming release.

I see that a PR was created: OpenAMP/open-amp#505

I'll wait for this PR, from open-amp repo, to be merge and then I'll update mine.
Hope it's ok with you @arnopo @carlocaione

arnopo · 2023-10-03T17:11:26Z

Probably @arnopo must take a look here but it looks a name clash to me. Maybe we can rename the zephyr define?

The issue is in open-amp lib. the VRING_ALIGNMENT is a system definition that should be common to the main and the coprocessor. Could you send a patch on open-amp that removes VRING_ALIGNMENT and VRING_DECLARE definition? They are not used yet and generate a regression, so should be removed for the coming release.

I see that a PR was created: OpenAMP/open-amp#505

I'll wait for this PR, from open-amp repo, to be merge and then I'll update mine. Hope it's ok with you @arnopo @carlocaione

@iuliana-prodan
Please, could you have a short test to confirm that OpenAMP/open-amp#505 fix the issue?
Then for your information the open-amp Libraries should be release at the end of this month. I don't know if you want/can wait the release to align the open-amp Zephyr repository.

iuliana-prodan · 2023-10-04T12:45:56Z

Probably @arnopo must take a look here but it looks a name clash to me. Maybe we can rename the zephyr define?

The issue is in open-amp lib. the VRING_ALIGNMENT is a system definition that should be common to the main and the coprocessor. Could you send a patch on open-amp that removes VRING_ALIGNMENT and VRING_DECLARE definition? They are not used yet and generate a regression, so should be removed for the coming release.

I see that a PR was created: OpenAMP/open-amp#505
I'll wait for this PR, from open-amp repo, to be merge and then I'll update mine. Hope it's ok with you @arnopo @carlocaione

@iuliana-prodan Please, could you have a short test to confirm that OpenAMP/open-amp#505 fix the issue?

Yes, I've tested it and everything works perfectly.

Then for your information the open-amp Libraries should be release at the end of this month. I don't know if you want/can wait the release to align the open-amp Zephyr repository.

@carlocaione what do you think about this?
Should we wait for the open-amp release?

carlocaione · 2023-10-05T06:48:47Z

@carlocaione what do you think about this? Should we wait for the open-amp release?

At least we should wait for that fix to be merged, then we can update this commit with the new SHA.

Synchronize code with sha1 5fce292fd447c2396731efeb7852ab7d84454aa1 Signed-off-by: Iuliana Prodan <[email protected]>

Use WITH_DCACHE option for all cache operations: vrings, buffers and resource table. The other options will be deprecated. Signed-off-by: Iuliana Prodan <[email protected]>

iuliana-prodan · 2023-10-13T09:45:29Z

@carlocaione what do you think about this? Should we wait for the open-amp release?

At least we should wait for that fix to be merged, then we can update this commit with the new SHA.

Updated open-amp to 5fce292fd447c2396731efeb7852ab7d84454aa1 from https://github.com/OpenAMP/open-amp/commits/main

arnopo · 2023-10-19T10:56:12Z

@carlocaione
I let you merge it,

carlocaione · 2023-10-19T11:02:40Z

@iuliana-prodan after the freeze is over please push a Zephyr commit to update the manifest SHA

iuliana-prodan · 2023-10-25T11:35:59Z

@iuliana-prodan after the freeze is over please push a Zephyr commit to update the manifest SHA

zephyrproject-rtos/zephyr#64364

iuliana-prodan mentioned this pull request Sep 29, 2023

Updates and clean-up cache management OpenAMP/open-amp#502

Merged

carlocaione requested review from carlocaione and arnopo September 29, 2023 12:21

arnopo mentioned this pull request Oct 2, 2023

Virtio native support for lib openamp OpenAMP/open-amp#494

Merged

iuliana-prodan added 2 commits October 13, 2023 12:35

Sync with open-amp project sha1 5fce292fd447

ed3edf3

Synchronize code with sha1 5fce292fd447c2396731efeb7852ab7d84454aa1 Signed-off-by: Iuliana Prodan <[email protected]>

cmake: Compile with WITH_DCACHE

e58b256

Use WITH_DCACHE option for all cache operations: vrings, buffers and resource table. The other options will be deprecated. Signed-off-by: Iuliana Prodan <[email protected]>

iuliana-prodan force-pushed the update-cache-options branch from d975406 to e58b256 Compare October 13, 2023 09:37

iuliana-prodan changed the title ~~Open-AMP update to SHA f2162a69ac67~~ Open-AMP update to SHA 5fce292fd447c2396731efeb7852ab7d84454aa1 Oct 13, 2023

iuliana-prodan changed the title ~~Open-AMP update to SHA 5fce292fd447c2396731efeb7852ab7d84454aa1~~ Open-AMP update to SHA 5fce292fd447 Oct 13, 2023

carlocaione approved these changes Oct 17, 2023

View reviewed changes

arnopo approved these changes Oct 19, 2023

View reviewed changes

carlocaione merged commit 214f9fc into zephyrproject-rtos:master Oct 19, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Open-AMP update to SHA 5fce292fd447 #17

Open-AMP update to SHA 5fce292fd447 #17

iuliana-prodan commented Sep 29, 2023 •

edited

Loading

iuliana-prodan commented Sep 29, 2023

iuliana-prodan commented Sep 29, 2023 •

edited

Loading

carlocaione commented Oct 2, 2023

arnopo commented Oct 2, 2023

iuliana-prodan commented Oct 2, 2023

arnopo commented Oct 3, 2023

iuliana-prodan commented Oct 4, 2023 •

edited

Loading

carlocaione commented Oct 5, 2023

iuliana-prodan commented Oct 13, 2023

arnopo commented Oct 19, 2023

carlocaione commented Oct 19, 2023

iuliana-prodan commented Oct 25, 2023

Open-AMP update to SHA 5fce292fd447 #17

Open-AMP update to SHA 5fce292fd447 #17

Conversation

iuliana-prodan commented Sep 29, 2023 • edited Loading

iuliana-prodan commented Sep 29, 2023

iuliana-prodan commented Sep 29, 2023 • edited Loading

carlocaione commented Oct 2, 2023

arnopo commented Oct 2, 2023

iuliana-prodan commented Oct 2, 2023

arnopo commented Oct 3, 2023

iuliana-prodan commented Oct 4, 2023 • edited Loading

carlocaione commented Oct 5, 2023

iuliana-prodan commented Oct 13, 2023

arnopo commented Oct 19, 2023

carlocaione commented Oct 19, 2023

iuliana-prodan commented Oct 25, 2023

iuliana-prodan commented Sep 29, 2023 •

edited

Loading

iuliana-prodan commented Sep 29, 2023 •

edited

Loading

iuliana-prodan commented Oct 4, 2023 •

edited

Loading