From patchwork Mon Jul 17 10:10:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Wiklander X-Patchwork-Id: 107881 Delivered-To: patches@linaro.org Received: by 10.182.45.195 with SMTP id p3csp4367275obm; Mon, 17 Jul 2017 03:10:30 -0700 (PDT) X-Received: by 10.25.115.210 with SMTP id h79mr6761102lfk.163.1500286230228; Mon, 17 Jul 2017 03:10:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500286230; cv=none; d=google.com; s=arc-20160816; b=yNO6zExs3RR/KS41zsQn4W0fueMqr2zTe/Ut99cMhFEIsCs8WAWmFqnBfpsOrdQohU 8tvnmaNFiBOPlRvIneM3M5xmMcTpBk+8C1YzlHGTSp2TVIbJAIs5rAbdWVfPLWw2caqY HL277HuWKXOs2y5eG+YFVMYGB7aHkSjMfoj6xuPkkisS+eXQ9u3aFZWbu7wMllRcNhvD u/q/EPO0o1YuLUdJFbo0npBYHyr5BZJB3klkAkWupyEL2L7RRxaGrGiajJHZn8fCYbrG LaIruhP0jWircTWPZUc92dnBQceQBQHmWCqqqmzGIQgXC1ivkLFsheUEqySwiQp3ypFy sQ6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=0LSmn2rIi6Y0gwUY31Mg4oG7MvxtItj19DVU2CQLsyQ=; b=cFyhVIU/hLtByVTDYC5WwilY4up34WUiCLA2p/Kbxl9ixVQDwUo5OL3oQGlFUkmqu4 hRQ8ZkGqqakwSWgUpIJ+Thj79AUgeG0q7hPvrk5HGo3Zni/8H1V677QRZnWdjN3tb4/T PDeCRblspfNbJHt1EkitM44+ALdwcKvjzFzGiV40NLywakUUfSMmu9fQ9jygACbpoHoc HbSd4avyJhGrI7Y6nQdZ9/31CvDuq6qh/OeugfDNMcz9z7rzL2ArtHowaXT5AZ+5c+VJ OzmEuwEp6ZGaNGJfH+M+F8XDLh/b9C6TBM7mOpZuCawL7wfi6IM1pKTvQlXIJ+0k9+5w yHYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=FFGMVfI2; spf=pass (google.com: domain of jens.wiklander@linaro.org designates 2a00:1450:4010:c07::22c as permitted sender) smtp.mailfrom=jens.wiklander@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-lf0-x22c.google.com (mail-lf0-x22c.google.com. [2a00:1450:4010:c07::22c]) by mx.google.com with ESMTPS id f28si8334205lji.248.2017.07.17.03.10.29 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jul 2017 03:10:30 -0700 (PDT) Received-SPF: pass (google.com: domain of jens.wiklander@linaro.org designates 2a00:1450:4010:c07::22c as permitted sender) client-ip=2a00:1450:4010:c07::22c; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.b=FFGMVfI2; spf=pass (google.com: domain of jens.wiklander@linaro.org designates 2a00:1450:4010:c07::22c as permitted sender) smtp.mailfrom=jens.wiklander@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by mail-lf0-x22c.google.com with SMTP id z78so82681578lff.0 for ; Mon, 17 Jul 2017 03:10:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=0LSmn2rIi6Y0gwUY31Mg4oG7MvxtItj19DVU2CQLsyQ=; b=FFGMVfI29bLbGJ9+0xlUOBJOQoQ4Wlt1/9UmyX65hEXyRX2qRalydbULYQGocUl8/q tTczl1P8YjCGC0zUc2hrC1bvt+YuHFSa0gTe+yrNm/1Z+/rJP8msftmMRflIfwiV5mFI VwgggtOhXyUYlJG7g1nLsIimyKs7ffFYaOV8s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=0LSmn2rIi6Y0gwUY31Mg4oG7MvxtItj19DVU2CQLsyQ=; b=QMgVJMuI9UFch3R0rDlzfMK9Rb2Lm3bK89SeneR3Yg3OoEhJHka+JRxvtLPygTJPH1 TDBW2LG1EfpPktv4dG+nfNGAQxxfV47XqjST0lbFVpeDYTYTdwLtoofdFI7LLKThdIwE 1ZldFVUfKNRlDwQiSVeK4ceZAWf+RD4DO5loJmSVaHnH2bcBkUQgi5DQu9rXMB28869P Q1WkRQ+8pgwrwf3qp0zdUnoOVb27UzpXjOprcthnD9cEA6A/WZeLHtjzQuj5LItktFH0 vi8pZVwjSIDowliKPPcCjct1JXFQwBfLTGj75YWfs6GcP6bo4IfW3xzLjsPFveV+ZKlb gXLg== X-Gm-Message-State: AIVw1107w/GdzFhPfGbSCMa8Iplmt/+/cI0EAm/6Jx60def2U7wt/uSB 8ueYdG1anDABwrAZ7ElmiGC3 X-Received: by 10.25.16.232 with SMTP id 101mr460558lfq.36.1500286229776; Mon, 17 Jul 2017 03:10:29 -0700 (PDT) Return-Path: Received: from jax.urgonet (h-84-45.A175.priv.bahnhof.se. [79.136.84.45]) by smtp.gmail.com with ESMTPSA id a78sm3780744ljb.66.2017.07.17.03.10.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 17 Jul 2017 03:10:28 -0700 (PDT) From: Jens Wiklander To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, tee-dev@lists.linaro.org Cc: tiger-yu99 , Jerome Forissier , Jens Wiklander Subject: [PATCH] tee: optee: interruptible RPC sleep Date: Mon, 17 Jul 2017 12:10:13 +0200 Message-Id: <1500286213-29560-1-git-send-email-jens.wiklander@linaro.org> X-Mailer: git-send-email 2.7.4 From: tiger-yu99 Prior to this patch RPC sleep was uninterruptible since msleep() is uninterruptible. Change to use msleep_interruptible() instead. Signed-off-by: Tiger Yu Reviewed-by: Joakim Bech Signed-off-by: Jerome Forissier Signed-off-by: Jens Wiklander --- drivers/tee/optee/rpc.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) -- 2.7.4 diff --git a/drivers/tee/optee/rpc.c b/drivers/tee/optee/rpc.c index 8814eca06021..9488ed1541bc 100644 --- a/drivers/tee/optee/rpc.c +++ b/drivers/tee/optee/rpc.c @@ -140,11 +140,8 @@ static void handle_rpc_func_cmd_wait(struct optee_msg_arg *arg) msec_to_wait = arg->params[0].u.value.a; - /* set task's state to interruptible sleep */ - set_current_state(TASK_INTERRUPTIBLE); - - /* take a nap */ - msleep(msec_to_wait); + /* Go to interruptible sleep */ + msleep_interruptible(msec_to_wait); arg->ret = TEEC_SUCCESS; return;