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

sof_remove.sh: make lib.sh optional #1220

Merged
merged 1 commit into from
Jul 18, 2024

Conversation

marc-hb
Copy link
Collaborator

@marc-hb marc-hb commented Jul 11, 2024

This makes is possible to use this file separately from sof-test, as requested in #1169.

@marc-hb
Copy link
Collaborator Author

marc-hb commented Jul 11, 2024

ACE and CAVS all green. Two totally unrelated errors in LNL and stable-v2.2

@marc-hb marc-hb marked this pull request as ready for review July 11, 2024 22:06
@marc-hb marc-hb requested review from plbossart and a team as code owners July 11, 2024 22:06
@marc-hb marc-hb requested a review from ujfalusi July 11, 2024 22:07
else
printf '%s warning: %s not found, not sourced\n' "$0" "$libsh"
fi
}
Copy link
Contributor

Choose a reason for hiding this comment

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

I think you misunderstand what #1169 intends to do. The intend was to 'dumb' down the sof_remove.sh to be comparable with sof_insert.sh, to not check for PA, to not check for booted firmware, to do exactly what the script should do: remove the modules.

I don't think it makes much sense to have this workflow to just remove the modules when initially booted to legacy or DSPless mode:

cp ~/sof-test/tools/kmod/sof_remove.sh ~/
~/sof_remove.sh
rm ~/sof_remove.sh

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I did understand.

This is software: it can be BOTH dumb and smart and this is what this PR does. Try it?

Copy link
Contributor

Choose a reason for hiding this comment

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

The moved sof_remove.sh do work now.
Apparently it also works in place as well, not failing anymore if the device were booted in legacy or DSPless mode..

Copy link
Collaborator Author

@marc-hb marc-hb Jul 16, 2024

Choose a reason for hiding this comment

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

Apparently it also works in place as well, not failing anymore if the device were booted in legacy or DSPless mode..

Probably because of what I did it a while back in commit 7c2ede0 , PR #1187 and friends.

(that was much more work than this BTW)

# shellcheck source=case-lib/lib.sh
source "$libsh"
else
printf '%s warning: %s not found, not sourced\n' "$0" "$libsh"
Copy link
Contributor

Choose a reason for hiding this comment

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

do we need to print this?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Depends... would that be enough to get your approval? :-)

Copy link
Contributor

Choose a reason for hiding this comment

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

Depends... would that be enough to get your approval? :-)

yes ;)

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@ujfalusi done.

else
printf '%s warning: %s not found, not sourced\n' "$0" "$libsh"
fi
}
Copy link
Contributor

Choose a reason for hiding this comment

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

The moved sof_remove.sh do work now.
Apparently it also works in place as well, not failing anymore if the device were booted in legacy or DSPless mode..

This makes is possible to use this file separately from sof-test, as
requested in thesofproject#1169.

Signed-off-by: Marc Herbert <[email protected]>
@marc-hb
Copy link
Collaborator Author

marc-hb commented Jul 18, 2024

MTL stopped booting in https://sof-ci.01.org/softestpr/PR1220/build662/devicetest/index.html, unrelated issue sof # 9308.

Everything else is green.

@marc-hb marc-hb merged commit dfb75d7 into thesofproject:main Jul 18, 2024
6 of 7 checks passed
@marc-hb marc-hb deleted the remove-opt-lib branch July 18, 2024 15:06
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.

2 participants