From 25bdb8c717074f575348733d34bcc06168e80e53 Mon Sep 17 00:00:00 2001 From: Alexandre Bard Date: Fri, 1 Nov 2019 16:09:08 +0100 Subject: [PATCH] modemmanager: Add new patches 0005: Improved handling of reconnect requests 0006: Increase timeout to avoid modem lock BugzID: 59580 --- ...t-for-configuration-of-initial-EPS-b.patch | 6 ++-- ...uauth-failure-on-default-PDP-context.patch | 4 +-- ...Choose-default-context-over-others-w.patch | 4 +-- ...band-modem-Handle-reconnect-requests.patch | 4 +-- ...rer-Don-t-clear-cid-when-connection-.patch | 29 +++++++++++++++++++ ...-commands-Force-timeout-to-3-minutes.patch | 29 +++++++++++++++++++ .../modemmanager/modemmanager_%.bbappend | 4 ++- 7 files changed, 70 insertions(+), 10 deletions(-) create mode 100644 recipes-connectivity/modemmanager/files/0005-mm-broadband-bearer-Don-t-clear-cid-when-connection-.patch create mode 100644 recipes-connectivity/modemmanager/files/0006-at-commands-Force-timeout-to-3-minutes.patch diff --git a/recipes-connectivity/modemmanager/files/0001-ublox-Add-support-for-configuration-of-initial-EPS-b.patch b/recipes-connectivity/modemmanager/files/0001-ublox-Add-support-for-configuration-of-initial-EPS-b.patch index 0116c4e..1458c0a 100644 --- a/recipes-connectivity/modemmanager/files/0001-ublox-Add-support-for-configuration-of-initial-EPS-b.patch +++ b/recipes-connectivity/modemmanager/files/0001-ublox-Add-support-for-configuration-of-initial-EPS-b.patch @@ -1,7 +1,7 @@ -From 12a4f1b2ebf65f8fc58d5707d940f5cabd3a76d4 Mon Sep 17 00:00:00 2001 -From: Alexandre Bard +From 8b89e222b0d42b7f1dc1d4f0438426fdbac9eee3 Mon Sep 17 00:00:00 2001 +From: Alexandre Bard Date: Thu, 5 Sep 2019 16:14:15 +0200 -Subject: [PATCH 1/4] ublox: Add support for configuration of initial EPS +Subject: [PATCH 1/6] ublox: Add support for configuration of initial EPS bearer BugzID: 59579 diff --git a/recipes-connectivity/modemmanager/files/0002-ublox-ignore-uauth-failure-on-default-PDP-context.patch b/recipes-connectivity/modemmanager/files/0002-ublox-ignore-uauth-failure-on-default-PDP-context.patch index 4f29abe..4932fec 100644 --- a/recipes-connectivity/modemmanager/files/0002-ublox-ignore-uauth-failure-on-default-PDP-context.patch +++ b/recipes-connectivity/modemmanager/files/0002-ublox-ignore-uauth-failure-on-default-PDP-context.patch @@ -1,7 +1,7 @@ -From f30f4848562366204e539312f5fbdf133c55451c Mon Sep 17 00:00:00 2001 +From f07c4210ef592bf3564d8b79791a73197e4b35f0 Mon Sep 17 00:00:00 2001 From: Alexandre Bard Date: Mon, 14 Oct 2019 17:33:38 +0200 -Subject: [PATCH 2/4] ublox: ignore uauth failure on default PDP context +Subject: [PATCH 2/6] ublox: ignore uauth failure on default PDP context Default PDP context has to be configured using UCGDFLT and therefor trying to use UAUTHREQ on this context lead to an unknown error, diff --git a/recipes-connectivity/modemmanager/files/0003-broadband-modem-Choose-default-context-over-others-w.patch b/recipes-connectivity/modemmanager/files/0003-broadband-modem-Choose-default-context-over-others-w.patch index 9a53865..171ae9a 100644 --- a/recipes-connectivity/modemmanager/files/0003-broadband-modem-Choose-default-context-over-others-w.patch +++ b/recipes-connectivity/modemmanager/files/0003-broadband-modem-Choose-default-context-over-others-w.patch @@ -1,7 +1,7 @@ -From 33b8d7208a266e83427c490fe4e605b741b98fc8 Mon Sep 17 00:00:00 2001 +From c47e9ea2b7f2375451b74dcf660a84b96e36fe52 Mon Sep 17 00:00:00 2001 From: Alexandre Bard Date: Wed, 16 Oct 2019 17:30:34 +0200 -Subject: [PATCH 3/4] broadband-modem: Choose default context over others when +Subject: [PATCH 3/6] broadband-modem: Choose default context over others when possible With ublox modems, the default context can be active and already diff --git a/recipes-connectivity/modemmanager/files/0004-broadband-modem-Handle-reconnect-requests.patch b/recipes-connectivity/modemmanager/files/0004-broadband-modem-Handle-reconnect-requests.patch index 4486a9c..d510fa0 100644 --- a/recipes-connectivity/modemmanager/files/0004-broadband-modem-Handle-reconnect-requests.patch +++ b/recipes-connectivity/modemmanager/files/0004-broadband-modem-Handle-reconnect-requests.patch @@ -1,7 +1,7 @@ -From ca52ad3f25a16ef9d52b1b5226309aca807067dd Mon Sep 17 00:00:00 2001 +From 20a538ef7706a59408f2ea0539e42a9e21328808 Mon Sep 17 00:00:00 2001 From: Alexandre Bard Date: Wed, 9 Oct 2019 14:47:11 +0200 -Subject: [PATCH 4/4] broadband-modem: Handle reconnect requests +Subject: [PATCH 4/6] broadband-modem: Handle reconnect requests BugzID: 59455 --- diff --git a/recipes-connectivity/modemmanager/files/0005-mm-broadband-bearer-Don-t-clear-cid-when-connection-.patch b/recipes-connectivity/modemmanager/files/0005-mm-broadband-bearer-Don-t-clear-cid-when-connection-.patch new file mode 100644 index 0000000..bb0dcc2 --- /dev/null +++ b/recipes-connectivity/modemmanager/files/0005-mm-broadband-bearer-Don-t-clear-cid-when-connection-.patch @@ -0,0 +1,29 @@ +From 41110620f1b054fac70519f2573d94e2ab47a6eb Mon Sep 17 00:00:00 2001 +From: Alexandre Bard +Date: Wed, 30 Oct 2019 15:25:44 +0100 +Subject: [PATCH 5/6] mm-broadband-bearer: Don't clear cid when connection + failed + +The CID is required to handle reconnect requests. + +BugzID: 59455 +--- + src/mm-broadband-bearer.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/mm-broadband-bearer.c b/src/mm-broadband-bearer.c +index 94f636b6..f142b75a 100644 +--- a/src/mm-broadband-bearer.c ++++ b/src/mm-broadband-bearer.c +@@ -1001,8 +1001,6 @@ dial_3gpp_ready (MMBroadbandBearer *self, + + ctx->data = MM_BROADBAND_BEARER_GET_CLASS (self)->dial_3gpp_finish (self, res, &error); + if (!ctx->data) { +- /* Clear CID when it failed to connect. */ +- self->priv->cid = 0; + g_task_return_error (task, error); + g_object_unref (task); + return; +-- +2.20.1 + diff --git a/recipes-connectivity/modemmanager/files/0006-at-commands-Force-timeout-to-3-minutes.patch b/recipes-connectivity/modemmanager/files/0006-at-commands-Force-timeout-to-3-minutes.patch new file mode 100644 index 0000000..5b709f6 --- /dev/null +++ b/recipes-connectivity/modemmanager/files/0006-at-commands-Force-timeout-to-3-minutes.patch @@ -0,0 +1,29 @@ +From c9594fee7bc245c8cfe55b2225338f417edae9ae Mon Sep 17 00:00:00 2001 +From: Alexandre Bard +Date: Wed, 23 Oct 2019 15:45:10 +0200 +Subject: [PATCH 6/6] at commands: Force timeout to 3 minutes + +ublox says some commands can take up to 3 minutes to complete +waiting less than that seems to overload the modem by sending +multiple commands while one is still not processed. + +BugzID: 59584 +--- + src/mm-port-serial-at.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/mm-port-serial-at.c b/src/mm-port-serial-at.c +index 67525af0..cc997ba6 100644 +--- a/src/mm-port-serial-at.c ++++ b/src/mm-port-serial-at.c +@@ -407,6 +407,7 @@ mm_port_serial_at_command (MMPortSerialAt *self, + GSimpleAsyncResult *simple; + GByteArray *buf; + ++ timeout_seconds = 180; + g_return_if_fail (self != NULL); + g_return_if_fail (MM_IS_PORT_SERIAL_AT (self)); + g_return_if_fail (command != NULL); +-- +2.20.1 + diff --git a/recipes-connectivity/modemmanager/modemmanager_%.bbappend b/recipes-connectivity/modemmanager/modemmanager_%.bbappend index b5937c9..16e97e7 100644 --- a/recipes-connectivity/modemmanager/modemmanager_%.bbappend +++ b/recipes-connectivity/modemmanager/modemmanager_%.bbappend @@ -5,4 +5,6 @@ SRC_URI_append = " \ file://0002-ublox-ignore-uauth-failure-on-default-PDP-context.patch \ file://0003-broadband-modem-Choose-default-context-over-others-w.patch \ file://0004-broadband-modem-Handle-reconnect-requests.patch \ - " + file://0005-mm-broadband-bearer-Don-t-clear-cid-when-connection-.patch \ + file://0006-at-commands-Force-timeout-to-3-minutes.patch \ + "