aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-03-01iface-modem-3gpp: avoid re-setting deferred registration update while disablingAleksander Morgado
Don't clear the current deferred registration update until having disabled and cleaned up unsolicited registrations state messages, or we may end up re-setting the deferred registration update again meanwhile
2013-03-01iface-modem-3gpp: clear deferred registration state update when disablingBen Chan
2013-02-26udev: update all udev rules to always match both VID/PID togetherAleksander Morgado
If the rules to tag specific USB interface numbers only apply on the PID, we'll end up seeing that if the port has a parent with another PID, and that other PID also has a rule, port will get tagged multiple times. Easier to see with an example: The ZTE MF637 (VID 0x19D2, PID 0x0121) had the following rules: ATTRS{idProduct}=="0121", ENV{.MM_USBIFNUM}=="04", ENV{ID_MM_ZTE_PORT_TYPE_MODEM}="1" ATTRS{idProduct}=="0121", ENV{.MM_USBIFNUM}=="01", ENV{ID_MM_ZTE_PORT_TYPE_AUX}="1" In our ZTE rules we also have some for the device with PID 0x0002, like: ATTRS{idProduct}=="0002", ENV{.MM_USBIFNUM}=="02", ENV{ID_MM_ZTE_PORT_TYPE_MODEM}="1" ATTRS{idProduct}=="0002", ENV{.MM_USBIFNUM}=="04", ENV{ID_MM_ZTE_PORT_TYPE_AUX}="1" And it seems that we can grab multiple PIDs from a single port, i.e. from the parent objects in the hierarchy: udevadm info -a -n /dev/ttyUSB4 | grep idProduct ATTRS{idProduct}=="0121" ATTRS{idProduct}=="0020" ATTRS{idProduct}=="0002" Where that 0x0002 idProduct is not from the modem, but from the EHCI Host Controller (with idVendor 0x1d6b in my case). So... we end up seeing that both set of rules will apply to the ports, and we misleadingly get: (ttyUSB3) type 'at' claimed by /sys/devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.2 ZTE: AT port 'tty/ttyUSB2' flagged as primary (ttyUSB2) type 'at' claimed by /sys/devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.2 ZTE: AT port 'tty/ttyUSB1' flagged as secondary (ttyUSB1) type 'at' claimed by /sys/devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.2 ZTE: AT port 'tty/ttyUSB4' flagged as primary b_port(): (ttyUSB4) type 'at' claimed by /sys/devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.2 (/sys/devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.2) tty/ttyUSB2 at (primary) (/sys/devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.2) tty/ttyUSB1 at (secondary) (/sys/devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.2) tty/ttyUSB2 data (primary) (/sys/devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.2) tty/ttyUSB0 qcdm Which is wrong, as ttyUSB4 should have been our primary port, not ttyUSB2. With this patch on, the rules apply only to the VID/PID pair, and we end up getting what we really wanted: (ttyUSB3) type 'at' claimed by /sys/devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.2 (ttyUSB2) type 'at' claimed by /sys/devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.2 ZTE: AT port 'tty/ttyUSB1' flagged as secondary (ttyUSB1) type 'at' claimed by /sys/devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.2 ZTE: AT port 'tty/ttyUSB4' flagged as primary b_port(): (ttyUSB4) type 'at' claimed by /sys/devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.2 (/sys/devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.2) tty/ttyUSB4 at (primary) (/sys/devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.2) tty/ttyUSB1 at (secondary) (/sys/devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.2) tty/ttyUSB4 data (primary) (/sys/devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.2) tty/ttyUSB0 qcdm https://bugzilla.gnome.org/show_bug.cgi?id=694759
2013-02-26iface-modem: allow falling back to 'failed' stateAleksander Morgado
Allow mm_iface_modem_update_state() receive 'MM_MODEM_STATE_FAILED', and treat it as any other change to failed state, but with 'MM_MODEM_STATE_FAILED_REASON_UNKNOWN'.
2013-02-26plugins: log about all port type hints received from udevAleksander Morgado
2013-02-25plugin-manager: cancelled tasks are no longer deferred-until-suggestedAleksander Morgado
The deferred-until-suggested tasks specify tasks that are open/ongoing; cancelled tasks shouldn't have this flag set. https://bugzilla.gnome.org/show_bug.cgi?id=694603
2013-02-25iface-modem-3gpp: defer registration state update when registration is lostBen Chan
This patch defers the update of 3GPP registration state by 15 seconds when the registration state changes from 'registered' (home / roaming) to 'searching'. This allows a temporary loss of 3GPP registration to recover itself when relying on ModemManager to explicitly disconnect and reconnect to the network.
2013-02-25build: Look for generated file in builddir, not srcdirColin Walters
2013-02-22broadband-modem: fix CUSD response parsingAleksander Morgado
When reading the string reply in a +CUSD indication, don't blindly split using whitespace or comma as field separator, as the string may be a text string with both whitespaces and commas, e.g.: +CUSD: 0,"hey hey, something here<LF>***<LF>and something more here" Also, skip reading the encoding field for now, as we don't use it yet.
2013-02-22broadband-modem: avoid reading already freed memory in USSD operationsAleksander Morgado
2013-02-22broadband-modem: USSD response may come even before finishing our requestAleksander Morgado
MBM devices seem to include the '+CUSD: 0' indication before even returning OK to our '+CUSD=1' (ttyACM0): --> 'AT+CUSD=1,"*111#",15<CR>' (ttyACM0): <-- '<CR><LF>+CUSD: 0,"reply here"<CR><LF>' (ttyACM0): <-- '<CR><LF>OK<CR><LF>'
2013-02-22broadband-modem: don't assume the returned string is always hex-encodedAleksander Morgado
2013-02-22mbm: fix CFUN result parsingAleksander Morgado
2013-02-22broadband-modem: increase default AT command timeout for USSD operationsAleksander Morgado
May really take more than 3s.
2013-02-22mbm: implement custom modem_power_down()Aleksander Morgado
Cache last valid allowed mode always, so that we re-use it when powering up again.
2013-02-22mbm: implement custom load_power_state()Aleksander Morgado
We need to handle modems which appear in low-power mode (e.g. CFUN=4), so implement a custom check of the power state. We cannot use the default check as MBM modems use CFUN also for allowed mode handling.
2013-02-22api: notify in the interface about the reason why the modem is FAILEDAleksander Morgado
We currently implement 'SIM missing' and 'SIM error', which are probably the most common ones.
2013-02-21plugin: avoid using uninitialized variableAleksander Morgado
Reported by: Jose Maria Gonzalez <jmgonzalezc@indra.es>
2013-02-20manager: during initial scan, add new ports in idlesAleksander Morgado
Treat each port independently in its own idle, as if we're receiving independent udev events, otherwise, GSources may not be properly scheduled in the main loop.
2013-02-20plugin: plug memleakAleksander Morgado
A new reference to probe was acquired through mm_device_get_probe(), just unref it when no longer needed. Note that mm_port_probe_run() will take its own reference for as long as required to complete the operation.
2013-02-20plugin: plug memleaksAleksander Morgado
This is really just to have a nice valgrind/memcheck output report, no big deal if they were never freed.
2013-02-20iridium: use generic disconnection logicAleksander Morgado
The generic disconnection logic now already handles getting the port fully closed and a wait time before reopening it, so no need for a custom disconnection logic any more.
2013-02-20serial-port: allow specifying some wait time between closing and reopeningAleksander Morgado
We will now by default wait some time (1s) between port getting fully closed and the port being reopened again. This logic seems to work for multiple modems where there is a single port for both AT and data, like my Nokia C7 and Iridium modems. If this wait time is not applied, the port ends up returning EAGAIN for every write that we try to do afterwards.
2013-02-20serial-port: remove unneeded property nameAleksander Morgado
Was incorrectly included in a previous commit
2013-02-20bearer-novatel-lte: fix reference counting of the 'data' portAleksander Morgado
2013-02-20plugin: plug memleaksAleksander Morgado
2013-02-20bearer: plug memleakAleksander Morgado
2013-02-20broadband-modem: plug memleakAleksander Morgado
2013-02-20iface-modem: fix modem state consolidation upon bearer disconnectionBen Chan
Patch "iface-modem: fix invalid modem state consolidation" (commit 69aff6183a9e6532b4074c89831d6dcfa81ddcce) incorrectly consolidates the modem state upon the disconnection of a bearer. The modem state remains 'connected' after the last bearer is disconnected. This patch fixes that.
2013-02-19build: fix passing arguments to configure from autogen.sh (bgo #694157)Evan Nemerson
2013-02-19zte: load unlock retries with +ZPINPUKAleksander Morgado
e.g: AT+ZPINPUK=? | | ZPINPUK: 3,10 | OK
2013-02-19at-serial-port: plug memleakAleksander Morgado
2013-02-19core: update logging levels of several messagesAleksander Morgado
'info' log level, the default if none specified, included too many logs which aren't that useful, to try to minimize the noise we produce by default.
2013-02-19plugin-manager: log time required for device probingAleksander Morgado
2013-02-19plugin-manager: if minimum time consumed and all deferred tasks, abort probingAleksander Morgado
For the case where we just get a device with all net ports (i.e. all deferred until result suggested), just abort the probing if the minimum probing time is consumed.
2013-02-19broadband-bearer: fallback to primary AT port if no data AT port availableAleksander Morgado
Spotted by Dan Williams <dcbw@redhat.com> with his ADU960S.
2013-02-18base-modem: don't run port init sequence if we're just sending a commandAleksander Morgado
This may happen when sending commands to the modem while in non-enabled state, like when sending the PIN. In this case, just send the command, don't fully initialize the port with the initialization sequence.
2013-02-18broadband-bearer: fully reopen data port before flashingAleksander Morgado
When disconnecting the data port, first fully close and reopen the port before flashing. This helps with some modems where the flashing mechanism doesn't fully work, like this ZTE modem: Before: [1360325270.357678] [mm-bearer.c:690] mm_bearer_disconnect(): Disconnecting bearer '/org/freedesktop/ModemManager1/Bearer/0' [1360325270.357796] [mm-iface-modem.c:1198] mm_iface_modem_update_state(): Modem /org/freedesktop/ModemManager1/Modem/1: state changed (connected -> disconnecting) [1360325270.358503] [mm-broadband-bearer.c:1539] disconnect_3gpp(): Sending PDP context deactivation in secondary port... [1360325270.358549] [mm-serial-port.c:927] mm_serial_port_open(): (ttyUSB4) device open count is 2 (open) [1360325270.358633] [mm-at-serial-port.c:392] debug_log(): (ttyUSB4): --> 'AT+CGACT=0,2<CR>' [1360325270.375131] [mm-at-serial-port.c:392] debug_log(): (ttyUSB4): <-- '<CR><LF>OK<CR><LF>' [1360325270.375251] [mm-serial-port.c:967] mm_serial_port_close(): (ttyUSB7) device open count is 1 (close) [1360325270.375282] [mm-serial-port.c:927] mm_serial_port_open(): (ttyUSB7) device open count is 2 (open) [1360325270.375300] [mm-broadband-bearer.c:1497] cgact_secondary_ready(): Flash primary port... [1360325270.375833] [mm-serial-port.c:967] mm_serial_port_close(): (ttyUSB4) device open count is 1 (close) [1360325271.377539] [mm-broadband-bearer.c:1455] primary_flash_3gpp_ready(): PDP disconnection already sent in secondary port [1360325271.377634] [mm-serial-port.c:967] mm_serial_port_close(): (ttyUSB7) device open count is 1 (close) [1360325271.377680] [mm-port.c:149] mm_port_set_connected(): (ttyUSB7): port now disconnected [1360325271.377721] [mm-bearer.c:623] disconnect_ready(): Disconnected bearer '/org/freedesktop/ModemManager1/Bearer/0' [1360325286.415396] [mm-serial-port.c:927] mm_serial_port_open(): (ttyUSB7) device open count is 2 (open) [1360325286.415510] [mm-at-serial-port.c:392] debug_log(): (ttyUSB7): --> 'AT+ZPAS?<CR>' [1360325287.400589] [mm-broadband-modem.c:1717] modem_load_signal_quality(): loading signal quality... [1360325287.400679] [mm-serial-port.c:927] mm_serial_port_open(): (ttyUSB7) device open count is 3 (open) [1360325289.401873] [mm-iface-modem.c:762] access_technologies_check_ready(): Couldn't refresh access technologies: 'Serial command timed out' [1360325289.401940] [mm-serial-port.c:967] mm_serial_port_close(): (ttyUSB7) device open count is 2 (close) [1360325289.401998] [mm-at-serial-port.c:392] debug_log(): (ttyUSB7): --> 'AT+CIND?<CR>' [1360325292.403162] [mm-serial-port.c:927] mm_serial_port_open(): (ttyUSB7) device open count is 3 (open) [1360325292.403247] [mm-serial-port.c:967] mm_serial_port_close(): (ttyUSB7) device open count is 2 (close ... After: [1360326617.604527] [mm-bearer.c:690] mm_bearer_disconnect(): Disconnecting bearer '/org/freedesktop/ModemManager1/Bearer/0' [1360326617.604622] [mm-iface-modem.c:1198] mm_iface_modem_update_state(): Modem /org/freedesktop/ModemManager1/Modem/0: state changed (connected -> disconnecting) [1360326617.605006] [mm-broadband-bearer.c:1535] disconnect_3gpp(): Sending PDP context deactivation in secondary port... [1360326617.605034] [mm-serial-port.c:929] mm_serial_port_open(): (ttyUSB4) device open count is 2 (open) [1360326617.605088] [mm-at-serial-port.c:392] debug_log(): (ttyUSB4): --> 'AT+CGACT=0,2<CR>' [1360326617.620075] [mm-at-serial-port.c:392] debug_log(): (ttyUSB4): <-- '<CR><LF>OK<CR><LF>' [1360326617.620206] [mm-broadband-bearer.c:1493] cgact_secondary_ready(): Flash primary port... [1360326617.620241] [mm-serial-port.c:1334] mm_serial_port_flash(): (ttyUSB7) reopening before flash (2) [1360326617.620265] [mm-serial-port.c:969] mm_serial_port_close(): (ttyUSB7) device open count is 1 (close) [1360326617.620286] [mm-serial-port.c:969] mm_serial_port_close(): (ttyUSB7) device open count is 0 (close) [1360326617.620320] [mm-serial-port.c:985] mm_serial_port_close(): (ttyUSB7) closing serial port... [1360326617.620356] [mm-port.c:149] mm_port_set_connected(): (ttyUSB7): port now disconnected [1360326617.621355] [mm-serial-port.c:1017] mm_serial_port_close(): (ttyUSB7) serial port closed [1360326617.621403] [mm-serial-port.c:860] mm_serial_port_open(): (ttyUSB7) opening serial port... [1360326617.622836] [mm-serial-port.c:417] real_config_fd(): (ttyUSB7): port attributes not fully set
2013-02-18serial-port: new method to reopen a portAleksander Morgado
We will fully close the port and the re-open it again keeping the same open_count that we had before.
2013-02-18broadband-bearer: try to run CGACT first on the primary portAleksander Morgado
It may happen that the primary port is not the data port; if so, try with the primary port first, and otherwise fallback to the secondary port.
2013-02-18broadband-bearer: update disconnection logicAleksander Morgado
We were maintaining the port we used for dialling (the data port) open during the connection, as specified by the CDMA or 3GPP specific logic. We'll now close that open count reference ourselves within the CDMA or 3GPP disconnection logic itself.
2013-02-18bearer,3gpp: dial operation specifies which data port to useAleksander Morgado
Instead of deciding in advance which data port to use, we let the dialling operation gather it. For the generic dialling logic, ATD-based, always an 'AT' port will be used as data port, even if we grabbed a 'net' port. Those plugins that can work with 'net' ports will grab the specific 'net' port themselves.
2013-02-18bearer: new helper 'MMBearerConnectResult' typeAleksander Morgado
Instead of returning 3 variables in connect_finish(), return a single reference counted struct. This simplifies how the result is built and passed within a GSimpleAsyncResult to each _finish() method. This also simplifies the dialling step in the 3GPP connection sequence, as we can use the same new type.
2013-02-18ports: add port initialization sequences instead of iface-modem's modem_init()Aleksander Morgado
Instead of a custom modem_init() step in the 'Modem' interface, just add a sequence of port initialization commands in each port. While enabling for the first time a non-hotplugged modem, we will issue the port initialization commands only after having run the enabling_modem_init() step (i.e. after ATZ usually).
2013-02-18at-serial-port: new properties to define and manage a set of init commandsAleksander Morgado
We are now able to specify a list of AT commands to be run whenever the port is opened for the first time (i.e. open_count from 0 to 1). These commands are to be treated as a 'port initialization' sequence, where port-configuration specific AT commands are defined (e.g. ATE0).
2013-02-18broadband-modem: new step during 'enabling_started' to initialize the modemAleksander Morgado
We previously had the modem initialization command merged with some other port setup commands in the 'modem_init' step of the 'Modem' interface. Instead of doing this, we now split the logic into two separate steps: A first 'enabling_modem_init' modem initialization step is to be run just after the ports have been opened, but only during the first enabling operation, and only if the modem was not hotplugged. A hotplugged modem is assumed to be properly initialized already, so no need to ATZ-it. Also, we will now wait 500ms by default after the modem initialization command has been sent, to let it settle down. The second 'modem_init' step will be run during the 'Modem' interface initialization, and it currently only holds specific setup of the primary and secondary serial ports. We'll be modifying this logic a bit in the next commits, so no big deal to have that step name unchanged.
2013-02-15serial-port: don't steal data from PPP when connectedDan Williams
There was a race where if PPP was slow to start, MM could read the first bits of PPP from the port, which MM shouldn't really do. So if the port is connected, remove our GIOChannel watch and let pppd handle all the data. When the port is disconnected, re-attach our watch and start reading from the port again. This may make it harder to detect spurious disconnects if for example pppd drops the connection and the thing controlling PPP (eg, NetworkManager or something else) doesn't tell us about that event by disconnecting the bearer. This is arguably programmer error though. See the logs in https://bugzilla.gnome.org/show_bug.cgi?id=624956#c10 for an example of this: DEBUG: <1280300196.929489> (ttyACM0): <-- '<CR><LF>CONNECT<CR><LF>' DEBUG: <1280300196.929761> (ttyACM0): port now connected DEBUG: <1280300196.929853> Modem /org/freedesktop/ModemManager/Modems/0: state changed (connecting -> connected) DEBUG: <1280300196.929954> (ttyACM0): simple connect state 6 DEBUG: <1280300196.933432> (ttyACM0): <-- '~\-1}#\-64!}!} } }2}#}$\-64#}!}$}%\-36}"}&} }*} } g}%~'
2013-02-15Revert "serial-port: don't steal data from PPP when connected"Dan Williams
This reverts commit 625e1c4884215bb9989dad6c9868c06ba76a4d94. By simply returning when data is available, no data gets cleared from the file descriptor and data_available() keeps getting rescheduled, leading to a busy-loop. This is the wrong approach, we should be removing the GIOChannel watch instead.
2013-02-15broadband-modem-longcheer: fix getting and setting of allowed modesDan Williams
When setting allowed modes, a ",2" crept into the MODODR command when porting the plugin from 0.6. That shouldn't be there. When getting allowed modes, 2 is UMTS preferred and 4 is GSM preferred, which the previous code combined into only UMTS preferred.
2013-02-15modem: use +CEREG to determine EPS network registration statusBen Chan
This patch adds the support for solicited/unsolicited EPS network registration status via AT+CEREG, which is configurable via the 'iface-modem-3gpp-eps-network-supported' property of the MMIfaceModem3gpp interface and is disabled by default.
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-06-19 18:50:52 +0000