diff mbox series

[01/10] qmi: wda: Add qmi_wda_set_data_format utility

Message ID 20241121152949.56962-1-denkenz@gmail.com (mailing list archive)
State Accepted
Commit 6f38ad430a00664efe18266ce82e542ad58dd96d
Headers show
Series [01/10] qmi: wda: Add qmi_wda_set_data_format utility | expand

Commit Message

Denis Kenzior Nov. 21, 2024, 3:29 p.m. UTC
This utility function builds a WDA Set Data Format message and sends it
to the desired wda service handle.
---
 Makefile.am                     |  1 +
 drivers/qmimodem/common.h       |  5 ++++
 drivers/qmimodem/gprs-context.c |  6 ++--
 drivers/qmimodem/wda.c          | 51 +++++++++++++++++++++++++++++++++
 drivers/qmimodem/wda.h          | 23 +++++++++++++++
 5 files changed, 82 insertions(+), 4 deletions(-)
 create mode 100644 drivers/qmimodem/wda.c

Comments

patchwork-bot+ofono@kernel.org Nov. 22, 2024, 2:50 a.m. UTC | #1
Hello:

This series was applied to ofono.git (master)
by Denis Kenzior <denkenz@gmail.com>:

On Thu, 21 Nov 2024 09:29:29 -0600 you wrote:
> This utility function builds a WDA Set Data Format message and sends it
> to the desired wda service handle.
> ---
>  Makefile.am                     |  1 +
>  drivers/qmimodem/common.h       |  5 ++++
>  drivers/qmimodem/gprs-context.c |  6 ++--
>  drivers/qmimodem/wda.c          | 51 +++++++++++++++++++++++++++++++++
>  drivers/qmimodem/wda.h          | 23 +++++++++++++++
>  5 files changed, 82 insertions(+), 4 deletions(-)
>  create mode 100644 drivers/qmimodem/wda.c

Here is the summary with links:
  - [01/10] qmi: wda: Add qmi_wda_set_data_format utility
    https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=6f38ad430a00
  - [02/10] qmi: wda: Add qmi_wda_parse_data_format utility
    https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=46c0a242a405
  - [03/10] gobi: Explicitly set 802.3 data format
    https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=1b4d98578779
  - [04/10] gobi: Detect qmi_wwan pass_through support
    https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=87aff5f3a23b
  - [05/10] gobi: ensure Set Data Format changes were applied
    https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=281b49763818
  - [06/10] gobi: Set MTU when initializing QMI_WWAN
    https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=b2c04c07f226
  - [07/10] gobi: Support RAW_IP configuration
    https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=4411399f7114
  - [08/10] gobi: Add support for multiple active contexts
    https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=7df5d3660e1d
  - [09/10] qmimodem: wds: Add qmi_wds_ip_support_from_ofono
    https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=1e88453c17cf
  - [10/10] qmimodem: gprs-context: Fix non-default bearer activation
    https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=3dce963d9bfb

You are awesome, thank you!
diff mbox series

Patch

diff --git a/Makefile.am b/Makefile.am
index d107dc410fd2..2d198f52a4a0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -366,6 +366,7 @@  qmi_sources = drivers/qmimodem/qmi.h drivers/qmimodem/qmi.c \
 					drivers/qmimodem/pds.h \
 					drivers/qmimodem/common.h \
 					drivers/qmimodem/wda.h \
+					drivers/qmimodem/wda.c \
 					drivers/qmimodem/wds.c \
 					drivers/qmimodem/voice.h
 
diff --git a/drivers/qmimodem/common.h b/drivers/qmimodem/common.h
index b0788285b5e7..1610f1da9e45 100644
--- a/drivers/qmimodem/common.h
+++ b/drivers/qmimodem/common.h
@@ -76,3 +76,8 @@ 
 #define QMI_LTE_BAND_MASK_EUTRA_41	0x0000010000000000
 #define QMI_LTE_BAND_MASK_EUTRA_42	0x0000020000000000
 #define QMI_LTE_BAND_MASK_EUTRA_43	0x0000040000000000
+
+struct qmi_endpoint_info {
+	uint32_t endpoint_type;
+	uint32_t interface_number;
+} __attribute__((packed));
diff --git a/drivers/qmimodem/gprs-context.c b/drivers/qmimodem/gprs-context.c
index 89d68d154ed8..a8ac3cb18c80 100644
--- a/drivers/qmimodem/gprs-context.c
+++ b/drivers/qmimodem/gprs-context.c
@@ -17,6 +17,7 @@ 
 #include <ofono/gprs-context.h>
 
 #include "qmi.h"
+#include "common.h"
 #include "wds.h"
 #include "util.h"
 
@@ -715,10 +716,7 @@  static int qmi_gprs_context_bind_mux(struct ofono_gprs_context *gc,
 	struct qmi_param *param;
 	const char *interface_number;
 	const char *bus;
-	struct {
-		uint32_t endpoint_type;
-		uint32_t interface_number;
-	} __attribute__((packed)) endpoint_info;
+	struct qmi_endpoint_info endpoint_info;
 	uint8_t u8;
 
 	bus = ofono_modem_get_string(modem, "Bus");
diff --git a/drivers/qmimodem/wda.c b/drivers/qmimodem/wda.c
new file mode 100644
index 000000000000..cf32aa094d69
--- /dev/null
+++ b/drivers/qmimodem/wda.c
@@ -0,0 +1,51 @@ 
+/*
+ * oFono - Open Source Telephony
+ * Copyright (C) 2024  Cruise, LLC
+ *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
+#include <stdint.h>
+#include <stddef.h>
+
+#include <ell/ell.h>
+
+#include "src/common.h"
+
+#include "qmi.h"
+#include "common.h"
+#include "wda.h"
+
+uint16_t qmi_wda_set_data_format(struct qmi_service *wda,
+				const struct qmi_endpoint_info *endpoint_info,
+				const struct qmi_wda_data_format *format,
+				qmi_service_result_func_t func,
+				void *user_data, qmi_destroy_func_t destroy)
+{
+	static const uint8_t PARAM_LL_PROTO = 0x11;
+	static const uint8_t PARAM_UL_AGGREGATION_PROTOCOL = 0x12;
+	static const uint8_t PARAM_DL_AGGREGATION_PROTOCOL = 0x13;
+	static const uint8_t PARAM_DL_MAX_DATAGRAMS = 0x15;
+	static const uint8_t PARAM_DL_MAX_SIZE = 0x16;
+	static const uint8_t PARAM_EP_INFO = 0x17;
+	struct qmi_param *param = qmi_param_new();
+	uint32_t req_id;
+
+	qmi_param_append_uint32(param, PARAM_LL_PROTO, format->ll_protocol);
+	qmi_param_append_uint32(param, PARAM_UL_AGGREGATION_PROTOCOL,
+					format->ul_aggregation_protocol);
+	qmi_param_append_uint32(param, PARAM_DL_AGGREGATION_PROTOCOL,
+					format->dl_aggregation_protocol);
+	qmi_param_append_uint32(param, PARAM_DL_MAX_DATAGRAMS,
+					format->dl_max_datagrams);
+	qmi_param_append_uint32(param, PARAM_DL_MAX_SIZE, format->dl_max_size);
+	qmi_param_append(param, PARAM_EP_INFO,
+				sizeof(*endpoint_info), endpoint_info);
+
+	req_id = qmi_service_send(wda, QMI_WDA_SET_DATA_FORMAT,
+					param, func, user_data, destroy);
+	if (!req_id)
+		qmi_param_free(param);
+
+	return req_id;
+}
diff --git a/drivers/qmimodem/wda.h b/drivers/qmimodem/wda.h
index fd1e1f63ab1e..4facc0cb6677 100644
--- a/drivers/qmimodem/wda.h
+++ b/drivers/qmimodem/wda.h
@@ -5,6 +5,8 @@ 
  * SPDX-License-Identifier: GPL-2.0-only
  */
 
+struct qmi_endpoint_info;
+
 #define QMI_WDA_SET_DATA_FORMAT	32	/* Set data format */
 #define QMI_WDA_GET_DATA_FORMAT	33	/* Get data format */
 
@@ -16,3 +18,24 @@  enum qmi_wda_data_link_protocol {
 	QMI_WDA_DATA_LINK_PROTOCOL_802_3 =			0x01,
 	QMI_WDA_DATA_LINK_PROTOCOL_RAW_IP =			0x02,
 };
+
+enum qmi_wda_aggregation_protocol {
+	QMI_WDA_AGGREGATION_PROTOCOL_DISABLED =			0x00,
+	QMI_WDA_AGGREGATION_PROTOCOL_QMAP =			0x05,
+	QMI_WDA_AGGREGATION_PROTOCOL_QMAPV4 =			0x08,
+	QMI_WDA_AGGREGATION_PROTOCOL_QMAPV5 =			0x09,
+};
+
+struct qmi_wda_data_format {
+	uint32_t ll_protocol;
+	uint32_t ul_aggregation_protocol;
+	uint32_t dl_aggregation_protocol;
+	uint32_t dl_max_datagrams;
+	uint32_t dl_max_size;
+};
+
+uint16_t qmi_wda_set_data_format(struct qmi_service *wda,
+				const struct qmi_endpoint_info *endpoint_info,
+				const struct qmi_wda_data_format *format,
+				qmi_service_result_func_t func,
+				void *user_data, qmi_destroy_func_t destroy);