Skip to contentSkip to conversation

qmi: Introduce SERVICE_VERSION macro

PATCH Applied Denis Kenzior 2 participants 15 messages Jun 25, 2024 – Jun 26, 2024

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/14 qmi: Introduce SERVICE_VERSION macro

This will make it easier to compare service major.minor versions in a more readable manner.

---
 drivers/qmimodem/qmi.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/qmimodem/qmi.c +6 -2
index e3a8b225140f..5f29c4384803 100644
@@ -36,6 +36,9 @@
 	l_util_debug((debug)->func, (debug)->user_data, "%s:%i " fmt,	\
 			__func__, __LINE__, ## args)
 
+#define SERVICE_VERSION(major, minor)				\
+	(((major) << 16) | (minor))
+
 struct qmi_device;
 struct qmi_request;
 
@@ -1199,6 +1202,7 @@ static void qmux_discover_callback(struct qmi_request *req, uint16_t message,
 	const void *ptr;
 	uint16_t len;
 	unsigned int i;
+	uint32_t control_version = 0;
 
 	result_code = tlv_get(buffer, length, 0x02, &len);
 	if (!result_code)
@@ -1233,6 +1237,7 @@ static void qmux_discover_callback(struct qmi_request *req, uint16_t message,
 		if (type == QMI_SERVICE_CONTROL) {
 			qmux->control_major = major;
 			qmux->control_minor = minor;
+			control_version = SERVICE_VERSION(major, minor);
 			continue;
 		}
 
@@ -1257,8 +1262,7 @@ done:
 	 * invoke it to reset the state, including release all previously
 	 * allocated clients
 	 */
-	if ((qmux->control_major == 1 && qmux->control_minor >= 5) ||
-			qmux->control_major > 1) {
+	if (control_version >= SERVICE_VERSION(1, 5)) {
 		struct qmi_request *req =
 			__control_request_alloc(QMI_CTL_SYNC, NULL, 0, 0);
 
Signature · 1 line
2.45.0
#1 lore raw

PATCH v2 2/14 qmi: Remove control_major and control_minor

These attributes are no longer used, remove them.

---
 drivers/qmimodem/qmi.c | 4 ----
 1 file changed, 4 deletions(-)
drivers/qmimodem/qmi.c +0 -4
index 5f29c4384803..238039d4add7 100644
@@ -100,8 +100,6 @@ struct qmi_device {
 
 struct qmi_qmux_device {
 	struct qmi_device super;
-	uint16_t control_major;
-	uint16_t control_minor;
 	char *version_str;
 	struct debug_data debug;
 	struct {
@@ -1235,8 +1233,6 @@ static void qmux_discover_callback(struct qmi_request *req, uint16_t message,
 					type, major, minor);
 
 		if (type == QMI_SERVICE_CONTROL) {
-			qmux->control_major = major;
-			qmux->control_minor = minor;
 			control_version = SERVICE_VERSION(major, minor);
 			continue;
 		}
Signature · 1 line
2.45.0
#2 lore raw

PATCH v2 3/14 qmi: Move service_handle allocation to service_family

In reply to Denis Kenzior

A unique service handle identifiers is allocated every time a new service is created. The unique identifier is generated by qmi_device and is monotonically increasing. qmi_device has now been completely refactored out of the public API and only remains as an implementation detail. It is desirable to remove it and transform it into a QMI transport abstraction. As a first step, remove service handle id allocation from struct qmi_device and move it into struct service_family instead.

As a consequence, ensure that when a request is canceled, compare both the service_handle and the service_family group_id since both are required to identify that a request belongs to a particular service. As a side effect, lightweight service handles are now not able to accidentally cancel (by tid) requests they do not own.

---
 drivers/qmimodem/qmi.c | 65 +++++++++++++++++++++++++++++++-----------
 1 file changed, 49 insertions(+), 16 deletions(-)
drivers/qmimodem/qmi.c +49 -16
index 238039d4add7..828f62584ea0 100644
@@ -90,7 +90,6 @@ struct qmi_device {
 	struct l_queue *req_queue;
 	struct l_queue *service_queue;
 	unsigned int next_group_id;	/* Matches requests with services */
-	unsigned int next_service_handle;
 	uint16_t next_service_tid;
 	struct l_queue *service_infos;
 	struct l_hashmap *family_list;
@@ -129,6 +128,7 @@ struct service_family {
 	unsigned int group_id;
 	uint8_t client_id;
 	uint16_t next_notify_id;
+	unsigned int next_service_handle;
 	struct l_queue *notify_list;
 };
 
@@ -1140,14 +1140,13 @@ static struct service_family *service_family_create(struct qmi_device *device,
 
 static struct qmi_service *service_create(struct service_family *family)
 {
-	struct qmi_device *device = family->device;
 	struct qmi_service *service;
 
-	if (device->next_service_handle == 0) /* 0 is reserved for control */
-		device->next_service_handle = 1;
+	if (family->next_service_handle == 0) /* 0 is reserved for control */
+		family->next_service_handle = 1;
 
 	service = l_new(struct qmi_service, 1);
-	service->handle = device->next_service_handle++;
+	service->handle = family->next_service_handle++;
 	service->family = service_family_ref(family);
 
 	return service;
@@ -2349,11 +2348,32 @@ uint16_t qmi_service_send(struct qmi_service *service,
 	return __service_request_submit(device, service, &sreq->super);
 }
 
+struct request_lookup {
+	uint16_t tid;
+	unsigned int service_handle;
+	unsigned int group_id;
+};
+
+static bool __request_compare_for_cancel(const void *a, const void *b)
+{
+	const struct qmi_request *req = a;
+	const struct request_lookup *lookup = b;
+
+	if (req->service_handle != lookup->service_handle)
+		return false;
+
+	if (req->group_id != lookup->group_id)
+		return false;
+
+	return req->tid == lookup->tid;
+}
+
 bool qmi_service_cancel(struct qmi_service *service, uint16_t id)
 {
 	struct qmi_device *device;
 	struct qmi_request *req;
 	struct service_family *family;
+	struct request_lookup lookup = { .tid = id };
 
 	if (!service || !id)
 		return false;
@@ -2367,12 +2387,15 @@ bool qmi_service_cancel(struct qmi_service *service, uint16_t id)
 	if (!device)
 		return false;
 
-	req = l_queue_remove_if(device->req_queue, __request_compare,
-					L_UINT_TO_PTR(id));
+	lookup.group_id = family->group_id;
+	lookup.service_handle = service->handle;
+
+	req = l_queue_remove_if(device->req_queue, __request_compare_for_cancel,
+					&lookup);
 	if (!req) {
 		req = l_queue_remove_if(device->service_queue,
-						__request_compare,
-						L_UINT_TO_PTR(id));
+						__request_compare_for_cancel,
+						&lookup);
 		if (!req)
 			return false;
 	}
@@ -2385,9 +2408,12 @@ bool qmi_service_cancel(struct qmi_service *service, uint16_t id)
 static bool remove_req_if_match(void *data, void *user_data)
 {
 	struct qmi_request *req = data;
-	unsigned int service_handle = L_PTR_TO_UINT(user_data);
+	struct request_lookup *lookup = user_data;
 
-	if (req->service_handle != service_handle)
+	if (req->service_handle != lookup->service_handle)
+		return false;
+
+	if (req->group_id != lookup->group_id)
 		return false;
 
 	__request_free(req);
@@ -2395,10 +2421,15 @@ static bool remove_req_if_match(void *data, void *user_data)
 	return true;
 }
 
-static void remove_client(struct l_queue *queue, unsigned int service_handle)
+static void remove_client(struct l_queue *queue, unsigned int group_id,
+						unsigned int service_handle)
 {
-	l_queue_foreach_remove(queue, remove_req_if_match,
-				L_UINT_TO_PTR(service_handle));
+	struct request_lookup lookup = {
+		.group_id = group_id,
+		.service_handle = service_handle,
+	};
+
+	l_queue_foreach_remove(queue, remove_req_if_match, &lookup);
 }
 
 static bool qmi_service_cancel_all(struct qmi_service *service)
@@ -2415,8 +2446,10 @@ static bool qmi_service_cancel_all(struct qmi_service *service)
 	if (!device)
 		return false;
 
-	remove_client(device->req_queue, service->handle);
-	remove_client(device->service_queue, service->handle);
+	remove_client(device->req_queue,
+				service->family->group_id, service->handle);
+	remove_client(device->service_queue,
+				service->family->group_id, service->handle);
 
 	return true;
 }
Signature · 1 line
2.45.0
#3 lore raw

PATCH v2 4/14 qmi: Move group id allocation out of qmi_device

In reply to Denis Kenzior

As another step of removing qmi_device vestiges, move group_id allocation into qmi_qrtr_node and qmi_qmux_device classes.

---
 drivers/qmimodem/qmi.c | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)
drivers/qmimodem/qmi.c +17 -9
index 828f62584ea0..2095a952fffd 100644
@@ -89,7 +89,6 @@ struct qmi_device {
 	struct l_io *io;
 	struct l_queue *req_queue;
 	struct l_queue *service_queue;
-	unsigned int next_group_id;	/* Matches requests with services */
 	uint16_t next_service_tid;
 	struct l_queue *service_infos;
 	struct l_hashmap *family_list;
@@ -116,6 +115,7 @@ struct qmi_qmux_device {
 		unsigned int release_users;
 	} shutdown;
 	uint8_t next_control_tid;
+	unsigned int next_group_id;	/* Matches requests with services */
 	struct l_queue *control_queue;
 	bool shutting_down : 1;
 	bool destroyed : 1;
@@ -194,6 +194,14 @@ struct qmi_tlv_hdr {
 } __attribute__ ((packed));
 #define QMI_TLV_HDR_SIZE 3
 
+static unsigned int next_id(unsigned int *id)
+{
+	if (*id == 0) /* 0 is reserved for control */
+		*id = 1;
+
+	return *id++;
+}
+
 static bool qmi_service_info_matches(const void *data, const void *user)
 {
 	const struct qmi_service_info *info = data;
@@ -1119,6 +1127,7 @@ static uint8_t __ctl_request_submit(struct qmi_qmux_device *qmux,
 }
 
 static struct service_family *service_family_create(struct qmi_device *device,
+			unsigned int group_id,
 			const struct qmi_service_info *info, uint8_t client_id)
 {
 	struct service_family *family = l_new(struct service_family, 1);
@@ -1127,12 +1136,7 @@ static struct service_family *service_family_create(struct qmi_device *device,
 	family->device = device;
 	family->client_id = client_id;
 	family->notify_list = l_queue_new();
-
-	if (device->next_group_id == 0) /* 0 is reserved for control */
-		device->next_group_id = 1;
-
-	family->group_id = device->next_group_id++;
-
+	family->group_id = group_id;
 	memcpy(&family->info, info, sizeof(family->info));
 
 	return family;
@@ -1397,7 +1401,9 @@ static void qmux_create_client_callback(struct qmi_request *r,
 	info.major = req->major;
 	info.minor = req->minor;
 
-	family = service_family_create(&qmux->super, &info, client_id->client);
+	family = service_family_create(&qmux->super,
+					next_id(&qmux->next_group_id),
+					&info, client_id->client);
 	DEBUG(&qmux->debug, "service family created [client=%d,type=%d]",
 			family->client_id, family->info.service_type);
 
@@ -1614,6 +1620,7 @@ void qmi_qmux_device_set_debug(struct qmi_qmux_device *qmux,
 
 struct qmi_qrtr_node {
 	struct qmi_device super;
+	unsigned int next_group_id;	/* Matches requests with services */
 	struct debug_data debug;
 	struct {
 		qmi_qrtr_node_lookup_done_func_t func;
@@ -1954,7 +1961,8 @@ struct qmi_service *qmi_qrtr_node_get_service(struct qmi_qrtr_node *node,
 	if (!info)
 		return NULL;
 
-	family = service_family_create(device, info, 0);
+	family = service_family_create(device, next_id(&node->next_group_id),
+					info, 0);
 	l_hashmap_insert(device->family_list, L_UINT_TO_PTR(type), family);
 done:
 	return service_create(family);
Signature · 1 line
2.45.0
#4 lore raw

PATCH v2 5/14 qmi: Move service_info management into qrtr/qmux

In reply to Denis Kenzior

Break out service_info management from struct qmi_device into qrtr and qmux classes. This allows to optimize how service info is managed slightly:
- On QMUX, the list is static and obtained during discovery. An array can be used instead of a linked list. Certain comparisons which are only relevant for QRTR can be skipped.
- QRTR behavior remains the same.

---
 drivers/qmimodem/qmi.c | 103 +++++++++++++++++++++++------------------
 1 file changed, 59 insertions(+), 44 deletions(-)
drivers/qmimodem/qmi.c +59 -44
index 2095a952fffd..59a50eabeb2b 100644
@@ -90,7 +90,6 @@ struct qmi_device {
 	struct l_queue *req_queue;
 	struct l_queue *service_queue;
 	uint16_t next_service_tid;
-	struct l_queue *service_infos;
 	struct l_hashmap *family_list;
 	const struct qmi_device_ops *ops;
 	bool writer_active : 1;
@@ -98,6 +97,8 @@ struct qmi_device {
 
 struct qmi_qmux_device {
 	struct qmi_device super;
+	struct qmi_service_info *service_list;
+	uint16_t n_services;
 	char *version_str;
 	struct debug_data debug;
 	struct {
@@ -219,16 +220,6 @@ static bool qmi_service_info_matches(const void *data, const void *user)
 	return true;
 }
 
-static void __qmi_service_appeared(struct qmi_device *device,
-					const struct qmi_service_info *info)
-{
-	if (l_queue_find(device->service_infos, qmi_service_info_matches, info))
-		return;
-
-	l_queue_push_tail(device->service_infos,
-				l_memdup(info, sizeof(struct qmi_service_info)));
-}
-
 static void *__request_alloc(uint32_t service_type,
 					uint8_t client, uint16_t message,
 					const void *data, uint16_t length,
@@ -843,7 +834,6 @@ static int qmi_device_init(struct qmi_device *device, int fd,
 
 	device->req_queue = l_queue_new();
 	device->service_queue = l_queue_new();
-	device->service_infos = l_queue_new();
 	device->family_list = l_hashmap_new();
 
 	device->next_service_tid = 256;
@@ -861,8 +851,6 @@ static void __qmi_device_free(struct qmi_device *device)
 	l_io_destroy(device->io);
 
 	l_hashmap_destroy(device->family_list, family_destroy);
-
-	l_queue_destroy(device->service_infos, l_free);
 }
 
 void qmi_result_print_tlvs(struct qmi_result *result)
@@ -905,23 +893,17 @@ static const void *tlv_get(const void *data, uint16_t size,
 	return NULL;
 }
 
-static const struct qmi_service_info *__find_service_info_by_type(
-				struct qmi_device *device, uint16_t type)
+static const struct qmi_service_info *__qmux_service_info_find(
+				struct qmi_qmux_device *qmux, uint16_t type)
 {
-	const struct qmi_service_info *info = NULL;
-	const struct l_queue_entry *entry;
-
-	for (entry = l_queue_get_entries(device->service_infos);
-						entry; entry = entry->next) {
-		struct qmi_service_info *data = entry->data;
+	unsigned int i;
 
-		if (data->service_type == type) {
-			info = data;
-			break;
-		}
+	for (i = 0; i < qmux->n_services; i++) {
+		if (qmux->service_list[i].service_type == type)
+			return qmux->service_list + i;
 	}
 
-	return info;
+	return NULL;
 }
 
 bool qmi_qmux_device_get_service_version(struct qmi_qmux_device *qmux,
@@ -933,7 +915,7 @@ bool qmi_qmux_device_get_service_version(struct qmi_qmux_device *qmux,
 	if (!qmux)
 		return false;
 
-	info = __find_service_info_by_type(&qmux->super, type);
+	info = __qmux_service_info_find(qmux, type);
 	if (!info)
 		return false;
 
@@ -947,7 +929,7 @@ bool qmi_qmux_device_has_service(struct qmi_qmux_device *qmux, uint16_t type)
 	if (!qmux)
 		return false;
 
-	return __find_service_info_by_type(&qmux->super, type);
+	return __qmux_service_info_find(qmux, type);
 }
 
 static int qmi_qmux_device_write(struct qmi_device *device,
@@ -1197,7 +1179,6 @@ static void qmux_discover_callback(struct qmi_request *req, uint16_t message,
 					uint16_t length, const void *buffer)
 {
 	struct qmi_qmux_device *qmux = req->user_data;
-	struct qmi_device *device = &qmux->super;
 	const struct qmi_result_code *result_code;
 	const struct qmi_service_list *service_list;
 	const void *ptr;
@@ -1219,6 +1200,13 @@ static void qmux_discover_callback(struct qmi_request *req, uint16_t message,
 	if (len < QMI_SERVICE_LIST_SIZE)
 		goto done;
 
+	if (!service_list->count)
+		goto done;
+
+	l_free(qmux->service_list);
+	qmux->n_services = 0;
+	qmux->service_list = l_new(struct qmi_service_info, service_list->count);
+
 	for (i = 0; i < service_list->count; i++) {
 		uint16_t major =
 			L_LE16_TO_CPU(service_list->services[i].major);
@@ -1226,7 +1214,6 @@ static void qmux_discover_callback(struct qmi_request *req, uint16_t message,
 			L_LE16_TO_CPU(service_list->services[i].minor);
 		uint8_t type = service_list->services[i].type;
 		const char *name = __service_type_to_string(type);
-		struct qmi_service_info info;
 
 		if (name)
 			DEBUG(&qmux->debug, "discovered service [%s %d.%d]",
@@ -1240,12 +1227,10 @@ static void qmux_discover_callback(struct qmi_request *req, uint16_t message,
 			continue;
 		}
 
-		memset(&info, 0, sizeof(info));
-		info.service_type = type;
-		info.major = major;
-		info.minor = minor;
-
-		__qmi_service_appeared(device, &info);
+		qmux->service_list[qmux->n_services].service_type = type;
+		qmux->service_list[qmux->n_services].major = major;
+		qmux->service_list[qmux->n_services].minor = minor;
+		qmux->n_services += 1;
 	}
 
 	ptr = tlv_get(buffer, length, 0x10, &len);
@@ -1304,7 +1289,7 @@ int qmi_qmux_device_discover(struct qmi_qmux_device *qmux,
 
 	DEBUG(&qmux->debug, "device %p", qmux);
 
-	if (l_queue_length(qmux->super.service_infos) > 0 || qmux->discover.tid)
+	if (qmux->n_services || qmux->discover.tid)
 		return -EALREADY;
 
 	req = __control_request_alloc(QMI_CTL_GET_VERSION_INFO, NULL, 0, 0);
@@ -1439,7 +1424,7 @@ bool qmi_qmux_device_create_client(struct qmi_qmux_device *qmux,
 	if (service_type == QMI_SERVICE_CONTROL)
 		return false;
 
-	info = __find_service_info_by_type(&qmux->super, service_type);
+	info = __qmux_service_info_find(qmux, service_type);
 	if (!info)
 		return false;
 
@@ -1504,6 +1489,7 @@ static void __qmux_device_free(struct qmi_qmux_device *qmux)
 	if (qmux->shutdown.idle)
 		l_idle_remove(qmux->shutdown.idle);
 
+	l_free(qmux->service_list);
 	l_free(qmux->version_str);
 	l_free(qmux);
 }
@@ -1621,6 +1607,7 @@ void qmi_qmux_device_set_debug(struct qmi_qmux_device *qmux,
 struct qmi_qrtr_node {
 	struct qmi_device super;
 	unsigned int next_group_id;	/* Matches requests with services */
+	struct l_queue *service_infos;
 	struct debug_data debug;
 	struct {
 		qmi_qrtr_node_lookup_done_func_t func;
@@ -1630,6 +1617,32 @@ struct qmi_qrtr_node {
 	} lookup;
 };
 
+static const struct qmi_service_info *__qrtr_service_info_find(
+				struct qmi_qrtr_node *node, uint16_t type)
+{
+	const struct l_queue_entry *entry;
+
+	for (entry = l_queue_get_entries(node->service_infos);
+						entry; entry = entry->next) {
+		struct qmi_service_info *info = entry->data;
+
+		if (info->service_type == type)
+			return info;
+	}
+
+	return NULL;
+}
+
+static void __qrtr_service_appeared(struct qmi_qrtr_node *node,
+					const struct qmi_service_info *info)
+{
+	if (l_queue_find(node->service_infos, qmi_service_info_matches, info))
+		return;
+
+	l_queue_push_tail(node->service_infos,
+				l_memdup(info, sizeof(struct qmi_service_info)));
+}
+
 static void __qrtr_lookup_finished(struct qmi_qrtr_node *node)
 {
 	if (!node->lookup.func) {
@@ -1708,7 +1721,6 @@ static void qrtr_debug_ctrl_request(const struct qrtr_ctrl_pkt *packet,
 static void qrtr_received_control_packet(struct qmi_qrtr_node *node,
 						const void *buf, size_t len)
 {
-	struct qmi_device *device = &node->super;
 	const struct qrtr_ctrl_pkt *packet = buf;
 	struct qmi_service_info info;
 	uint32_t cmd;
@@ -1755,7 +1767,7 @@ static void qrtr_received_control_packet(struct qmi_qrtr_node *node,
 	info.major = version;
 	info.instance = instance;
 
-	__qmi_service_appeared(device, &info);
+	__qrtr_service_appeared(node, &info);
 
 	if (!node->lookup.func)
 		return;
@@ -1772,7 +1784,7 @@ static void qrtr_received_service_message(struct qmi_qrtr_node *node,
 	const struct l_queue_entry *entry;
 	uint32_t service_type = 0;
 
-	for (entry = l_queue_get_entries(device->service_infos);
+	for (entry = l_queue_get_entries(node->service_infos);
 				entry; entry = entry->next) {
 		struct qmi_service_info *info = entry->data;
 
@@ -1844,6 +1856,8 @@ struct qmi_qrtr_node *qmi_qrtr_node_new(uint32_t node)
 		return NULL;
 	}
 
+	qrtr->service_infos = l_queue_new();
+
 	l_io_set_read_handler(qrtr->super.io, qrtr_received_data, qrtr, NULL);
 
 	return qrtr;
@@ -1855,6 +1869,7 @@ void qmi_qrtr_node_free(struct qmi_qrtr_node *node)
 		return;
 
 	__qmi_device_free(&node->super);
+	l_queue_destroy(node->service_infos, l_free);
 
 	if (node->lookup.destroy)
 		node->lookup.destroy(node->lookup.user_data);
@@ -1957,7 +1972,7 @@ struct qmi_service *qmi_qrtr_node_get_service(struct qmi_qrtr_node *node,
 	if (family)
 		goto done;
 
-	info = __find_service_info_by_type(device, type);
+	info = __qrtr_service_info_find(node, type);
 	if (!info)
 		return NULL;
 
@@ -1973,7 +1988,7 @@ bool qmi_qrtr_node_has_service(struct qmi_qrtr_node *node, uint16_t type)
 	if (!node)
 		return false;
 
-	return __find_service_info_by_type(&node->super, type);
+	return __qrtr_service_info_find(node, type);
 }
 
 struct qmi_param *qmi_param_new(void)
Signature · 1 line
2.45.0
#5 lore raw

PATCH v2 6/14 qmi: Rename qmi_device to qmi_transport

In reply to Denis Kenzior
---
 drivers/qmimodem/qmi.c | 233 +++++++++++++++++++++--------------------
 1 file changed, 117 insertions(+), 116 deletions(-)
drivers/qmimodem/qmi.c +117 -116
index 59a50eabeb2b..f4af59a1b783 100644
@@ -39,7 +39,7 @@
 #define SERVICE_VERSION(major, minor)				\
 	(((major) << 16) | (minor))
 
-struct qmi_device;
+struct qmi_transport;
 struct qmi_request;
 
 typedef void (*response_func_t)(struct qmi_request *, uint16_t message,
@@ -74,31 +74,31 @@ struct qmi_service_request {
 	struct qmi_request super;
 };
 
-struct qmi_device_ops {
-	int (*write)(struct qmi_device *device, struct qmi_request *req);
-	void (*client_release)(struct qmi_device *device,
-				uint16_t service_type, uint16_t client_id);
-};
-
 struct debug_data {
 	qmi_debug_func_t func;
 	void *user_data;
 };
 
-struct qmi_device {
+struct qmi_transport_ops {
+	int (*write)(struct qmi_transport *transport, struct qmi_request *req);
+	void (*client_release)(struct qmi_transport *transport,
+				uint16_t service_type, uint16_t client_id);
+};
+
+struct qmi_transport {
 	struct l_io *io;
 	struct l_queue *req_queue;
 	struct l_queue *service_queue;
 	uint16_t next_service_tid;
 	struct l_hashmap *family_list;
-	const struct qmi_device_ops *ops;
+	const struct qmi_transport_ops *ops;
 	bool writer_active : 1;
 };
 
 struct qmi_qmux_device {
-	struct qmi_device super;
 	struct qmi_service_info *service_list;
 	uint16_t n_services;
+	struct qmi_transport transport;
 	char *version_str;
 	struct debug_data debug;
 	struct {
@@ -124,7 +124,7 @@ struct qmi_qmux_device {
 
 struct service_family {
 	int ref_count;
-	struct qmi_device *device;
+	struct qmi_transport *transport;
 	struct qmi_service_info info;
 	unsigned int group_id;
 	uint8_t client_id;
@@ -651,21 +651,21 @@ static void __qrtr_debug_msg(const char dir, const void *buf, size_t len,
 
 static bool can_write_data(struct l_io *io, void *user_data)
 {
-	struct qmi_device *device = user_data;
+	struct qmi_transport *transport = user_data;
 	struct qmi_request *req;
 	int r;
 
-	req = l_queue_pop_head(device->req_queue);
+	req = l_queue_pop_head(transport->req_queue);
 	if (!req)
 		return false;
 
-	r = device->ops->write(device, req);
+	r = transport->ops->write(transport, req);
 	if (r < 0) {
 		__request_free(req);
 		return false;
 	}
 
-	if (l_queue_length(device->req_queue) > 0)
+	if (l_queue_length(transport->req_queue) > 0)
 		return true;
 
 	return false;
@@ -673,33 +673,33 @@ static bool can_write_data(struct l_io *io, void *user_data)
 
 static void write_watch_destroy(void *user_data)
 {
-	struct qmi_device *device = user_data;
+	struct qmi_transport *transport = user_data;
 
-	device->writer_active = false;
+	transport->writer_active = false;
 }
 
-static void wakeup_writer(struct qmi_device *device)
+static void wakeup_writer(struct qmi_transport *transport)
 {
-	if (device->writer_active)
+	if (transport->writer_active)
 		return;
 
-	l_io_set_write_handler(device->io, can_write_data, device,
+	l_io_set_write_handler(transport->io, can_write_data, transport,
 				write_watch_destroy);
 
-	device->writer_active = true;
+	transport->writer_active = true;
 }
 
-static uint16_t __service_request_submit(struct qmi_device *device,
+static uint16_t __service_request_submit(struct qmi_transport *transport,
 						struct qmi_service *service,
 						struct qmi_request *req)
 {
 	struct qmi_service_hdr *hdr =
 		(struct qmi_service_hdr *) &req->data[QMI_MUX_HDR_SIZE];
 
-	req->tid = device->next_service_tid++;
+	req->tid = transport->next_service_tid++;
 
-	if (device->next_service_tid < 256)
-		device->next_service_tid = 256;
+	if (transport->next_service_tid < 256)
+		transport->next_service_tid = 256;
 
 	req->group_id = service->family->group_id;
 	req->service_handle = service->handle;
@@ -707,8 +707,8 @@ static uint16_t __service_request_submit(struct qmi_device *device,
 	hdr->type = 0x00;
 	hdr->transaction = L_CPU_TO_LE16(req->tid);
 
-	l_queue_push_tail(device->req_queue, req);
-	wakeup_writer(device);
+	l_queue_push_tail(transport->req_queue, req);
+	wakeup_writer(transport);
 
 	return req->tid;
 }
@@ -737,7 +737,7 @@ static unsigned int family_list_create_hash(uint16_t service_type,
 	return (service_type | (client_id << 16));
 }
 
-static void handle_indication(struct qmi_device *device,
+static void handle_indication(struct qmi_transport *transport,
 			uint32_t service_type, uint8_t client_id,
 			uint16_t message, uint16_t length, const void *data)
 {
@@ -755,13 +755,13 @@ static void handle_indication(struct qmi_device *device,
 	result.length = length;
 
 	if (client_id == 0xff) {
-		l_hashmap_foreach(device->family_list, service_notify,
+		l_hashmap_foreach(transport->family_list, service_notify,
 					&result);
 		return;
 	}
 
 	hash_id = family_list_create_hash(service_type, client_id);
-	family = l_hashmap_lookup(device->family_list,
+	family = l_hashmap_lookup(transport->family_list,
 					L_UINT_TO_PTR(hash_id));
 
 	if (!family)
@@ -770,7 +770,7 @@ static void handle_indication(struct qmi_device *device,
 	service_notify(NULL, family, &result);
 }
 
-static void __rx_message(struct qmi_device *device,
+static void __rx_message(struct qmi_transport *transport,
 				uint32_t service_type, uint8_t client_id,
 				const void *buf)
 {
@@ -787,12 +787,12 @@ static void __rx_message(struct qmi_device *device,
 	tid = L_LE16_TO_CPU(service->transaction);
 
 	if (service->type == 0x04) {
-		handle_indication(device, service_type, client_id,
+		handle_indication(transport, service_type, client_id,
 					message, length, data);
 		return;
 	}
 
-	req = l_queue_remove_if(device->service_queue, __request_compare,
+	req = l_queue_remove_if(transport->service_queue, __request_compare,
 						L_UINT_TO_PTR(tid));
 	if (!req)
 		return;
@@ -807,14 +807,14 @@ static void family_destroy(void *data)
 {
 	struct service_family *family = data;
 
-	if (!family->device)
+	if (!family->transport)
 		return;
 
-	family->device = NULL;
+	family->transport = NULL;
 }
 
-static int qmi_device_init(struct qmi_device *device, int fd,
-					const struct qmi_device_ops *ops)
+static int qmi_transport_open(struct qmi_transport *transport, int fd,
+				const struct qmi_transport_ops *ops)
 {
 	long flags;
 
@@ -829,28 +829,26 @@ static int qmi_device_init(struct qmi_device *device, int fd,
 			return -errno;
 	}
 
-	device->io = l_io_new(fd);
-	l_io_set_close_on_destroy(device->io, true);
-
-	device->req_queue = l_queue_new();
-	device->service_queue = l_queue_new();
-	device->family_list = l_hashmap_new();
+	transport->io = l_io_new(fd);
+	l_io_set_close_on_destroy(transport->io, true);
 
-	device->next_service_tid = 256;
-
-	device->ops = ops;
+	transport->req_queue = l_queue_new();
+	transport->service_queue = l_queue_new();
+	transport->next_service_tid = 256;
+	transport->ops = ops;
+	transport->family_list = l_hashmap_new();
 
 	return 0;
 }
 
-static void __qmi_device_free(struct qmi_device *device)
+static void qmi_transport_close(struct qmi_transport *transport)
 {
-	l_queue_destroy(device->service_queue, __request_free);
-	l_queue_destroy(device->req_queue, __request_free);
+	l_queue_destroy(transport->service_queue, __request_free);
+	l_queue_destroy(transport->req_queue, __request_free);
 
-	l_io_destroy(device->io);
+	l_io_destroy(transport->io);
 
-	l_hashmap_destroy(device->family_list, family_destroy);
+	l_hashmap_destroy(transport->family_list, family_destroy);
 }
 
 void qmi_result_print_tlvs(struct qmi_result *result)
@@ -932,15 +930,15 @@ bool qmi_qmux_device_has_service(struct qmi_qmux_device *qmux, uint16_t type)
 	return __qmux_service_info_find(qmux, type);
 }
 
-static int qmi_qmux_device_write(struct qmi_device *device,
+static int qmi_qmux_device_write(struct qmi_transport *transport,
 					struct qmi_request *req)
 {
 	struct qmi_qmux_device *qmux =
-		l_container_of(device, struct qmi_qmux_device, super);
+		l_container_of(transport, struct qmi_qmux_device, transport);
 	struct qmi_mux_hdr *hdr;
 	ssize_t bytes_written;
 
-	bytes_written = write(l_io_get_fd(device->io), req->data, req->len);
+	bytes_written = write(l_io_get_fd(transport->io), req->data, req->len);
 	if (bytes_written < 0)
 		return -errno;
 
@@ -955,7 +953,7 @@ static int qmi_qmux_device_write(struct qmi_device *device,
 	if (hdr->service == QMI_SERVICE_CONTROL)
 		l_queue_push_tail(qmux->control_queue, req);
 	else
-		l_queue_push_tail(device->service_queue, req);
+		l_queue_push_tail(transport->service_queue, req);
 
 	return 0;
 }
@@ -979,7 +977,7 @@ static void __rx_ctl_message(struct qmi_qmux_device *qmux,
 	length = L_LE16_TO_CPU(msg->length);
 
 	if (control->type == 0x02 && control->transaction == 0x00) {
-		handle_indication(&qmux->super, service_type, client_id,
+		handle_indication(&qmux->transport, service_type, client_id,
 					message, length, data);
 		return;
 	}
@@ -1003,7 +1001,7 @@ static bool received_qmux_data(struct l_io *io, void *user_data)
 	ssize_t bytes_read;
 	uint16_t offset;
 
-	bytes_read = read(l_io_get_fd(qmux->super.io), buf, sizeof(buf));
+	bytes_read = read(l_io_get_fd(qmux->transport.io), buf, sizeof(buf));
 	if (bytes_read < 0)
 		return true;
 
@@ -1040,7 +1038,7 @@ static bool received_qmux_data(struct l_io *io, void *user_data)
 		if (hdr->service == QMI_SERVICE_CONTROL)
 			__rx_ctl_message(qmux, hdr->service, hdr->client, msg);
 		else
-			__rx_message(&qmux->super,
+			__rx_message(&qmux->transport,
 					hdr->service, hdr->client, msg);
 
 		offset += len;
@@ -1058,28 +1056,29 @@ static struct service_family *service_family_ref(struct service_family *family)
 
 static void service_family_unref(struct service_family *family)
 {
-	struct qmi_device *device;
+	struct qmi_transport *transport;
 
 	if (--family->ref_count)
 		return;
 
-	device = family->device;
-	if (!device)
+	transport = family->transport;
+	if (!transport)
 		goto done;
 
 	if (family->client_id) {
 		unsigned int hash_id =
 			family_list_create_hash(family->info.service_type,
 							family->client_id);
-		l_hashmap_remove(device->family_list, L_UINT_TO_PTR(hash_id));
+		l_hashmap_remove(transport->family_list, L_UINT_TO_PTR(hash_id));
 	}
 
-	l_hashmap_remove(device->family_list,
+	l_hashmap_remove(transport->family_list,
 				L_UINT_TO_PTR(family->info.service_type));
 
-	if (device->ops->client_release)
-		device->ops->client_release(device, family->info.service_type,
-							family->client_id);
+	if (transport->ops->client_release)
+		transport->ops->client_release(transport,
+						family->info.service_type,
+						family->client_id);
 
 done:
 	l_queue_destroy(family->notify_list, NULL);
@@ -1102,20 +1101,21 @@ static uint8_t __ctl_request_submit(struct qmi_qmux_device *qmux,
 	req->tid = hdr->transaction;
 	req->callback = callback;
 
-	l_queue_push_tail(qmux->super.req_queue, req);
-	wakeup_writer(&qmux->super);
+	l_queue_push_tail(qmux->transport.req_queue, req);
+	wakeup_writer(&qmux->transport);
 
 	return req->tid;
 }
 
-static struct service_family *service_family_create(struct qmi_device *device,
+static struct service_family *service_family_create(
+			struct qmi_transport *transport,
 			unsigned int group_id,
 			const struct qmi_service_info *info, uint8_t client_id)
 {
 	struct service_family *family = l_new(struct service_family, 1);
 
 	family->ref_count = 0;
-	family->device = device;
+	family->transport = transport;
 	family->client_id = client_id;
 	family->notify_list = l_queue_new();
 	family->group_id = group_id;
@@ -1146,7 +1146,7 @@ static struct qmi_request *find_control_request(struct qmi_qmux_device *qmux,
 	if (!tid)
 		return NULL;
 
-	req = l_queue_remove_if(qmux->super.req_queue,
+	req = l_queue_remove_if(qmux->transport.req_queue,
 					__request_compare, L_UINT_TO_PTR(tid));
 	if (req)
 		return req;
@@ -1265,9 +1265,7 @@ done:
 static void qmux_discover_reply_timeout(struct l_timeout *timeout,
 							void *user_data)
 {
-	struct qmi_device *device = user_data;
-	struct qmi_qmux_device *qmux =
-		l_container_of(device, struct qmi_qmux_device, super);
+	struct qmi_qmux_device *qmux = user_data;
 	struct qmi_request *req;
 
 	/* remove request from queues */
@@ -1386,7 +1384,7 @@ static void qmux_create_client_callback(struct qmi_request *r,
 	info.major = req->major;
 	info.minor = req->minor;
 
-	family = service_family_create(&qmux->super,
+	family = service_family_create(&qmux->transport,
 					next_id(&qmux->next_group_id),
 					&info, client_id->client);
 	DEBUG(&qmux->debug, "service family created [client=%d,type=%d]",
@@ -1395,7 +1393,7 @@ static void qmux_create_client_callback(struct qmi_request *r,
 	family = service_family_ref(family);
 	hash_id = family_list_create_hash(family->info.service_type,
 							family->client_id);
-	l_hashmap_insert(qmux->super.family_list,
+	l_hashmap_insert(qmux->transport.family_list,
 					L_UINT_TO_PTR(hash_id), family);
 
 done:
@@ -1459,12 +1457,12 @@ static void qmux_client_release_callback(struct qmi_request *req,
 	qmux->shutdown.release_users--;
 }
 
-static void qmi_qmux_device_client_release(struct qmi_device *device,
+static void qmi_qmux_device_client_release(struct qmi_transport *transport,
 						uint16_t service_type,
 						uint16_t client_id)
 {
 	struct qmi_qmux_device *qmux =
-		l_container_of(device, struct qmi_qmux_device, super);
+		l_container_of(transport, struct qmi_qmux_device, transport);
 	uint8_t release_req[] = { 0x01, 0x02, 0x00, service_type, client_id };
 	struct qmi_request *req;
 
@@ -1550,7 +1548,7 @@ int qmi_qmux_device_shutdown(struct qmi_qmux_device *qmux,
 	return 0;
 }
 
-static const struct qmi_device_ops qmux_ops = {
+static const struct qmi_transport_ops qmux_ops = {
 	.write = qmi_qmux_device_write,
 	.client_release = qmi_qmux_device_client_release,
 };
@@ -1566,7 +1564,7 @@ struct qmi_qmux_device *qmi_qmux_device_new(const char *device)
 
 	qmux = l_new(struct qmi_qmux_device, 1);
 
-	if (qmi_device_init(&qmux->super, fd, &qmux_ops) < 0) {
+	if (qmi_transport_open(&qmux->transport, fd, &qmux_ops) < 0) {
 		close(fd);
 		l_free(qmux);
 		return NULL;
@@ -1574,7 +1572,8 @@ struct qmi_qmux_device *qmi_qmux_device_new(const char *device)
 
 	qmux->next_control_tid = 1;
 	qmux->control_queue = l_queue_new();
-	l_io_set_read_handler(qmux->super.io, received_qmux_data, qmux, NULL);
+	l_io_set_read_handler(qmux->transport.io,
+				received_qmux_data, qmux, NULL);
 
 	return qmux;
 }
@@ -1585,7 +1584,7 @@ void qmi_qmux_device_free(struct qmi_qmux_device *qmux)
 		return;
 
 	DEBUG(&qmux->debug, "device %p", qmux);
-	__qmi_device_free(&qmux->super);
+	qmi_transport_close(&qmux->transport);
 
 	if (qmux->shutting_down) {
 		qmux->destroyed = true;
@@ -1605,7 +1604,6 @@ void qmi_qmux_device_set_debug(struct qmi_qmux_device *qmux,
 }
 
 struct qmi_qrtr_node {
-	struct qmi_device super;
 	unsigned int next_group_id;	/* Matches requests with services */
 	struct l_queue *service_infos;
 	struct debug_data debug;
@@ -1615,6 +1613,7 @@ struct qmi_qrtr_node {
 		qmi_destroy_func_t destroy;
 		struct l_timeout *timeout;
 	} lookup;
+	struct qmi_transport transport;
 };
 
 static const struct qmi_service_info *__qrtr_service_info_find(
@@ -1659,16 +1658,16 @@ static void __qrtr_lookup_finished(struct qmi_qrtr_node *node)
 	memset(&node->lookup, 0, sizeof(node->lookup));
 }
 
-static int qmi_qrtr_node_write(struct qmi_device *device,
+static int qmi_qrtr_node_write(struct qmi_transport *transport,
 					struct qmi_request *req)
 {
 	struct qmi_qrtr_node *node =
-		l_container_of(device, struct qmi_qrtr_node, super);
+		l_container_of(transport, struct qmi_qrtr_node, transport);
 	struct sockaddr_qrtr addr;
 	uint8_t *data;
 	uint16_t len;
 	ssize_t bytes_written;
-	int fd = l_io_get_fd(device->io);
+	int fd = l_io_get_fd(transport->io);
 
 	/* Skip the QMUX header */
 	data = req->data + QMI_MUX_HDR_SIZE;
@@ -1692,7 +1691,7 @@ static int qmi_qrtr_node_write(struct qmi_device *device,
 	__qrtr_debug_msg(' ', data, bytes_written,
 			req->info.service_type, &node->debug);
 
-	l_queue_push_tail(device->service_queue, req);
+	l_queue_push_tail(transport->service_queue, req);
 
 	return 0;
 }
@@ -1780,7 +1779,7 @@ static void qrtr_received_service_message(struct qmi_qrtr_node *node,
 						uint32_t qrtr_port,
 						const void *buf, size_t len)
 {
-	struct qmi_device *device = &node->super;
+	struct qmi_transport *transport = &node->transport;
 	const struct l_queue_entry *entry;
 	uint32_t service_type = 0;
 
@@ -1802,7 +1801,7 @@ static void qrtr_received_service_message(struct qmi_qrtr_node *node,
 	}
 
 	__qrtr_debug_msg(' ', buf, len, service_type, &node->debug);
-	__rx_message(device, service_type, 0, buf);
+	__rx_message(transport, service_type, 0, buf);
 }
 
 static bool qrtr_received_data(struct l_io *io, void *user_data)
@@ -1814,7 +1813,8 @@ static bool qrtr_received_data(struct l_io *io, void *user_data)
 	socklen_t addr_size;
 
 	addr_size = sizeof(addr);
-	bytes_read = recvfrom(l_io_get_fd(qrtr->super.io), buf, sizeof(buf), 0,
+	bytes_read = recvfrom(l_io_get_fd(qrtr->transport.io),
+				buf, sizeof(buf), 0,
 				(struct sockaddr *) &addr, &addr_size);
 	DEBUG(&qrtr->debug, "Received %zd bytes from Node: %d Port: %d",
 			bytes_read, addr.sq_node, addr.sq_port);
@@ -1834,9 +1834,8 @@ static bool qrtr_received_data(struct l_io *io, void *user_data)
 	return true;
 }
 
-static const struct qmi_device_ops qrtr_ops = {
+static const struct qmi_transport_ops qrtr_ops = {
 	.write = qmi_qrtr_node_write,
-	.client_release = NULL,
 };
 
 struct qmi_qrtr_node *qmi_qrtr_node_new(uint32_t node)
@@ -1850,15 +1849,15 @@ struct qmi_qrtr_node *qmi_qrtr_node_new(uint32_t node)
 
 	qrtr = l_new(struct qmi_qrtr_node, 1);
 
-	if (qmi_device_init(&qrtr->super, fd, &qrtr_ops) < 0) {
+	if (qmi_transport_open(&qrtr->transport, fd, &qrtr_ops) < 0) {
 		close(fd);
 		l_free(qrtr);
 		return NULL;
 	}
 
 	qrtr->service_infos = l_queue_new();
-
-	l_io_set_read_handler(qrtr->super.io, qrtr_received_data, qrtr, NULL);
+	l_io_set_read_handler(qrtr->transport.io,
+					qrtr_received_data, qrtr, NULL);
 
 	return qrtr;
 }
@@ -1868,7 +1867,7 @@ void qmi_qrtr_node_free(struct qmi_qrtr_node *node)
 	if (!node)
 		return;
 
-	__qmi_device_free(&node->super);
+	qmi_transport_close(&node->transport);
 	l_queue_destroy(node->service_infos, l_free);
 
 	if (node->lookup.destroy)
@@ -1912,7 +1911,7 @@ int qmi_qrtr_node_lookup(struct qmi_qrtr_node *node,
 
 	DEBUG(&node->debug, "node %p", node);
 
-	fd = l_io_get_fd(node->super.io);
+	fd = l_io_get_fd(node->transport.io);
 
 	/*
 	 * The control node is configured by the system. Use getsockname to
@@ -1958,7 +1957,7 @@ int qmi_qrtr_node_lookup(struct qmi_qrtr_node *node,
 struct qmi_service *qmi_qrtr_node_get_service(struct qmi_qrtr_node *node,
 						uint32_t type)
 {
-	struct qmi_device *device = &node->super;
+	struct qmi_transport *transport;
 	struct service_family *family;
 	const struct qmi_service_info *info;
 
@@ -1968,7 +1967,9 @@ struct qmi_service *qmi_qrtr_node_get_service(struct qmi_qrtr_node *node,
 	if (type == QMI_SERVICE_CONTROL)
 		return NULL;
 
-	family = l_hashmap_lookup(device->family_list, L_UINT_TO_PTR(type));
+	transport = &node->transport;
+
+	family = l_hashmap_lookup(transport->family_list, L_UINT_TO_PTR(type));
 	if (family)
 		goto done;
 
@@ -1976,9 +1977,9 @@ struct qmi_service *qmi_qrtr_node_get_service(struct qmi_qrtr_node *node,
 	if (!info)
 		return NULL;
 
-	family = service_family_create(device, next_id(&node->next_group_id),
+	family = service_family_create(transport, next_id(&node->next_group_id),
 					info, 0);
-	l_hashmap_insert(device->family_list, L_UINT_TO_PTR(type), family);
+	l_hashmap_insert(transport->family_list, L_UINT_TO_PTR(type), family);
 done:
 	return service_create(family);
 }
@@ -2338,8 +2339,8 @@ uint16_t qmi_service_send(struct qmi_service *service,
 				qmi_service_result_func_t func,
 				void *user_data, qmi_destroy_func_t destroy)
 {
-	struct qmi_device *device;
 	struct service_family *family;
+	struct qmi_transport *transport;
 	struct qmi_service_request *sreq;
 	struct qmi_service_info *info;
 
@@ -2350,8 +2351,8 @@ uint16_t qmi_service_send(struct qmi_service *service,
 	if (!family->group_id)
 		return 0;
 
-	device = family->device;
-	if (!device)
+	transport = family->transport;
+	if (!transport)
 		return 0;
 
 	info = &family->info;
@@ -2368,7 +2369,7 @@ uint16_t qmi_service_send(struct qmi_service *service,
 	sreq->user_data = user_data;
 	sreq->destroy = destroy;
 
-	return __service_request_submit(device, service, &sreq->super);
+	return __service_request_submit(transport, service, &sreq->super);
 }
 
 struct request_lookup {
@@ -2393,7 +2394,7 @@ static bool __request_compare_for_cancel(const void *a, const void *b)
 
 bool qmi_service_cancel(struct qmi_service *service, uint16_t id)
 {
-	struct qmi_device *device;
+	struct qmi_transport *transport;
 	struct qmi_request *req;
 	struct service_family *family;
 	struct request_lookup lookup = { .tid = id };
@@ -2406,17 +2407,17 @@ bool qmi_service_cancel(struct qmi_service *service, uint16_t id)
 	if (!family->client_id)
 		return false;
 
-	device = family->device;
-	if (!device)
+	transport = family->transport;
+	if (!transport)
 		return false;
 
 	lookup.group_id = family->group_id;
 	lookup.service_handle = service->handle;
 
-	req = l_queue_remove_if(device->req_queue, __request_compare_for_cancel,
-					&lookup);
+	req = l_queue_remove_if(transport->req_queue,
+				__request_compare_for_cancel, &lookup);
 	if (!req) {
-		req = l_queue_remove_if(device->service_queue,
+		req = l_queue_remove_if(transport->service_queue,
 						__request_compare_for_cancel,
 						&lookup);
 		if (!req)
@@ -2457,7 +2458,7 @@ static void remove_client(struct l_queue *queue, unsigned int group_id,
 
 static bool qmi_service_cancel_all(struct qmi_service *service)
 {
-	struct qmi_device *device;
+	struct qmi_transport *transport;
 
 	if (!service)
 		return false;
@@ -2465,13 +2466,13 @@ static bool qmi_service_cancel_all(struct qmi_service *service)
 	if (!service->family->group_id)
 		return false;
 
-	device = service->family->device;
-	if (!device)
+	transport = service->family->transport;
+	if (!transport)
 		return false;
 
-	remove_client(device->req_queue,
+	remove_client(transport->req_queue,
 				service->family->group_id, service->handle);
-	remove_client(device->service_queue,
+	remove_client(transport->service_queue,
 				service->family->group_id, service->handle);
 
 	return true;
Signature · 1 line
2.45.0
#6 lore raw

PATCH v2 7/14 qmi: Separate transport from qmux/qrtr debugging

In reply to Denis Kenzior

Functions that send and receive bytes on the QMI transport are quite verbose (using hexdump, etc). It might be desirable to output debug information from the internal state of qmi_qrtr_node / qmi_qmux_device without also outputting everything coming and going over the wire.

Add qmi_qmux_set_io_debug and qmi_qrtr_node_set_io_debug setters for shuttling low-level transport debug information. Update lower level rx and tx path functions to use the transport debug handlers instead of the ones on struct qmi_qrtr_node / struct qmi_qmux_device.

---
 drivers/qmimodem/qmi.c | 54 +++++++++++++++++++++++++++++-------------
 drivers/qmimodem/qmi.h |  4 ++++
 2 files changed, 41 insertions(+), 17 deletions(-)
drivers/qmimodem/qmi.c +37 -17
index f4af59a1b783..a2b5e652ef93 100644
@@ -92,6 +92,7 @@ struct qmi_transport {
 	uint16_t next_service_tid;
 	struct l_hashmap *family_list;
 	const struct qmi_transport_ops *ops;
+	struct debug_data debug;
 	bool writer_active : 1;
 };
 
@@ -943,10 +944,10 @@ static int qmi_qmux_device_write(struct qmi_transport *transport,
 		return -errno;
 
 	l_util_hexdump(false, req->data, bytes_written,
-			qmux->debug.func, qmux->debug.user_data);
+			transport->debug.func, transport->debug.user_data);
 
 	__qmux_debug_msg(' ', req->data, bytes_written,
-				qmux->debug.func, qmux->debug.user_data);
+			transport->debug.func, transport->debug.user_data);
 
 	hdr = (struct qmi_mux_hdr *) req->data;
 
@@ -996,6 +997,7 @@ static void __rx_ctl_message(struct qmi_qmux_device *qmux,
 static bool received_qmux_data(struct l_io *io, void *user_data)
 {
 	struct qmi_qmux_device *qmux = user_data;
+	struct qmi_transport *transport = &qmux->transport;
 	struct qmi_mux_hdr *hdr;
 	unsigned char buf[2048];
 	ssize_t bytes_read;
@@ -1006,7 +1008,7 @@ static bool received_qmux_data(struct l_io *io, void *user_data)
 		return true;
 
 	l_util_hexdump(true, buf, bytes_read,
-			qmux->debug.func, qmux->debug.user_data);
+			transport->debug.func, transport->debug.user_data);
 
 	offset = 0;
 
@@ -1031,7 +1033,8 @@ static bool received_qmux_data(struct l_io *io, void *user_data)
 			break;
 
 		__qmux_debug_msg(' ', buf + offset, len,
-				qmux->debug.func, qmux->debug.user_data);
+				transport->debug.func,
+				transport->debug.user_data);
 
 		msg = buf + offset + QMI_MUX_HDR_SIZE;
 
@@ -1603,6 +1606,15 @@ void qmi_qmux_device_set_debug(struct qmi_qmux_device *qmux,
 	__debug_data_init(&qmux->debug, func, user_data);
 }
 
+void qmi_qmux_device_set_io_debug(struct qmi_qmux_device *qmux,
+				qmi_debug_func_t func, void *user_data)
+{
+	if (!qmux)
+		return;
+
+	__debug_data_init(&qmux->transport.debug, func, user_data);
+}
+
 struct qmi_qrtr_node {
 	unsigned int next_group_id;	/* Matches requests with services */
 	struct l_queue *service_infos;
@@ -1661,8 +1673,6 @@ static void __qrtr_lookup_finished(struct qmi_qrtr_node *node)
 static int qmi_qrtr_node_write(struct qmi_transport *transport,
 					struct qmi_request *req)
 {
-	struct qmi_qrtr_node *node =
-		l_container_of(transport, struct qmi_qrtr_node, transport);
 	struct sockaddr_qrtr addr;
 	uint8_t *data;
 	uint16_t len;
@@ -1681,15 +1691,15 @@ static int qmi_qrtr_node_write(struct qmi_transport *transport,
 	bytes_written = sendto(fd, data, len, 0, (struct sockaddr *) &addr,
 							sizeof(addr));
 	if (bytes_written < 0) {
-		DEBUG(&node->debug, "sendto: %s", strerror(errno));
+		DEBUG(&transport->debug, "sendto: %s", strerror(errno));
 		return -errno;
 	}
 
 	l_util_hexdump(false, data, bytes_written,
-			node->debug.func, node->debug.user_data);
+			transport->debug.func, transport->debug.user_data);
 
 	__qrtr_debug_msg(' ', data, bytes_written,
-			req->info.service_type, &node->debug);
+			req->info.service_type, &transport->debug);
 
 	l_queue_push_tail(transport->service_queue, req);
 
@@ -1800,13 +1810,14 @@ static void qrtr_received_service_message(struct qmi_qrtr_node *node,
 		return;
 	}
 
-	__qrtr_debug_msg(' ', buf, len, service_type, &node->debug);
+	__qrtr_debug_msg(' ', buf, len, service_type, &transport->debug);
 	__rx_message(transport, service_type, 0, buf);
 }
 
 static bool qrtr_received_data(struct l_io *io, void *user_data)
 {
 	struct qmi_qrtr_node *qrtr = user_data;
+	struct debug_data *debug = &qrtr->transport.debug;
 	struct sockaddr_qrtr addr;
 	unsigned char buf[2048];
 	ssize_t bytes_read;
@@ -1816,14 +1827,13 @@ static bool qrtr_received_data(struct l_io *io, void *user_data)
 	bytes_read = recvfrom(l_io_get_fd(qrtr->transport.io),
 				buf, sizeof(buf), 0,
 				(struct sockaddr *) &addr, &addr_size);
-	DEBUG(&qrtr->debug, "Received %zd bytes from Node: %d Port: %d",
+	DEBUG(debug, "Received %zd bytes from Node: %d Port: %d",
 			bytes_read, addr.sq_node, addr.sq_port);
 
 	if (bytes_read < 0)
 		return true;
 
-	l_util_hexdump(true, buf, bytes_read,
-			qrtr->debug.func, qrtr->debug.user_data);
+	l_util_hexdump(true, buf, bytes_read, debug->func, debug->user_data);
 
 	if (addr.sq_port == QRTR_PORT_CTRL)
 		qrtr_received_control_packet(qrtr, buf, bytes_read);
@@ -1885,6 +1895,15 @@ void qmi_qrtr_node_set_debug(struct qmi_qrtr_node *node,
 	__debug_data_init(&node->debug, func, user_data);
 }
 
+void qmi_qrtr_node_set_io_debug(struct qmi_qrtr_node *node,
+				qmi_debug_func_t func, void *user_data)
+{
+	if (!node)
+		return;
+
+	__debug_data_init(&node->transport.debug, func, user_data);
+}
+
 static void qrtr_lookup_reply_timeout(struct l_timeout *timeout,
 							void *user_data)
 {
@@ -1902,6 +1921,7 @@ int qmi_qrtr_node_lookup(struct qmi_qrtr_node *node,
 	socklen_t addr_len;
 	ssize_t bytes_written;
 	int fd;
+	struct debug_data *debug = &node->transport.debug;
 
 	if (!node || !func)
 		return -EINVAL;
@@ -1919,12 +1939,12 @@ int qmi_qrtr_node_lookup(struct qmi_qrtr_node *node,
 	 */
 	addr_len = sizeof(addr);
 	if (getsockname(fd, (struct sockaddr *) &addr, &addr_len) < 0) {
-		DEBUG(&node->debug, "getsockname failed: %s", strerror(errno));
+		DEBUG(debug, "getsockname failed: %s", strerror(errno));
 		return -errno;
 	}
 
 	if (addr.sq_family != AF_QIPCRTR || addr_len != sizeof(addr)) {
-		DEBUG(&node->debug, "Unexpected sockaddr family: %d size: %d",
+		DEBUG(debug, "Unexpected sockaddr family: %d size: %d",
 				addr.sq_family, addr_len);
 		return -EIO;
 	}
@@ -1937,12 +1957,12 @@ int qmi_qrtr_node_lookup(struct qmi_qrtr_node *node,
 				sizeof(packet), 0,
 				(struct sockaddr *) &addr, addr_len);
 	if (bytes_written < 0) {
-		DEBUG(&node->debug, "sendto failed: %s", strerror(errno));
+		DEBUG(debug, "sendto failed: %s", strerror(errno));
 		return -errno;
 	}
 
 	l_util_hexdump(false, &packet, bytes_written,
-			node->debug.func, node->debug.user_data);
+			debug->func, debug->user_data);
 
 	node->lookup.func = func;
 	node->lookup.user_data = user_data;
drivers/qmimodem/qmi.h +4 -0
index db20280f9aa3..e61e9cc9e878 100644
@@ -72,6 +72,8 @@ struct qmi_qmux_device *qmi_qmux_device_new(const char *device);
 void qmi_qmux_device_free(struct qmi_qmux_device *qmux);
 void qmi_qmux_device_set_debug(struct qmi_qmux_device *qmux,
 				qmi_debug_func_t func, void *user_data);
+void qmi_qmux_device_set_io_debug(struct qmi_qmux_device *qmux,
+				qmi_debug_func_t func, void *user_data);
 int qmi_qmux_device_discover(struct qmi_qmux_device *qmux,
 				qmi_qmux_device_discover_func_t func,
 				void *user_data, qmi_destroy_func_t destroy);
@@ -91,6 +93,8 @@ struct qmi_qrtr_node *qmi_qrtr_node_new(uint32_t node);
 void qmi_qrtr_node_free(struct qmi_qrtr_node *node);
 void qmi_qrtr_node_set_debug(struct qmi_qrtr_node *node,
 				qmi_debug_func_t func, void *user_data);
+void qmi_qrtr_node_set_io_debug(struct qmi_qrtr_node *node,
+				qmi_debug_func_t func, void *user_data);
 int qmi_qrtr_node_lookup(struct qmi_qrtr_node *node,
 			qmi_qrtr_node_lookup_done_func_t func,
 			void *user_data, qmi_destroy_func_t destroy);
Signature · 1 line
2.45.0
#7 lore raw

PATCH v2 8/14 gobi: Enable io debugging only if OFONO_QMI_IO_DEBUG is set

In reply to Denis Kenzior

QMUX/QMI protocol details are now mostly stable to the point that hexdumping what is being sent / received over the wire is just noise. qmi_qmux_device now supports setting separate debug handlers for the underlying object and the low-level IO. If OFONO_QMI_DEBUG environment variable is set, enable debugging for core QMUX/QMI implementation but disable low-level IO debugging. If IO debugging is desired, use the OFONO_QMI_IO_DEBUG environment variable.

---
 plugins/gobi.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)
plugins/gobi.c +13 -2
index e25807753e20..88e4c7fc4887 100644
@@ -89,7 +89,14 @@ static void gobi_debug(const char *str, void *user_data)
 {
 	const char *prefix = user_data;
 
-	ofono_info("%s%s", prefix, str);
+	ofono_debug("%s%s", prefix, str);
+}
+
+static void gobi_io_debug(const char *str, void *user_data)
+{
+	const char *prefix = user_data;
+
+	ofono_debug("%s%s", prefix, str);
 }
 
 /*
@@ -543,7 +550,11 @@ static int gobi_enable(struct ofono_modem *modem)
 		return -EIO;
 
 	if (getenv("OFONO_QMI_DEBUG"))
-		qmi_qmux_device_set_debug(data->device, gobi_debug, "QMI: ");
+		qmi_qmux_device_set_debug(data->device, gobi_debug, "");
+
+	if (getenv("OFONO_QMI_IO_DEBUG"))
+		qmi_qmux_device_set_io_debug(data->device,
+						gobi_io_debug, "QMI: ");
 
 	r = qmi_qmux_device_discover(data->device, discover_cb, modem, NULL);
 	if (!r)
Signature · 1 line
2.45.0
#8 lore raw

PATCH v2 9/14 qmiqrtr: Enable io debugging only if OFONO_QMI_IO_DEBUG is set

In reply to Denis Kenzior

QRTR/QMI protocol details are now mostly stable to the point that hexdumping what is being sent / received over the wire is just noise. qmi_qrtr_node now supports setting separate debug handlers for the underlying object and the low-level IO. If OFONO_QMI_DEBUG environment variable is set, enable debugging for core QRTR/QMI implementation but disable low-level IO debugging. If IO debugging is desired, use the OFONO_QMI_IO_DEBUG environment variable.

---
 plugins/qrtrqmi.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)
plugins/qrtrqmi.c +13 -2
index 4117cac11423..b64ab355a2e8 100644
@@ -52,13 +52,20 @@ struct qrtrqmi_data {
 	bool have_voice : 1;
 };
 
-static void qrtrqmi_debug(const char *str, void *user_data)
+static void qrtrqmi_io_debug(const char *str, void *user_data)
 {
 	const char *prefix = user_data;
 
 	ofono_info("%s%s", prefix, str);
 }
 
+static void qrtrqmi_debug(const char *str, void *user_data)
+{
+	const char *prefix = user_data;
+
+	ofono_debug("%s%s", prefix, str);
+}
+
 /*
  * Probe the modem.  The following modem properties are expected to be set
  * in order to initialize the driver properly:
@@ -213,7 +220,11 @@ static int qrtrqmi_enable(struct ofono_modem *modem)
 		return -EIO;
 
 	if (getenv("OFONO_QMI_DEBUG"))
-		qmi_qrtr_node_set_debug(data->node, qrtrqmi_debug, "QRTR: ");
+		qmi_qrtr_node_set_debug(data->node, qrtrqmi_debug, "");
+
+	if (getenv("OFONO_QMI_IO_DEBUG"))
+		qmi_qrtr_node_set_io_debug(data->node,
+						qrtrqmi_io_debug, "QRTR: ");
 
 	r = qmi_qrtr_node_lookup(data->node, lookup_done, modem, NULL);
 	if (!r)
Signature · 1 line
2.45.0
#9 lore raw

PATCH v2 10/14 qmi: Move release_client operation into service_family

In reply to Denis Kenzior

qmi_device has been renamed into qmi_transport which now encapsulated the details of maintaining a list of outstanding requests, active service families and low-level tx/rx details. The client_remove operation is now out of place and logically fits much better on the service_family object.

Remove the release_client operation from qmi_transport_ops. Introduce two specializations of service_family for qrtr and qmux respectively. Release of QMUX clients will now be triggered when the QMUX service family object is destroyed.

---
 drivers/qmimodem/qmi.c | 121 +++++++++++++++++++++++++----------------
 1 file changed, 74 insertions(+), 47 deletions(-)
drivers/qmimodem/qmi.c +74 -47
index a2b5e652ef93..5720218072bc 100644
@@ -81,8 +81,6 @@ struct debug_data {
 
 struct qmi_transport_ops {
 	int (*write)(struct qmi_transport *transport, struct qmi_request *req);
-	void (*client_release)(struct qmi_transport *transport,
-				uint16_t service_type, uint16_t client_id);
 };
 
 struct qmi_transport {
@@ -132,6 +130,7 @@ struct service_family {
 	uint16_t next_notify_id;
 	unsigned int next_service_handle;
 	struct l_queue *notify_list;
+	void (*free_family)(struct service_family *family);
 };
 
 struct qmi_service {
@@ -1078,14 +1077,9 @@ static void service_family_unref(struct service_family *family)
 	l_hashmap_remove(transport->family_list,
 				L_UINT_TO_PTR(family->info.service_type));
 
-	if (transport->ops->client_release)
-		transport->ops->client_release(transport,
-						family->info.service_type,
-						family->client_id);
-
 done:
 	l_queue_destroy(family->notify_list, NULL);
-	l_free(family);
+	family->free_family(family);
 }
 
 static uint8_t __ctl_request_submit(struct qmi_qmux_device *qmux,
@@ -1110,21 +1104,18 @@ static uint8_t __ctl_request_submit(struct qmi_qmux_device *qmux,
 	return req->tid;
 }
 
-static struct service_family *service_family_create(
-			struct qmi_transport *transport,
-			unsigned int group_id,
-			const struct qmi_service_info *info, uint8_t client_id)
+static void __service_family_init(struct service_family *family,
+					struct qmi_transport *transport,
+					unsigned int group_id,
+					const struct qmi_service_info *info,
+					uint8_t client_id)
 {
-	struct service_family *family = l_new(struct service_family, 1);
-
 	family->ref_count = 0;
 	family->transport = transport;
 	family->client_id = client_id;
 	family->notify_list = l_queue_new();
 	family->group_id = group_id;
 	memcpy(&family->info, info, sizeof(family->info));
-
-	return family;
 }
 
 static struct qmi_service *service_create(struct service_family *family)
@@ -1308,6 +1299,50 @@ int qmi_qmux_device_discover(struct qmi_qmux_device *qmux,
 	return 0;
 }
 
+static void qmux_client_release_callback(struct qmi_request *req,
+					uint16_t message, uint16_t length,
+					const void *buffer)
+{
+	struct qmi_qmux_device *qmux = req->user_data;
+
+	qmux->shutdown.release_users--;
+}
+
+static void qmux_service_family_free(struct service_family *family)
+{
+	struct qmi_qmux_device *qmux = l_container_of(family->transport,
+							struct qmi_qmux_device,
+							transport);
+	uint8_t release_req[] = { 0x01, 0x02, 0x00,
+				family->info.service_type, family->client_id };
+	struct qmi_request *req;
+
+	if (family->transport) {
+		qmux->shutdown.release_users++;
+		req = __control_request_alloc(QMI_CTL_RELEASE_CLIENT_ID,
+					release_req, sizeof(release_req), 0);
+		req->user_data = qmux;
+
+		__ctl_request_submit(qmux, req, qmux_client_release_callback);
+	}
+
+	l_free(family);
+}
+
+static struct service_family *qmux_service_family_new(
+					struct qmi_transport *transport,
+					unsigned int group_id,
+					const struct qmi_service_info *info,
+					uint8_t client_id)
+{
+	struct service_family *family = l_new(struct service_family, 1);
+
+	__service_family_init(family, transport, group_id, info, client_id);
+	family->free_family = qmux_service_family_free;
+
+	return family;
+}
+
 struct qmux_create_client_request {
 	struct qmi_qmux_device *qmux;
 	uint8_t type;
@@ -1387,7 +1422,7 @@ static void qmux_create_client_callback(struct qmi_request *r,
 	info.major = req->major;
 	info.minor = req->minor;
 
-	family = service_family_create(&qmux->transport,
+	family = qmux_service_family_new(&qmux->transport,
 					next_id(&qmux->next_group_id),
 					&info, client_id->client);
 	DEBUG(&qmux->debug, "service family created [client=%d,type=%d]",
@@ -1451,33 +1486,6 @@ bool qmi_qmux_device_create_client(struct qmi_qmux_device *qmux,
 	return true;
 }
 
-static void qmux_client_release_callback(struct qmi_request *req,
-					uint16_t message, uint16_t length,
-					const void *buffer)
-{
-	struct qmi_qmux_device *qmux = req->user_data;
-
-	qmux->shutdown.release_users--;
-}
-
-static void qmi_qmux_device_client_release(struct qmi_transport *transport,
-						uint16_t service_type,
-						uint16_t client_id)
-{
-	struct qmi_qmux_device *qmux =
-		l_container_of(transport, struct qmi_qmux_device, transport);
-	uint8_t release_req[] = { 0x01, 0x02, 0x00, service_type, client_id };
-	struct qmi_request *req;
-
-	qmux->shutdown.release_users++;
-
-	req = __control_request_alloc(QMI_CTL_RELEASE_CLIENT_ID,
-					release_req, sizeof(release_req), 0);
-	req->user_data = qmux;
-
-	__ctl_request_submit(qmux, req, qmux_client_release_callback);
-}
-
 static void __qmux_device_free(struct qmi_qmux_device *qmux)
 {
 	l_queue_destroy(qmux->control_queue, __request_free);
@@ -1553,7 +1561,6 @@ int qmi_qmux_device_shutdown(struct qmi_qmux_device *qmux,
 
 static const struct qmi_transport_ops qmux_ops = {
 	.write = qmi_qmux_device_write,
-	.client_release = qmi_qmux_device_client_release,
 };
 
 struct qmi_qmux_device *qmi_qmux_device_new(const char *device)
@@ -1670,6 +1677,25 @@ static void __qrtr_lookup_finished(struct qmi_qrtr_node *node)
 	memset(&node->lookup, 0, sizeof(node->lookup));
 }
 
+static void qrtr_service_family_free(struct service_family *family)
+{
+	l_free(family);
+}
+
+static struct service_family *qrtr_service_family_new(
+					struct qmi_transport *transport,
+					unsigned int group_id,
+					const struct qmi_service_info *info,
+					uint8_t client_id)
+{
+	struct service_family *family = l_new(struct service_family, 1);
+
+	__service_family_init(family, transport, group_id, info, client_id);
+	family->free_family = qrtr_service_family_free;
+
+	return family;
+}
+
 static int qmi_qrtr_node_write(struct qmi_transport *transport,
 					struct qmi_request *req)
 {
@@ -1997,8 +2023,9 @@ struct qmi_service *qmi_qrtr_node_get_service(struct qmi_qrtr_node *node,
 	if (!info)
 		return NULL;
 
-	family = service_family_create(transport, next_id(&node->next_group_id),
-					info, 0);
+	family = qrtr_service_family_new(transport,
+						next_id(&node->next_group_id),
+						info, 0);
 	l_hashmap_insert(transport->family_list, L_UINT_TO_PTR(type), family);
 done:
 	return service_create(family);
Signature · 1 line
2.45.0
#10 lore raw

PATCH v2 11/14 qmi: Add dedicated service for qrtr

In reply to Denis Kenzior
---
 drivers/qmimodem/qmi.c | 91 ++++++++++++++++++++++++++++++++++++++++++
 drivers/qmimodem/qmi.h |  3 ++
 2 files changed, 94 insertions(+)
drivers/qmimodem/qmi.c +91 -0
index 5720218072bc..24d2ff8075fe 100644
@@ -2039,6 +2039,97 @@ bool qmi_qrtr_node_has_service(struct qmi_qrtr_node *node, uint16_t type)
 	return __qrtr_service_info_find(node, type);
 }
 
+struct qrtr_service_family_dedicated {
+	struct service_family super;
+	struct qmi_transport transport;
+};
+
+static void qrtr_service_family_dedicated_free(struct service_family *family)
+{
+	struct qrtr_service_family_dedicated *dfamily =
+		l_container_of(family,
+				struct qrtr_service_family_dedicated, super);
+
+	qmi_transport_close(&dfamily->transport);
+	l_free(dfamily);
+}
+
+static bool qrtr_service_family_dedicated_rx(struct l_io *io, void *user_data)
+{
+	struct qrtr_service_family_dedicated *family = user_data;
+	struct debug_data *debug = &family->transport.debug;
+	const struct qmi_service_info *info = &family->super.info;
+	struct sockaddr_qrtr addr;
+	unsigned char buf[2048];
+	ssize_t bytes_read;
+	socklen_t addr_size;
+	int fd = l_io_get_fd(family->transport.io);
+
+	addr_size = sizeof(addr);
+	bytes_read = recvfrom(fd, buf, sizeof(buf), 0,
+				(struct sockaddr *) &addr, &addr_size);
+	DEBUG(debug, "fd %d Received %zd bytes from Node: %d Port: %d",
+			fd, bytes_read, addr.sq_node, addr.sq_port);
+
+	if (bytes_read < 0)
+		return true;
+
+	if (addr.sq_port != info->qrtr_port && addr.sq_node != info->qrtr_node)
+		return true;
+
+	l_util_hexdump(true, buf, bytes_read, debug->func, debug->user_data);
+	__qrtr_debug_msg(' ', buf, bytes_read, info->service_type, debug);
+	__rx_message(&family->transport, info->service_type, 0, buf);
+
+	return true;
+}
+
+struct qmi_service *qmi_qrtr_node_get_dedicated_service(
+						struct qmi_qrtr_node *node,
+						uint16_t type)
+{
+	struct qrtr_service_family_dedicated *family;
+	const struct qmi_service_info *info;
+	int fd;
+
+	if (!node)
+		return NULL;
+
+	if (type == QMI_SERVICE_CONTROL)
+		return NULL;
+
+	info = __qrtr_service_info_find(node, type);
+	if (!info)
+		return NULL;
+
+	fd = socket(AF_QIPCRTR, SOCK_DGRAM, 0);
+	if (fd < 0)
+		return NULL;
+
+	family = l_new(struct qrtr_service_family_dedicated, 1);
+
+	if (qmi_transport_open(&family->transport, fd, &qrtr_ops) < 0) {
+		close(fd);
+		l_free(family);
+		return NULL;
+	}
+
+	DEBUG(&node->debug, "Opening dedicated service for %u", type);
+	__service_family_init(&family->super, &family->transport,
+				next_id(&node->next_group_id), info, 0);
+	family->super.free_family = qrtr_service_family_dedicated_free;
+	l_hashmap_insert(family->transport.family_list,
+					L_UINT_TO_PTR(type), family);
+
+	l_io_set_read_handler(family->transport.io,
+					qrtr_service_family_dedicated_rx,
+					family, NULL);
+	memcpy(&family->transport.debug, &node->transport.debug,
+						sizeof(struct debug_data));
+
+	return service_create(&family->super);
+}
+
 struct qmi_param *qmi_param_new(void)
 {
 	return l_new(struct qmi_param, 1);
drivers/qmimodem/qmi.h +3 -0
index e61e9cc9e878..0e48313ebb64 100644
@@ -100,6 +100,9 @@ int qmi_qrtr_node_lookup(struct qmi_qrtr_node *node,
 			void *user_data, qmi_destroy_func_t destroy);
 struct qmi_service *qmi_qrtr_node_get_service(struct qmi_qrtr_node *node,
 						uint32_t type);
+struct qmi_service *qmi_qrtr_node_get_dedicated_service(
+						struct qmi_qrtr_node *node,
+						uint16_t type);
 bool qmi_qrtr_node_has_service(struct qmi_qrtr_node *node, uint16_t type);
 
 struct qmi_param;
Signature · 1 line
2.45.0
#11 lore raw

PATCH v2 12/14 qmi: debug print fd that QRTR data was received on

In reply to Denis Kenzior

Similarly to qrtr_service_family_dedicated_rx(), output the fd for the rx operation.

---
 drivers/qmimodem/qmi.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/qmimodem/qmi.c +4 -4
index 24d2ff8075fe..b8f46a5b4a0e 100644
@@ -1848,13 +1848,13 @@ static bool qrtr_received_data(struct l_io *io, void *user_data)
 	unsigned char buf[2048];
 	ssize_t bytes_read;
 	socklen_t addr_size;
+	int fd = l_io_get_fd(qrtr->transport.io);
 
 	addr_size = sizeof(addr);
-	bytes_read = recvfrom(l_io_get_fd(qrtr->transport.io),
-				buf, sizeof(buf), 0,
+	bytes_read = recvfrom(fd, buf, sizeof(buf), 0,
 				(struct sockaddr *) &addr, &addr_size);
-	DEBUG(debug, "Received %zd bytes from Node: %d Port: %d",
-			bytes_read, addr.sq_node, addr.sq_port);
+	DEBUG(debug, "fd %d Received %zd bytes from Node: %d Port: %d",
+			fd, bytes_read, addr.sq_node, addr.sq_port);
 
 	if (bytes_read < 0)
 		return true;
Signature · 1 line
2.45.0
#12 lore raw

PATCH v2 13/14 unit: Use _auto_ to automatically tear-down test setup

In reply to Denis Kenzior
---
 unit/test-qmimodem-qmi.c | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)
unit/test-qmimodem-qmi.c +8 -16
index 2ff981391849..e68f5a7bdd8f 100644
@@ -181,11 +181,11 @@ static void test_cleanup(struct test_info *info)
 	l_main_exit();
 }
 
+static void _l_test_cleanup_cleanup(void *p) { test_cleanup(*(void **) p); }
+
 static void test_create_qrtr_node(const void *data)
 {
-	struct test_info *info = test_setup();
-
-	test_cleanup(info);
+	_auto_(test_cleanup) struct test_info *info = test_setup();
 }
 
 static void lookup_complete_cb(void *user_data)
@@ -205,11 +205,9 @@ static void perform_lookup(struct test_info *info)
 
 static void test_lookup(const void *data)
 {
-	struct test_info *info = test_setup();
+	_auto_(test_cleanup) struct test_info *info = test_setup();
 
 	perform_lookup(info);
-
-	test_cleanup(info);
 }
 
 /* Callbacks could queue other callbacks so continue until there are no more. */
@@ -223,7 +221,7 @@ static void perform_all_pending_work(void)
 
 static void test_create_services(const void *data)
 {
-	struct test_info *info = test_setup();
+	_auto_(test_cleanup) struct test_info *info = test_setup();
 	struct qmi_service *services[3];
 	uint32_t service_type;
 	size_t i;
@@ -262,8 +260,6 @@ static void test_create_services(const void *data)
 
 	for (i = 0; i < L_ARRAY_SIZE(services); i++)
 		qmi_service_free(services[i]);
-
-	test_cleanup(info);
 }
 
 static bool received_data(struct l_io *io, void *user_data)
@@ -423,7 +419,7 @@ static void send_response_to_client(struct test_info *info, struct l_io *io)
  */
 static void test_send_data(const void *data)
 {
-	struct test_info *info = test_setup();
+	_auto_(test_cleanup) struct test_info *info = test_setup();
 	struct l_io *io;
 	uint32_t service_type;
 	struct qmi_service *service;
@@ -443,8 +439,6 @@ static void test_send_data(const void *data)
 
 	l_io_destroy(io);
 	qmi_service_free(service);
-
-	test_cleanup(info);
 }
 
 
@@ -469,7 +463,7 @@ static void internal_timeout_cb(struct l_timeout *timeout, void *user_data)
 
 static void test_notifications(const void *data)
 {
-	struct test_info *info = test_setup();
+	_auto_(test_cleanup) struct test_info *info = test_setup();
 	struct l_io *io;
 	uint32_t service_type;
 	struct qmi_service *service;
@@ -517,12 +511,11 @@ static void test_notifications(const void *data)
 	l_timeout_remove(receive_timeout);
 
 	l_io_destroy(io);
-	test_cleanup(info);
 }
 
 static void test_service_notification_independence(const void *data)
 {
-	struct test_info *info = test_setup();
+	_auto_(test_cleanup) struct test_info *info = test_setup();
 	struct l_io *io;
 	uint32_t service_type;
 	struct qmi_service *services[2];
@@ -563,7 +556,6 @@ static void test_service_notification_independence(const void *data)
 		qmi_service_free(services[i]);
 
 	l_io_destroy(io);
-	test_cleanup(info);
 }
 
 static void exit_if_qrtr_not_supported(void)
Signature · 1 line
2.45.0
#13 lore raw

PATCH v2 14/14 unit: Add unit test for QRTR dedicated services

In reply to Denis Kenzior

While here, also add a couple of helper functions that perform boiler-plate operations. The service_common_setup helper takes a 'dedicated' parameter which is used to select whether qmi_qrtr_node_get_service or qmi_qrtr_node_get_service_dedicated is used for service creation.

---
 unit/test-qmimodem-qmi.c | 73 +++++++++++++++++++++++++---------------
 1 file changed, 46 insertions(+), 27 deletions(-)
unit/test-qmimodem-qmi.c +46 -27
index e68f5a7bdd8f..bc021901ce74 100644
@@ -413,26 +413,45 @@ static void send_response_to_client(struct test_info *info, struct l_io *io)
 		l_main_iterate(-1);
 }
 
-/*
- * Initiates a send of the TLV data payload to the test service. The test
- * service will respond with the same data payload.
- */
-static void test_send_data(const void *data)
+static struct qmi_service *service_common_setup(struct test_info *info,
+								bool dedicated)
 {
-	_auto_(test_cleanup) struct test_info *info = test_setup();
-	struct l_io *io;
 	uint32_t service_type;
 	struct qmi_service *service;
 
 	perform_lookup(info);
 
 	service_type = unique_service_type(0); /* Use the first service */
-	service = qmi_qrtr_node_get_service(info->node, service_type);
+
+	if (dedicated)
+		service = qmi_qrtr_node_get_dedicated_service(info->node,
+								service_type);
+	else
+		service = qmi_qrtr_node_get_service(info->node, service_type);
+
 	assert(service);
 
-	io = l_io_new(info->service_fds[0]);
+	return service;
+}
+
+static struct l_io *setup_io(int fd, void *user_data)
+{
+	struct l_io *io = l_io_new(fd);
+
 	assert(io);
-	l_io_set_read_handler(io, received_data, info, NULL);
+	l_io_set_read_handler(io, received_data, user_data, NULL);
+	return io;
+}
+
+/*
+ * Initiates a send of the TLV data payload to the test service. The test
+ * service will respond with the same data payload.
+ */
+static void test_send_data(const void *data)
+{
+	_auto_(test_cleanup) struct test_info *info = test_setup();
+	struct l_io *io = setup_io(info->service_fds[0], info);
+	struct qmi_service *service = service_common_setup(info, false);
 
 	send_request_via_qmi(info, service);
 	send_response_to_client(info, io);
@@ -441,7 +460,6 @@ static void test_send_data(const void *data)
 	qmi_service_free(service);
 }
 
-
 static void notify_cb(struct qmi_result *result, void *user_data)
 {
 	struct test_info *info = user_data;
@@ -464,21 +482,10 @@ static void internal_timeout_cb(struct l_timeout *timeout, void *user_data)
 static void test_notifications(const void *data)
 {
 	_auto_(test_cleanup) struct test_info *info = test_setup();
-	struct l_io *io;
-	uint32_t service_type;
-	struct qmi_service *service;
+	struct qmi_service *service = service_common_setup(info, false);
+	struct l_io *io = setup_io(info->service_fds[0], info);
 	struct l_timeout *receive_timeout;
 
-	perform_lookup(info);
-
-	service_type = unique_service_type(0); /* Use the first service */
-	service = qmi_qrtr_node_get_service(info->node, service_type);
-	assert(service);
-
-	io = l_io_new(info->service_fds[0]);
-	assert(io);
-	l_io_set_read_handler(io, received_data, info, NULL);
-
 	send_request_via_qmi(info, service);
 	send_response_to_client(info, io);
 
@@ -525,9 +532,7 @@ static void test_service_notification_independence(const void *data)
 
 	service_type = unique_service_type(0); /* Use the first service */
 
-	io = l_io_new(info->service_fds[0]);
-	assert(io);
-	l_io_set_read_handler(io, received_data, info, NULL);
+	io = setup_io(info->service_fds[0], info);
 
 	for (i = 0; i < L_ARRAY_SIZE(services); i++) {
 		services[i] = qmi_qrtr_node_get_service(info->node,
@@ -558,6 +563,19 @@ static void test_service_notification_independence(const void *data)
 	l_io_destroy(io);
 }
 
+static void test_dedicated(const void *data)
+{
+	_auto_(test_cleanup) struct test_info *info = test_setup();
+	struct qmi_service *service = service_common_setup(info, true);
+	struct l_io *io = setup_io(info->service_fds[0], info);
+
+	send_request_via_qmi(info, service);
+	send_response_to_client(info, io);
+
+	l_io_destroy(io);
+	qmi_service_free(service);
+}
+
 static void exit_if_qrtr_not_supported(void)
 {
 	int fd;
@@ -590,6 +608,7 @@ int main(int argc, char **argv)
 	l_test_add("QRTR notifications", test_notifications, NULL);
 	l_test_add("QRTR service notifications are independent",
 				test_service_notification_independence, NULL);
+	l_test_add("QRTR dedicated service", test_dedicated, NULL);
 	result = l_test_run();
 
 	__ofono_log_cleanup();
Signature · 1 line
2.45.0
#14 lore raw
In reply to Denis Kenzior
This series was applied to ofono.git (master) by Denis Kenzior <[email protected]>:

Hello:

This series was applied to ofono.git (master)
by Denis Kenzior <[email protected]>:

Quoted 5 lines · On Tue, 25 Jun 2024 11:41:37 -0500 you wrote:

This will make it easier to compare service major.minor versions in a more readable manner.

---
 drivers/qmimodem/qmi.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Here is the summary with links:
- [v2,01/14] qmi: Introduce SERVICE_VERSION macro

    https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=17c59087a559
  - [v2,02/14] qmi: Remove control_major and control_minor
    https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=c2fca8c3ff5a
  - [v2,03/14] qmi: Move service_handle allocation to service_family
    https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=1dada7a3caef
  - [v2,04/14] qmi: Move group id allocation out of qmi_device
    https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=97758fc3e797
  - [v2,05/14] qmi: Move service_info management into qrtr/qmux
    https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=d216d9826b3a
  - [v2,06/14] qmi: Rename qmi_device to qmi_transport
    https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=c98edde4fabb
  - [v2,07/14] qmi: Separate transport from qmux/qrtr debugging
    https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=3287d7b5e8b6
  - [v2,08/14] gobi: Enable io debugging only if OFONO_QMI_IO_DEBUG is set
    https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=369d68cab127
  - [v2,09/14] qmiqrtr: Enable io debugging only if OFONO_QMI_IO_DEBUG is set
    https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=37662676bce0
  - [v2,10/14] qmi: Move release_client operation into service_family
    https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=015266f253ab
  - [v2,11/14] qmi: Add dedicated service for qrtr
    https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=0e99a8932bae
  - [v2,12/14] qmi: debug print fd that QRTR data was received on
    https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=fba357d49292
  - [v2,13/14] unit: Use _auto_ to automatically tear-down test setup
    https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=e78bb3a9338e
  - [v2,14/14] unit: Add unit test for QRTR dedicated services
    https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=19a0671b111e

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html