From patchwork Wed Mar 7 12:25:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 130873 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp5120768lja; Wed, 7 Mar 2018 04:27:27 -0800 (PST) X-Google-Smtp-Source: AG47ELsP8Yyp/2ZEBdf386yFjOBR2Mb1Mt1T3PSHstD+PIextmfo4n+awiwFWuBBqycAYk9YnZZ9 X-Received: by 2002:a17:902:7404:: with SMTP id g4-v6mr20029072pll.235.1520425647307; Wed, 07 Mar 2018 04:27:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520425647; cv=none; d=google.com; s=arc-20160816; b=JcDIAwDMutol+ThDDuiRi6zPwS3LZkrfc9je4UXfyUQ1n1TvLD6ZJJ3dZ8D7ScDBIF AL1P6pUE9kaNJgwJhkfWSvcnaViYSiEj+Fb2fJnBeBEenuyfbnpkJxQwJLKZONk8W9s6 DaEZdRP8KS2qEuhSYgUEWEbxeYj44/U4SHN9piA9bQZiavYQ+ev0qQhzbRUSd5zXQnmM djPZlWnXlJqbuu4x52saQ+uqSZenF39YzzDbEJkmCaDHWSNy4UMFObCXz40nkMvQFjED cslBMkrWSMWGkZpV5Tyh2R51mQBHUiZbwPmgHnpwiBjgvw2BOL+Bz/eR3DlAC+1+sTPY H/mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:arc-authentication-results; bh=dhQj25UHgAqz0fi2vBcFen4tBEnixxIOY4PNNRKJxgo=; b=IGpKv559/g9lIFvv/RVLip3tjAgtBRzKzuRpSVVq/iFF5AgswtSIaGDo0NaGpbLIn8 QR4RMBzcrI3l7AkIbbKYHSjikM9vrdMWCJIrwba9yvxJZ1m16jA5ucj98GWYzQK0lttU QBYNWUr05nysdLvEIqN+DQccleFhyHG8nherBTHj1PPJWPcM1ZXP00wyxQwW1A1gkl6A 0q+rKMB3mf4d+5edQOSQUeSwMEaRdpPHnvc65W5YVmoLgHkaKQA3kOsd4mealR9uXhDm /RENbnAxBeVfN4AnrRBsPwnc8P1gI5/t84fwdKGVJ6U2lAQL8yOEDg+e/yzBh27DJOzF QrBw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t189si11314952pgd.620.2018.03.07.04.27.27; Wed, 07 Mar 2018 04:27:27 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754503AbeCGM1V (ORCPT + 28 others); Wed, 7 Mar 2018 07:27:21 -0500 Received: from szxga04-in.huawei.com ([45.249.212.190]:6169 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753972AbeCGM0B (ORCPT ); Wed, 7 Mar 2018 07:26:01 -0500 Received: from DGGEMS412-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id D980BFF6B358B; Wed, 7 Mar 2018 20:25:42 +0800 (CST) Received: from localhost.localdomain (10.67.212.75) by DGGEMS412-HUB.china.huawei.com (10.3.19.212) with Microsoft SMTP Server id 14.3.361.1; Wed, 7 Mar 2018 20:25:35 +0800 From: John Garry To: , , , , CC: , , , , Xiaofei Tan , John Garry Subject: [PATCH v4 05/10] scsi: hisi_sas: increase timer expire of internal abort task Date: Wed, 7 Mar 2018 20:25:09 +0800 Message-ID: <1520425514-205565-6-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1520425514-205565-1-git-send-email-john.garry@huawei.com> References: <1520425514-205565-1-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.212.75] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xiaofei Tan The current 110ms expiry time is not long enough for the internal abort task. The reason is that the internal abort task could be blocked in HW if the HW is retrying to set up link. The internal abort task will be executed only when the retry process finished. The maximum time is 5s for the retry of setting up link. So, the timer expire should be more than 5s. This patch increases it from 110ms to 6s. Signed-off-by: Xiaofei Tan Signed-off-by: John Garry --- drivers/scsi/hisi_sas/hisi_sas_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 1.9.1 diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c index 9d16372..9ff8790 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_main.c +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c @@ -871,6 +871,7 @@ static void hisi_sas_tmf_timedout(struct timer_list *t) #define TASK_TIMEOUT 20 #define TASK_RETRY 3 +#define INTERNAL_ABORT_TIMEOUT 6 static int hisi_sas_exec_internal_tmf_task(struct domain_device *device, void *parameter, u32 para_len, struct hisi_sas_tmf_task *tmf) @@ -1574,7 +1575,7 @@ static int hisi_sas_query_task(struct sas_task *task) task->task_proto = device->tproto; task->task_done = hisi_sas_task_done; task->slow_task->timer.function = hisi_sas_tmf_timedout; - task->slow_task->timer.expires = jiffies + msecs_to_jiffies(110); + task->slow_task->timer.expires = jiffies + INTERNAL_ABORT_TIMEOUT*HZ; add_timer(&task->slow_task->timer); res = hisi_sas_internal_abort_task_exec(hisi_hba, sas_dev->device_id,