From patchwork Tue Mar 28 15:42:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 9650021 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 949D660113 for ; Tue, 28 Mar 2017 15:44:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 87F7D283C9 for ; Tue, 28 Mar 2017 15:44:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7C89728403; Tue, 28 Mar 2017 15:44:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2FD9B283C9 for ; Tue, 28 Mar 2017 15:44:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753639AbdC1Pnn (ORCPT ); Tue, 28 Mar 2017 11:43:43 -0400 Received: from mail-pg0-f67.google.com ([74.125.83.67]:32961 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752114AbdC1Pnl (ORCPT ); Tue, 28 Mar 2017 11:43:41 -0400 Received: by mail-pg0-f67.google.com with SMTP id 79so22303268pgf.0; Tue, 28 Mar 2017 08:43:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=M76BqbGt9Mi8P8y5GUJLCCXZu/QWE1AouLLhSBROFIM=; b=CuUh+YZhGKbwbwO7jNOx4Xu/g1MC8QHZltzXC1HRYs53CBvY5xaiHFmrG1jZOn2Rnk 1oPwcZRfJTjMK5l08Ak9zPTudfk+/qh/WMYUfctW4/8qZo0/dWD+KZXlhhMBqAPJ3ZEV 4KrHISjkE4Qx5+++bEB6wwnMadjN+Kv6rLSTdXrSwGMs2aSsP07fFQLsvTE1M6UDpm7H nP1xsdNLxWtaihKsyobX86tiPqTca4PfMgGeRgRF/g2tUHgj/UVkJGrcxRBYN5SIYtkW cdBz8J5GGSsLm41tlW/IialBMetzfcXvdnveslo56T5z+vQxXOqqwzqrIE8Z+MwIPmJy cJiQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=M76BqbGt9Mi8P8y5GUJLCCXZu/QWE1AouLLhSBROFIM=; b=LGnBks+UlP+sXhhU8vkSEvWPMOtroOTaW+Bh1C1LVPBTi9jyd8au7rSI7pCbZ0H4ID Y0X9uBifnVTOC1sQwe8vobISpEx8C92TupcMsxzqFX2DmuWHhxWUVONCJyqns/UKaZ6a qjItaLlXTiWViFBUtZ43ZTWdygD95Q2ed7JwfpOQ0o+fggZQReMR8xkcMW+CHnO6i0rU EIFdLGYwdo01OioNvvQibRACYM0rTKbtO56HDQuaulmM+h8sTVnrd568fKzX5WXy3nb3 +TsTiUl8XFdAa/rA7Z4w9OiVLZmIl7XN35zjIESVZs2anYqoP/puuBqV8ue+KJ5PieRR mXCA== X-Gm-Message-State: AFeK/H2vKebzR73yklx3vldcLPpTkMxpscXtgaFWay1E1n49J0YpNIbOkDMHQ68ROhho+Q== X-Received: by 10.84.218.130 with SMTP id r2mr36832115pli.79.1490715787342; Tue, 28 Mar 2017 08:43:07 -0700 (PDT) Received: from squirtle.lan (c-73-19-0-61.hsd1.wa.comcast.net. [73.19.0.61]) by smtp.gmail.com with ESMTPSA id e16sm8238865pfb.102.2017.03.28.08.43.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Mar 2017 08:43:06 -0700 (PDT) From: Andrey Smirnov To: Bjorn Helgaas Cc: Andrey Smirnov , yurovsky@gmail.com, Lucas Stach , Fabio Estevam , Dong Aisheng , linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v8 3/4] PCI: imx6: Do not wait for speed change on i.MX7 Date: Tue, 28 Mar 2017 08:42:51 -0700 Message-Id: <20170328154252.6902-4-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170328154252.6902-1-andrew.smirnov@gmail.com> References: <20170328154252.6902-1-andrew.smirnov@gmail.com> MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP As can be seen from [1]: "...the different behavior between iMX6Q PCIe and iMX7D PCIe maybe caused by the different controller version. Regarding to the DOC description, the DIRECT_SPEED_CHANGE should be cleared after the speed change from GEN1 to GEN2. Unfortunately, when GEN1 device is used, the behavior is not documented. So, IC design guys run the simulation and find out the following behaviors: 1. DIRECT_SPEED_CHANGE will be cleared in 7D after speed change from GEN1 to GEN2. This matches doc’s description 2. set MAX link speed(PCIE_CAP_TARGET_LINK_SPEED=0x01) as GEN1 and re-run the simulation, DIRECT_SPEED_CHANGE will not be cleared; remain as 1, this matches your result, but function test is passed, so this bit should not affect the normal PCIe function. ..." imx6_pcie_wait_for_speed_change will report false failures for Gen1 -> Gen1 speed transition, so avoid doing that check and just rely on imx6_pcie_wait_for_link only. [1] https://community.nxp.com/message/867943 Cc: yurovsky@gmail.com Cc: Lucas Stach Cc: Fabio Estevam Cc: Dong Aisheng Cc: linux-pci@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Reviewed-by: Lucas Stach Signed-off-by: Andrey Smirnov --- drivers/pci/dwc/pci-imx6.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/drivers/pci/dwc/pci-imx6.c b/drivers/pci/dwc/pci-imx6.c index 64de9bb..c731e41 100644 --- a/drivers/pci/dwc/pci-imx6.c +++ b/drivers/pci/dwc/pci-imx6.c @@ -545,10 +545,21 @@ static int imx6_pcie_establish_link(struct imx6_pcie *imx6_pcie) tmp |= PORT_LOGIC_SPEED_CHANGE; dw_pcie_writel_dbi(pci, PCIE_LINK_WIDTH_SPEED_CONTROL, tmp); - ret = imx6_pcie_wait_for_speed_change(imx6_pcie); - if (ret) { - dev_err(dev, "Failed to bring link up!\n"); - goto err_reset_phy; + if (imx6_pcie->variant != IMX7D) { + /* + * On i.MX7, DIRECT_SPEED_CHANGE behaves differently + * from i.MX6 family when no link speed transition + * occurs and we go Gen1 -> yep, Gen1. The difference + * is that, in such case, it will not be cleared by HW + * which will cause the following code to report false + * failure. + */ + + ret = imx6_pcie_wait_for_speed_change(imx6_pcie); + if (ret) { + dev_err(dev, "Failed to bring link up!\n"); + goto err_reset_phy; + } } /* Make sure link training is finished as well! */