| Message ID | 20201009202848.29341-1-elder@linaro.org |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net,v2] net: ipa: skip suspend/resume activities if not set up | expand |
Hello: This patch was applied to netdev/net.git (refs/heads/master): On Fri, 9 Oct 2020 15:28:48 -0500 you wrote: > When processing a system suspend request we suspend modem endpoints > if they are enabled, and call ipa_cmd_tag_process() (which issues > IPA commands) to ensure the IPA pipeline is cleared. It is an error > to attempt to issue an IPA command before setup is complete, so this > is clearly a bug. But we also shouldn't suspend or resume any > endpoints that have not been set up. > > [...] Here is the summary with links: - [net,v2] net: ipa: skip suspend/resume activities if not set up https://git.kernel.org/netdev/net/c/d17043828210 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/drivers/net/ipa/ipa_endpoint.c b/drivers/net/ipa/ipa_endpoint.c index b7efd7c95e9c8..ed60fa5bcdaca 100644 --- a/drivers/net/ipa/ipa_endpoint.c +++ b/drivers/net/ipa/ipa_endpoint.c @@ -1471,6 +1471,9 @@ void ipa_endpoint_resume_one(struct ipa_endpoint *endpoint) void ipa_endpoint_suspend(struct ipa *ipa) { + if (!ipa->setup_complete) + return; + if (ipa->modem_netdev) ipa_modem_suspend(ipa->modem_netdev); @@ -1482,6 +1485,9 @@ void ipa_endpoint_suspend(struct ipa *ipa) void ipa_endpoint_resume(struct ipa *ipa) { + if (!ipa->setup_complete) + return; + ipa_endpoint_resume_one(ipa->name_map[IPA_ENDPOINT_AP_COMMAND_TX]); ipa_endpoint_resume_one(ipa->name_map[IPA_ENDPOINT_AP_LAN_RX]);
When processing a system suspend request we suspend modem endpoints if they are enabled, and call ipa_cmd_tag_process() (which issues IPA commands) to ensure the IPA pipeline is cleared. It is an error to attempt to issue an IPA command before setup is complete, so this is clearly a bug. But we also shouldn't suspend or resume any endpoints that have not been set up. Have ipa_endpoint_suspend() and ipa_endpoint_resume() immediately return if setup hasn't completed, to avoid any attempt to configure endpoints or issue IPA commands in that case. Fixes: 84f9bd12d46d ("soc: qcom: ipa: IPA endpoints") Tested-by: Matthias Kaehlcke <mka@chromium.org> Signed-off-by: Alex Elder <elder@linaro.org> --- v2: Patch posted alone (Jakub pointed out the other was unnecessary) drivers/net/ipa/ipa_endpoint.c | 6 ++++++ 1 file changed, 6 insertions(+)