As the UX design document updated, please create a patch to re-arrange the spm sub-folders:

A common folder contains PSA FF logic, pure C without CMSIS depends
A cmsis_psa for IPC related operations including init, handlers and others.
A cmsis_func contains all library sources.