drivers: modem: cellular: Close down CMUX before shut down #97571
Conversation
This file contains hidden or 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
zephyrbot
added
area: Modem
area: Modem Drivers
area: Tests
SeppoTakalo
commented
Oct 15, 2025
| case MODEM_CMUX_COMMAND_CLD: | ||
| modem_cmux_on_cld_command(cmux, command); | ||
| break; | ||
| default: |
There was a problem hiding this comment.
For reviewers: In case you are wondering why switch-case with only one case, see the PR #97362 there is PSC command handler coming.
This is just split into its own PR.
bjarki-andreasen
previously approved these changes
Oct 15, 2025
rerickson1
previously approved these changes
Oct 15, 2025
subsys/modem/modem_cmux.c
Outdated
Comment on lines
469
to
476
| set_state(cmux, MODEM_CMUX_STATE_DISCONNECTED); | ||
| k_mutex_lock(&cmux->transmit_rb_lock, K_FOREVER); | ||
| cmux->flow_control_on = false; | ||
| k_mutex_unlock(&cmux->transmit_rb_lock); | ||
| modem_cmux_raise_event(cmux, MODEM_CMUX_EVENT_DISCONNECTED); | ||
| } else { | ||
| set_state(cmux, MODEM_CMUX_STATE_DISCONNECTING); | ||
| k_work_schedule(&cmux->disconnect_work, MODEM_CMUX_T1_TIMEOUT); |
There was a problem hiding this comment.
This code is duplicated in two spots. Maybe make it a function?
|
@SeppoTakalo - needs a rebase |
Instead of dropping all responses, handle the CLD. Signed-off-by: Seppo Takalo <[email protected]>
SeppoTakalo
dismissed stale reviews from rerickson1 and bjarki-andreasen
via
0639885
SeppoTakalo
force-pushed
the
cmux_close
branch
from
67e74f1 to
0639885
Compare
If we immediately send disconnected event when CLD is received, we might close the UART pipe before the response is actually send. Also, shutdown_handler should not retry indefinitely. Signed-off-by: Seppo Takalo <[email protected]>
Properly close down the CMUX channel before shutting down the modem. The CMUX Close-Down command should indicate the remote end to clean up, even if we don't have shutdown script or power-key GPIO. Signed-off-by: Seppo Takalo <[email protected]>
SeppoTakalo
force-pushed
the
cmux_close
branch
from
0639885 to
8d80036
Compare
|
|
Rebased and fixed the duplicated code as @rerickson1 suggested. @tomi-font and @bjarki-andreasen please review again. |
rerickson1
approved these changes
Oct 17, 2025
bjarki-andreasen
approved these changes
Oct 20, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
drivers: modem: cellular: Close down CMUX before shut down
Properly close down the CMUX channel before shutting down
the modem.
The CMUX Close-Down command should indicate the remote end
to clean up, even if we don't have shutdown script or power-key GPIO.
Requires also minor fix to CMUX so we send disconnect event only after responding to CLD (Multiplexer Close Down).
If we immediately send disconnected event when CLD is received,
we might close the UART pipe before the response is actually send.
Contains changes from PR #97570