diff options
| author | Kaz Fukuoka <kfukuoka@nvidia.com> | 2011-06-27 16:57:31 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:47:12 -0800 |
| commit | 951a7ec6e6e6d54d1a0e8560c529e0a571f190d6 (patch) | |
| tree | 086285059455c403d27d9155033b6fa09a7730c4 | |
| parent | f978c31adf185dd2ecea508986ecbc8329a104b3 (diff) | |
media: tegra: avp: Clean avp_svc_thread shutdown
- Avoid exiting from avp_svc_thread in error case.
- Add nicer messages.
bug 840262
bug 836806
Original-Change-Id: I28fe1de9451b10a810f61db94ad3a7770703fd09
Reviewed-on: http://git-master/r/38581
Reviewed-by: Niket Sirsi <nsirsi@nvidia.com>
Tested-by: Niket Sirsi <nsirsi@nvidia.com>
Rebase-Id: R74283b26e4d63ca7d7777844a4ee5703b0473fb1
| -rw-r--r-- | drivers/media/video/tegra/avp/avp_svc.c | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/drivers/media/video/tegra/avp/avp_svc.c b/drivers/media/video/tegra/avp/avp_svc.c index 1a6d06b49d8f..a8bfdcf1fd53 100644 --- a/drivers/media/video/tegra/avp/avp_svc.c +++ b/drivers/media/video/tegra/avp/avp_svc.c @@ -579,12 +579,12 @@ static int avp_svc_thread(void *data) u8 buf[TEGRA_RPC_MAX_MSG_LEN]; struct svc_msg *msg = (struct svc_msg *)buf; int ret; + long timeout; BUG_ON(!avp_svc->cpu_ep); ret = trpc_wait_peer(avp_svc->cpu_ep, -1); if (ret) { - /* XXX: teardown?! */ pr_err("%s: no connection from AVP (%d)\n", __func__, ret); goto err; } @@ -596,12 +596,19 @@ static int avp_svc_thread(void *data) ret = trpc_recv_msg(avp_svc->rpc_node, avp_svc->cpu_ep, buf, TEGRA_RPC_MAX_MSG_LEN, -1); DBG(AVP_DBG_TRACE_SVC, "%s: got message\n", __func__); - if (ret < 0) { - pr_err("%s: couldn't receive msg\n", __func__); - /* XXX: port got closed? we should exit? */ - goto err; - } else if (!ret) { - pr_err("%s: received msg of len 0?!\n", __func__); + + if (ret == -ECONNRESET || ret == -ENOTCONN) { + pr_info("%s: AVP seems to be down; " + "wait for kthread_stop\n", __func__); + timeout = msecs_to_jiffies(100); + timeout = schedule_timeout_interruptible(timeout); + if (timeout == 0) + pr_err("%s: timed out while waiting for " + "kthread_stop\n", __func__); + continue; + } else if (ret <= 0) { + pr_err("%s: couldn't receive msg (ret=%d)\n", + __func__, ret); continue; } dispatch_svc_message(avp_svc, msg, ret); @@ -609,7 +616,7 @@ static int avp_svc_thread(void *data) err: trpc_put(avp_svc->cpu_ep); - pr_info("%s: done\n", __func__); + pr_info("%s: exiting\n", __func__); return ret; } |