Add and start using generic functions fw_reldir() and fw_relfilepath() #1224
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Minor fixes to prepare support for /sys/kernel/debug/sof/fw_profile/ - Move emptiness test and error message from caller to function. - Give a much more specific name - Call journalctl directly, no need for the journalctl_cmd() indirection here. Signed-off-by: Marc Herbert <[email protected]>
|
Usual LNL failures in https://sof-ci.01.org/softestpr/PR1224/build686/devicetest/index.html, everything else 100% green (even suspend/resume!) EDIT after force-push: Usual LNL failures in https://sof-ci.01.org/softestpr/PR1224/build690/devicetest/index.html everything else green. |
Unifies all 3 possible ways to find the relative firmware directory. To be used in find_ldc_file() and is_firmware_file_zephyr(). Signed-off-by: Marc Herbert <[email protected]>
Simplify get_ldc_subdir() but using the new, universal fw_reldir(). Signed-off-by: Marc Herbert <[email protected]>
Add new, "universal" fw_relfilepath() function modelled after fw_reldir(). To be used in `is_firmware_file_zephyr()` and others. Signed-off-by: Marc Herbert <[email protected]>
Faster and more flexible. Signed-off-by: Marc Herbert <[email protected]>
fredoh9
reviewed
Jul 24, 2024
case-lib/lib.sh
Outdated
| @@ -825,22 +825,30 @@ is_zephyr_ldc() | |||
| # https://github.com/thesofproject/linux/issues/3867 and friends. Keep this existing | |||
| # journalctl_cmd() code as a fallback for older kernels or when the firmware has been | |||
There was a problem hiding this comment.
journalctl_cmd() -> journalctl
fredoh9
reviewed
Jul 24, 2024
| @@ -840,6 +840,45 @@ fw_reldir() | |||
| printf '%s' "$(dirname "$from_klogs")" | |||
| } | |||
|
|
|||
| # Prints the relative firmware filepath: e.g. `intel/sof-ipc4/tgl/community/sof-tgl.ri` | |||
| # | |||
| # Some of the code duplicates fw_reldir() above. Unfortunately can't re-use and invoke | |||
There was a problem hiding this comment.
I tried to put a comment of duplication and possible re-use, but good comment here
fredoh9
approved these changes
Jul 24, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add two generic functions fw_reldir() and fw_relfilepath() which search in this order:
The 3., slower, "legacy" option is kept because it's useful with either old kernels or when the modules have been unloaded.
Start using these two generic functions in
is_firmware_file_zephyr()andget_ldc_subdir().