Hi Martin,
On 07/04/2019 06:03 AM, Martin Hundebøll wrote:
This adds support for configuring a gpio in udev to control the modem
power.
To enable gpio control, specify OFONO_QUECTEL_GPIO_CHIP and
OFONO_QUECTEL_GPIO_OFFSET in the udev environment, for example:
KERNEL=="ttymxc0", ENV{OFONO_DRIVER}="quectel", \
ENV{OFONO_QUECTEL_GPIO_CHIP}="gpiochip2", \
ENV{OFONO_QUECTEL_GPIO_OFFSET}="26"
---
plugins/quectel.c | 70 +++++++++++++++++++++++++++++++++++++++++++----
plugins/udevng.c | 10 ++++++-
2 files changed, 73 insertions(+), 7 deletions(-)
diff --git a/plugins/quectel.c b/plugins/quectel.c
index b993af85..af9d0308 100644
--- a/plugins/quectel.c
+++ b/plugins/quectel.c
@@ -75,6 +75,7 @@ struct quectel_data {
struct l_timeout *mux_ready_timer;
int mux_ready_count;
int initial_ldisc;
+ struct l_gpio_writer *gpio;
};
static void quectel_debug(const char *str, void *user_data)
@@ -84,6 +85,41 @@ static void quectel_debug(const char *str, void *user_data)
ofono_info("%s%s", prefix, str);
}
+static int quectel_probe_gpio(struct ofono_modem *modem)
+{
+ struct quectel_data *data = ofono_modem_get_data(modem);
+ struct l_gpio_chip *gpiochip;
+ uint32_t offset;
+ const char *chip_name, *offset_str;
Kernel style wants each variable on a separate line...
+ uint32_t value = 0;
+
+ chip_name = ofono_modem_get_string(modem, "GpioChip");
+ if (!chip_name)
+ return 0;
+
+ offset_str = ofono_modem_get_string(modem, "GpioOffset");
+ if (!offset_str)
+ return -EINVAL;
+
+ gpiochip = l_gpio_chip_new(chip_name);
+ if (!gpiochip)
+ return -ENODEV;
+
+ offset = strtoul(offset_str, NULL, 0);
+ if (!offset)
+ return -EINVAL;
memory leak?
+
+ data->gpio = l_gpio_writer_new(gpiochip, "ofono", 1, &offset,
+ &value);
+
+ l_gpio_chip_free(gpiochip);
+
+ if (!data->gpio)
+ return -EIO;
+
+ return 0;
+}
+
static int quectel_probe(struct ofono_modem *modem)
{
struct quectel_data *data;
@@ -94,7 +130,7 @@ static int quectel_probe(struct ofono_modem *modem)
ofono_modem_set_data(modem, data);
- return 0;
+ return quectel_probe_gpio(modem);
}
static void quectel_remove(struct ofono_modem *modem)
@@ -107,6 +143,7 @@ static void quectel_remove(struct ofono_modem *modem)
g_at_chat_unregister(data->aux, data->cpin_ready);
ofono_modem_set_data(modem, NULL);
+ l_gpio_writer_free(data->gpio);
g_at_chat_unref(data->aux);
g_at_chat_unref(data->modem);
g_at_chat_unref(data->uart);
@@ -245,6 +282,7 @@ static void close_serial(struct ofono_modem *modem)
struct quectel_data *data = ofono_modem_get_data(modem);
GIOChannel *device;
ssize_t write_count;
+ uint32_t gpio_value = 0;
int fd;
DBG("%p", modem);
@@ -264,6 +302,7 @@ static void close_serial(struct ofono_modem *modem)
g_at_chat_unref(data->uart);
data->uart = NULL;
+ l_gpio_writer_set(data->gpio, 1, &gpio_value);
you allow gpio to be NULL if GpioChip is NULL... Does calling this make
sense then?
ofono_modem_set_powered(modem, false);
}
@@ -356,9 +395,20 @@ static void cmux_cb(int ok, GAtResult *result, void *user_data)
}
}
+static void ate_cb(int ok, GAtResult *result, void *user_data)
+{
+ struct ofono_modem *modem = user_data;
+ struct quectel_data *data = ofono_modem_get_data(modem);
+
+ g_at_chat_set_wakeup_command(data->uart, NULL, 0, 0);
+ g_at_chat_send(data->uart, "AT+CMUX=0,0,5,127,10,3,30,10,2", NULL,
+ cmux_cb, modem, NULL);
+}
+
static int open_serial(struct ofono_modem *modem)
{
struct quectel_data *data = ofono_modem_get_data(modem);
+ const uint32_t gpio_value = 1;
const char *rts_cts;
DBG("%p", modem);
@@ -379,12 +429,20 @@ static int open_serial(struct ofono_modem *modem)
if (data->uart == NULL)
return -EINVAL;
- g_at_chat_send(data->uart, "ATE0", none_prefix, NULL, NULL,
- NULL);
+ if (data->gpio && !l_gpio_writer_set(data->gpio, 1, &gpio_value)) {
+ close_serial(modem);
+ return -EIO;
+ }
- /* setup multiplexing */
- g_at_chat_send(data->uart, "AT+CMUX=0,0,5,127,10,3,30,10,2", NULL,
- cmux_cb, modem, NULL);
+ /*
+ * if the modem is configured with auto-baud-detection, it learns the
+ * baud rate from a few 'AT' commands. Utilize the wakeup feature to
+ * send those 'AT's.
+ * It doesn't hurt if the modem is configured with a fixed baudrate,
+ * as it just detects when the modem is ready instead.
+ */
+ g_at_chat_set_wakeup_command(data->uart, "AT\r", 500, 10000);
Yikes. I'll again warn that set_wakeup_command is only meant to be used
on the Freerunner. This looks like a 'creative' use of the feature.
Can I get a bit more details how exactly it is helping you in this case?
+ g_at_chat_send(data->uart, "ATE0", none_prefix, ate_cb, modem, NULL);
return -EINPROGRESS;
}
diff --git a/plugins/udevng.c b/plugins/udevng.c
index ec19995d..dcc276e1 100644
--- a/plugins/udevng.c
+++ b/plugins/udevng.c
@@ -883,8 +883,16 @@ static gboolean setup_quectel_serial(struct modem_info
*modem)
const char *value;
info = modem->serial;
- value = udev_device_get_property_value(info->dev,
"OFONO_QUECTEL_RTSCTS");
+ value = udev_device_get_property_value(info->dev, "OFONO_QUECTEL_GPIO_CHIP");
+ if (value)
+ ofono_modem_set_string(modem->modem, "GpioChip", value);
+
+ value = udev_device_get_property_value(info->dev,
"OFONO_QUECTEL_GPIO_OFFSET");
+ if (value)
+ ofono_modem_set_string(modem->modem, "GpioOffset", value);
+
+ value = udev_device_get_property_value(info->dev,
"OFONO_QUECTEL_RTSCTS");
ofono_modem_set_string(modem->modem, "RtsCts", value ? value : "off");
ofono_modem_set_string(modem->modem, "Device", info->devnode);
Regards,
-Denis
_______________________________________________
ofono mailing list
ofono@ofono.org
https://lists.ofono.org/mailman/listinfo/ofono
