summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2024-11-26 18:36:55 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2024-11-26 18:36:55 -0800
commitaaf20f870da056752f6386693cc0d8e25421ef35 (patch)
treeb42e3dbe01d53f337e01a3248e8e5ee5b119ad2b /drivers
parent08906abc8c6e3a64f7d02965b657a3c6c159cd96 (diff)
parent06c59d97f63c1b8af521fa5aef8a716fb988b285 (diff)
downloadlinux-aaf20f870da056752f6386693cc0d8e25421ef35.tar.gz
linux-aaf20f870da056752f6386693cc0d8e25421ef35.tar.bz2
linux-aaf20f870da056752f6386693cc0d8e25421ef35.zip
Merge tag 'rpmsg-v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux
Pull rpmsg update from Bjorn Andersson: "Correct GLINK driver's decoding of the CMD_OPEN message, as upper half of the second parameter encodes 'priority', and 'length' is only the lower half" * tag 'rpmsg-v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux: rpmsg: glink: use only lower 16-bits of param2 for CMD_OPEN name length
Diffstat (limited to 'drivers')
-rw-r--r--drivers/rpmsg/qcom_glink_native.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/rpmsg/qcom_glink_native.c b/drivers/rpmsg/qcom_glink_native.c
index d3af1dfa3c7d..a2f9d85c7156 100644
--- a/drivers/rpmsg/qcom_glink_native.c
+++ b/drivers/rpmsg/qcom_glink_native.c
@@ -1204,7 +1204,8 @@ void qcom_glink_native_rx(struct qcom_glink *glink)
ret = qcom_glink_rx_open_ack(glink, param1);
break;
case GLINK_CMD_OPEN:
- ret = qcom_glink_rx_defer(glink, param2);
+ /* upper 16 bits of param2 are the "prio" field */
+ ret = qcom_glink_rx_defer(glink, param2 & 0xffff);
break;
case GLINK_CMD_TX_DATA:
case GLINK_CMD_TX_DATA_CONT: