Received: by 2002:a05:6358:9144:b0:117:f937:c515 with SMTP id r4csp5767552rwr; Mon, 1 May 2023 10:24:51 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4YETHmA6edzrNoTupzyrv6xpPmkc1GjxaD42Xqqe7xEX0DUS+IooQAlzxTKbCrdKDKT3AK X-Received: by 2002:a17:90b:1d01:b0:247:4f32:d108 with SMTP id on1-20020a17090b1d0100b002474f32d108mr15516623pjb.13.1682961891108; Mon, 01 May 2023 10:24:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682961891; cv=none; d=google.com; s=arc-20160816; b=ekKTbNQ1ndhm5xdi3wlAGRRvUQ8bn6jINUBwZWT24IPwuKl6IhdL4LGiYZUBkE1nX3 p/vzDwZh6Ut56YoL6kQuQHhMOLPi5EmbY9Zh+JidBiQQ7yuhDuP7gSblCTpY5FHMbRQR QP7cQAdFN2c+6vrl+8tiaapr2YVLYs2LpWYkbp4Air3lHKIqzUR8me/DFK/FXcsiYuhb rffyYvFdGnj6pNhzRnVXn0nZdD6UEJcJErj9na9DnGpJ9djmsrG2fapmBt9rX6V3AHZv sX0EtD+NuH6dFwoS+7jwZ2Kwlp4oQDSxXkoUnV5yHRml3VekHUpJ4jLKI7OZf1NpCt9N gtUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:organization :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=xTUiam1mNVkvBIOCFygEjOsaIx+Hp4y9WTKziIxXGUc=; b=HjrzPitA1hl5E0mPDAWoCtrxkXaqlxuuXgBUpItTJffFfnIbhfxBsiuJmHaQPPivEY EJE8YUvdzDKvnlmkcdekKI+NBxxF4qfCCuzfAMNDJeLfJoMDfKo9uPFBW/9NaebqFKNk DneslJaziP9lMOVERG6JjFQ6XiO0cveEELQ4cZAECvH+DwZZA/wSY0HNZjhzuPxh7/9I BTGPbP4GKKtD/8LxyTuM1QaaFsRG/RCrw03hBfQ6LIlrYYWHycpDKryGWksm8Mk71ICl 11MF6Z7zQQij3X44vOgm+dN7rSBvBQfC1HFvn67pK01sykKKQk1QEizSLhpyRSw1bFcc csYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kolabnow.com header.s=dkim20160331 header.b=myEJZQ7o; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e185-20020a6369c2000000b0052c2061447dsi2977511pgc.522.2023.05.01.10.24.39; Mon, 01 May 2023 10:24:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kolabnow.com header.s=dkim20160331 header.b=myEJZQ7o; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232394AbjEARSJ (ORCPT + 99 others); Mon, 1 May 2023 13:18:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54028 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231467AbjEARSF (ORCPT ); Mon, 1 May 2023 13:18:05 -0400 Received: from mx.kolabnow.com (mx.kolabnow.com [212.103.80.154]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 46DD81727; Mon, 1 May 2023 10:17:27 -0700 (PDT) Received: from localhost (unknown [127.0.0.1]) by mx.kolabnow.com (Postfix) with ESMTP id E46321285; Mon, 1 May 2023 19:01:43 +0200 (CEST) Authentication-Results: ext-mx-out002.mykolab.com (amavisd-new); dkim=pass (4096-bit key) reason="pass (just generated, assumed good)" header.d=kolabnow.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= content-transfer-encoding:organization:mime-version:references :in-reply-to:message-id:date:date:subject:subject:from:from :received:received:received; s=dkim20160331; t=1682960501; x= 1684774902; bh=xTUiam1mNVkvBIOCFygEjOsaIx+Hp4y9WTKziIxXGUc=; b=m yEJZQ7ojeN7+Viyk+MZVj/6XgzMi9jxP7nDfirgh5lG8lIqRj/NnbQdRrWRj6hqf DRqRzjwazIQHU2RbU174pynb2qnZr+Vx2jB5HJE3Ln/ozJOqFtQDA268VAU/7pgW 5EezQAZ5TvDyC+jGJVyjt1k5PXelW9eLkrr7zI9h/2OT583hOm/QHRiHFYOf1t3O 4n6RzDqqGz+AdYcaQUTi4eOAixyXZ7iL2yFwPVn5OxiBJ0ZnzhrjvuFhNIBFE9iq UsTWQCJAHf4z/38f+m8nTAKmCXecbg6K9Z81zRa+evPV+2rXBGckC7bE7PeEYOnf QOBML6e3ueH9Xrv1P1a+ajo3+hV4xtdEWosZWB5ZyjHXWBfdVvXP/eI3a6WOl/kT b1b4/27Zc9ZXxdNYPtVYkPVMj1xKzZ/0Ym5YRqG+f88+JbhdlXeGBQAAJmmISvfe QpKOQvXxWkoH5YfBYfqgX5+4jnwrILUlKx2jBVCS9eFeSMbsdNPebOzINXlg/V4F 5mR9SSscTVcRTyy3Ao1C0IzzzPSltYhGXEkmr4Xk45OVZXsHoY/gVZIY/e+NuDDd FqRk0RTmoV/k6FWI/E23RVo+nvtrgFb83ThQaqAhO0sHIO61l3v8N2rqOfURwEFw E5a7yTNiEU4H+t+kaN4AYRtiN9frDeDv8bARl/Dk4E= X-Virus-Scanned: amavisd-new at mykolab.com X-Spam-Score: -1.899 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out002.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IPjw4Y3ilWCT; Mon, 1 May 2023 19:01:41 +0200 (CEST) Received: from int-mx002.mykolab.com (unknown [10.9.13.2]) by mx.kolabnow.com (Postfix) with ESMTPS id 12A28E4A; Mon, 1 May 2023 19:01:40 +0200 (CEST) Received: from ext-subm001.mykolab.com (unknown [10.9.6.1]) by int-mx002.mykolab.com (Postfix) with ESMTPS id 7DCE175AF; Mon, 1 May 2023 19:01:40 +0200 (CEST) From: alison@she-devel.com To: johan@kernel.org Cc: robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, alison@she-devel.com, achaiken@aurora.tech Subject: [PATCH 1/2] gnss: ubx: customize serial device open to set U-Blox Zed-F9P baud Date: Mon, 1 May 2023 10:01:23 -0700 Message-Id: <20230501170124.1218603-2-alison@she-devel.com> In-Reply-To: <20230501170124.1218603-1-alison@she-devel.com> References: <20230501170124.1218603-1-alison@she-devel.com> MIME-Version: 1.0 Organization: Aurora Innovation Content-Transfer-Encoding: 8bit X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alison Chaiken Add support for setting the baud rate of U-Blox Zed-F9P GNSS devices. Provide functions that support writing of arbitrary configuration messages to the device plus one that specifically configures the baud rate. Override the default gnss_serial_open() with a new method that writes the configuration message to the GNSS if the devicetree declares it to be a Zed F9P and requests a non-default baud. Add a boolean flag to the ubx_data private data of the GNSS driver in order to track whether the configuration message has already been written. Set the Zed F9P to its default port speed if the devicetree does not specify a value. Signed-off-by: Alison Chaiken --- drivers/gnss/ubx.c | 195 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 195 insertions(+) diff --git a/drivers/gnss/ubx.c b/drivers/gnss/ubx.c index c951be202ca2..1d59a11f5360 100644 --- a/drivers/gnss/ubx.c +++ b/drivers/gnss/ubx.c @@ -9,18 +9,201 @@ #include #include #include +#include #include #include +#include +#include #include #include #include "serial.h" +/* Total configuration message length = PREAMBLE_LEN + MESSAGE_CLASS_LEN + + * MESSAGE_LENGTH_LEN + payload length + CHECKSUM_LEN + */ +const int32_t PREAMBLE_LEN = 2; +const int32_t MESSAGE_CLASS_LEN = 2; +const int32_t MESSAGE_LENGTH_LEN = 2; +const int32_t CHECKSUM_LEN = 2; +const size_t FIRST_CONFIG_REGISTER_BYTE = 10U; +const size_t FIRST_VALUE_BYTE = 14U; +const size_t FIRST_CHECKSUM_BYTE = 18U; +const size_t CFG_MSG_TOTAL_LEN = 20U; + +uint8_t ZED_F9P_CFG_VALSET_MSG[] = { + 0xB5, 0x62, /* 0-1 preamble */ + 0x06, 0x8A, /* 2-3 CFG_VALSET command */ + 0x0C, 0x00, /* 4-5 payload length = 12 for one key-value pair */ + 0x00, /* 6 U-Blox API version */ + 0x01, /* 7 Write to RAM */ + 0x00, 0x00, /* 8-9 Reserved */ + 0x00, 0x00, 0x00, 0x00, /* 10-13 Placeholder for configuration register */ + 0x00, 0x00, 0x00, 0x00, /* 14-17 Placeholder for baud value */ + 0x00, 0x00 /* 18-19 Placeholder for checksum */ +}; + +const speed_t ZED_F9P_MIN_BAUD = 9600; +const speed_t ZED_F9P_DEFAULT_BAUD = 38400; +const speed_t ZED_F9P_MAX_BAUD = 921600; +const uint32_t ZED_F9P_BAUD_CONFIG_REGISTER = 0x40520001; + struct ubx_data { struct regulator *v_bckp; struct regulator *vcc; + unsigned long is_configured; +}; + +union message_length { + uint16_t ml; + uint8_t bytes[2]; +}; + +union int_to_bytes { + uint32_t int_val; + uint8_t bytes[4]; }; +/* Payload length is contained in bytes 0-2 after message class and ID. + * While the checksum includes the Message class and ID plus message length, the + * payload does not. + */ +static uint16_t get_payload_length(const uint8_t msg[]) +{ + union message_length hs_msg_len; + + hs_msg_len.bytes[0] = msg[PREAMBLE_LEN + MESSAGE_CLASS_LEN]; + hs_msg_len.bytes[1] = msg[PREAMBLE_LEN + MESSAGE_CLASS_LEN + 1U]; + return hs_msg_len.ml; +} + +static int32_t get_msg_total_len(const uint8_t msg[]) +{ + const size_t payload_len = get_payload_length(msg); + + return PREAMBLE_LEN + MESSAGE_CLASS_LEN + MESSAGE_LENGTH_LEN + payload_len + + CHECKSUM_LEN; +} + +/* The checksum is calculated on message class, message ID, message length and + * payload. + */ +static void calc_ubx_checksum(const uint8_t msg[], uint8_t checksum[], + const uint16_t total_len) +{ + uint8_t CK_A = 0; + uint8_t CK_B = 0; + int i; + + for (i = PREAMBLE_LEN; i < (total_len - CHECKSUM_LEN); i++) { + CK_A += msg[i]; + CK_B += CK_A; + } + checksum[0] = CK_A; + checksum[1] = CK_B; +} + +static uint32_t check_baud(speed_t speed, const struct device *dev) +{ + if ((speed < ZED_F9P_MIN_BAUD) || (speed > ZED_F9P_MAX_BAUD)) { + dev_warn(dev, "Baud rate specification %d out of range\n", speed); + speed = ZED_F9P_DEFAULT_BAUD; + } + return speed; +} + +static int prepare_zedf9p_config_msg(const speed_t speed, + const struct device *dev, const size_t msg_register) +{ + union int_to_bytes cfg_val, cfg_register; + int i = 0; + uint8_t checksum[2]; + const size_t total_len = get_msg_total_len(ZED_F9P_CFG_VALSET_MSG); + + if (total_len != CFG_MSG_TOTAL_LEN) + goto bad_msg; + + cfg_val.int_val = check_baud(speed, dev); + cfg_register.int_val = msg_register; + for (i = 0; i < 4; i++) { + ZED_F9P_CFG_VALSET_MSG[FIRST_VALUE_BYTE + i] = cfg_val.bytes[i]; + ZED_F9P_CFG_VALSET_MSG[FIRST_CONFIG_REGISTER_BYTE + i] = cfg_register.bytes[i]; + } + calc_ubx_checksum(ZED_F9P_CFG_VALSET_MSG, checksum, total_len); + ZED_F9P_CFG_VALSET_MSG[FIRST_CHECKSUM_BYTE] = checksum[0]; + ZED_F9P_CFG_VALSET_MSG[FIRST_CHECKSUM_BYTE + 1U] = checksum[1]; + return 0; + + bad_msg: + dev_err(dev, "Malformed UBX-CFG-VALSET message\n"); + return -EINVAL; +} + +/* Configure the Zed F9P baud rate via the UBX-CFG-VALSET message. */ +static int set_zedf9p_baud(struct gnss_device *gdev, + struct serdev_device *serdev, const speed_t speed) +{ + size_t count = 0U; + int ret; + + if (speed == ZED_F9P_DEFAULT_BAUD) + return 0; + + ret = prepare_zedf9p_config_msg(speed, &gdev->dev, ZED_F9P_BAUD_CONFIG_REGISTER); + if (ret) + return ret; + /* Initially set the UART to the default speed to match the GNSS' power-on value. */ + serdev_device_set_baudrate(serdev, ZED_F9P_DEFAULT_BAUD); + /* Now set the new baud rate. */ + count = gdev->ops->write_raw(gdev, ZED_F9P_CFG_VALSET_MSG, CFG_MSG_TOTAL_LEN); + if (count != CFG_MSG_TOTAL_LEN) + return count; + + return 0; +} + +static int ubx_serial_open(struct gnss_device *gdev) +{ + struct gnss_serial *gserial = gnss_get_drvdata(gdev); + struct serdev_device *serdev = gserial->serdev; + struct ubx_data *data = gnss_serial_get_drvdata(gserial); + struct device_node *np; + int ret; + + ret = serdev_device_open(serdev); + if (ret) + return ret; + + serdev_device_set_flow_control(serdev, false); + + np = serdev->dev.of_node; + if ((of_device_is_compatible(np, "u-blox,zed-f9p")) && (!data->is_configured)) { + /* 4800 is the default value set by gnss_serial_parse_dt() */ + if (gserial->speed == 4800) { + /* Fall back instead to Zed F9P default */ + gserial->speed = ZED_F9P_DEFAULT_BAUD; + } else { + ret = set_zedf9p_baud(gdev, serdev, gserial->speed); + if (ret) + return ret; + } + data->is_configured = 1; + } + serdev_device_set_baudrate(serdev, gserial->speed); + + ret = pm_runtime_get_sync(&serdev->dev); + if (ret < 0) { + pm_runtime_put_noidle(&serdev->dev); + goto err_close; + } + return 0; + +err_close: + serdev_device_close(serdev); + + return ret; +} + static int ubx_set_active(struct gnss_serial *gserial) { struct ubx_data *data = gnss_serial_get_drvdata(gserial); @@ -67,6 +250,7 @@ static int ubx_probe(struct serdev_device *serdev) { struct gnss_serial *gserial; struct ubx_data *data; + struct gnss_operations *ubx_gnss_ops; int ret; gserial = gnss_serial_allocate(serdev, sizeof(*data)); @@ -74,12 +258,22 @@ static int ubx_probe(struct serdev_device *serdev) ret = PTR_ERR(gserial); return ret; } + ubx_gnss_ops = kzalloc(sizeof(struct gnss_operations), GFP_KERNEL); + if (IS_ERR(ubx_gnss_ops)) { + ret = PTR_ERR(ubx_gnss_ops); + return ret; + } gserial->ops = &ubx_gserial_ops; gserial->gdev->type = GNSS_TYPE_UBX; + ubx_gnss_ops->open = &ubx_serial_open; + ubx_gnss_ops->close = gserial->gdev->ops->close; + ubx_gnss_ops->write_raw = gserial->gdev->ops->write_raw; + gserial->gdev->ops = ubx_gnss_ops; data = gnss_serial_get_drvdata(gserial); + data->is_configured = 0; data->vcc = devm_regulator_get(&serdev->dev, "vcc"); if (IS_ERR(data->vcc)) { @@ -133,6 +327,7 @@ static const struct of_device_id ubx_of_match[] = { { .compatible = "u-blox,neo-6m" }, { .compatible = "u-blox,neo-8" }, { .compatible = "u-blox,neo-m8" }, + { .compatible = "u-blox,zed-f9p" }, {}, }; MODULE_DEVICE_TABLE(of, ubx_of_match); -- 2.39.2