From: Steve Schrock <steve.schrock@getcruise.com>
To: ofono@lists.linux.dev
Cc: Steve Schrock <steve.schrock@getcruise.com>
Subject: [PATCH 1/3] qmi: Add an abstract service id to requests
Date: Fri, 1 Mar 2024 11:11:20 -0600 [thread overview]
Message-ID: <20240301171124.38735-1-steve.schrock@getcruise.com> (raw)
This will allow services and requests to be matched without using
the QMUX client id which does not exist in QRTR.
---
drivers/qmimodem/qmi.c | 38 ++++++++++++++++++++++++--------------
1 file changed, 24 insertions(+), 14 deletions(-)
diff --git a/drivers/qmimodem/qmi.c b/drivers/qmimodem/qmi.c
index 23a5fee7..ce40d6a1 100644
--- a/drivers/qmimodem/qmi.c
+++ b/drivers/qmimodem/qmi.c
@@ -61,6 +61,7 @@ struct qmi_service_info {
struct qmi_request {
uint16_t tid;
+ unsigned int service_id; /* Always 0 for control */
uint8_t client;
qmi_message_func_t callback;
void *user_data;
@@ -90,6 +91,7 @@ struct qmi_device {
struct l_queue *req_queue;
struct l_queue *service_queue;
struct l_queue *discovery_queue;
+ unsigned int next_service_id; /* Matches requests with services */
uint16_t next_service_tid;
qmi_debug_func_t debug_func;
void *debug_data;
@@ -119,6 +121,7 @@ struct qmi_service {
int ref_count;
struct qmi_device *device;
struct qmi_service_info info;
+ unsigned int service_id;
uint8_t client_id;
uint16_t next_notify_id;
struct l_queue *notify_list;
@@ -213,6 +216,7 @@ static void __qmi_service_appeared(struct qmi_device *device,
}
static struct qmi_request *__request_alloc(uint8_t service,
+ unsigned int service_id,
uint8_t client, uint16_t message,
const void *data,
uint16_t length, qmi_message_func_t func,
@@ -232,6 +236,7 @@ static struct qmi_request *__request_alloc(uint8_t service,
msglen = hdrlen + QMI_MESSAGE_HDR_SIZE + length;
req = l_malloc(sizeof(struct qmi_request) + msglen);
req->tid = 0;
+ req->service_id = service_id;
req->len = msglen;
req->client = client;
@@ -1397,6 +1402,11 @@ static struct qmi_service *service_create(struct qmi_device *device,
service->client_id = client_id;
service->notify_list = l_queue_new();
+ if (device->next_service_id == 0) /* 0 is reserved for control */
+ device->next_service_id = 1;
+
+ service->service_id = device->next_service_id++;
+
memcpy(&service->info, info, sizeof(service->info));
__debug_device(device, "service created [client=%d,type=%d]",
@@ -1484,7 +1494,7 @@ static bool qmi_device_qmux_sync(struct qmi_device_qmux *qmux,
__debug_device(&qmux->super, "Sending sync to reset QMI");
- req = __request_alloc(QMI_SERVICE_CONTROL, 0x00,
+ req = __request_alloc(QMI_SERVICE_CONTROL, 0, 0x00,
QMI_CTL_SYNC, NULL, 0,
qmux_sync_callback, data);
@@ -1612,7 +1622,7 @@ static int qmi_device_qmux_discover(struct qmi_device *device,
data->user_data = user_data;
data->destroy = destroy;
- req = __request_alloc(QMI_SERVICE_CONTROL, 0x00,
+ req = __request_alloc(QMI_SERVICE_CONTROL, 0, 0x00,
QMI_CTL_GET_VERSION_INFO,
NULL, 0, qmux_discover_callback, data);
@@ -1758,7 +1768,7 @@ static int qmi_device_qmux_client_create(struct qmi_device *device,
qmi_device_get_service_version(device, data->type,
&data->major, &data->minor);
- req = __request_alloc(QMI_SERVICE_CONTROL, 0x00,
+ req = __request_alloc(QMI_SERVICE_CONTROL, 0, 0x00,
QMI_CTL_GET_CLIENT_ID,
client_req, sizeof(client_req),
qmux_client_create_callback, data);
@@ -1795,7 +1805,7 @@ static void qmi_device_qmux_client_release(struct qmi_device *device,
qmux->release_users++;
- req = __request_alloc(QMI_SERVICE_CONTROL, 0x00,
+ req = __request_alloc(QMI_SERVICE_CONTROL, 0, 0x00,
QMI_CTL_RELEASE_CLIENT_ID,
release_req, sizeof(release_req),
qmux_client_release_callback, qmux);
@@ -2667,7 +2677,7 @@ uint16_t qmi_service_send(struct qmi_service *service,
if (!service)
return 0;
- if (!service->client_id)
+ if (!service->service_id)
return 0;
device = service->device;
@@ -2680,8 +2690,8 @@ uint16_t qmi_service_send(struct qmi_service *service,
data->user_data = user_data;
data->destroy = destroy;
- req = __request_alloc(service->info.service_type, service->client_id,
- message,
+ req = __request_alloc(service->info.service_type, service->service_id,
+ service->client_id, message,
param ? param->data : NULL,
param ? param->length : 0,
service_send_callback, data);
@@ -2729,9 +2739,9 @@ 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;
- uint8_t client = L_PTR_TO_UINT(user_data);
+ unsigned int service_id = L_PTR_TO_UINT(user_data);
- if (!req->client || req->client != client)
+ if (req->service_id != service_id)
return false;
service_send_free(req->user_data);
@@ -2740,10 +2750,10 @@ static bool remove_req_if_match(void *data, void *user_data)
return true;
}
-static void remove_client(struct l_queue *queue, uint8_t client)
+static void remove_client(struct l_queue *queue, unsigned int service_id)
{
l_queue_foreach_remove(queue, remove_req_if_match,
- L_UINT_TO_PTR(client));
+ L_UINT_TO_PTR(service_id));
}
bool qmi_service_cancel_all(struct qmi_service *service)
@@ -2753,15 +2763,15 @@ bool qmi_service_cancel_all(struct qmi_service *service)
if (!service)
return false;
- if (!service->client_id)
+ if (!service->service_id)
return false;
device = service->device;
if (!device)
return false;
- remove_client(device->req_queue, service->client_id);
- remove_client(device->service_queue, service->client_id);
+ remove_client(device->req_queue, service->service_id);
+ remove_client(device->service_queue, service->service_id);
return true;
}
--
2.43.2
--
*Confidentiality Note:* We care about protecting our proprietary
information, confidential material, and trade secrets. This message may
contain some or all of those things. Cruise will suffer material harm if
anyone other than the intended recipient disseminates or takes any action
based on this message. If you have received this message (including any
attachments) in error, please delete it immediately and notify the sender
promptly.
next reply other threads:[~2024-03-01 17:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-01 17:11 Steve Schrock [this message]
2024-03-01 17:11 ` [PATCH 2/3] qmi: Store the service info in the request Steve Schrock
2024-03-01 17:11 ` [PATCH 3/3] qmi: Enable QRTR service writes and reads Steve Schrock
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240301171124.38735-1-steve.schrock@getcruise.com \
--to=steve.schrock@getcruise.com \
--cc=ofono@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).