Received: by 10.223.185.116 with SMTP id b49csp131433wrg; Fri, 2 Mar 2018 15:11:19 -0800 (PST) X-Google-Smtp-Source: AG47ELvIibez3vaCDQzQhx4dbx8K6KkYJ2FQi7ijurDbvIpld3qmJfcCAKbd0UnpJKdaGUa/db2h X-Received: by 10.99.125.29 with SMTP id y29mr5761083pgc.277.1520032279723; Fri, 02 Mar 2018 15:11:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520032279; cv=none; d=google.com; s=arc-20160816; b=O0hOYcTLZrWoEEI2cgchKDQo//O5ZMXBoyGUloANGsFX2zRPotFxw9C7N5mutoKnUE Vo6XVChJdD4kw5SOeeE9utSuru+KOeQlDlA0Z9b8D+ZSxWPNxooIvbd2zXfEAz1Pea3H Bcr0GhDxQGbC2NPWSuWYArLzYZQfvth8zRuWLjLAUE8sUlvbH/JkRVypu4d+KlQMj0bF Q6l1U6GAFq03MX3LzXS6YN4mAed+e6unbfcjt2ft7DFS5+9wakOhDNUbcaSInBgQUMty V0BNW+R/vOtLhx2Gev84AzZN4Um95uC/y1rhYtPWIZUwIc3BRuZ9jqTNPTZOcm8j9gej K6GQ== 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=OrJyYCcy9GU9bmmDfFXDHd/2myMSTPiqTbiHOdpGs4U=; b=cBx+nKrBDyhK8iwSKrXt3Z9v+4aHye+lrCIfIEm+Dch2X49q6GWp6S4vpBFUd8Rz/y /lhG8pBCHI/3UzmGGt10SSu+xosgxAoAshPnUu04QwQeVxlsih2c5ukDyP/mH2ISY2va T1HLkv/k46dP5NFBxBNT6uQr1Qiqps6bXYpBdzEzLS9qRWjhgnP36W93RjlU0UyLznZH G9gL/xGOfqtVTVbat/ECFcsBOmI2dQ+g+ZTl8lsN09Et1Wf3oz17ZyLRqNFP6hxOzicm Ic2amwbCdAh2wkRQruES8fxJvbuiY0qBTMzFMx38NI5VyNSLwHS9p9em8OD0V5iBp0aB zfPw== 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 70si5644530pfk.60.2018.03.02.15.11.05; Fri, 02 Mar 2018 15:11:19 -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 S1429016AbeCBPHw (ORCPT + 99 others); Fri, 2 Mar 2018 10:07:52 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:5730 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1423587AbeCBPHu (ORCPT ); Fri, 2 Mar 2018 10:07:50 -0500 Received: from DGGEMS411-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 2976B1E0CA7C4; Fri, 2 Mar 2018 23:07:33 +0800 (CST) Received: from localhost.localdomain (10.67.212.75) by DGGEMS411-HUB.china.huawei.com (10.3.19.211) with Microsoft SMTP Server id 14.3.361.1; Fri, 2 Mar 2018 23:07:26 +0800 From: John Garry To: , , , CC: , , , , Xiaofei Tan , John Garry Subject: [PATCH v2 2/8] scsi: hisi_sas: support the property of signal attenuation for v2 hw Date: Fri, 2 Mar 2018 23:06:16 +0800 Message-ID: <1520003182-26277-3-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1520003182-26277-1-git-send-email-john.garry@huawei.com> References: <1520003182-26277-1-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 Content-Type: text/plain 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 register SAS_PHY_CTRL is configured according to signal quality. The signal quality is calculated by signal attenuation of hardware physical link. It may be different for different PCB layout. So, in order to give better support to new board, this patch add support to reading the devicetree property, hisi-signal-attenuation. Of course, we still keep an default value in driver to adapt old board. Signed-off-by: Xiaofei Tan Signed-off-by: John Garry --- drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 39 +++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c index 4ccb61e..3a0b4ed 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c +++ b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c @@ -406,6 +406,17 @@ struct hisi_sas_err_record_v2 { __le32 dma_rx_err_type; }; +struct signal_attenuation_s { + u32 de_emphasis; + u32 preshoot; + u32 boost; +}; + +struct sig_atten_lu_s { + const struct signal_attenuation_s *att; + u32 sas_phy_ctrl; +}; + static const struct hisi_sas_hw_error one_bit_ecc_errors[] = { { .irq_msk = BIT(SAS_ECC_INTR_DQE_ECC_1B_OFF), @@ -1130,9 +1141,16 @@ static void phys_try_accept_stp_links_v2_hw(struct hisi_hba *hisi_hba) } } +static const struct signal_attenuation_s x6000 = {9200, 0, 10476}; +static const struct sig_atten_lu_s sig_atten_lu[] = { + { &x6000, 0x3016a68 }, +}; + static void init_reg_v2_hw(struct hisi_hba *hisi_hba) { struct device *dev = hisi_hba->dev; + u32 sas_phy_ctrl = 0x30b9908; + u32 signal[3]; int i; /* Global registers init */ @@ -1176,9 +1194,28 @@ static void init_reg_v2_hw(struct hisi_hba *hisi_hba) hisi_sas_write32(hisi_hba, AXI_AHB_CLK_CFG, 1); hisi_sas_write32(hisi_hba, HYPER_STREAM_ID_EN_CFG, 1); + /* Get sas_phy_ctrl value to deal with TX FFE issue. */ + if (!device_property_read_u32_array(dev, "hisi-signal-attenuation", + signal, ARRAY_SIZE(signal))) { + for (i = 0; i < ARRAY_SIZE(sig_atten_lu); i++) { + const struct sig_atten_lu_s *lookup = &sig_atten_lu[i]; + const struct signal_attenuation_s *att = lookup->att; + + if ((signal[0] == att->de_emphasis) && + (signal[1] == att->preshoot) && + (signal[2] == att->boost)) { + sas_phy_ctrl = lookup->sas_phy_ctrl; + break; + } + } + + if (i == ARRAY_SIZE(sig_atten_lu)) + dev_warn(dev, "unknown signal attenuation values, using default PHY ctrl config\n"); + } + for (i = 0; i < hisi_hba->n_phy; i++) { hisi_sas_phy_write32(hisi_hba, i, PROG_PHY_LINK_RATE, 0x855); - hisi_sas_phy_write32(hisi_hba, i, SAS_PHY_CTRL, 0x30b9908); + hisi_sas_phy_write32(hisi_hba, i, SAS_PHY_CTRL, sas_phy_ctrl); hisi_sas_phy_write32(hisi_hba, i, SL_TOUT_CFG, 0x7d7d7d7d); hisi_sas_phy_write32(hisi_hba, i, SL_CONTROL, 0x0); hisi_sas_phy_write32(hisi_hba, i, TXID_AUTO, 0x2); -- 1.9.1