From patchwork Thu Aug 10 16:09:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 109832 Delivered-To: patch@linaro.org Received: by 10.182.109.195 with SMTP id hu3csp2567170obb; Thu, 10 Aug 2017 08:48:38 -0700 (PDT) X-Received: by 10.98.15.217 with SMTP id 86mr12478348pfp.23.1502380118265; Thu, 10 Aug 2017 08:48:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502380118; cv=none; d=google.com; s=arc-20160816; b=SZojtNwVCF78CHw6amkxcYJ6aBm/ZXO0lJMww9DMzTgcwKJBmGSaXA9xBJpfpYSPJU JlwoX1oNA0n0W+BzFd7olSamn+PyRcjpncxJETBoeYXh4RtPTGmcb9HvQRwVZczPu/CM s8M2ILE/B8K3cYUNumGTcrCQD3k6fsuwJZ+K4WfZiI/l6dsBiu0Hb6502i8PxgNh1TIQ ETAvgLGA/ja/hBbKXeSC7yZyuvEyBUhXMJv4V/93+cgwaE1R1cMNMIzKFddCwCDnrgZu fJrvs9f+uyvznYG43f55dicNU70iWmMcIkMqiI7wYWF5X3ZH/mBS6wOONwmyhwhlt07A QYXg== 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=4guNIGAvcThDsm9/IBZ35up2nLiFNEOVRSn/LWO5lSs=; b=kHXAUc+vtkMKyX2Vj+OhfvfG/aHMfX6OKPIg8vB1G55e2+v24GC8/UnX2BzqkKld+7 LEOCntsa4ltM1ZQKtnIE6zjx/2KH6VMo8VtUwXKTYHsiU9v/dmmUsftn6JRum1KLgOKr Eo6mz8m0s501mJmJLv2tWsywWc5ag39fRVscFa/mbL395WtKviWOU9iLc6sUNgrsu4BD J8wNZoU7ecqlG6HfBGDG35RwL8Ik38q6bjQUUxLZrr1Lbie7VBjkplKRu6PZzAS+KlFz nQA91aHBKneJ8nU7Jh3Jo9yM7nBvhhuzJeTHQfb9IxqY+uLDCLF1eD12yTdRQ9o0jICI pMHw== 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 v29si4143433pgo.576.2017.08.10.08.48.37; Thu, 10 Aug 2017 08:48:38 -0700 (PDT) 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 S1753218AbdHJPse (ORCPT + 25 others); Thu, 10 Aug 2017 11:48:34 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:3053 "EHLO szxga05-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752898AbdHJPmv (ORCPT ); Thu, 10 Aug 2017 11:42:51 -0400 Received: from 172.30.72.59 (EHLO DGGEMS402-HUB.china.huawei.com) ([172.30.72.59]) by dggrg05-dlp.huawei.com (MOS 4.4.6-GA FastPath queued) with ESMTP id DEY38524; Thu, 10 Aug 2017 23:42:47 +0800 (CST) Received: from localhost.localdomain (10.67.212.75) by DGGEMS402-HUB.china.huawei.com (10.3.19.202) with Microsoft SMTP Server id 14.3.301.0; Thu, 10 Aug 2017 23:42:38 +0800 From: John Garry To: , CC: , , , , Xiang Chen , John Garry Subject: [PATCH 11/19] scsi: hisi_sas: Modify v3 hw STP_LINK_TIMER setting Date: Fri, 11 Aug 2017 00:09:36 +0800 Message-ID: <1502381384-219889-12-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1502381384-219889-1-git-send-email-john.garry@huawei.com> References: <1502381384-219889-1-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.212.75] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A090204.598C7EF8.006D, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 2c01769674fe6e0adec4e9e575598280 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xiang Chen Modify STP link timer from 10ms to 500ms. Also add the register address. Signed-off-by: Xiang Chen Signed-off-by: John Garry --- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 3 +++ 1 file changed, 3 insertions(+) -- 1.9.1 diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c index dc5c551..bb79b776 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c @@ -137,6 +137,7 @@ #define TX_HARDRST_MSK (0x1 << TX_HARDRST_OFF) #define RX_IDAF_DWORD0 (PORT_BASE + 0xc4) #define RXOP_CHECK_CFG_H (PORT_BASE + 0xfc) +#define STP_LINK_TIMER (PORT_BASE + 0x120) #define SAS_SSP_CON_TIMER_CFG (PORT_BASE + 0x134) #define SAS_SMP_CON_TIMER_CFG (PORT_BASE + 0x138) #define SAS_STP_CON_TIMER_CFG (PORT_BASE + 0x13c) @@ -401,6 +402,8 @@ static void init_reg_v3_hw(struct hisi_hba *hisi_hba) 0xa0064); hisi_sas_phy_write32(hisi_hba, i, SAS_STP_CON_TIMER_CFG, 0xa0064); + hisi_sas_phy_write32(hisi_hba, i, STP_LINK_TIMER, + 0x7f7a120); } for (i = 0; i < hisi_hba->queue_count; i++) { /* Delivery queue */