Commit 643af93f authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'rpmsg-v6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux

Pull rpmsg updates from Bjorn Andersson:

 - fix interrupt handling in the stm32 remoteproc driver when being
   attached to an already running remote processor

 - fix invalid kernel-doc and add missing MODULE_DESCRIPTION() in the
   rpmsg char driver

* tag 'rpmsg-v6.11' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux:
  rpmsg: char: add missing MODULE_DESCRIPTION() macro
  remoteproc: stm32_rproc: Fix mailbox interrupts queuing
  rpmsg: char: Fix rpmsg_eptdev structure documentation
parents 60c6119c 36862eab
...@@ -294,7 +294,7 @@ static void stm32_rproc_mb_vq_work(struct work_struct *work) ...@@ -294,7 +294,7 @@ static void stm32_rproc_mb_vq_work(struct work_struct *work)
mutex_lock(&rproc->lock); mutex_lock(&rproc->lock);
if (rproc->state != RPROC_RUNNING) if (rproc->state != RPROC_RUNNING && rproc->state != RPROC_ATTACHED)
goto unlock_mutex; goto unlock_mutex;
if (rproc_vq_interrupt(rproc, mb->vq_id) == IRQ_NONE) if (rproc_vq_interrupt(rproc, mb->vq_id) == IRQ_NONE)
......
...@@ -52,8 +52,8 @@ static DEFINE_IDA(rpmsg_minor_ida); ...@@ -52,8 +52,8 @@ static DEFINE_IDA(rpmsg_minor_ida);
* @readq: wait object for incoming queue * @readq: wait object for incoming queue
* @default_ept: set to channel default endpoint if the default endpoint should be re-used * @default_ept: set to channel default endpoint if the default endpoint should be re-used
* on device open to prevent endpoint address update. * on device open to prevent endpoint address update.
* remote_flow_restricted: to indicate if the remote has requested for flow to be limited * @remote_flow_restricted: to indicate if the remote has requested for flow to be limited
* remote_flow_updated: to indicate if the flow control has been requested * @remote_flow_updated: to indicate if the flow control has been requested
*/ */
struct rpmsg_eptdev { struct rpmsg_eptdev {
struct device dev; struct device dev;
...@@ -566,4 +566,5 @@ static void rpmsg_chrdev_exit(void) ...@@ -566,4 +566,5 @@ static void rpmsg_chrdev_exit(void)
module_exit(rpmsg_chrdev_exit); module_exit(rpmsg_chrdev_exit);
MODULE_ALIAS("rpmsg:rpmsg_chrdev"); MODULE_ALIAS("rpmsg:rpmsg_chrdev");
MODULE_DESCRIPTION("RPMSG device interface");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment