diff options
| author | Andy Green <andy.green@linaro.org> | 2012-01-03 09:24:22 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2012-01-09 08:39:59 +0800 |
| commit | 6f9404f85ba8dec2a87afa82876ed7781b2f7637 (patch) | |
| tree | c2efe35450a3ff21566b10a99ca11758f0b78cd4 | |
| parent | 6f0708083dcf9cbb702ddacb3422ec537df91115 (diff) | |
revrt to tilt 3.1 state 1
Signed-off-by: Andy Green <andy.green@linaro.org>
| -rw-r--r-- | drivers/dsp/syslink/ipu_pm/ipu_pm.c | 26 | ||||
| -rw-r--r-- | drivers/dsp/syslink/multicore_ipc/ipc.c | 4 | ||||
| -rw-r--r-- | drivers/dsp/syslink/multicore_ipc/ipc_drv.c | 3 |
3 files changed, 15 insertions, 18 deletions
diff --git a/drivers/dsp/syslink/ipu_pm/ipu_pm.c b/drivers/dsp/syslink/ipu_pm/ipu_pm.c index 608f3acf7d1..ff6ad2041c2 100644 --- a/drivers/dsp/syslink/ipu_pm/ipu_pm.c +++ b/drivers/dsp/syslink/ipu_pm/ipu_pm.c @@ -314,7 +314,7 @@ static struct pm_qos_request_list *pm_qos_handle_2; static struct omap_rproc *sys_rproc; static struct omap_rproc *app_rproc; static struct omap_mbox *ducati_mbox; -static struct omap_iommu *ducati_iommu; +static struct iommu *ducati_iommu; static bool first_time = 1; /* BIOS flags states for each core in IPU */ @@ -584,8 +584,8 @@ static int ipu_pm_iommu_notifier_call(struct notifier_block *nb, * restore IOMMU since it is required the IOMMU * is up and running for reclaiming MMU entries */ -// if (ipu_pm_get_state(SYS_M3) & SYS_PROC_DOWN) -// iommu_restore_ctx(ducati_iommu); + if (ipu_pm_get_state(SYS_M3) & SYS_PROC_DOWN) + iommu_restore_ctx(ducati_iommu); return 0; case IOMMU_FAULT: ipu_pm_recover_schedule(); @@ -2503,10 +2503,10 @@ int ipu_pm_save_ctx(int proc_id) omap_mbox_save_ctx(ducati_mbox); else pr_err("Not able to save mbox"); -// if (ducati_iommu) -// iommu_save_ctx(ducati_iommu); -// else -// pr_err("Not able to save iommu"); + if (ducati_iommu) + iommu_save_ctx(ducati_iommu); + else + pr_err("Not able to save iommu"); } else goto error; @@ -2592,10 +2592,10 @@ int ipu_pm_restore_ctx(int proc_id) omap_mbox_restore_ctx(ducati_mbox); else pr_err("Not able to restore mbox"); -// if (ducati_iommu) -// iommu_restore_ctx(ducati_iommu); -// else -// pr_err("Not able to restore iommu"); + if (ducati_iommu) + iommu_restore_ctx(ducati_iommu); + else + pr_err("Not able to restore iommu"); pr_info("Wakeup SYSM3\n"); retval = rproc_wakeup(sys_rproc); @@ -2927,8 +2927,8 @@ int ipu_pm_detach(u16 remote_proc_id) * Restore iommu to allow process's iommu cleanup * after ipu_pm is shutdown */ -// if (ipu_pm_get_state(SYS_M3) & SYS_PROC_DOWN) -// iommu_restore_ctx(ducati_iommu); + if (ipu_pm_get_state(SYS_M3) & SYS_PROC_DOWN) + iommu_restore_ctx(ducati_iommu); iommu_unregister_notifier(ducati_iommu, &ipu_pm_notify_nb_iommu_ducati); pr_debug("releasing ducati_iommu\n"); diff --git a/drivers/dsp/syslink/multicore_ipc/ipc.c b/drivers/dsp/syslink/multicore_ipc/ipc.c index c8acd992d88..323006f0a72 100644 --- a/drivers/dsp/syslink/multicore_ipc/ipc.c +++ b/drivers/dsp/syslink/multicore_ipc/ipc.c @@ -872,10 +872,8 @@ static int ipc_proc_sync_start(u16 remote_proc_id, void *shared_addr) Cache_inv((void *)remote, reserved_size, Cache_Type_ALL, true); #endif - if (remote->started_key != IPC_PROCSYNCSTART) { - pr_err("(remote->started_key != IPC_PROCSYNCSTART))\n"); + if (remote->started_key != IPC_PROCSYNCSTART) status = IPC_E_FAIL; - } goto exit; } diff --git a/drivers/dsp/syslink/multicore_ipc/ipc_drv.c b/drivers/dsp/syslink/multicore_ipc/ipc_drv.c index 68dd747ac65..b73e1896b15 100644 --- a/drivers/dsp/syslink/multicore_ipc/ipc_drv.c +++ b/drivers/dsp/syslink/multicore_ipc/ipc_drv.c @@ -32,11 +32,10 @@ #include <notify_ioctl.h> #include <nameserver.h> #ifdef CONFIG_SYSLINK_RECOVERY +#include <plat/iommu.h> #include <plat/remoteproc.h> #endif -#include <plat/iommu.h> - #define IPC_NAME "syslink_ipc" #define IPC_MAJOR 0 #define IPC_MINOR 0 |