From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751537AbcFUIy0 (ORCPT ); Tue, 21 Jun 2016 04:54:26 -0400 Received: from mail-bl2on0084.outbound.protection.outlook.com ([65.55.169.84]:30383 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750872AbcFUIyW (ORCPT ); Tue, 21 Jun 2016 04:54:22 -0400 Authentication-Results: spf=softfail (sender IP is 66.35.236.227) smtp.mailfrom=altera.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=altera.com; From: Ley Foon Tan To: Bjorn Helgaas CC: , , Ley Foon Tan , Ley Foon Tan Subject: [PATCH 2/2] PCI: altera: Polling for link up status after retrain the link Date: Tue, 21 Jun 2016 16:53:13 +0800 Message-ID: <1466499193-1987-3-git-send-email-lftan@altera.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1466499193-1987-1-git-send-email-lftan@altera.com> References: <1466499193-1987-1-git-send-email-lftan@altera.com> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:66.35.236.227;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(7916002)(2980300002)(199003)(189002)(48376002)(76176999)(4001430100002)(50466002)(6806005)(2950100001)(47776003)(4326007)(81156014)(81166006)(8676002)(7846002)(2906002)(50986999)(105596002)(356003)(33646002)(106466001)(68736007)(586003)(87936001)(97736004)(19580395003)(107886002)(189998001)(92566002)(229853001)(5003940100001)(8936002)(42186005)(86362001)(11100500001)(50226002)(110136002)(19580405001)(36756003)(7099028);DIR:OUT;SFP:1101;SCL:1;SRVR:BL2PR03MB100;H:sj-itexedge03.altera.priv.altera.com;FPR:;SPF:SoftFail;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11FD017;1:okh1iqp7QC5qC8RW2feU/ahbDiXKJV4Bg9yd2kU1SORIs2mFRonjUf8v/STmHvBqHjI8DA3fPd0gsnRUYWFSh4QD0TxR+adI1WfW8ZCTZfBLgp1SJmLgaNctLatAyIrYlh/PAaCXkZJVrua5fjx9w66W1A+0/KPy8ss/NAQ7Z6auEYLH+t7EcX1AWOYGbzeEc+V7ick7EUoQBnG5TkaJrvbnXgSA8uhRUu4v6z36dNKZpfKxCXaAAz41RPT2i0hwoLq9fbbkPNuHHCjFVk0xPQwpjL/ZCikc8/+I8zhSPdVEf/VS5z2H2hexaoW9VSBAYhD0SksYvmGhkxv7wSURedmRfxNqg1J4d2LysquUu0HsIJg4P5P5veNQgVVbtpUcme2VB/jbLwL0H+uYnXS9eIlBHR4tyo8h0yGGdvwrmZQlnSWxKdJg4fN11jd/gs4p9t6jKhT6Bl+w9XMBQKWYCG+7hKeI8FQ/+ewYUFprTEymHFS3jc4bHgVqa9zbohHK7MAMfVlj837SS/Z5wdmvnQ== X-MS-Office365-Filtering-Correlation-Id: f631171e-c4ce-491c-fe0d-08d399b18451 X-Microsoft-Exchange-Diagnostics: 1;BL2PR03MB100;2:8k/uM2+iZDo4sTBoN090uqJtEM1pYKioWpASZJdZRoo3fArmgGOL/4wtdu8R4YmSNCazgXUsuk4pLWAAOF1gGxfbbwx4gApkcTaY74abvcqHTpSyxzTpvdFqBSMyzhisLvRem15w4RDsk+KIN65eN+vVqCblhPhq7gq35v+S8NSCasb/RaTV55HtV72bNulj;3:uaBn6VkR17vWcTNLZVkgCFdlDsGg455Ol4cx9H+QDX89nBUR3xHd6z2/uJtHCbYwF+sR2ByRX1xCZocD7TgNgO56p32ztPvXIbz1VUHdO930D5/0TnZTcEGrOwdAAm4AgoC+Zl+8KuC1+k9aCV5d561qT8t4omTmGdhSx78fogxWDrLkSLPk9pmIpSMW2yczDo+xbaJKo18ZxOF0uCeX/ynyxeK6Il/ZSpnqHe5thac= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BL2PR03MB100; X-Microsoft-Exchange-Diagnostics: 1;BL2PR03MB100;25:2bBohAH3pNqAQAKGHP5ncBV33V8e+6NQAEKXw1wnTCZon4ukgz+DiVotI/tMOKQDweqKhhuzIocgcrdfGON45UxtueH17yL72GLHGySggHZgNaIwU5o0nTltyf3qySDxHccuU4RGd2naSd/NcG2M966glY6V94i/FqJkrB1qlO1cQTpUZYb6fLtfWpiWYJTvZ7hblAV8uTZTA0GUmPrL9IjRL53Cteqk2uDR0m3ARTkvh50rz2RnEexkdwBRG3Ie+vnLf6s04HpkGzNK/RjHaRGq6vAm+Qv/LQ/76ELSqdtFT0DUfiNYH+DN82nEcBtfSLAskl+r9qu1ndlJEzmGTOuBbKjnu/RZVSuI8Lsp2TcIOX6cmH3rUgO6VeYBBuin6qpCi4kdpiFGCVijfJTnsGNlj6LlVCPDGlv7Ji7ZrU+rjEAVhugWlE455zvjeZYCqwOuGmeXuvn3n0Rqxzq3e5xz86KzynKefGjrzKT3nkSSDwMgZVxby5sfazWPi8257YZP6WmCthE9XiLpX87jekm4ywH+wOYbB8B4uCwtZZudg4Gpp2KozgvEpsrHG9171YmjEqQE9uHkIhWK9OgfwHDHCEOYByTTN0hFXic/jIfGCC9pQe6FjlKxHLdX6hDGXIud5iXG/D/mvAxcdsXAphGcSdX/rX/xtame9KYz/8l8FPSHvtas0Ri06cNhm9J9WpY0xUhbhzyrAhfGXWmVNgVCKI6md3tOLIOdS5HSx5cC0UPORx0Dl5/M0AqqEf9MLAwoKfZVN9EsLGzdRfUWrw==;20:bLDGvhH0vNbO/hD+daBFXUOjMvWo/fRo06ABmBEbVAs8wn3vg13ve7hiZI3CVI7JGSZ7ut8SoGGI+lMo3IC1lJOi6xuJMC66UtGeSzjPX50E3upcSjCm0pCWWOaiQdn+jg+4qLyTt3W09pNjPbNV80BSMdx14neAstY6JGooi5o= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(80048183373757); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(13018025)(13017025)(13024025)(13023025)(13015025)(5005006)(8121501046)(10201501046)(3002001)(6055026);SRVR:BL2PR03MB100;BCL:0;PCL:0;RULEID:;SRVR:BL2PR03MB100; X-Microsoft-Exchange-Diagnostics: 1;BL2PR03MB100;4:TbKTK2KfUUodqQwnTHZbDOeCkHlMX1sktOB4Y3nOqGLR7UerRzS9fMNkX5LUGEtiPAlT66M7Xj6K8Z9MnfbwPL2BwOoC9/ygwrEy+4RsTqP/F6nYLmV5c0PDRITVS6uTln1M1SdHD7y0eiO6KB+DnRio9TPlGztHDVZRRGmrmNa7lL+6U7sHmvtQryr+Sb0KUIfXuh0pnrooRy7Apbppa4hN0ipwNkEWKk5MiZOywwLp2Hd2hK0z8WA9vgUM22Ci5QpT9mhAoplWejYvf9r/DzP/BJ2UaOnMYIdnMgA7X72eIhSZMIabzy7Ebva1SCPzmonMPSvZ3fS48t7kZywRsFokr4qrgK45E1Dsp8VBpMwkLe+QFyhmJ2JkpPPiC0QpR2ArIJ0amdUeP1TiRoM9EwwUgtsh51THH+KvvOhR+uHakII/Qr8Yx+5A0C7xXlL/gl+WbMpY2a1o5Iegi9jfjbfDeNT9mJ/Kpme0OS61LwNTuLTz5P7AObJMNOq/2Gb7PVnq2wwpezDQZqXp3B+dng== X-Forefront-PRVS: 098076C36C X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BL2PR03MB100;23:B4W8NQrG1b/5umGUdR4CzaET9tw49VTGjWtix10KF1?= =?us-ascii?Q?dq54AgO8Gw1NuHg6LXbPqDFN1NuoGc0H3yX4hbmH1tw9/6x/Be3P5pCXhbrx?= =?us-ascii?Q?bfsM5ZugitWJeUSl2qz3ht4QlK+xyd9/xVU20vMrNtYkAN3mYpItuit47lqT?= =?us-ascii?Q?G7ylIVorjq72tT1yz63j7htmU6l3bsl7Ydk9gsaH1ECFU8MUJNPlCsSAWBAI?= =?us-ascii?Q?gKh9HJ1ku6Rx5xP+OlB+QrwJumrb4srxFvyv5tH3Px45tGfnLVL7t5ALVoLZ?= =?us-ascii?Q?X5gi72aw2KjU6pdFcv/4jXtQT327u74Cy+TYU7VO402hRdYsfKHsMH0aK58B?= =?us-ascii?Q?zKeojSD3ZNFkpj5AaDQ7rfsUYDgpjxe3VBZhPrJOqzHNXrp5/HtZNDdFRUom?= =?us-ascii?Q?dMtOhmSbwVF5bLgUiePatvpGUPkXHMbjZspk1c70cQdMnG78bZmsmaPh42zg?= =?us-ascii?Q?ba1SF6D9DlLAityRbNzpSV9mSIdkxtjgWaidQ3R9eKpxTEYPlv3kgXkwWKdD?= =?us-ascii?Q?hDwt5plq1DbezLPCwf2UoiqYVEYkdwYdktgjeb9ib7CIE1otjgPlUSuucyVP?= =?us-ascii?Q?Ut7IJ7hYZrbLozDyAGeEfccE1UnUDEKj4w6b0r3Jo3BlpMEp45XqA+lpetGv?= =?us-ascii?Q?sR1u/FKI8lE8Jloo4yXznPNvisT0Q4Ky5oNY/VRD2G/4Pyr+xyidVllHl7K6?= =?us-ascii?Q?Z8P73C3SntiXM3RgO/4bzZtHsdzgtSz5hDsjNXRaksauDLw/0WhcpyY123P4?= =?us-ascii?Q?2cpdABNTK2fjWzqAhSySbNdYCpMab4fGot7s1dUXCpayxKS4Iz/BqJB/Hd+B?= =?us-ascii?Q?dYdmaqNMH3Pe0D78+IpInwxkgI4/Q9Uch9pZcmDHaJD6wv2eytDw0mNdJJ0c?= =?us-ascii?Q?ig6zRC4Ywsv+5Xs6gKwWyM9K7+dAYEJXRV+WHpJcwH4Hfh4d0y5WDoplYQc1?= =?us-ascii?Q?ObNtaF7e8g3+oXMgftlVVEMLed8Mv00/uoQ+x29GatirbAeCmlf5HEtgUHDY?= =?us-ascii?Q?FFrL2ZISTgCL/5pjFYJl9rkG42YeztgR2m7QLq+GbYPEE0ur9Mr8LktSzXfq?= =?us-ascii?Q?fi51cceWsrXF1VMoQJD/nIFe6m?= X-Microsoft-Exchange-Diagnostics: 1;BL2PR03MB100;5:uTYeNwnNf7LmQYE4c5mA+AC5v8rKJ82xyhuDgtIyjTVzLrtz7dJJ/cBjQvYsEDo1jFo5WSb66bZy5rvSIOvQKGSPmQL0FehQFiGcFziIW2wZdynAPfzqL05UTohdACzJHFj/ot0X8Rs6CcImcQ/K4g==;24:qbbtIK/tHqJh3ACZ4Re/4853UtfPu8SjVuXUZj8bNf5Lc6xv6EUDau2fz0xowQkDVFM5hziP/emmhwbqEgypfihZdCQa2JRSUOZLy6U7nHs=;7:o+pwPpieQrN52d5F2J+J4H8Hbr9MOxj15wy6kyJw6YOmD/QVbu62K21svVv+d+nHNnRRVcgMpgHUOa/hBz27q6XjIRJUUVIF1bNC6AnpIr9SD1qzNIh9LhH90eRNn1+aQ3qOKI/fuXcgBvngkV56nbbABg5LM4PY4j94yxRKfC72uvCEmyuQLMXxv5UhDL6KxVlMx0VW8bvPVIim+gNm8Q==;20:Xmi6FURfqZCa86AR9mrqkJ/ufCgjlR8tWtp5JibktnyrrBYReVNeY7qQqyMEyKWVuS6M1z1DnAS+EsclJCKVWOEZ3rlXWsTu1gpx8u8vLWBY+Txu2p4yddagsh/BrjR7WgjYiKzHHvpQSVPH9b5BbuvzIT7CO9B5OI50grZ+OP0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: altera.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2016 08:53:29.5570 (UTC) X-MS-Exchange-CrossTenant-Id: fbd72e03-d4a5-4110-adce-614d51f2077a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=fbd72e03-d4a5-4110-adce-614d51f2077a;Ip=[66.35.236.227];Helo=[sj-itexedge03.altera.priv.altera.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL2PR03MB100 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Some PCIe devices take longer time to reach link up state after retrain. This patch polling for link up status after retrain the link. This is to make sure the link is stable and up before we access to configuration space registers after this. Signed-off-by: Ley Foon Tan --- drivers/pci/host/pcie-altera.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/pci/host/pcie-altera.c b/drivers/pci/host/pcie-altera.c index 78f77e1..a9de2a0 100644 --- a/drivers/pci/host/pcie-altera.c +++ b/drivers/pci/host/pcie-altera.c @@ -61,6 +61,8 @@ #define TLP_LOOP 500 #define RP_DEVFN 0 +#define LINK_UP_TIMEOUT 5000 + #define INTX_NUM 4 #define DWORD_MASK 3 @@ -101,6 +103,7 @@ static void altera_pcie_retrain(struct pci_dev *dev) { u16 linkcap, linkstat; struct altera_pcie *pcie = dev->bus->sysdata; + int timeout = 0; if(!altera_pcie_link_is_up(pcie)) return; @@ -115,9 +118,16 @@ static void altera_pcie_retrain(struct pci_dev *dev) return; pcie_capability_read_word(dev, PCI_EXP_LNKSTA, &linkstat); - if ((linkstat & PCI_EXP_LNKSTA_CLS) == PCI_EXP_LNKSTA_CLS_2_5GB) + if ((linkstat & PCI_EXP_LNKSTA_CLS) == PCI_EXP_LNKSTA_CLS_2_5GB) { pcie_capability_set_word(dev, PCI_EXP_LNKCTL, PCI_EXP_LNKCTL_RL); + while(!altera_pcie_link_is_up(pcie)) { + timeout++; + if (timeout > LINK_UP_TIMEOUT) + break; + udelay(5); + } + } } DECLARE_PCI_FIXUP_EARLY(0x1172, PCI_ANY_ID, altera_pcie_retrain); -- 1.8.2.1