Skip to content

Qcom 6.18.y #235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
quic-tingweiz merged 2 commits into from
Feb 6, 2026
+8 −7
Merged

Qcom 6.18.y #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
349e69a
FROMLIST: soc: qcom: pd-mapper: Fix element length in servreg_loc_pfr…
mukeshojha-linux Feb 2, 2026
42c7a1c
FROMLIST: soc: qcom: qmi: Print error codes in failure paths
mukeshojha-linux Feb 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion drivers/soc/qcom/pdr_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ struct servreg_set_ack_resp {

struct servreg_loc_pfr_req {
char service[SERVREG_NAME_LENGTH + 1];
char reason[257];
char reason[SERVREG_PFR_LENGTH + 1];
};

struct servreg_loc_pfr_resp {
Expand Down
2 changes: 1 addition & 1 deletion drivers/soc/qcom/qcom_pdr_msg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ const struct qmi_elem_info servreg_loc_pfr_req_ei[] = {
},
{
.data_type = QMI_STRING,
.elem_len = SERVREG_NAME_LENGTH + 1,
.elem_len = SERVREG_PFR_LENGTH + 1,
.elem_size = sizeof(char),
.array_type = VAR_LEN_ARRAY,
.tlv_type = 0x02,
Expand Down
10 changes: 5 additions & 5 deletions drivers/soc/qcom/qmi_interface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ int qmi_txn_init(struct qmi_handle *qmi, struct qmi_txn *txn,
mutex_lock(&qmi->txn_lock);
ret = idr_alloc_cyclic(&qmi->txns, txn, 0, U16_MAX, GFP_KERNEL);
if (ret < 0)
pr_err("failed to allocate transaction id\n");
pr_err("failed to allocate transaction id: %d\n", ret);

txn->id = ret;
mutex_unlock(&qmi->txn_lock);
Expand Down Expand Up @@ -413,7 +413,7 @@ static void qmi_invoke_handler(struct qmi_handle *qmi, struct sockaddr_qrtr *sq,

ret = qmi_decode_message(buf, len, handler->ei, dest);
if (ret < 0)
pr_err("failed to decode incoming message\n");
pr_err("failed to decode incoming message: %d\n", ret);
else
handler->fn(qmi, sq, txn, dest);

Expand Down Expand Up @@ -502,7 +502,7 @@ static void qmi_handle_message(struct qmi_handle *qmi,
if (txn->dest && txn->ei) {
ret = qmi_decode_message(buf, len, txn->ei, txn->dest);
if (ret < 0)
pr_err("failed to decode incoming message\n");
pr_err("failed to decode incoming message: %d\n", ret);

txn->result = ret;
complete(&txn->completion);
Expand Down Expand Up @@ -661,8 +661,8 @@ int qmi_handle_init(struct qmi_handle *qmi, size_t recv_buf_size,
if (PTR_ERR(qmi->sock) == -EAFNOSUPPORT) {
ret = -EPROBE_DEFER;
} else {
pr_err("failed to create QMI socket\n");
ret = PTR_ERR(qmi->sock);
pr_err("failed to create QMI socket: %d\n", ret);
}
goto err_destroy_wq;
}
Expand Down Expand Up @@ -766,7 +766,7 @@ static ssize_t qmi_send_message(struct qmi_handle *qmi,
if (qmi->sock) {
ret = kernel_sendmsg(qmi->sock, &msghdr, &iv, 1, len);
if (ret < 0)
pr_err("failed to send QMI message\n");
pr_err("failed to send QMI message: %d\n", ret);
} else {
ret = -EPIPE;
}
Expand Down
1 change: 1 addition & 0 deletions include/linux/soc/qcom/pdr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include <linux/soc/qcom/qmi.h>

#define SERVREG_NAME_LENGTH 64
#define SERVREG_PFR_LENGTH 256

struct pdr_service;
struct pdr_handle;
Expand Down