- dragonboard - lists.linaro.org

[PATCH v3 1/2] kernel: distro.config: enable 'fq' and 'fq_codel' qdiscs

by Koen Kooi

'fq_codel' is designed to fight bufferbloat, 'fq' can do similar things when coupled with the 'BBR' TCP congestion algorithm. Signed-off-by: Koen Kooi <koen.kooi(a)linaro.org> --- kernel/configs/distro.config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/configs/distro.config b/kernel/configs/distro.config index dfb1a9b..02d829f 100644 --- a/kernel/configs/distro.config +++ b/kernel/configs/distro.config @@ -328,6 +328,8 @@ CONFIG_BLK_DEV_THROTTLING=y CONFIG_CFQ_GROUP_IOSCHED=y CONFIG_NET_SCHED=y CONFIG_NET_CLS_CGROUP=m +CONFIG_NET_SCH_FQ_CODEL=m +CONFIG_NET_SCH_FQ=m CONFIG_CFS_BANDWIDTH=y CONFIG_IP_VS=m CONFIG_VXLAN=m -- 2.9.5

6 years, 2 months

2
2
0 0

[PATCH v2 1/3] kernel: distro.config: enable 'schedutil' CPUfreq governor

by Koen Kooi

Signed-off-by: Koen Kooi <koen.kooi(a)linaro.org> --- kernel/configs/distro.config | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/configs/distro.config b/kernel/configs/distro.config index b287f81..dfb1a9b 100644 --- a/kernel/configs/distro.config +++ b/kernel/configs/distro.config @@ -219,6 +219,7 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_GOV_POWERSAVE=y CONFIG_CPU_FREQ_GOV_ONDEMAND=y CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y CONFIG_CPU_FREQ_STAT=y CONFIG_PRINTK_TIME=y CONFIG_STACKTRACE=y -- 2.9.5

6 years, 2 months

2
5
0 0

[PATCH 1/3] kernel: distro.config: enable 'schedutil' CPUfreq governor

by Koen Kooi

Signed-off-by: Koen Kooi <koen.kooi(a)linaro.org> --- kernel/configs/distro.config | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/configs/distro.config b/kernel/configs/distro.config index b287f81..dfb1a9b 100644 --- a/kernel/configs/distro.config +++ b/kernel/configs/distro.config @@ -219,6 +219,7 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_GOV_POWERSAVE=y CONFIG_CPU_FREQ_GOV_ONDEMAND=y CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y CONFIG_CPU_FREQ_STAT=y CONFIG_PRINTK_TIME=y CONFIG_STACKTRACE=y -- 2.9.5

6 years, 2 months

2
4
0 0

[PATCH] Add pixel clock support to OV5640 camera sensor

by Manivannan Sadhasivam

Some of the camera subsystems like camss in Qualcommm MSM chipsets require pixel clock support in camera sensor drivers for proper functioning. So, add a default pixel clock rate of 96MHz to OV5640 camera sensor driver. According to the datasheet, 96MHz can be used as a pixel clock rate for most of the modes. This patch has been validated on Dragonboard410c with OV5640 connected using D3 Camera Mezzanine. Manivannan Sadhasivam (1): media: i2c: ov5640: Add pixel clock support drivers/media/i2c/ov5640.c | 4 ++++ 1 file changed, 4 insertions(+) -- 2.7.4

6 years, 2 months

1
1
0 0

[PATCH] drivers: soc: qcom: remove gps_proxy

by Ramon Fried

Implementation moved to userspace Change-Id: Ia090b0947ae2ab0e6869b33f98f5e03cb45a0c48 Signed-off-by: Ramon Fried <rfried(a)codeaurora.org> --- arch/arm64/configs/defconfig | 1 - drivers/soc/qcom/Kconfig | 8 -- drivers/soc/qcom/Makefile | 1 - drivers/soc/qcom/gps_proxy.c | 308 ------------------------------------------- 4 files changed, 318 deletions(-) delete mode 100644 drivers/soc/qcom/gps_proxy.c diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 025235f32911..c06d96455131 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -441,7 +441,6 @@ CONFIG_MSM_ADSPRPC=y CONFIG_QCOM_SMP2P=y CONFIG_QCOM_SMSM=y CONFIG_QCOM_WCNSS_CTRL=y -CONFIG_QTI_LNX_GPS_PROXY=y CONFIG_ARCH_TEGRA_132_SOC=y CONFIG_ARCH_TEGRA_210_SOC=y CONFIG_EXTCON_USB_GPIO=y diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig index 4a9844a5b82d..8412b2dce112 100644 --- a/drivers/soc/qcom/Kconfig +++ b/drivers/soc/qcom/Kconfig @@ -96,11 +96,3 @@ config BUS_TOPOLOGY_ADHOC directionality of connections by explicitly listing device connections thus avoiding illegal routes. -config QTI_LNX_GPS_PROXY - tristate "User mode QTI_LNX_GPS_PROXY device driver support" - help - This supports user mode QTI_LNX_GPS_PROXY - - Note that this application programming interface is EXPERIMENTAL - and hence SUBJECT TO CHANGE WITHOUT NOTICE while it stabilizes. - diff --git a/drivers/soc/qcom/Makefile b/drivers/soc/qcom/Makefile index 5eb303e2647b..d36b874dcd4a 100644 --- a/drivers/soc/qcom/Makefile +++ b/drivers/soc/qcom/Makefile @@ -10,4 +10,3 @@ obj-$(CONFIG_QCOM_WCNSS_CTRL) += wcnss_ctrl.o obj-$(CONFIG_MSM_BUS_SCALING) += msm_bus/ obj-$(CONFIG_BUS_TOPOLOGY_ADHOC) += msm_bus/ -obj-$(CONFIG_QTI_LNX_GPS_PROXY) += gps_proxy.o diff --git a/drivers/soc/qcom/gps_proxy.c b/drivers/soc/qcom/gps_proxy.c deleted file mode 100644 index d0b129cc530d..000000000000 --- a/drivers/soc/qcom/gps_proxy.c +++ /dev/null @@ -1,308 +0,0 @@ -/* Copyright (c) 2016, The Linux Foundation. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 and - * only version 2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include <linux/fs.h> -#include <linux/kernel.h> -#include <linux/errno.h> -#include <linux/init.h> -#include <linux/module.h> -#include <linux/slab.h> -#include <linux/wait.h> -#include <linux/tty.h> -#include <linux/tty_driver.h> -#include <linux/tty_flip.h> -#include <linux/serial.h> -#include <asm/uaccess.h> -#include <linux/seq_file.h> -#include <linux/module.h> -#include <linux/slab.h> -#include <linux/errno.h> -#include <linux/delay.h> -#include <linux/debugfs.h> -#include <linux/device.h> -#include <uapi/linux/gps_proxy.h> - -/* Module information */ -MODULE_DESCRIPTION( DRIVER_DESC ); -MODULE_LICENSE("GPL v2"); - -#define LOC_SERVICE_SVC_ID 0x00000010 -#define LOC_SERVICE_V1 2 -#define LOC_SERVICE_INS_ID 0 - -#define DRIVER_VERSION "v1.0" -#define DRIVER_DESC "GPS TTY driver" -#define MODULE_NAME "gps_proxy" -#define TTY_DRIVER_NAME "gps_serial" -#define TTY_DEV_NAME "ttyGPS" -#define MAX_TTY_BUFFER_SZ 0x10000 -#define GPS_TTY_MAJOR 100 /* experimental range */ -#define DEVICE_NAME "gps_proxy_ch" -#define CLASS_NAME "gps_proxy_class" - -static struct tty_driver *gps_proxy_tty_driver; -static struct tty_port gps_proxy_tty_port; -static bool g_port_open = false; -static struct semaphore g_port_sem; -static int gps_proxy_ch_driver_major = 0; -static struct class* gps_proxy_ch_class = 0; -static struct device* gps_proxy_ch_dev = 0; - -static void serial_port_shutdown(struct tty_port *tport) -{ -} - -static int serial_port_activate(struct tty_port *tport, struct tty_struct *tty) -{ - return 0; -} - -static struct tty_port_operations serial_port_ops = { - .activate = serial_port_activate, - .shutdown = serial_port_shutdown -}; - -static int gps_proxy_open(struct tty_struct *tty, struct file *file) -{ - int rc; - rc = tty_port_open(&gps_proxy_tty_port, tty, file); - g_port_open = true; - up(&g_port_sem); - return rc; -} - -static void gps_proxy_close(struct tty_struct *tty, struct file *file) -{ - tty_port_close(tty->port, tty, file); - g_port_open = false; - down(&g_port_sem); -} - -static void gps_proxy_tty_hangup(struct tty_struct *tty) -{ - tty_port_hangup(tty->port); -} - -static int gps_proxy_write(struct tty_struct *tty, - const unsigned char *buffer, int count) -{ - return count; -} - -static int gps_proxy_write_room(struct tty_struct *tty) -{ - return MAX_TTY_BUFFER_SZ; -} - -static int gps_proxy_tty_chars_in_buffer(struct tty_struct *tty) -{ - return 0; -} - - -static int gps_proxy_tiocmget(struct tty_struct *tty) -{ - return 0; -} - -static int gps_proxy_tiocmset(struct tty_struct *tty, - unsigned int set, unsigned int clear) -{ - return 0; -} - -static int gps_proxy_ioctl(struct tty_struct *tty, - unsigned int cmd, unsigned long arg) -{ - return 0; -} - -static struct tty_operations serial_ops = { - .open = gps_proxy_open, - .close = gps_proxy_close, - .hangup = gps_proxy_tty_hangup, - .write = gps_proxy_write, - .write_room = gps_proxy_write_room, - .chars_in_buffer = gps_proxy_tty_chars_in_buffer, - .tiocmget = gps_proxy_tiocmget, - .tiocmset = gps_proxy_tiocmset, - .ioctl = gps_proxy_ioctl, -}; - -int gps_proxy_ch_driver_open(struct inode *inode, struct file *filp) -{ - return 0; -} - -int gps_proxy_ch_driver_close(struct inode *inode, struct file *filp) -{ - return 0; -} - -long gps_proxy_chdev_ioctl(struct file *filp, unsigned int opt, unsigned long arg) -{ - int rc = 0; - struct gps_proxy_data buff; - switch (opt) - { - case QGPS_REGISTER_HANDLE: - /* DOWN is necessary to make client wait till port is open */ - if (!down_killable(&g_port_sem)) { - /* UP to semaphore is necessary here for close or - next register handle (for parity) */ - up(&g_port_sem); - rc = 0; - } - else { - rc = -EFAULT; - } - break; - case QGPS_SEND_NMEA: - pr_debug(KERN_INFO "Received string: %s\n", - ((struct gps_proxy_data*)arg)->nmea_string); - rc = access_ok(struct gps_proxy_data, (struct gps_proxy_data*)arg, - sizeof(struct gps_proxy_data)); - if (!rc) { - pr_err(KERN_ERR "Invalid argument was received\n"); - return rc; - } - rc = copy_from_user((void*)&buff, (void*)arg, sizeof(buff)); - if (rc) { - pr_err(KERN_ERR "Number of bytes that \ - couldn't be copied: %d", rc); - return -EFAULT; - } - if (buff.nmea_length < QMI_LOC_NMEA_STRING_MAX_LENGTH_V02 + 1) { - pr_debug(KERN_INFO "Received string: %s\n", - buff.nmea_string); - rc = tty_insert_flip_string(&gps_proxy_tty_port, - buff.nmea_string, - strnlen(buff.nmea_string, - QMI_LOC_NMEA_STRING_MAX_LENGTH_V02) + 1); - if (rc < 0) { - pr_err(KERN_ERR "Error flipping string"); - return rc; - } - tty_flip_buffer_push(&gps_proxy_tty_port); - } - else { - pr_err(KERN_ERR "Illegal message size"); - rc = -EFAULT; - } - break; - case QGPS_IS_ACTIVE: - if (g_port_open) - rc = 0; - else - rc = -EFAULT; - break; - default: - rc = -EFAULT; - break; - } - return rc; -} - -struct file_operations gps_proxy_ch_driver_ops = { - open: gps_proxy_ch_driver_open, - unlocked_ioctl: gps_proxy_chdev_ioctl, - release: gps_proxy_ch_driver_close -}; - -static int __init gps_proxy_init(void) -{ - int rc; - struct device *ttydev; - - sema_init(&g_port_sem,0); - - gps_proxy_ch_driver_major = register_chrdev(0, "gps_proxy_ch_dev", - &gps_proxy_ch_driver_ops); - if (gps_proxy_ch_driver_major < 0) { - pr_err(KERN_ERR "Failed to register char device\n"); - return -EFAULT; - } - else { - pr_debug(KERN_INFO "char device registered with major %d\n", - gps_proxy_ch_driver_major); - } - - /* Register the device class */ - gps_proxy_ch_class = class_create(THIS_MODULE, CLASS_NAME); - if (IS_ERR(gps_proxy_ch_class)){ - unregister_chrdev(gps_proxy_ch_driver_major, DEVICE_NAME); - pr_debug(KERN_ALERT "Failed to register device class\n"); - return -EFAULT; - } - pr_debug(KERN_INFO "EBBChar: device class registered correctly\n"); - - /* Register the device driver */ - gps_proxy_ch_dev = device_create(gps_proxy_ch_class, NULL, - MKDEV(gps_proxy_ch_driver_major, 0), NULL, DEVICE_NAME); - if (IS_ERR(gps_proxy_ch_dev)){ - class_destroy(gps_proxy_ch_class); - unregister_chrdev(gps_proxy_ch_driver_major, DEVICE_NAME); - pr_debug(KERN_ALERT "Failed to create the device\n"); - return -EFAULT; - } - - /* allocate the tty driver */ - gps_proxy_tty_driver = alloc_tty_driver(1); - if (!gps_proxy_tty_driver) - return -ENOMEM; - - tty_port_init(&gps_proxy_tty_port); - gps_proxy_tty_port.ops = &serial_port_ops; - - /* initialize the tty driver */ - gps_proxy_tty_driver->driver_name = TTY_DRIVER_NAME; - gps_proxy_tty_driver->name = TTY_DEV_NAME; - gps_proxy_tty_driver->major = GPS_TTY_MAJOR; - gps_proxy_tty_driver->minor_start = 0; - gps_proxy_tty_driver->type = TTY_DRIVER_TYPE_SERIAL; - gps_proxy_tty_driver->subtype = SERIAL_TYPE_NORMAL; - gps_proxy_tty_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV; - gps_proxy_tty_driver->init_termios = tty_std_termios; - - tty_set_operations(gps_proxy_tty_driver, &serial_ops); - - /* register the tty driver */ - rc = tty_register_driver(gps_proxy_tty_driver); - if (rc) { - pr_err("Failed to register gps_proxy tty driver\n"); - put_tty_driver(gps_proxy_tty_driver); - return rc; - } - - ttydev = tty_port_register_device(&gps_proxy_tty_port, gps_proxy_tty_driver, 0, 0); - if (IS_ERR(ttydev)) { - rc = PTR_ERR(ttydev); - pr_err("Failed to register gps_proxy tty proxy\n"); - return rc; - } - - pr_debug(KERN_INFO DRIVER_DESC " \n" DRIVER_VERSION); - return rc; -} - -static void __exit gps_proxy_exit(void) -{ - tty_unregister_device(gps_proxy_tty_driver, 0); - tty_unregister_driver(gps_proxy_tty_driver); - unregister_chrdev(gps_proxy_ch_driver_major, "gps_proxy_ch_dev"); - device_destroy(gps_proxy_ch_class, MKDEV(gps_proxy_ch_driver_major, 0)); - class_unregister(gps_proxy_ch_class); - class_destroy(gps_proxy_ch_class); -} - -late_initcall(gps_proxy_init); -module_exit(gps_proxy_exit); -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

6 years, 5 months

1
0
0 0

[meta-qcom] qmi-gps-proxy: install gps control script

by Ramon Fried

added install line for gps control script Signed-off-by: Ramon Fried <rfried(a)codeaurora.org> --- .../recipes-support/qmi-gps-proxy/qmi-gps-proxy_0.0+0+df3b976-6.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/openembedded-layer/recipes-support/qmi-gps-proxy/qmi-gps-proxy_0.0+0+df3b976-6.bb b/openembedded-layer/recipes-support/qmi-gps-proxy/qmi-gps-proxy_0.0+0+df3b976-6.bb index 5bea830..d5f86e9 100644 --- a/openembedded-layer/recipes-support/qmi-gps-proxy/qmi-gps-proxy_0.0+0+df3b976-6.bb +++ b/openembedded-layer/recipes-support/qmi-gps-proxy/qmi-gps-proxy_0.0+0+df3b976-6.bb @@ -31,6 +31,7 @@ do_install () { install -d ${D}${systemd_unitdir}/system/ install -m 0644 ${S}/debian/qmi-gps-proxy.service ${D}${systemd_unitdir}/system install -m 0644 ${S}/debian/gnss-gpsd.service ${D}${systemd_unitdir}/system + install -m 0755 ${S}/gps ${D}${bindir} install -d ${D}${sysconfdir}/udev/rules.d install -m 0644 ${S}/debian/gnss-gpsd.udev ${D}${sysconfdir}/udev/rules.d/gnss-gpsd.rules -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

6 years, 5 months

1
0
0 0

[PATCH] gps_proxy: rewrite as psuedo tty device

by Ramon Fried

1. Kernel tty device is substituted with pseudo-tty device. 2. NMEA flow doesn't start automatically, but on request. 3. NMEA flow is controlled externally with signals: - SIGUSR1 to stop - SIGUSR2 to start 4. Bash script file is added for sending NMEA flow controlling signals. The script receives input commands: start and stop Signed-off-by: Ramon Fried <rfried(a)codeaurora.org> --- gps | 24 ++++ gps_proxy.c | 410 ++++++++++++++++++++++++++++++++++++++++++++---------------- 2 files changed, 323 insertions(+), 111 deletions(-) create mode 100755 gps diff --git a/gps b/gps new file mode 100755 index 0000000..cccf259 --- /dev/null +++ b/gps @@ -0,0 +1,24 @@ +#!/bin/bash + +if [ 1 != $# ] +then echo "Unknown command" +exit -1 +fi + +GPS_PID=$(pidof gps_proxy) + +if [ "" = "$GPS_PID" ] +then echo "gps_proxy isn't running" +exit -1 +fi + +if [ "stop" = "$1" ] +then kill -s SIGUSR1 $GPS_PID + +elif [ "start" = "$1" ] +then kill -s SIGUSR2 $GPS_PID + +else +echo "Unknown command" +exit -1 +fi diff --git a/gps_proxy.c b/gps_proxy.c index 9980932..479a64d 100644 --- a/gps_proxy.c +++ b/gps_proxy.c @@ -27,8 +27,12 @@ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#define _GNU_SOURCE /* posix pseudo tty */ + #include <sys/mman.h> +#include <sys/signalfd.h> #include <sys/socket.h> +#include <sys/stat.h> #include <sys/types.h> #include <sys/ioctl.h> #include <ctype.h> @@ -36,6 +40,7 @@ #include <errno.h> #include <fcntl.h> #include <libqrtr.h> +#include <signal.h> #include <stdarg.h> #include <stdbool.h> #include <stdint.h> @@ -53,6 +58,19 @@ #define QMI_LOC_EVENT_MASK_NMEA_V02 ((uint64_t)0x00000004ull) #define MAX_BUF_SZ 512 +#define MAX_ATTEMPTS_CONNECT_TO_QRTR 5 +#define QRTR_CONNECTION_ATTEMPTS_INTERVAL 10 +#define MAX_SLAVE_DEV_NAME_SIZE 216 +#define MAX_COMMAND_SIZE 32 +#define CHECK_IF_ACTIVE_TIME 1 + +#define GPS_DEVICE_NAME "/dev/ttyGPS" + +#define STOP_SIG SIGUSR1 +#define START_SIG SIGUSR2 + +#define RD_WR_ALL_PERM 0666 + typedef enum { NEED_SEND = 1, NEED_RECV @@ -77,13 +95,14 @@ static unsigned g_txn = 1; static uint8_t g_session_id = 0; static uint32_t g_loc_node = -1; static uint32_t g_loc_port = -1; -static bool dbgprintf_enabled; +static bool g_dbgprintf_enabled; +static bool g_is_active = true; static void dbgprintf(const char *fmt, ...) { va_list ap; - if (!dbgprintf_enabled) + if (!g_dbgprintf_enabled) return; va_start(ap, fmt); @@ -91,7 +110,7 @@ static void dbgprintf(const char *fmt, ...) va_end(ap); } -int qrtr_send_recv(int sock, unsigned node, unsigned port, void *ptr, size_t len, char *buf, +static int qrtr_send_recv(int sock, unsigned node, unsigned port, void *ptr, size_t len, char *buf, size_t buf_len, unsigned *in_node, unsigned *in_port, struct qmi_packet **qmi, int op_mask) { @@ -128,17 +147,19 @@ static int check_result(struct gps_qmi_result *result) fprintf(stderr, "[GPS] Can't get response result from message\n"); return -EINVAL; } + if (result->result != QMI_GPS_RESULT_SUCCESS) { fprintf(stderr, "[GPS] Stop Response error: %d, %d\n", - (int)result->result,(int)result->error); + (int)result->result, (int)result->error); return -EINVAL; } + ++g_txn; return 0; } -int gps_send_start(int sock, unsigned node, unsigned port) +static int gps_send_start(int sock, unsigned node, unsigned port) { int ret = 0; struct gps_qmi_result *result; @@ -146,62 +167,58 @@ int gps_send_start(int sock, unsigned node, unsigned port) struct gps_loc_start_resp *resp; size_t len; void *ptr; - unsigned in_node,in_port; + unsigned in_node, in_port; char buf[MAX_BUF_SZ]; struct qmi_packet *qmi; unsigned txn; - dbgprintf("[GPS] send LOC_START to (%d:%d)\n", node, port); req = gps_loc_start_req_alloc(g_txn); - gps_loc_start_req_set_session_id(req,g_session_id); + gps_loc_start_req_set_session_id(req, g_session_id); ptr = gps_loc_start_req_encode(req, &len); if (!ptr) - goto free_resp; + goto free_req; ret = qrtr_send_recv(sock, node, port, ptr, len, buf, sizeof(buf), &in_node, &in_port, &qmi, NEED_SEND | NEED_RECV); if (!ret) - goto free_resp; + goto free_req; /* check response status */ - switch (qmi->msg_id) { - case QMI_GPS_LOC_START: + if (QMI_GPS_LOC_START == qmi->msg_id) { resp = gps_loc_start_resp_parse(qmi, qmi->msg_len, &txn); if ((!resp) || (txn != g_txn)) { fprintf(stderr, "[GPS] Invalid response message\n"); ret = -EINVAL; - goto free_resp; + goto free_req; } + result = gps_loc_start_resp_get_result(resp); ret = check_result(result); if (ret) - goto free_resp; - - break; + goto free_req; + } - default: + else { fprintf(stderr, "[GPS] Unknown message: id=%d size=%d\n", qmi->msg_id, qmi->msg_len); ret = -EINVAL; - break; } - -free_resp: +free_req: gps_loc_start_req_free(req); return ret; } -int gps_send_stop(int sock, unsigned node, unsigned port) +static int gps_send_stop(int sock, unsigned node, unsigned port) { int ret = 0; struct gps_qmi_result *result; struct gps_loc_stop_req *req; struct gps_loc_stop_resp *resp; void *ptr; - unsigned in_node,in_port; + unsigned in_node, in_port; char buf[MAX_BUF_SZ]; struct qmi_packet *qmi; unsigned txn; @@ -211,21 +228,21 @@ int gps_send_stop(int sock, unsigned node, unsigned port) dbgprintf("[GPS] send LOC_STOP to (%d:%d)\n", node, port); req = gps_loc_stop_req_alloc(g_txn); - gps_loc_stop_req_set_session_id(req,g_session_id); + gps_loc_stop_req_set_session_id(req, g_session_id); ptr = gps_loc_stop_req_encode(req, &len); if (!ptr) - goto free_resp; + goto free_req; ret = qrtr_send_recv(sock, node, port, ptr, len, buf, sizeof(buf), &in_node, &in_port, &qmi, NEED_SEND); if (!ret) - goto free_resp; + goto free_req; while (!stop) { ret = qrtr_send_recv(sock, node, port, ptr, len, buf, sizeof(buf), &in_node, &in_port, &qmi, NEED_RECV); if (!ret) - goto free_resp; + goto free_req; /* check response status */ switch (qmi->msg_id) { @@ -234,12 +251,13 @@ int gps_send_stop(int sock, unsigned node, unsigned port) if ((!resp) || (txn != g_txn)) { fprintf(stderr, "[GPS] Invalid response message\n"); ret = -EINVAL; - goto free_resp; + goto free_req; } + result = gps_loc_stop_resp_get_result(resp); ret = check_result(result); if (ret) - goto free_resp; + goto free_req; stop = 1; break; @@ -254,13 +272,13 @@ int gps_send_stop(int sock, unsigned node, unsigned port) } } -free_resp: +free_req: gps_loc_stop_req_free(req); return ret; } -int gps_send_register_nmea_event(int sock, unsigned node, unsigned port) +static int gps_send_register_nmea_event(int sock, unsigned node, unsigned port) { int ret = 0; struct gps_qmi_result *result; @@ -268,67 +286,62 @@ int gps_send_register_nmea_event(int sock, unsigned node, unsigned port) struct gps_loc_reg_events_resp *resp; size_t len; void *ptr; - unsigned in_node,in_port; + unsigned in_node, in_port; char buf[MAX_BUF_SZ]; struct qmi_packet *qmi; unsigned txn; - dbgprintf("[GPS] send LOC_REG_EVENT to (%d:%d)\n", node, port); req = gps_loc_reg_events_req_alloc(g_txn); - gps_loc_reg_events_req_set_event_reg_mask(req,QMI_LOC_EVENT_MASK_NMEA_V02); + gps_loc_reg_events_req_set_event_reg_mask(req, QMI_LOC_EVENT_MASK_NMEA_V02); ptr = gps_loc_reg_events_req_encode(req, &len); if (!ptr) - goto free_resp; + goto free_req; ret = qrtr_send_recv(sock, node, port, ptr, len, buf, sizeof(buf), &in_node, &in_port, &qmi, NEED_SEND | NEED_RECV); if (!ret) - goto free_resp; + goto free_req; /* check response status */ - switch (qmi->msg_id) { - case QMI_GPS_LOC_REG_EVENTS: + if (QMI_GPS_LOC_REG_EVENTS == qmi->msg_id) { resp = gps_loc_reg_events_resp_parse(qmi, qmi->msg_len, &txn); if ((!resp) || (txn != g_txn)) { fprintf(stderr, "[GPS] Invalid response message\n"); ret = -EINVAL; - goto free_resp; + goto free_req; } result = gps_loc_reg_events_resp_get_result(resp); ret = check_result(result); if (ret) - goto free_resp; - - break; + goto free_req; + } - default: + else { fprintf(stderr, "[GPS] Unknown message: id=%d size=%d\n", qmi->msg_id, qmi->msg_len); ret = -EINVAL; - break; } - -free_resp: +free_req: gps_loc_reg_events_req_free(req); return ret; } -void loc_service_cb(void *udata,uint32_t service,uint32_t instance,uint32_t node,uint32_t port) +static void loc_service_cb(void *udata, uint32_t service, uint32_t instance, uint32_t node, uint32_t port) { dbgprintf("[GPS] New LOC service found at (%u:%u)\n", node, port); g_loc_node = node; g_loc_port = port; } -int handle_gps_ind(int sock,int dev) +static int handle_gps_ind(int sock,int dev) { struct sockaddr_qrtr sq; socklen_t sl; char buf[MAX_BUF_SZ]; - int ret,len; + int ret, len; unsigned txn; struct gps_loc_event_nmea_ind *req; struct gps_proxy_data nmea_data; @@ -336,106 +349,281 @@ int handle_gps_ind(int sock,int dev) sl = sizeof(sq); len = ret = recvfrom(sock, buf, sizeof(buf), 0, (void *)&sq, &sl); if (ret < 0) { - fprintf(stderr, "[GPS] recvfrom failed: %d\n", ret); + perror("[GPS] recvfrom failed"); return ret; } - req = gps_loc_event_nmea_ind_parse(buf,len,&txn); + + req = gps_loc_event_nmea_ind_parse(buf, len, &txn); if (req) { - if (0 < gps_loc_event_nmea_ind_get_nmea(req,nmea_data.nmea_string,sizeof(nmea_data.nmea_string))) { + if (0 < gps_loc_event_nmea_ind_get_nmea(req, nmea_data.nmea_string, sizeof(nmea_data.nmea_string))) { nmea_data.nmea_length = strnlen(nmea_data.nmea_string, sizeof(nmea_data.nmea_string)-1) +1; - ret = ioctl(dev, QGPS_SEND_NMEA, &nmea_data); - if ( ret < 0) - { - fprintf(stderr, "[GPS] can't post nmea string: %d\n", ret); + ret = write(dev, nmea_data.nmea_string, strlen(nmea_data.nmea_string) + 1); + if (ret < 0) { + perror("[GPS] can't post nmea string"); } } } dbgprintf("[GPS] packet; from: %d:%d\n", sq.sq_node, sq.sq_port); - if (dbgprintf_enabled) + if (g_dbgprintf_enabled) print_hex_dump("[GPS <-]", buf, len); - return 0; + return (ret < 0) ? ret : 0; } -int main(int argc, char **argv) +static int pty_master_init(char* pty_slave_name) { - int gps_fd; - fd_set rfds; - int nfds; - int ret; - int ch_fd = 0; + int fd, fail_val = -1; - if (argc == 2 && strcmp(argv[1], "-v") == 0) - dbgprintf_enabled = true; + fd = posix_openpt(O_RDWR | O_NOCTTY); + if (fd < 0) { + perror("Failed to open pty master"); + return fail_val; + } + + if (grantpt(fd)) { + perror("Failed to grant pty"); + return fail_val; + } + + if (unlockpt(fd)) { + perror("Failed to unlock pty"); + return fail_val; + } + + if (ptsname_r(fd, pty_slave_name, MAX_SLAVE_DEV_NAME_SIZE)) { + perror("Failed to get slave device name"); + return fail_val; + } + + if (chmod(pty_slave_name, RD_WR_ALL_PERM)) + perror("Failed to change slave device permission"); + + if (unlink(GPS_DEVICE_NAME) && ENOENT != errno) { + perror("Failed to remove yhr old GPS device"); + return fail_val; + } - ch_fd = open("/dev/gps_proxy_ch", O_RDONLY); - if (ch_fd < 0){ - fprintf(stdout,"OPEN: %s\n", strerror(errno)); - return -1; + if (symlink(pty_slave_name, GPS_DEVICE_NAME)) { + perror("Failed to rename slave device"); + return fail_val; } + return fd; +} + +static int qrtr_init(void) +{ + int ret, gps_fd, fail_val = -1; + int attempt_to_connect_to_qrtr = MAX_ATTEMPTS_CONNECT_TO_QRTR; + gps_fd = qrtr_open(0); if (gps_fd < 0) { - fprintf(stderr, "failed to create qrtr socket"); - goto clean_file; + perror("failed to create qrtr socket"); + return fail_val; } - ret = qrtr_lookup(gps_fd, QMI_LOC_SERVICE, QMI_LOC_VERSION, - QMI_LOC_INSTANCE,0xFFFFFFFF,loc_service_cb,NULL); - if (ret < 0 || g_loc_node == -1 || g_loc_port == -1) { - fprintf(stderr, "failed to lookup LOC service"); - goto clean; + /* perform several atempts to connect to modem */ + while (attempt_to_connect_to_qrtr--) { + ret = qrtr_lookup(gps_fd, QMI_LOC_SERVICE, QMI_LOC_VERSION, + QMI_LOC_INSTANCE, 0xFFFFFFFF, loc_service_cb, NULL); + + if (ret < 0 || g_loc_node == -1 || g_loc_port == -1) { + fprintf(stderr, "failed to lookup LOC service\n"); + + if (attempt_to_connect_to_qrtr) + sleep(QRTR_CONNECTION_ATTEMPTS_INTERVAL); + } + else + break; } - - for (;;) { - ret = ioctl(ch_fd, QGPS_REGISTER_HANDLE, 0); - ret = gps_send_register_nmea_event(gps_fd,g_loc_node,g_loc_port); - if (ret < 0) { - fprintf(stderr, "failed to send LOC_REG_EVENTS"); - goto clean; + if (attempt_to_connect_to_qrtr < 0) { + fprintf(stderr, "failed to lookup LOC service for %d times with %d seconds interval\n", MAX_ATTEMPTS_CONNECT_TO_QRTR, QRTR_CONNECTION_ATTEMPTS_INTERVAL); + return fail_val; + } + + else { + fprintf(stdout, "GPS is activated\n"); + fflush(stdout); + } + + return gps_fd; +} + +static int sig_handler_init(void) +{ + int sig_fd, fail_val = -1; + sigset_t mask; + + sigemptyset(&mask); + sigaddset(&mask, STOP_SIG); + sigaddset(&mask, START_SIG); + + if (sigprocmask(SIG_BLOCK, &mask, NULL) < 0) { + perror("sigprocmask failed"); + return fail_val; + } + + sig_fd = signalfd(-1, &mask, 0); + if (sig_fd < 0) { + perror("signalfd failed"); + return fail_val; + } + + return sig_fd; +} + +static int gps_start(int gps_fd) +{ + int ret, fail_val = -1; + + ret = gps_send_register_nmea_event(gps_fd,g_loc_node,g_loc_port); + if (ret < 0) { + fprintf(stderr, "failed to send LOC_REG_EVENTS\n"); + return fail_val; + } + + ret = gps_send_start(gps_fd,g_loc_node,g_loc_port); + if (ret < 0) { + fprintf(stderr, "failed to send LOC_START\n"); + return fail_val; + } + + return 0; +} + +static int gps_stop(int gps_fd) +{ + int ret, fail_val = -1; + + ret = gps_send_stop(gps_fd, g_loc_node, g_loc_port); + if (ret < 0) { + fprintf(stderr, "failed to send LOC_STOP\n"); + return fail_val; + } + + return 0; +} + +static void nmea_disable(void) +{ + g_is_active = false; +} + +static void nmea_enable(void) +{ + g_is_active = true; +} + +static int check_if_signal(int socket, int signal) +{ + struct signalfd_siginfo sig_info; + ssize_t res; + int fail_val = 0; + + res = read(socket, &sig_info, sizeof(sig_info)); + + if (res < 0 || res != sizeof(sig_info)) { + perror("sig_fd read failed"); + return fail_val; + } + + return sig_info.ssi_signo == signal; +} + +static int check_if_stop(int socket) +{ + return check_if_signal(socket, STOP_SIG); +} + +static int check_if_start(int socket) +{ + return check_if_signal(socket, START_SIG); +} + +static void wait_for_start(int socket) +{ + while (true) { + if (check_if_start(socket)) { + nmea_enable(); + break; } - ret = gps_send_start(gps_fd,g_loc_node,g_loc_port); + } +} + +static void transit_gps_data(int source_fd, int destination_fd, int sig_fd) +{ + fd_set rfds; + int nfds; + int ret; + + nfds = MAX(source_fd, sig_fd) + 1; + + while (g_is_active) { + FD_ZERO(&rfds); + FD_SET(source_fd, &rfds); + FD_SET(sig_fd, &rfds); + + ret = select(nfds, &rfds, NULL, NULL, NULL); if (ret < 0) { - fprintf(stderr, "failed to send LOC_START"); - goto clean; + perror("select failed"); + break; + } else if (ret == 0) { + continue; } - for (;;) { - FD_ZERO(&rfds); - FD_SET(gps_fd, &rfds); + if (FD_ISSET(sig_fd, &rfds) && check_if_stop(sig_fd)) { + nmea_disable(); + break; + } - nfds = gps_fd + 1; - ret = select(nfds, &rfds, NULL, NULL, NULL); - if (ret < 0) { - fprintf(stderr, "select failed: %d\n", ret); - break; - } else if (ret == 0) { - continue; - } + if (FD_ISSET(source_fd, &rfds)) + handle_gps_ind(source_fd, destination_fd); + } +} + +int main(int argc, char **argv) +{ + int gps_fd, pty_m_fd, sig_fd; + int ret; + char pty_slave_name[MAX_SLAVE_DEV_NAME_SIZE]; + + if (argc == 2 && strcmp(argv[1], "-v") == 0) + g_dbgprintf_enabled = true; - if (FD_ISSET(gps_fd, &rfds)) - handle_gps_ind(gps_fd,ch_fd); + sig_fd = sig_handler_init(); + if (sig_fd < 0) + goto clean_signal; + + pty_m_fd = pty_master_init(pty_slave_name); + if (pty_m_fd < 0) + goto clean_file; + + gps_fd = qrtr_init(); + if (gps_fd < 0) + goto clean; + + while (true) { + wait_for_start(sig_fd); - ret = ioctl(ch_fd, QGPS_IS_ACTIVE, 0); - if (0!=ret) { - dbgprintf("All clients have disconnected\n"); - break; - } - } + ret = gps_start(gps_fd); + if (ret < 0) + goto clean; - ret = gps_send_stop(gps_fd,g_loc_node,g_loc_port); - if (ret < 0) { - fprintf(stderr, "failed to send LOC_STOP"); + transit_gps_data(gps_fd, pty_m_fd, sig_fd); + + ret = gps_stop(gps_fd); + if (ret < 0) goto clean; - } } clean: qrtr_close(gps_fd); clean_file: - close(ch_fd); - return 0; + close(pty_m_fd); +clean_signal: + close(sig_fd); + return EXIT_SUCCESS; } -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

6 years, 5 months

1
0
0 0

[PATCH] gps_proxy: Remove dependency from kernel code and change NMEA flow control.

by Ramon Fried

From: Alona Solntseva <asolnt(a)codeaurora.org> 1. Kernel tty device is substituted with pseudo-tty device. 2. NMEA flow doesn't start automatically, but on request. 3. NMEA flow is controlled externally with signals: - SIGUSR1 to stop - SIGUSR2 to start 4. Bash script file is added for sending NMEA flow controlling signals. The script receives input commands: start and stop Change-Id: If7ef2cf55260550e7a9302039e3fa16360f51395 Signed-off-by: Ramon Fried <rfried(a)codeaurora.org> --- gps_userspace_proxy/gps | 24 +++ gps_userspace_proxy/gps_proxy.c | 418 ++++++++++++++++++++++++++++------------ 2 files changed, 324 insertions(+), 118 deletions(-) create mode 100755 gps_userspace_proxy/gps diff --git a/gps_userspace_proxy/gps b/gps_userspace_proxy/gps new file mode 100755 index 0000000..cccf259 --- /dev/null +++ b/gps_userspace_proxy/gps @@ -0,0 +1,24 @@ +#!/bin/bash + +if [ 1 != $# ] +then echo "Unknown command" +exit -1 +fi + +GPS_PID=$(pidof gps_proxy) + +if [ "" = "$GPS_PID" ] +then echo "gps_proxy isn't running" +exit -1 +fi + +if [ "stop" = "$1" ] +then kill -s SIGUSR1 $GPS_PID + +elif [ "start" = "$1" ] +then kill -s SIGUSR2 $GPS_PID + +else +echo "Unknown command" +exit -1 +fi diff --git a/gps_userspace_proxy/gps_proxy.c b/gps_userspace_proxy/gps_proxy.c index ab01873..6d54845 100644 --- a/gps_userspace_proxy/gps_proxy.c +++ b/gps_userspace_proxy/gps_proxy.c @@ -27,8 +27,12 @@ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#define _GNU_SOURCE /* posix pseudo tty */ + #include <sys/mman.h> +#include <sys/signalfd.h> #include <sys/socket.h> +#include <sys/stat.h> #include <sys/types.h> #include <sys/ioctl.h> #include <ctype.h> @@ -36,6 +40,7 @@ #include <errno.h> #include <fcntl.h> #include <libqrtr.h> +#include <signal.h> #include <stdarg.h> #include <stdbool.h> #include <stdint.h> @@ -53,6 +58,19 @@ #define QMI_LOC_EVENT_MASK_NMEA_V02 ((uint64_t)0x00000004ull) #define MAX_BUF_SZ 512 +#define MAX_ATTEMPTS_CONNECT_TO_QRTR 5 +#define QRTR_CONNECTION_ATTEMPTS_INTERVAL 10 +#define MAX_SLAVE_DEV_NAME_SIZE 216 +#define MAX_COMMAND_SIZE 32 +#define CHECK_IF_ACTIVE_TIME 1 + +#define GPS_DEVICE_NAME "/dev/ttyGPS" + +#define STOP_SIG SIGUSR1 +#define START_SIG SIGUSR2 + +#define RD_WR_ALL_PERM 0666 + typedef enum { NEED_SEND = 1, NEED_RECV @@ -66,7 +84,6 @@ struct qmi_packet { uint8_t data[]; } __attribute__((__packed__)); -/* TODO: include from kernel once it lands */ struct sockaddr_qrtr { unsigned short sq_family; uint32_t sq_node; @@ -77,13 +94,14 @@ static unsigned g_txn = 1; static uint8_t g_session_id = 0; static uint32_t g_loc_node = -1; static uint32_t g_loc_port = -1; -static bool dbgprintf_enabled; +static bool g_dbgprintf_enabled; +static bool g_is_active = true; static void dbgprintf(const char *fmt, ...) { va_list ap; - if (!dbgprintf_enabled) + if (!g_dbgprintf_enabled) return; va_start(ap, fmt); @@ -91,7 +109,7 @@ static void dbgprintf(const char *fmt, ...) va_end(ap); } -int qrtr_send_recv(int sock, unsigned node, unsigned port, void *ptr, size_t len, char *buf, +static int qrtr_send_recv(int sock, unsigned node, unsigned port, void *ptr, size_t len, char *buf, size_t buf_len, unsigned *in_node, unsigned *in_port, struct qmi_packet **qmi, int op_mask) { @@ -128,17 +146,19 @@ static int check_result(struct gps_qmi_result *result) fprintf(stderr, "[GPS] Can't get response result from message\n"); return -EINVAL; } + if (result->result != QMI_GPS_RESULT_SUCCESS) { fprintf(stderr, "[GPS] Stop Response error: %d, %d\n", - (int)result->result,(int)result->error); + (int)result->result, (int)result->error); return -EINVAL; } + ++g_txn; return 0; } -int gps_send_start(int sock, unsigned node, unsigned port) +static int gps_send_start(int sock, unsigned node, unsigned port) { int ret = 0; struct gps_qmi_result *result; @@ -146,62 +166,58 @@ int gps_send_start(int sock, unsigned node, unsigned port) struct gps_loc_start_resp *resp; size_t len; void *ptr; - unsigned in_node,in_port; + unsigned in_node, in_port; char buf[MAX_BUF_SZ]; struct qmi_packet *qmi; unsigned txn; - dbgprintf("[GPS] send LOC_START to (%d:%d)\n", node, port); req = gps_loc_start_req_alloc(g_txn); - gps_loc_start_req_set_session_id(req,g_session_id); + gps_loc_start_req_set_session_id(req, g_session_id); ptr = gps_loc_start_req_encode(req, &len); if (!ptr) - goto free_resp; + goto free_req; ret = qrtr_send_recv(sock, node, port, ptr, len, buf, sizeof(buf), &in_node, &in_port, &qmi, NEED_SEND | NEED_RECV); if (!ret) - goto free_resp; + goto free_req; /* check response status */ - switch (qmi->msg_id) { - case QMI_GPS_LOC_START: + if (QMI_GPS_LOC_START == qmi->msg_id) { resp = gps_loc_start_resp_parse(qmi, qmi->msg_len, &txn); if ((!resp) || (txn != g_txn)) { fprintf(stderr, "[GPS] Invalid response message\n"); ret = -EINVAL; - goto free_resp; + goto free_req; } + result = gps_loc_start_resp_get_result(resp); ret = check_result(result); if (ret) - goto free_resp; - - break; + goto free_req; + } - default: + else { fprintf(stderr, "[GPS] Unknown message: id=%d size=%d\n", qmi->msg_id, qmi->msg_len); ret = -EINVAL; - break; } - -free_resp: +free_req: gps_loc_start_req_free(req); return ret; } -int gps_send_stop(int sock, unsigned node, unsigned port) +static int gps_send_stop(int sock, unsigned node, unsigned port) { int ret = 0; struct gps_qmi_result *result; struct gps_loc_stop_req *req; struct gps_loc_stop_resp *resp; void *ptr; - unsigned in_node,in_port; + unsigned in_node, in_port; char buf[MAX_BUF_SZ]; struct qmi_packet *qmi; unsigned txn; @@ -211,21 +227,21 @@ int gps_send_stop(int sock, unsigned node, unsigned port) dbgprintf("[GPS] send LOC_STOP to (%d:%d)\n", node, port); req = gps_loc_stop_req_alloc(g_txn); - gps_loc_stop_req_set_session_id(req,g_session_id); + gps_loc_stop_req_set_session_id(req, g_session_id); ptr = gps_loc_stop_req_encode(req, &len); if (!ptr) - goto free_resp; + goto free_req; ret = qrtr_send_recv(sock, node, port, ptr, len, buf, sizeof(buf), &in_node, &in_port, &qmi, NEED_SEND); if (!ret) - goto free_resp; + goto free_req; while (!stop) { ret = qrtr_send_recv(sock, node, port, ptr, len, buf, sizeof(buf), &in_node, &in_port, &qmi, NEED_RECV); if (!ret) - goto free_resp; + goto free_req; /* check response status */ switch (qmi->msg_id) { @@ -234,12 +250,13 @@ int gps_send_stop(int sock, unsigned node, unsigned port) if ((!resp) || (txn != g_txn)) { fprintf(stderr, "[GPS] Invalid response message\n"); ret = -EINVAL; - goto free_resp; + goto free_req; } + result = gps_loc_stop_resp_get_result(resp); ret = check_result(result); if (ret) - goto free_resp; + goto free_req; stop = 1; break; @@ -254,13 +271,13 @@ int gps_send_stop(int sock, unsigned node, unsigned port) } } -free_resp: +free_req: gps_loc_stop_req_free(req); return ret; } -int gps_send_register_nmea_event(int sock, unsigned node, unsigned port) +static int gps_send_register_nmea_event(int sock, unsigned node, unsigned port) { int ret = 0; struct gps_qmi_result *result; @@ -268,67 +285,63 @@ int gps_send_register_nmea_event(int sock, unsigned node, unsigned port) struct gps_loc_reg_events_resp *resp; size_t len; void *ptr; - unsigned in_node,in_port; + unsigned in_node, in_port; char buf[MAX_BUF_SZ]; struct qmi_packet *qmi; unsigned txn; - dbgprintf("[GPS] send LOC_REG_EVENT to (%d:%d)\n", node, port); req = gps_loc_reg_events_req_alloc(g_txn); - gps_loc_reg_events_req_set_event_reg_mask(req,QMI_LOC_EVENT_MASK_NMEA_V02); + gps_loc_reg_events_req_set_event_reg_mask(req, QMI_LOC_EVENT_MASK_NMEA_V02); ptr = gps_loc_reg_events_req_encode(req, &len); if (!ptr) - goto free_resp; + goto free_req; ret = qrtr_send_recv(sock, node, port, ptr, len, buf, sizeof(buf), &in_node, &in_port, &qmi, NEED_SEND | NEED_RECV); if (!ret) - goto free_resp; + goto free_req; /* check response status */ - switch (qmi->msg_id) { - case QMI_GPS_LOC_REG_EVENTS: + if (QMI_GPS_LOC_REG_EVENTS == qmi->msg_id) { resp = gps_loc_reg_events_resp_parse(qmi, qmi->msg_len, &txn); if ((!resp) || (txn != g_txn)) { fprintf(stderr, "[GPS] Invalid response message\n"); ret = -EINVAL; - goto free_resp; + goto free_req; } + result = gps_loc_reg_events_resp_get_result(resp); ret = check_result(result); if (ret) - goto free_resp; - - break; + goto free_req; + } - default: + else { fprintf(stderr, "[GPS] Unknown message: id=%d size=%d\n", qmi->msg_id, qmi->msg_len); ret = -EINVAL; - break; } - -free_resp: +free_req: gps_loc_reg_events_req_free(req); return ret; } -void loc_service_cb(void *udata,uint32_t service,uint32_t instance,uint32_t node,uint32_t port) +static void loc_service_cb(void *udata, uint32_t service, uint32_t instance, uint32_t node, uint32_t port) { dbgprintf("[GPS] New LOC service found at (%u:%u)\n", node, port); g_loc_node = node; g_loc_port = port; } -int handle_gps_ind(int sock,int dev) +static int handle_gps_ind(int sock,int dev) { struct sockaddr_qrtr sq; socklen_t sl; char buf[MAX_BUF_SZ]; - int ret,len; + int ret, len; unsigned txn; struct gps_loc_event_nmea_ind *req; struct gps_proxy_data nmea_data; @@ -336,112 +349,281 @@ int handle_gps_ind(int sock,int dev) sl = sizeof(sq); len = ret = recvfrom(sock, buf, sizeof(buf), 0, (void *)&sq, &sl); if (ret < 0) { - fprintf(stderr, "[GPS] recvfrom failed: %d\n", ret); + perror("[GPS] recvfrom failed"); return ret; } - req = gps_loc_event_nmea_ind_parse(buf,len,&txn); + + req = gps_loc_event_nmea_ind_parse(buf, len, &txn); if (req) { - if (0 < gps_loc_event_nmea_ind_get_nmea(req,nmea_data.nmea_string,sizeof(nmea_data.nmea_string))) { + if (0 < gps_loc_event_nmea_ind_get_nmea(req, nmea_data.nmea_string, sizeof(nmea_data.nmea_string))) { nmea_data.nmea_length = strnlen(nmea_data.nmea_string, sizeof(nmea_data.nmea_string)-1) +1; - ret = ioctl(dev, QGPS_SEND_NMEA, &nmea_data); - if ( ret < 0) - { - fprintf(stderr, "[GPS] can't post nmea string: %d\n", ret); + ret = write(dev, nmea_data.nmea_string, strlen(nmea_data.nmea_string) + 1); + if (ret < 0) { + perror("[GPS] can't post nmea string"); } } } dbgprintf("[GPS] packet; from: %d:%d\n", sq.sq_node, sq.sq_port); - if (dbgprintf_enabled) - print_hex_dump("[GPS <-]", buf, ret); + if (g_dbgprintf_enabled) + print_hex_dump("[GPS <-]", buf, len); - return 0; + return (ret < 0) ? ret : 0; } -int main(int argc, char **argv) +static int pty_master_init(char* pty_slave_name) { - int gps_fd; - fd_set rfds; - int nfds; - int ret; - int ch_fd = 0; + int fd, fail_val = -1; - if (argc == 2 && strcmp(argv[1], "-v") == 0) - dbgprintf_enabled = true; + fd = posix_openpt(O_RDWR | O_NOCTTY); + if (fd < 0) { + perror("Failed to open pty master"); + return fail_val; + } + + if (grantpt(fd)) { + perror("Failed to grant pty"); + return fail_val; + } + + if (unlockpt(fd)) { + perror("Failed to unlock pty"); + return fail_val; + } + + if (ptsname_r(fd, pty_slave_name, MAX_SLAVE_DEV_NAME_SIZE)) { + perror("Failed to get slave device name"); + return fail_val; + } + + if (chmod(pty_slave_name, RD_WR_ALL_PERM)) + perror("Failed to change slave device permission"); + + if (unlink(GPS_DEVICE_NAME) && ENOENT != errno) { + perror("Failed to remove yhr old GPS device"); + return fail_val; + } - ch_fd = open("/dev/gps_proxy_ch", O_RDONLY); - if (ch_fd < 0){ - fprintf(stdout,"OPEN: %s\n", strerror(errno)); - return -1; + if (symlink(pty_slave_name, GPS_DEVICE_NAME)) { + perror("Failed to rename slave device"); + return fail_val; } + return fd; +} + +static int qrtr_init(void) +{ + int ret, gps_fd, fail_val = -1; + int attempt_to_connect_to_qrtr = MAX_ATTEMPTS_CONNECT_TO_QRTR; + gps_fd = qrtr_open(0); if (gps_fd < 0) { - fprintf(stderr, "failed to create qrtr socket"); - goto clean_file; + perror("failed to create qrtr socket"); + return fail_val; } - ret = qrtr_lookup(gps_fd, QMI_LOC_SERVICE, QMI_LOC_VERSION, - QMI_LOC_INSTANCE,0xFFFFFFFF,loc_service_cb,NULL); - if (ret < 0 || g_loc_node == -1 || g_loc_port == -1) { - fprintf(stderr, "failed to lookup LOC service"); - goto clean; + /* perform several atempts to connect to modem */ + while (attempt_to_connect_to_qrtr--) { + ret = qrtr_lookup(gps_fd, QMI_LOC_SERVICE, QMI_LOC_VERSION, + QMI_LOC_INSTANCE, 0xFFFFFFFF, loc_service_cb, NULL); + + if (ret < 0 || g_loc_node == -1 || g_loc_port == -1) { + fprintf(stderr, "failed to lookup LOC service\n"); + + if (attempt_to_connect_to_qrtr) + sleep(QRTR_CONNECTION_ATTEMPTS_INTERVAL); + } + else + break; } - - for (;;) { - ret = ioctl(ch_fd, QGPS_REGISTER_HANDLE, 0); - if (ret < 0) { - fprintf(stderr, "failed at QGPS_REGISTER_HANDLE"); - goto clean; + + if (attempt_to_connect_to_qrtr < 0) { + fprintf(stderr, "failed to lookup LOC service for %d times with %d seconds interval\n", MAX_ATTEMPTS_CONNECT_TO_QRTR, QRTR_CONNECTION_ATTEMPTS_INTERVAL); + return fail_val; + } + + else { + fprintf(stdout, "GPS is activated\n"); + fflush(stdout); + } + + return gps_fd; +} + +static int sig_handler_init(void) +{ + int sig_fd, fail_val = -1; + sigset_t mask; + + sigemptyset(&mask); + sigaddset(&mask, STOP_SIG); + sigaddset(&mask, START_SIG); + + if (sigprocmask(SIG_BLOCK, &mask, NULL) < 0) { + perror("sigprocmask failed"); + return fail_val; + } + + sig_fd = signalfd(-1, &mask, 0); + if (sig_fd < 0) { + perror("signalfd failed"); + return fail_val; + } + + return sig_fd; +} + +static int gps_start(int gps_fd) +{ + int ret, fail_val = -1; + + ret = gps_send_register_nmea_event(gps_fd,g_loc_node,g_loc_port); + if (ret < 0) { + fprintf(stderr, "failed to send LOC_REG_EVENTS\n"); + return fail_val; + } + + ret = gps_send_start(gps_fd,g_loc_node,g_loc_port); + if (ret < 0) { + fprintf(stderr, "failed to send LOC_START\n"); + return fail_val; + } + + return 0; +} + +static int gps_stop(int gps_fd) +{ + int ret, fail_val = -1; + + ret = gps_send_stop(gps_fd, g_loc_node, g_loc_port); + if (ret < 0) { + fprintf(stderr, "failed to send LOC_STOP\n"); + return fail_val; + } + + return 0; +} + +static void nmea_disable(void) +{ + g_is_active = false; +} + +static void nmea_enable(void) +{ + g_is_active = true; +} + +static int check_if_signal(int socket, int signal) +{ + struct signalfd_siginfo sig_info; + ssize_t res; + int fail_val = 0; + + res = read(socket, &sig_info, sizeof(sig_info)); + + if (res < 0 || res != sizeof(sig_info)) { + perror("sig_fd read failed"); + return fail_val; + } + + return sig_info.ssi_signo == signal; +} + +static int check_if_stop(int socket) +{ + return check_if_signal(socket, STOP_SIG); +} + +static int check_if_start(int socket) +{ + return check_if_signal(socket, START_SIG); +} + +static void wait_for_start(int socket) +{ + while (true) { + if (check_if_start(socket)) { + nmea_enable(); + break; } - ret = gps_send_register_nmea_event(gps_fd,g_loc_node,g_loc_port); + } +} + +static void transit_gps_data(int source_fd, int destination_fd, int sig_fd) +{ + fd_set rfds; + int nfds; + int ret; + + nfds = MAX(source_fd, sig_fd) + 1; + + while (g_is_active) { + FD_ZERO(&rfds); + FD_SET(source_fd, &rfds); + FD_SET(sig_fd, &rfds); + + ret = select(nfds, &rfds, NULL, NULL, NULL); if (ret < 0) { - fprintf(stderr, "failed to send LOC_REG_EVENTS"); - goto clean; + perror("select failed"); + break; + } else if (ret == 0) { + continue; } - ret = gps_send_start(gps_fd,g_loc_node,g_loc_port); - if (ret < 0) { - fprintf(stderr, "failed to send LOC_START"); - goto clean; + if (FD_ISSET(sig_fd, &rfds) && check_if_stop(sig_fd)) { + nmea_disable(); + break; } - for (;;) { - FD_ZERO(&rfds); - FD_SET(gps_fd, &rfds); + if (FD_ISSET(source_fd, &rfds)) + handle_gps_ind(source_fd, destination_fd); + } +} - nfds = gps_fd + 1; - ret = select(nfds, &rfds, NULL, NULL, NULL); - if (ret < 0) { - fprintf(stderr, "select failed: %d\n", ret); - break; - } else if (ret == 0) { - continue; - } +int main(int argc, char **argv) +{ + int gps_fd, pty_m_fd, sig_fd; + int ret; + char pty_slave_name[MAX_SLAVE_DEV_NAME_SIZE]; + + if (argc == 2 && strcmp(argv[1], "-v") == 0) + g_dbgprintf_enabled = true; + + sig_fd = sig_handler_init(); + if (sig_fd < 0) + goto clean_signal; + + pty_m_fd = pty_master_init(pty_slave_name); + if (pty_m_fd < 0) + goto clean_file; + + gps_fd = qrtr_init(); + if (gps_fd < 0) + goto clean; - if (FD_ISSET(gps_fd, &rfds)) - handle_gps_ind(gps_fd,ch_fd); + while (true) { + wait_for_start(sig_fd); - ret = ioctl(ch_fd, QGPS_IS_ACTIVE, 0); - if (0!=ret) { - dbgprintf("All clients have disconnected\n"); - fflush(stdout); - break; - } - } + ret = gps_start(gps_fd); + if (ret < 0) + goto clean; - ret = gps_send_stop(gps_fd,g_loc_node,g_loc_port); - if (ret < 0) { - fprintf(stderr, "failed to send LOC_STOP"); + transit_gps_data(gps_fd, pty_m_fd, sig_fd); + + ret = gps_stop(gps_fd); + if (ret < 0) goto clean; - } - fflush(stdout); } clean: qrtr_close(gps_fd); clean_file: - close(ch_fd); - return 0; + close(pty_m_fd); +clean_signal: + close(sig_fd); + return EXIT_SUCCESS; } -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

6 years, 5 months

1
0
0 0

Problem using kgdboc for kernel debug

by Chris Simmonds

Hi, I am trying to get kgdb and kdb to work on DB410c, but I am having problems with the serial driver. I have compiled with these options: CONFIG_KGDB=y CONFIG_KGDB_SERIAL_CONSOLE=y CONFIG_KGDB_KDB=y CONFIG_KDB_DEFAULT_ENABLE=0x1 I am using the kernel from git.linaro.org/landing-teams/working/qualcomm/kernel.git, branch release/qcomlt-4.9. So, I enable kdb/kgdb on the serial console like so: echo ttyMSM0 > /sys/module/kgdboc/parameters/kgdboc echo g > /proc/sysrq-trigger Then it enters kdb mode, and things start to go wrong. For example, keystrokes are sometimes ignored, and then repeated 20 or 30 times after a few other keystrokes. When trying to connect to kgdb over a serial line (after quitting from the terminal emulator on the console, of course) I don't get any connection. I have a feeling that it is a problem with the implementation of poll_get_char and poll_put_char in the serial driver. Has anyone seen this type of behaviour? Any ideas on how to fix? Regards, Chris Simmonds

6 years, 5 months

1
0
0 0

[PATCH v2] distro.config: enable USB device class drivers

by Manivannan Sadhasivam

This patch enables USB device class drivers which were enabled by default in previous releases till 16.09 Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam(a)linaro.org> --- kernel/configs/distro.config | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kernel/configs/distro.config b/kernel/configs/distro.config index 776ab3d..f7026de 100644 --- a/kernel/configs/distro.config +++ b/kernel/configs/distro.config @@ -132,6 +132,11 @@ CONFIG_USB_NET_SMSC75XX=m CONFIG_USB_NET_SMSC95XX=m CONFIG_USB_NET_MCS7830=m +# USB device class +CONFIG_USB_ACM=m +CONFIG_USB_PRINTER=m +CONFIG_USB_WDM=m + # LEDs CONFIG_LEDS_CLASS=y CONFIG_LEDS_GPIO=y -- 2.7.4

6 years, 7 months

2
1
0 0

2024

2023

2022

2021

2020

2019

2018

2017

dragonboard