]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - rpmsg/rpmsg.git/blobdiff - drivers/remoteproc/omap_remoteproc.c
TEMP: remoteproc/omap: add "late attach" support
[rpmsg/rpmsg.git] / drivers / remoteproc / omap_remoteproc.c
index a96ce9083f7faba98f460aa8cfdde8a6f55dd0d3..731986d026c40840ed71447a7bd5a880a353b04f 100644 (file)
@@ -1,7 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * OMAP Remote Processor driver
  *
- * Copyright (C) 2011 Texas Instruments, Inc.
+ * Copyright (C) 2011-2019 Texas Instruments Incorporated - http://www.ti.com/
  * Copyright (C) 2011 Google, Inc.
  *
  * Ohad Ben-Cohen <ohad@wizery.com>
  * Mark Grosen <mgrosen@ti.com>
  * Suman Anna <s-anna@ti.com>
  * Hari Kanigeri <h-kanigeri2@ti.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
  */
 
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/err.h>
+#include <linux/io.h>
+#include <linux/of_device.h>
+#include <linux/of_address.h>
+#include <linux/of_reserved_mem.h>
 #include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
 #include <linux/dma-mapping.h>
+#include <linux/interrupt.h>
 #include <linux/remoteproc.h>
 #include <linux/mailbox_client.h>
 #include <linux/omap-mailbox.h>
+#include <linux/omap-iommu.h>
+#include <linux/regmap.h>
+#include <linux/mfd/syscon.h>
+#include <clocksource/timer-ti-dm.h>
 
 #include <linux/platform_data/remoteproc-omap.h>
+#include <linux/platform_data/dmtimer-omap.h>
 
 #include "omap_remoteproc.h"
 #include "remoteproc_internal.h"
 
+#define OMAP_RPROC_DSP_LOCAL_MEM_OFFSET                (0x00800000)
+#define OMAP_RPROC_IPU_L2RAM_DEV_ADDR          (0x20000000)
+
+/* default auto-suspend delay (ms) */
+#define DEFAULT_AUTOSUSPEND_DELAY              10000
+
+/**
+ * struct omap_rproc_boot_data - boot data structure for the DSP omap rprocs
+ * @syscon: regmap handle for the system control configuration module
+ * @boot_reg: boot register offset within the @syscon regmap
+ * @boot_reg_shift: bit-field shift required for the boot address value in
+ *                 @boot_reg
+ */
+struct omap_rproc_boot_data {
+       struct regmap *syscon;
+       unsigned int boot_reg;
+       unsigned int boot_reg_shift;
+};
+
+/**
+ * struct omap_rproc_mem - internal memory structure
+ * @cpu_addr: MPU virtual address of the memory region
+ * @bus_addr: bus address used to access the memory region
+ * @dev_addr: device address of the memory region from DSP view
+ * @size: size of the memory region
+ */
+struct omap_rproc_mem {
+       void __iomem *cpu_addr;
+       phys_addr_t bus_addr;
+       u32 dev_addr;
+       size_t size;
+};
+
+/**
+ * struct omap_rproc_timer - data structure for a timer used by a omap rproc
+ * @odt: timer pointer
+ * @timer_ops: OMAP dmtimer ops for @odt timer
+ * @irq: timer irq
+ */
+struct omap_rproc_timer {
+       struct omap_dm_timer *odt;
+       const struct omap_dm_timer_ops *timer_ops;
+       int irq;
+};
+
 /**
  * struct omap_rproc - omap remote processor state
  * @mbox: mailbox channel handle
  * @client: mailbox client to request the mailbox channel
+ * @boot_data: boot data structure for setting processor boot address
+ * @mem: internal memory regions data
+ * @num_mems: number of internal memory regions
+ * @num_timers: number of rproc timer(s)
+ * @num_wd_timers: number of rproc watchdog timers
+ * @timers: timer(s) info used by rproc
+ * @autosuspend_delay: auto-suspend delay value to be used for runtime pm
+ * @need_resume: if true a resume is needed in the system resume callback
  * @rproc: rproc handle
+ * @pm_comp: completion primitive to sync for suspend response
+ * @standby_addr: kernel address of the register having module standby status
+ * @suspend_acked: state machine flag to store the suspend request ack
  */
 struct omap_rproc {
        struct mbox_chan *mbox;
        struct mbox_client client;
+       struct omap_rproc_boot_data *boot_data;
+       struct omap_rproc_mem *mem;
+       int num_mems;
+       int num_timers;
+       int num_wd_timers;
+       struct omap_rproc_timer *timers;
+       int autosuspend_delay;
+       bool need_resume;
        struct rproc *rproc;
+       struct completion pm_comp;
+       void __iomem *standby_addr;
+       bool suspend_acked;
 };
 
+/**
+ * struct omap_rproc_dev_data - device data for the omap remote processor
+ * @device_name: device name of the remote processor
+ * @fw_name: firmware name to use
+ * @autosuspend_delay: custom auto-suspend delay value in milliseconds
+ */
+struct omap_rproc_dev_data {
+       const char *device_name;
+       const char *fw_name;
+       int autosuspend_delay;
+};
+
+/**
+ * omap_rproc_request_timer - request a timer for a remoteproc
+ * @np: device node pointer to the desired timer
+ * @timer: handle to a struct omap_rproc_timer to return the timer handle
+ *
+ * This helper function is used primarily to request a timer associated with
+ * a remoteproc. The returned handle is stored in the .odt field of the
+ * @timer structure passed in, and is used to invoke other timer specific
+ * ops (like starting a timer either during device initialization or during
+ * a resume operation, or for stopping/freeing a timer).
+ *
+ * Returns 0 on success, otherwise an appropriate failure
+ */
+static int omap_rproc_request_timer(struct device_node *np,
+                                   struct omap_rproc_timer *timer)
+{
+       int ret = 0;
+
+       timer->odt = timer->timer_ops->request_by_node(np);
+       if (!timer->odt) {
+               pr_err("request for timer node %p failed\n", np);
+               return -EBUSY;
+       }
+
+       ret = timer->timer_ops->set_source(timer->odt, OMAP_TIMER_SRC_SYS_CLK);
+       if (ret) {
+               pr_err("error setting OMAP_TIMER_SRC_SYS_CLK as source for timer node %p\n",
+                      np);
+               timer->timer_ops->free(timer->odt);
+               return ret;
+       }
+
+       /* clean counter, remoteproc code will set the value */
+       timer->timer_ops->set_load(timer->odt, 0, 0);
+
+       return ret;
+}
+
+/**
+ * omap_rproc_start_timer - start a timer for a remoteproc
+ * @timer: handle to a OMAP rproc timer
+ *
+ * This helper function is used to start a timer associated with a remoteproc,
+ * obtained using the request_timer ops. The helper function needs to be
+ * invoked by the driver to start the timer (during device initialization)
+ * or to just resume the timer.
+ *
+ * Returns 0 on success, otherwise a failure as returned by DMTimer ops
+ */
+static inline int omap_rproc_start_timer(struct omap_rproc_timer *timer)
+{
+       return timer->timer_ops->start(timer->odt);
+}
+
+/**
+ * omap_rproc_stop_timer - stop a timer for a remoteproc
+ * @timer: handle to a OMAP rproc timer
+ *
+ * This helper function is used to disable a timer associated with a
+ * remoteproc, and needs to be called either during a device shutdown
+ * or suspend operation. The separate helper function allows the driver
+ * to just stop a timer without having to release the timer during a
+ * suspend operation.
+ *
+ * Returns 0 on success, otherwise a failure as returned by DMTimer ops
+ */
+static inline int omap_rproc_stop_timer(struct omap_rproc_timer *timer)
+{
+       return timer->timer_ops->stop(timer->odt);
+}
+
+/**
+ * omap_rproc_release_timer - release a timer for a remoteproc
+ * @timer: handle to a OMAP rproc timer
+ *
+ * This helper function is used primarily to release a timer associated
+ * with a remoteproc. The dmtimer will be available for other clients to
+ * use once released.
+ *
+ * Returns 0 on success, otherwise a failure as returned by DMTimer ops
+ */
+static inline int omap_rproc_release_timer(struct omap_rproc_timer *timer)
+{
+       return timer->timer_ops->free(timer->odt);
+}
+
+/**
+ * omap_rproc_get_timer_irq - get the irq for a timer
+ * @timer - handle to a OMAP rproc timer
+ *
+ * This function is used to get the irq associated with a watchdog timer. The
+ * function is called by the OMAP remoteproc driver to register a interrupt
+ * handler to handle watchdog events on the remote processor.
+ *
+ * Returns the irq id on success, otherwise a failure as returned by DMTimer ops
+ */
+static inline int omap_rproc_get_timer_irq(struct omap_rproc_timer *timer)
+{
+       return timer->timer_ops->get_irq(timer->odt);
+}
+
+/**
+ * omap_rproc_ack_timer_irq - acknowledge a timer irq
+ * @timer: handle to a OMAP rproc timer
+ *
+ * This function is used to clear the irq associated with a watchdog timer. The
+ * The function is called by the OMAP remoteproc upon a watchdog event on the
+ * remote processor to clear the interrupt status of the watchdog timer.
+ *
+ * Returns the irq id on success, otherwise a failure as returned by DMTimer ops
+ */
+static inline void omap_rproc_ack_timer_irq(struct omap_rproc_timer *timer)
+{
+       timer->timer_ops->write_status(timer->odt, OMAP_TIMER_INT_OVERFLOW);
+}
+
+/**
+ * omap_rproc_watchdog_isr - Watchdog ISR handler for remoteproc device
+ * @irq: IRQ number associated with a watchdog timer
+ * @data: IRQ handler data
+ *
+ * This ISR routine executes the required necessary low-level code to
+ * acknowledge a watchdog timer interrupt. There can be multiple watchdog
+ * timers associated with a rproc (like IPUs which have 2 watchdog timers,
+ * one per Cortex M3/M4 core), so a lookup has to be performed to identify
+ * the timer to acknowledge its interrupt.
+ *
+ * The function also invokes rproc_report_crash to report the watchdog event
+ * to the remoteproc driver core, to trigger a recovery.
+ *
+ * Return: IRQ_HANDLED or IRQ_NONE
+ */
+static irqreturn_t omap_rproc_watchdog_isr(int irq, void *data)
+{
+       struct rproc *rproc = data;
+       struct omap_rproc *oproc = rproc->priv;
+       struct device *dev = rproc->dev.parent;
+       struct omap_rproc_timer *timers = oproc->timers;
+       struct omap_rproc_timer *wd_timer = NULL;
+       int num_timers = oproc->num_timers + oproc->num_wd_timers;
+       int i;
+
+       for (i = oproc->num_timers; i < num_timers; i++) {
+               if (timers[i].irq > 0 && irq == timers[i].irq) {
+                       wd_timer = &timers[i];
+                       break;
+               }
+       }
+
+       if (!wd_timer) {
+               dev_err(dev, "invalid timer\n");
+               return IRQ_NONE;
+       }
+
+       omap_rproc_ack_timer_irq(wd_timer);
+
+       rproc_report_crash(rproc, RPROC_WATCHDOG);
+
+       return IRQ_HANDLED;
+}
+
+/**
+ * omap_rproc_enable_timers - enable the timers for a remoteproc
+ * @rproc: handle of a remote processor
+ * @configure: boolean flag used to acquire and configure the timer handle
+ *
+ * This function is used primarily to enable the timers associated with
+ * a remoteproc. The configure flag is provided to allow the driver to
+ * to either acquire and start a timer (during device initialization) or
+ * to just start a timer (during a resume operation).
+ */
+static int omap_rproc_enable_timers(struct rproc *rproc, bool configure)
+{
+       int i;
+       int ret = 0;
+       struct platform_device *tpdev;
+       struct dmtimer_platform_data *tpdata;
+       const struct omap_dm_timer_ops *timer_ops;
+       struct omap_rproc *oproc = rproc->priv;
+       struct omap_rproc_timer *timers = oproc->timers;
+       struct device *dev = rproc->dev.parent;
+       struct device_node *np = NULL;
+       int num_timers = oproc->num_timers + oproc->num_wd_timers;
+
+       if (num_timers <= 0)
+               return 0;
+
+       if (!configure)
+               goto start_timers;
+
+       for (i = 0; i < num_timers; i++) {
+               if (i < oproc->num_timers)
+                       np = of_parse_phandle(dev->of_node, "timers", i);
+               else
+                       np = of_parse_phandle(dev->of_node, "watchdog-timers",
+                                             (i - oproc->num_timers));
+               if (!np) {
+                       ret = -ENXIO;
+                       dev_err(dev, "device node lookup for timer at index %d failed: %d\n",
+                               i < oproc->num_timers ? i :
+                               i - oproc->num_timers, ret);
+                       goto free_timers;
+               }
+
+               tpdev = of_find_device_by_node(np);
+               if (!tpdev) {
+                       ret = -ENODEV;
+                       dev_err(dev, "could not get timer platform device\n");
+                       goto put_node;
+               }
+
+               tpdata = dev_get_platdata(&tpdev->dev);
+               put_device(&tpdev->dev);
+               if (!tpdata) {
+                       ret = -EINVAL;
+                       dev_err(dev, "dmtimer pdata structure NULL\n");
+                       goto put_node;
+               }
+
+               timer_ops = tpdata->timer_ops;
+               if (!timer_ops || !timer_ops->request_by_node ||
+                   !timer_ops->set_source || !timer_ops->set_load ||
+                   !timer_ops->free || !timer_ops->start ||
+                   !timer_ops->stop || !timer_ops->get_irq ||
+                   !timer_ops->write_status) {
+                       ret = -EINVAL;
+                       dev_err(dev, "device does not have required timer ops\n");
+                       goto put_node;
+               }
+
+               timers[i].irq = -1;
+               timers[i].timer_ops = timer_ops;
+               ret = omap_rproc_request_timer(np, &timers[i]);
+               if (ret) {
+                       dev_err(dev, "request for timer %p failed: %d\n", np,
+                               ret);
+                       goto put_node;
+               }
+               of_node_put(np);
+
+               if (i >= oproc->num_timers) {
+                       timers[i].irq = omap_rproc_get_timer_irq(&timers[i]);
+                       if (timers[i].irq < 0) {
+                               dev_err(dev, "get_irq for timer %p failed: %d\n",
+                                       np, timers[i].irq);
+                               ret = -EBUSY;
+                               goto free_timers;
+                       }
+
+                       ret = request_irq(timers[i].irq,
+                                         omap_rproc_watchdog_isr, IRQF_SHARED,
+                                         "rproc-wdt", rproc);
+                       if (ret) {
+                               dev_err(dev, "error requesting irq for timer %p\n",
+                                       np);
+                               omap_rproc_release_timer(&timers[i]);
+                               timers[i].odt = NULL;
+                               timers[i].timer_ops = NULL;
+                               timers[i].irq = -1;
+                               goto free_timers;
+                       }
+               }
+       }
+
+start_timers:
+       for (i = 0; i < num_timers; i++)
+               omap_rproc_start_timer(&timers[i]);
+       return 0;
+
+put_node:
+       of_node_put(np);
+free_timers:
+       while (i--) {
+               if (i >= oproc->num_timers)
+                       free_irq(timers[i].irq, rproc);
+               omap_rproc_release_timer(&timers[i]);
+               timers[i].odt = NULL;
+               timers[i].timer_ops = NULL;
+               timers[i].irq = -1;
+       }
+
+       return ret;
+}
+
+/**
+ * omap_rproc_disable_timers - disable the timers for a remoteproc
+ * @rproc: handle of a remote processor
+ * @configure: boolean flag used to release the timer handle
+ *
+ * This function is used primarily to disable the timers associated with
+ * a remoteproc. The configure flag is provided to allow the driver to
+ * to either stop and release a timer (during device shutdown) or to just
+ * stop a timer (during a suspend operation).
+ */
+static int omap_rproc_disable_timers(struct rproc *rproc, bool configure)
+{
+       int i;
+       struct omap_rproc *oproc = rproc->priv;
+       struct omap_rproc_timer *timers = oproc->timers;
+       int num_timers = oproc->num_timers + oproc->num_wd_timers;
+
+       if (num_timers <= 0)
+               return 0;
+
+       for (i = 0; i < num_timers; i++) {
+               omap_rproc_stop_timer(&timers[i]);
+               if (configure) {
+                       if (i >= oproc->num_timers)
+                               free_irq(timers[i].irq, rproc);
+                       omap_rproc_release_timer(&timers[i]);
+                       timers[i].odt = NULL;
+                       timers[i].timer_ops = NULL;
+                       timers[i].irq = -1;
+               }
+       }
+
+       return 0;
+}
+
 /**
  * omap_rproc_mbox_callback() - inbound mailbox message handler
  * @client: mailbox client pointer used for requesting the mailbox channel
@@ -73,13 +474,28 @@ static void omap_rproc_mbox_callback(struct mbox_client *client, void *data)
 
        switch (msg) {
        case RP_MBOX_CRASH:
-               /* just log this for now. later, we'll also do recovery */
+               /*
+                * remoteproc detected an exception, notify the rproc core.
+                * The remoteproc core will handle the recovery.
+                */
                dev_err(dev, "omap rproc %s crashed\n", name);
+               rproc_report_crash(oproc->rproc, RPROC_FATAL_ERROR);
                break;
        case RP_MBOX_ECHO_REPLY:
                dev_info(dev, "received echo reply from %s\n", name);
                break;
+       case RP_MBOX_SUSPEND_ACK:
+       case RP_MBOX_SUSPEND_CANCEL:
+               oproc->suspend_acked = msg == RP_MBOX_SUSPEND_ACK;
+               complete(&oproc->pm_comp);
+               break;
        default:
+               if (msg >= RP_MBOX_READY && msg < RP_MBOX_END_MSG)
+                       return;
+               if (msg > oproc->rproc->max_notifyid) {
+                       dev_dbg(dev, "dropping unknown message 0x%x", msg);
+                       return;
+               }
                /* 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);
@@ -93,11 +509,52 @@ static void omap_rproc_kick(struct rproc *rproc, int vqid)
        struct device *dev = rproc->dev.parent;
        int ret;
 
+       /* wake up the rproc before kicking it */
+       ret = pm_runtime_get_sync(dev);
+       if (WARN_ON(ret < 0)) {
+               dev_err(dev, "pm_runtime_get_sync() failed during kick, ret = %d\n",
+                       ret);
+               pm_runtime_put_noidle(dev);
+               return;
+       }
+
        /* send the index of the triggered virtqueue in the mailbox payload */
        ret = mbox_send_message(oproc->mbox, (void *)vqid);
        if (ret < 0)
                dev_err(dev, "failed to send mailbox message, status = %d\n",
                        ret);
+
+       pm_runtime_mark_last_busy(dev);
+       pm_runtime_put_autosuspend(dev);
+}
+
+/**
+ * omap_rproc_write_dsp_boot_addr - set boot address for a DSP remote processor
+ * @rproc: handle of a remote processor
+ *
+ * Set boot address for a supported DSP remote processor.
+ */
+static int omap_rproc_write_dsp_boot_addr(struct rproc *rproc)
+{
+       struct device *dev = rproc->dev.parent;
+       struct omap_rproc *oproc = rproc->priv;
+       struct omap_rproc_boot_data *bdata = oproc->boot_data;
+       u32 offset = bdata->boot_reg;
+       unsigned int value = rproc->bootaddr;
+       unsigned int mask = ~(SZ_1K - 1);
+
+       if (value & (SZ_1K - 1)) {
+               dev_err(dev, "invalid boot address 0x%x, must be aligned on a 1KB boundary\n",
+                       value);
+               return -EINVAL;
+       }
+
+       value >>= bdata->boot_reg_shift;
+       mask >>= bdata->boot_reg_shift;
+
+       regmap_update_bits(bdata->syscon, offset, mask, value);
+
+       return 0;
 }
 
 /*
@@ -116,8 +573,15 @@ static int omap_rproc_start(struct rproc *rproc)
        int ret;
        struct mbox_client *client = &oproc->client;
 
-       if (pdata->set_bootaddr)
-               pdata->set_bootaddr(rproc->bootaddr);
+       /*
+        * We set boot address irrespective of the value of the late attach flag
+        * as boot address takes effect only on a deassert of remoteproc reset.
+        */
+       if (oproc->boot_data) {
+               ret = omap_rproc_write_dsp_boot_addr(rproc);
+               if (ret)
+                       return ret;
+       }
 
        client->dev = dev;
        client->tx_done = NULL;
@@ -125,7 +589,7 @@ static int omap_rproc_start(struct rproc *rproc)
        client->tx_block = false;
        client->knows_txdone = false;
 
-       oproc->mbox = omap_mbox_request_channel(client, pdata->mbox_name);
+       oproc->mbox = mbox_request_channel(client, 0);
        if (IS_ERR(oproc->mbox)) {
                ret = -EBUSY;
                dev_err(dev, "mbox_request_channel failed: %ld\n",
@@ -146,14 +610,37 @@ static int omap_rproc_start(struct rproc *rproc)
                goto put_mbox;
        }
 
-       ret = pdata->device_enable(pdev);
+       ret = omap_rproc_enable_timers(rproc, true);
        if (ret) {
-               dev_err(dev, "omap_device_enable failed: %d\n", ret);
+               dev_err(dev, "omap_rproc_enable_timers failed: %d\n", ret);
                goto put_mbox;
        }
 
+       if (!rproc->late_attach) {
+               ret = pdata->device_enable(pdev);
+               if (ret) {
+                       dev_err(dev, "omap_device_enable failed: %d\n", ret);
+                       goto reset_timers;
+               }
+       }
+
+       /*
+        * remote processor is up, so update the runtime pm status and
+        * enable the auto-suspend. The device usage count is incremented
+        * manually for balancing it for auto-suspend
+        */
+       pm_runtime_set_active(dev);
+       pm_runtime_set_autosuspend_delay(dev, oproc->autosuspend_delay);
+       pm_runtime_use_autosuspend(dev);
+       pm_runtime_get_noresume(dev);
+       pm_runtime_enable(dev);
+       pm_runtime_mark_last_busy(dev);
+       pm_runtime_put_autosuspend(dev);
+
        return 0;
 
+reset_timers:
+       omap_rproc_disable_timers(rproc, true);
 put_mbox:
        mbox_free_channel(oproc->mbox);
        return ret;
@@ -168,53 +655,772 @@ static int omap_rproc_stop(struct rproc *rproc)
        struct omap_rproc *oproc = rproc->priv;
        int ret;
 
+       /*
+        * cancel any possible scheduled runtime suspend by incrementing
+        * the device usage count, and resuming the device. The remoteproc
+        * also needs to be woken up if suspended, to avoid the remoteproc
+        * OS to continue to remember any context that it has saved, and
+        * avoid potential issues in misindentifying a subsequent device
+        * reboot as a power restore boot
+        */
+       ret = pm_runtime_get_sync(dev);
+       if (ret < 0) {
+               pm_runtime_put_noidle(dev);
+               return ret;
+       }
+
        ret = pdata->device_shutdown(pdev);
        if (ret)
-               return ret;
+               goto out;
+
+       ret = omap_rproc_disable_timers(rproc, true);
+       if (ret)
+               goto enable_device;
+
+       /*
+        * During late attach, we use non-zeroing dma ops to prevent the kernel
+        * from overwriting already loaded code and data segments. When
+        * shutting down the processor, we restore the normal zeroing dma ops.
+        * This allows the kernel to clear memory when loading a new remoteproc
+        * binary or during error recovery with the current remoteproc binary.
+        */
+       if (rproc->late_attach)
+               set_dma_ops(dev, &arm_dma_ops);
 
        mbox_free_channel(oproc->mbox);
 
+       /*
+        * update the runtime pm states and status now that the remoteproc
+        * has stopped
+        */
+       pm_runtime_disable(dev);
+       pm_runtime_dont_use_autosuspend(dev);
+       pm_runtime_put_noidle(dev);
+       pm_runtime_set_suspended(dev);
+
        return 0;
+
+enable_device:
+       pdata->device_enable(pdev);
+out:
+       /* schedule the next auto-suspend */
+       pm_runtime_mark_last_busy(dev);
+       pm_runtime_put_autosuspend(dev);
+       return ret;
+
+}
+
+/*
+ * Internal Memory translation helper
+ *
+ * Custom function implementing the rproc .da_to_va ops to provide address
+ * translation (device address to kernel virtual address) for internal RAMs
+ * present in a DSP or IPU device). The translated addresses can be used
+ * either by the remoteproc core for loading, or by any rpmsg bus drivers.
+ */
+static void *omap_rproc_da_to_va(struct rproc *rproc, u64 da, int len,
+                                u32 flags)
+{
+       struct omap_rproc *oproc = rproc->priv;
+       void *va = NULL;
+       int i;
+       u32 offset;
+
+       if (len <= 0)
+               return NULL;
+
+       if (!oproc->num_mems)
+               return NULL;
+
+       for (i = 0; i < oproc->num_mems; i++) {
+               if (da >= oproc->mem[i].dev_addr && da + len <=
+                   oproc->mem[i].dev_addr +  oproc->mem[i].size) {
+                       offset = da -  oproc->mem[i].dev_addr;
+                       /* __force to make sparse happy with type conversion */
+                       va = (__force void *)(oproc->mem[i].cpu_addr + offset);
+                       break;
+               }
+       }
+
+       return va;
 }
 
 static const struct rproc_ops omap_rproc_ops = {
        .start          = omap_rproc_start,
        .stop           = omap_rproc_stop,
        .kick           = omap_rproc_kick,
+       .da_to_va       = omap_rproc_da_to_va,
+};
+
+#ifdef CONFIG_PM
+static bool _is_rproc_in_standby(struct omap_rproc *oproc)
+{
+       static int standby_mask = (1 << 18);
+
+       return readl(oproc->standby_addr) & standby_mask;
+}
+
+/* 1 sec is long enough time to let the remoteproc side suspend the device */
+#define DEF_SUSPEND_TIMEOUT 1000
+static int _omap_rproc_suspend(struct rproc *rproc, bool auto_suspend)
+{
+       struct device *dev = rproc->dev.parent;
+       struct platform_device *pdev = to_platform_device(dev);
+       struct omap_rproc_pdata *pdata = dev_get_platdata(dev);
+       struct omap_rproc *oproc = rproc->priv;
+       unsigned long to = msecs_to_jiffies(DEF_SUSPEND_TIMEOUT);
+       unsigned long ta = jiffies + to;
+       u32 suspend_msg = auto_suspend ?
+                               RP_MBOX_SUSPEND_AUTO : RP_MBOX_SUSPEND_SYSTEM;
+       int ret;
+
+       reinit_completion(&oproc->pm_comp);
+       oproc->suspend_acked = false;
+       ret = mbox_send_message(oproc->mbox, (void *)suspend_msg);
+       if (ret < 0) {
+               dev_err(dev, "PM mbox_send_message failed: %d\n", ret);
+               return ret;
+       }
+
+       ret = wait_for_completion_timeout(&oproc->pm_comp, to);
+       if (!oproc->suspend_acked)
+               return -EBUSY;
+
+       /*
+        * The remoteproc side is returning the ACK message before saving the
+        * context, because the context saving is performed within a SYS/BIOS
+        * function, and it cannot have any inter-dependencies against the IPC
+        * layer. Also, as the SYS/BIOS needs to preserve properly the processor
+        * register set, sending this ACK or signalling the completion of the
+        * context save through a shared memory variable can never be the
+        * absolute last thing to be executed on the remoteproc side, and the
+        * MPU cannot use the ACK message as a sync point to put the remoteproc
+        * into reset. The only way to ensure that the remote processor has
+        * completed saving the context is to check that the module has reached
+        * STANDBY state (after saving the context, the SYS/BIOS executes the
+        * appropriate target-specific WFI instruction causing the module to
+        * enter STANDBY).
+        */
+       while (!_is_rproc_in_standby(oproc)) {
+               if (time_after(jiffies, ta))
+                       return -ETIME;
+               schedule();
+       }
+
+       ret = pdata->device_shutdown(pdev);
+       if (ret)
+               return ret;
+
+       ret = omap_rproc_disable_timers(rproc, false);
+       if (ret) {
+               dev_err(dev, "disabling timers during suspend failed %d\n",
+                       ret);
+               goto enable_device;
+       }
+
+       /*
+        * IOMMUs would have to be disabled specifically for runtime suspend.
+        * They are handled automatically through System PM callbacks for
+        * regular system suspend
+        */
+       if (auto_suspend) {
+               ret = omap_iommu_domain_deactivate(rproc->domain);
+               if (ret) {
+                       dev_err(dev, "iommu domain deactivate failed %d\n",
+                               ret);
+                       goto enable_timers;
+               }
+       }
+
+       return 0;
+
+enable_timers:
+       /* ignore errors on re-enabling code */
+       omap_rproc_enable_timers(rproc, false);
+enable_device:
+       pdata->device_enable(pdev);
+       return ret;
+}
+
+static int _omap_rproc_resume(struct rproc *rproc, bool auto_suspend)
+{
+       struct device *dev = rproc->dev.parent;
+       struct platform_device *pdev = to_platform_device(dev);
+       struct omap_rproc_pdata *pdata = dev_get_platdata(dev);
+       struct omap_rproc *oproc = rproc->priv;
+       int ret;
+
+       /*
+        * IOMMUs would have to be enabled specifically for runtime resume.
+        * They would have been already enabled automatically through System
+        * PM callbacks for regular system resume
+        */
+       if (auto_suspend) {
+               ret = omap_iommu_domain_activate(rproc->domain);
+               if (ret) {
+                       dev_err(dev, "omap_iommu activate failed %d\n", ret);
+                       goto out;
+               }
+       }
+
+       /* boot address could be lost after suspend, so restore it */
+       if (oproc->boot_data) {
+               ret = omap_rproc_write_dsp_boot_addr(rproc);
+               if (ret) {
+                       dev_err(dev, "boot address restore failed %d\n", ret);
+                       goto suspend_iommu;
+               }
+       }
+
+       ret = omap_rproc_enable_timers(rproc, false);
+       if (ret) {
+               dev_err(dev, "enabling timers during resume failed %d\n",
+                       ret);
+               goto suspend_iommu;
+       }
+
+       ret = pdata->device_enable(pdev);
+       if (ret)
+               goto disable_timers;
+
+       return 0;
+
+disable_timers:
+       omap_rproc_disable_timers(rproc, false);
+suspend_iommu:
+       if (auto_suspend)
+               omap_iommu_domain_deactivate(rproc->domain);
+out:
+       return ret;
+}
+
+static int __maybe_unused omap_rproc_suspend(struct device *dev)
+{
+       struct platform_device *pdev = to_platform_device(dev);
+       struct rproc *rproc = platform_get_drvdata(pdev);
+       struct omap_rproc *oproc = rproc->priv;
+       int ret = 0;
+
+       mutex_lock(&rproc->lock);
+       if (rproc->state == RPROC_OFFLINE)
+               goto out;
+
+       if (rproc->state == RPROC_SUSPENDED)
+               goto out;
+
+       if (rproc->state != RPROC_RUNNING) {
+               ret = -EBUSY;
+               goto out;
+       }
+
+       ret = _omap_rproc_suspend(rproc, false);
+       if (ret) {
+               dev_err(dev, "suspend failed %d\n", ret);
+               goto out;
+       }
+
+       /*
+        * remoteproc is running at the time of system suspend, so remember
+        * it so as to wake it up during system resume
+        */
+       oproc->need_resume = 1;
+       rproc->state = RPROC_SUSPENDED;
+
+       /*
+        * update the runtime pm status to be suspended, without decrementing
+        * the device usage count
+        */
+       pm_runtime_disable(dev);
+       pm_runtime_set_suspended(dev);
+out:
+       mutex_unlock(&rproc->lock);
+       return ret;
+}
+
+static int __maybe_unused omap_rproc_resume(struct device *dev)
+{
+       struct platform_device *pdev = to_platform_device(dev);
+       struct rproc *rproc = platform_get_drvdata(pdev);
+       struct omap_rproc *oproc = rproc->priv;
+       int ret = 0;
+
+       mutex_lock(&rproc->lock);
+       if (rproc->state == RPROC_OFFLINE)
+               goto out;
+
+       if (rproc->state != RPROC_SUSPENDED) {
+               ret = -EBUSY;
+               goto out;
+       }
+
+       /*
+        * remoteproc was auto-suspended at the time of system suspend,
+        * so no need to wake-up the processor (leave it in suspended
+        * state, will be woken up during a subsequent runtime_resume)
+        */
+       if (!oproc->need_resume)
+               goto out;
+
+       ret = _omap_rproc_resume(rproc, false);
+       if (ret) {
+               dev_err(dev, "resume failed %d\n", ret);
+               goto out;
+       }
+       oproc->need_resume = false;
+
+       rproc->state = RPROC_RUNNING;
+
+       /*
+        * update the runtime pm status to be active, without incrementing
+        * the device usage count
+        */
+       pm_runtime_set_active(dev);
+       pm_runtime_enable(dev);
+       pm_runtime_mark_last_busy(dev);
+out:
+       mutex_unlock(&rproc->lock);
+       return ret;
+}
+
+static int omap_rproc_runtime_suspend(struct device *dev)
+{
+       struct rproc *rproc = dev_get_drvdata(dev);
+       struct omap_rproc *oproc = rproc->priv;
+       int ret;
+
+       if (rproc->state == RPROC_CRASHED) {
+               dev_dbg(dev, "rproc cannot be runtime suspended when crashed!\n");
+               return -EBUSY;
+       }
+
+       if (WARN_ON(rproc->state != RPROC_RUNNING)) {
+               dev_err(dev, "rproc cannot be runtime suspended when not running!\n");
+               return -EBUSY;
+       }
+
+       /*
+        * do not even attempt suspend if the remote processor is not
+        * idled for runtime auto-suspend
+        */
+       if (!_is_rproc_in_standby(oproc)) {
+               ret = -EBUSY;
+               goto abort;
+       }
+
+       ret = _omap_rproc_suspend(rproc, true);
+       if (ret)
+               goto abort;
+
+       rproc->state = RPROC_SUSPENDED;
+       return 0;
+
+abort:
+       pm_runtime_mark_last_busy(dev);
+       return ret;
+}
+
+static int omap_rproc_runtime_resume(struct device *dev)
+{
+       struct rproc *rproc = dev_get_drvdata(dev);
+       int ret;
+
+       if (WARN_ON(rproc->state != RPROC_SUSPENDED)) {
+               dev_err(dev, "rproc cannot be runtime resumed if not suspended!\n");
+               return -EBUSY;
+       }
+
+       ret = _omap_rproc_resume(rproc, true);
+       if (ret) {
+               dev_err(dev, "runtime resume failed %d\n", ret);
+               return ret;
+       }
+
+       rproc->state = RPROC_RUNNING;
+       return 0;
+}
+#endif /* CONFIG_PM */
+
+static const struct omap_rproc_dev_data omap4_dsp_dev_data = {
+       .device_name    = "dsp",
+       .fw_name        = "omap4-dsp-fw.xe64T",
+};
+
+static const struct omap_rproc_dev_data omap4_ipu_dev_data = {
+       .device_name    = "ipu",
+       .fw_name        = "omap4-ipu-fw.xem3",
 };
 
+static const struct omap_rproc_dev_data omap5_dsp_dev_data = {
+       .device_name    = "dsp",
+       .fw_name        = "omap5-dsp-fw.xe64T",
+};
+
+static const struct omap_rproc_dev_data omap5_ipu_dev_data = {
+       .device_name    = "ipu",
+       .fw_name        = "omap5-ipu-fw.xem4",
+};
+
+static const struct omap_rproc_dev_data dra7_rproc_dev_data[] = {
+       {
+               .device_name    = "40800000.dsp",
+               .fw_name        = "dra7-dsp1-fw.xe66",
+       },
+       {
+               .device_name    = "41000000.dsp",
+               .fw_name        = "dra7-dsp2-fw.xe66",
+       },
+       {
+               .device_name    = "55020000.ipu",
+               .fw_name        = "dra7-ipu2-fw.xem4",
+       },
+       {
+               .device_name    = "58820000.ipu",
+               .fw_name        = "dra7-ipu1-fw.xem4",
+       },
+       {
+               /* sentinel */
+       },
+};
+
+static const struct of_device_id omap_rproc_of_match[] = {
+       {
+               .compatible     = "ti,omap4-dsp",
+               .data           = &omap4_dsp_dev_data,
+       },
+       {
+               .compatible     = "ti,omap4-ipu",
+               .data           = &omap4_ipu_dev_data,
+       },
+       {
+               .compatible     = "ti,omap5-dsp",
+               .data           = &omap5_dsp_dev_data,
+       },
+       {
+               .compatible     = "ti,omap5-ipu",
+               .data           = &omap5_ipu_dev_data,
+       },
+       {
+               .compatible     = "ti,dra7-dsp",
+               .data           = dra7_rproc_dev_data,
+       },
+       {
+               .compatible     = "ti,dra7-ipu",
+               .data           = dra7_rproc_dev_data,
+       },
+       {
+               /* end */
+       },
+};
+MODULE_DEVICE_TABLE(of, omap_rproc_of_match);
+
+static int omap_rproc_get_autosuspend_delay(struct platform_device *pdev)
+{
+       struct device_node *np = pdev->dev.of_node;
+       const struct omap_rproc_dev_data *data;
+       int delay = -EINVAL;
+
+       data = of_device_get_match_data(&pdev->dev);
+       if (!data)
+               return -ENODEV;
+
+       if (!of_device_is_compatible(np, "ti,dra7-dsp") &&
+           !of_device_is_compatible(np, "ti,dra7-ipu")) {
+               delay = data->autosuspend_delay;
+               goto out;
+       }
+
+       for (; data && data->device_name; data++) {
+               if (!strcmp(dev_name(&pdev->dev), data->device_name)) {
+                       delay = data->autosuspend_delay;
+                       break;
+               }
+       }
+
+out:
+       return (delay > 0) ? delay : DEFAULT_AUTOSUSPEND_DELAY;
+}
+
+static const char *omap_rproc_get_firmware(struct platform_device *pdev)
+{
+       struct device_node *np = pdev->dev.of_node;
+       const struct omap_rproc_dev_data *data;
+
+       data = of_device_get_match_data(&pdev->dev);
+       if (!data)
+               return ERR_PTR(-ENODEV);
+
+       if (!of_device_is_compatible(np, "ti,dra7-dsp") &&
+           !of_device_is_compatible(np, "ti,dra7-ipu"))
+               return data->fw_name;
+
+       for (; data && data->device_name; data++) {
+               if (!strcmp(dev_name(&pdev->dev), data->device_name))
+                       return data->fw_name;
+       }
+
+       return ERR_PTR(-ENOENT);
+}
+
+static int omap_rproc_get_boot_data(struct platform_device *pdev,
+                                   struct rproc *rproc)
+{
+       struct device_node *np = pdev->dev.of_node;
+       struct omap_rproc *oproc = rproc->priv;
+       int ret;
+
+       if (!of_device_is_compatible(np, "ti,omap4-dsp") &&
+           !of_device_is_compatible(np, "ti,omap5-dsp") &&
+           !of_device_is_compatible(np, "ti,dra7-dsp"))
+               return 0;
+
+       oproc->boot_data = devm_kzalloc(&pdev->dev, sizeof(*oproc->boot_data),
+                                       GFP_KERNEL);
+       if (!oproc->boot_data)
+               return -ENOMEM;
+
+       if (!of_property_read_bool(np, "syscon-bootreg")) {
+               dev_err(&pdev->dev, "syscon-bootreg property is missing\n");
+               return -EINVAL;
+       }
+
+       oproc->boot_data->syscon =
+                       syscon_regmap_lookup_by_phandle(np, "syscon-bootreg");
+       if (IS_ERR(oproc->boot_data->syscon)) {
+               ret = PTR_ERR(oproc->boot_data->syscon);
+               return ret;
+       }
+
+       if (of_property_read_u32_index(np, "syscon-bootreg", 1,
+                                      &oproc->boot_data->boot_reg)) {
+               dev_err(&pdev->dev, "couldn't get the boot register\n");
+               return -EINVAL;
+       }
+
+       if (of_device_is_compatible(np, "ti,dra7-dsp"))
+               oproc->boot_data->boot_reg_shift = 10;
+
+       return 0;
+}
+
+static int omap_rproc_of_get_internal_memories(struct platform_device *pdev,
+                                              struct rproc *rproc)
+{
+       static const char * const ipu_mem_names[] = {"l2ram"};
+       static const char * const dra7_dsp_mem_names[] = {"l2ram", "l1pram",
+                                                               "l1dram"};
+       struct device_node *np = pdev->dev.of_node;
+       struct omap_rproc *oproc = rproc->priv;
+       struct device *dev = &pdev->dev;
+       const char * const *mem_names;
+       struct resource *res;
+       int num_mems;
+       const __be32 *addrp;
+       u32 l4_offset = 0;
+       u64 size;
+       int i;
+
+       /* OMAP4 and OMAP5 DSPs do not have support for flat SRAM */
+       if (of_device_is_compatible(np, "ti,omap4-dsp") ||
+           of_device_is_compatible(np, "ti,omap5-dsp"))
+               return 0;
+
+       /* DRA7 DSPs have two additional SRAMs at L1 level */
+       if (of_device_is_compatible(np, "ti,dra7-dsp")) {
+               mem_names = dra7_dsp_mem_names;
+               num_mems = ARRAY_SIZE(dra7_dsp_mem_names);
+       } else {
+               mem_names = ipu_mem_names;
+               num_mems = ARRAY_SIZE(ipu_mem_names);
+       }
+
+       oproc->mem = devm_kcalloc(dev, num_mems, sizeof(*oproc->mem),
+                                 GFP_KERNEL);
+       if (!oproc->mem)
+               return -ENOMEM;
+
+       for (i = 0; i < num_mems; i++) {
+               res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
+                                                  mem_names[i]);
+               oproc->mem[i].cpu_addr = devm_ioremap_resource(dev, res);
+               if (IS_ERR(oproc->mem[i].cpu_addr)) {
+                       dev_err(dev, "failed to parse and map %s memory\n",
+                               mem_names[i]);
+                       return PTR_ERR(oproc->mem[i].cpu_addr);
+               }
+               oproc->mem[i].bus_addr = res->start;
+
+               /*
+                * The DSPs have the internal memories starting at a fixed
+                * offset of 0x800000 from address 0, and this corresponds to
+                * L2RAM. The L3 address view has the L2RAM bus address as the
+                * starting address for the IP, so the L2RAM memory region needs
+                * to be processed first, and the device addresses for each
+                * memory region can be computed using the relative offset
+                * from this base address.
+                */
+               if (of_device_is_compatible(np, "ti,dra7-dsp") &&
+                   !strcmp(mem_names[i], "l2ram")) {
+                       addrp = of_get_address(dev->of_node, i, &size, NULL);
+                       l4_offset = be32_to_cpu(*addrp);
+               }
+               oproc->mem[i].dev_addr =
+                       of_device_is_compatible(np, "ti,dra7-dsp") ?
+                               res->start - l4_offset +
+                               OMAP_RPROC_DSP_LOCAL_MEM_OFFSET :
+                               OMAP_RPROC_IPU_L2RAM_DEV_ADDR;
+               oproc->mem[i].size = resource_size(res);
+
+               dev_dbg(dev, "memory %8s: bus addr %pa size 0x%x va %p da 0x%x\n",
+                       mem_names[i], &oproc->mem[i].bus_addr,
+                       oproc->mem[i].size, oproc->mem[i].cpu_addr,
+                       oproc->mem[i].dev_addr);
+       }
+       oproc->num_mems = num_mems;
+
+       return 0;
+}
+
 static int omap_rproc_probe(struct platform_device *pdev)
 {
-       struct omap_rproc_pdata *pdata = pdev->dev.platform_data;
+       struct omap_rproc_pdata *pdata = dev_get_platdata(&pdev->dev);
+       struct device_node *np = pdev->dev.of_node;
        struct omap_rproc *oproc;
        struct rproc *rproc;
+       const char *firmware;
+       u32 standby_addr = 0;
+       int num_timers;
        int ret;
 
+       if (!np) {
+               dev_err(&pdev->dev, "only DT-based devices are supported\n");
+               return -ENODEV;
+       }
+
+       /*
+        * self-manage the ordering dependencies between omap_device_enable/idle
+        * and omap_device_assert/deassert_hardreset API during runtime suspend
+        * and resume, rather than relying on the order in omap_device layer.
+        */
+       if (pdev->dev.pm_domain) {
+               dev_dbg(&pdev->dev, "device pm_domain is being reset for this remoteproc device\n");
+               pdev->dev.pm_domain = NULL;
+       }
+
+       if (!pdata || !pdata->device_enable || !pdata->device_shutdown) {
+               dev_err(&pdev->dev, "platform data is either missing or incomplete\n");
+               return -ENODEV;
+       }
+
+       firmware = omap_rproc_get_firmware(pdev);
+       if (IS_ERR(firmware))
+               return PTR_ERR(firmware);
+
        ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
        if (ret) {
                dev_err(&pdev->dev, "dma_set_coherent_mask: %d\n", ret);
                return ret;
        }
 
-       rproc = rproc_alloc(&pdev->dev, pdata->name, &omap_rproc_ops,
-                           pdata->firmware, sizeof(*oproc));
+       rproc = rproc_alloc(&pdev->dev, dev_name(&pdev->dev), &omap_rproc_ops,
+                           firmware, sizeof(*oproc));
        if (!rproc)
                return -ENOMEM;
 
+       if (pdata->device_is_enabled && pdata->device_is_enabled(pdev)) {
+               rproc->late_attach = 1;
+               set_dma_ops(&pdev->dev, &arm_dma_m_ops);
+       }
+
        oproc = rproc->priv;
        oproc->rproc = rproc;
        /* All existing OMAP IPU and DSP processors have an MMU */
        rproc->has_iommu = true;
 
+       ret = omap_rproc_of_get_internal_memories(pdev, rproc);
+       if (ret)
+               goto free_rproc;
+
+       ret = omap_rproc_get_boot_data(pdev, rproc);
+       if (ret)
+               goto free_rproc;
+
+       /*
+        * Timer nodes are directly used in client nodes as phandles, so
+        * retrieve the count using appropriate size
+        */
+       oproc->num_timers = of_property_count_elems_of_size(np, "timers",
+                                                           sizeof(phandle));
+       if (oproc->num_timers <= 0) {
+               dev_dbg(&pdev->dev, "device does not have timers, status = %d\n",
+                       oproc->num_timers);
+               oproc->num_timers = 0;
+       }
+
+#ifdef CONFIG_OMAP_REMOTEPROC_WATCHDOG
+       oproc->num_wd_timers = of_count_phandle_with_args(np, "watchdog-timers",
+                                                         NULL);
+       if (oproc->num_wd_timers <= 0) {
+               dev_dbg(&pdev->dev, "device does not have watchdog timers, status = %d\n",
+                       oproc->num_wd_timers);
+               oproc->num_wd_timers = 0;
+       }
+#endif
+
+       if (oproc->num_timers || oproc->num_wd_timers) {
+               num_timers = oproc->num_timers + oproc->num_wd_timers;
+               oproc->timers = devm_kzalloc(&pdev->dev, sizeof(*oproc->timers)
+                                            * num_timers, GFP_KERNEL);
+               if (!oproc->timers) {
+                       ret = -ENOMEM;
+                       goto free_rproc;
+               }
+
+               dev_dbg(&pdev->dev, "device has %d tick timers and %d watchdog timers\n",
+                       oproc->num_timers, oproc->num_wd_timers);
+       }
+
+       init_completion(&oproc->pm_comp);
+       oproc->autosuspend_delay = omap_rproc_get_autosuspend_delay(pdev);
+       if (oproc->autosuspend_delay < 0) {
+               ret = oproc->autosuspend_delay;
+               goto free_rproc;
+       }
+
+       ret = of_property_read_u32(np, "ti,rproc-standby-info", &standby_addr);
+       if (ret || !standby_addr) {
+               ret = !standby_addr ? -EINVAL : ret;
+               goto free_rproc;
+       }
+
+       oproc->standby_addr = devm_ioremap(&pdev->dev, standby_addr,
+                                          sizeof(u32));
+       if (!oproc->standby_addr) {
+               ret = -ENOMEM;
+               goto free_rproc;
+       }
+
+       ret = of_reserved_mem_device_init(&pdev->dev);
+       if (ret) {
+               dev_err(&pdev->dev, "device does not have specific CMA pool\n");
+               goto free_rproc;
+       }
+
        platform_set_drvdata(pdev, rproc);
 
        ret = rproc_add(rproc);
        if (ret)
-               goto free_rproc;
+               goto release_mem;
+
+       if (rproc_get_id(rproc) < 0)
+               dev_warn(&pdev->dev, "device does not have an alias id\n");
 
        return 0;
 
+release_mem:
+       of_reserved_mem_device_release(&pdev->dev);
 free_rproc:
+       if (rproc->late_attach)
+               set_dma_ops(&pdev->dev, &arm_dma_ops);
        rproc_free(rproc);
        return ret;
 }
@@ -225,15 +1431,24 @@ static int omap_rproc_remove(struct platform_device *pdev)
 
        rproc_del(rproc);
        rproc_free(rproc);
+       of_reserved_mem_device_release(&pdev->dev);
 
        return 0;
 }
 
+static const struct dev_pm_ops omap_rproc_pm_ops = {
+       SET_SYSTEM_SLEEP_PM_OPS(omap_rproc_suspend, omap_rproc_resume)
+       SET_RUNTIME_PM_OPS(omap_rproc_runtime_suspend,
+                          omap_rproc_runtime_resume, NULL)
+};
+
 static struct platform_driver omap_rproc_driver = {
        .probe = omap_rproc_probe,
        .remove = omap_rproc_remove,
        .driver = {
                .name = "omap-rproc",
+               .pm = &omap_rproc_pm_ops,
+               .of_match_table = omap_rproc_of_match,
        },
 };