summaryrefslogtreecommitdiff
path: root/drivers/remoteproc/omap_remoteproc.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-03-07 15:21:12 -0800
committerOlof Johansson <olof@lixom.net>2012-03-07 15:21:12 -0800
commit6458acb5a31926dcc1295410221493544d628cf7 (patch)
tree15b5a855f73d52f95aeed2ab11e2e8028d82b746 /drivers/remoteproc/omap_remoteproc.c
parentab646a24bb9b6125f3c23ef908b7c5b44b1b4e69 (diff)
parent1e3e2c7c46b2e6e90f3a26ba9be6326c00ca31e4 (diff)
Merge tag 'rpmsg-fixes-and-more-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc into next/rpmsg
Fixing and cleaning up several remoteproc and rpmsg issues. In addition, remoteproc's resource table is converted to a collection of type-value members, instead of a rigid array of homogeneous structs. This enables remoteproc to support registration of generic virtio devices, and not only a single VIRTIO_ID_RPMSG virtio device. But perhaps more importantly, the resource table overhaul makes it possible to easily extend it in the future without breaking older images (simply by defining a new member type, while continuing to support older types). * tag 'rpmsg-fixes-and-more-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc: remoteproc: cleanup resource table parsing paths remoteproc: remove the hardcoded vring alignment remoteproc/omap: remove the mbox_callback limitation remoteproc: remove the single rpmsg vdev limitation remoteproc: safer boot/shutdown order remoteproc: remoteproc_rpmsg -> remoteproc_virtio remoteproc: resource table overhaul rpmsg: fix build warning when dma_addr_t is 64-bit rpmsg: fix published buffer length in rpmsg_recv_done rpmsg: validate incoming message length before propagating rpmsg: fix name service endpoint leak remoteproc/omap: two Kconfig fixes remoteproc: make sure we're parsing a 32bit firmware
Diffstat (limited to 'drivers/remoteproc/omap_remoteproc.c')
-rw-r--r--drivers/remoteproc/omap_remoteproc.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/remoteproc/omap_remoteproc.c b/drivers/remoteproc/omap_remoteproc.c
index aa3ce52dc65e..69425c4e86f3 100644
--- a/drivers/remoteproc/omap_remoteproc.c
+++ b/drivers/remoteproc/omap_remoteproc.c
@@ -80,16 +80,7 @@ static int omap_rproc_mbox_callback(struct notifier_block *this,
dev_info(dev, "received echo reply from %s\n", name);
break;
default:
- /* ignore vq indices which are too large to be valid */
- if (msg >= 2) {
- dev_warn(dev, "invalid mbox msg: 0x%x\n", msg);
- break;
- }
-
- /*
- * At this point, 'msg' contains the index of the vring
- * which was just triggered.
- */
+ /* msg contains the index of the triggered vring */
if (rproc_vq_interrupt(oproc->rproc, msg) == IRQ_NONE)
dev_dbg(dev, "no message was found in vqid %d\n", msg);
}