From 23cd14af7d41ab3d17fe51e9cfc62e6ea98a3518 Mon Sep 17 00:00:00 2001
From: Masamichi Takagi <masamichi.takagi@riken.jp>
Date: Fri, 5 Feb 2021 13:45:31 +0900
Subject: [PATCH] __mcctrl_os_read_write_cpu_register: timeout in 1 sec for
 when McKernel can't respond

Change-Id: Ia2d5f64e107697dda1f3bae499eb3afb8a7aedba
---
 executer/kernel/mcctrl/control.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/executer/kernel/mcctrl/control.c b/executer/kernel/mcctrl/control.c
index c147d62d..3d1a5760 100644
--- a/executer/kernel/mcctrl/control.c
+++ b/executer/kernel/mcctrl/control.c
@@ -3646,7 +3646,8 @@ int __mcctrl_os_read_write_cpu_register(ihk_os_t os, int cpu,
 	isp.op = op;
 	isp.pdesc = virt_to_phys(ldesc);
 
-	ret = mcctrl_ikc_send_wait(os, cpu, &isp, 0, NULL, &do_free, 1, ldesc);
+	/* 1 sec timeout for the case where McKernel can't respond */
+	ret = mcctrl_ikc_send_wait(os, cpu, &isp, 1000, NULL, &do_free, 1, ldesc);
 	if (ret != 0) {
 		printk("%s: ERROR sending IKC msg: %d\n", __FUNCTION__, ret);
 		goto out;