From patchwork Tue Mar 14 15:18:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 9623713 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 DE1BF604CC for ; Tue, 14 Mar 2017 15:19:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D12D32859F for ; Tue, 14 Mar 2017 15:19:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C4860285B0; Tue, 14 Mar 2017 15:19:30 +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 48682285A4 for ; Tue, 14 Mar 2017 15:19:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751607AbdCNPSj (ORCPT ); Tue, 14 Mar 2017 11:18:39 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:35317 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753356AbdCNPSh (ORCPT ); Tue, 14 Mar 2017 11:18:37 -0400 Received: by mail-pg0-f66.google.com with SMTP id g2so20624754pge.2; Tue, 14 Mar 2017 08:18:36 -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; bh=/Dpu4/wG1PGiitFKjh88ifL2ql29jZCTvND+RN8CngU=; b=R8mmTPCSK6Zoqs79b91Q6Zmapdq51NxzK6bk2x7fyOzFRvFfabzOY5FYwmOKF3AJIQ Xoyi3lm2VRmJVhEEGQM1XRkthjeSUe81TC/ubNTKhVrUPGQvOVqdm2G3j30M1ENtq8Ev rG7hY3+3FgKjn4PElGXWpipPSZXpD4d7dZEeTxpZSwrkqBKoooVUyl51W4kx7ju5uvQg MJXk6CK/UT19pnlGsQ/QhSaCUBzHiom2s5y3jtwevaBv9GbyKINc0vLuSU5gJQFpgQmK 9kzBdGa3e4AKLTaJcsForCFJjJ1oTE+m6s8yjIqEnX1ZiJ4u1lMUJnAB8Zh00fVzsoEt X3Wg== 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; bh=/Dpu4/wG1PGiitFKjh88ifL2ql29jZCTvND+RN8CngU=; b=qc/Bh2/y0ljF2kROdJ/FAJdcj/HW5FVhjRn6YCarXG3IBJAZNNzqvoSexjL1ZMTvhV xiIgCGK4nIc4zS5W17SWWZxBClCx04z3eXuZWYLfZi49DJh2SBPUC32hQVHSdW6Latgs GSWohkicLrB12yH01su/rBAEAxpuqveK0pGQrsf1jcHY8LcYn6FsTEJzaGfVTCZUTWRn tuwswFq97yxkbFEFzxHs4HrWEpo7dfZYTm6K9r6GAigDYNFkTLxP5yw153OiNac2a3xY Di3OrGiwr+yXzBWIRrt2NBtFS4hHOVB9mTgrOIDtCJVWr0TNcmiMDEktFEzbsEMKLh1L AXFg== X-Gm-Message-State: AMke39m0eqO0A8OeGk6Kx/JjlmbOD1GYBL20Q9xzdSJXvUMyCt+cBTvqBp90Op/C7paRyA== X-Received: by 10.84.224.131 with SMTP id s3mr56666691plj.162.1489504715769; Tue, 14 Mar 2017 08:18:35 -0700 (PDT) Received: from squirtle.lan ([2601:602:9400:8377:f0f2:a63b:2597:b3d9]) by smtp.gmail.com with ESMTPSA id m6sm39248277pfm.22.2017.03.14.08.18.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Mar 2017 08:18:34 -0700 (PDT) From: Andrey Smirnov To: linux-pci@vger.kernel.org Cc: Andrey Smirnov , yurovsky@gmail.com, Lucas Stach , Bjorn Helgaas , Fabio Estevam , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 3/4] PCI: imx6: Do not switch speed if Gen2 is disabled Date: Tue, 14 Mar 2017 08:18:26 -0700 Message-Id: <20170314151827.31248-4-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170314151827.31248-1-andrew.smirnov@gmail.com> References: <20170314151827.31248-1-andrew.smirnov@gmail.com> 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 Save a bit of time and avoid going through link speed change procedure in configuration where link max speed is limited to Gen1 in DT. Cc: yurovsky@gmail.com Cc: Lucas Stach Cc: Bjorn Helgaas Cc: Fabio Estevam Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Andrey Smirnov --- drivers/pci/host/pci-imx6.c | 52 ++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/drivers/pci/host/pci-imx6.c b/drivers/pci/host/pci-imx6.c index 473bbdc..071251f3 100644 --- a/drivers/pci/host/pci-imx6.c +++ b/drivers/pci/host/pci-imx6.c @@ -565,40 +565,40 @@ static int imx6_pcie_establish_link(struct imx6_pcie *imx6_pcie) tmp &= ~PCIE_RC_LCR_MAX_LINK_SPEEDS_MASK; tmp |= PCIE_RC_LCR_MAX_LINK_SPEEDS_GEN2; dw_pcie_writel_rc(pp, PCIE_RC_LCR, tmp); - } else { - dev_info(dev, "Link: Gen2 disabled\n"); - } - - /* - * Start Directed Speed Change so the best possible speed both link - * partners support can be negotiated. - */ - tmp = dw_pcie_readl_rc(pp, PCIE_LINK_WIDTH_SPEED_CONTROL); - tmp |= PORT_LOGIC_SPEED_CHANGE; - dw_pcie_writel_rc(pp, PCIE_LINK_WIDTH_SPEED_CONTROL, tmp); - 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. + * Start Directed Speed Change so the best possible + * speed both link partners support can be negotiated. */ + tmp = dw_pcie_readl_rc(pp, PCIE_LINK_WIDTH_SPEED_CONTROL); + tmp |= PORT_LOGIC_SPEED_CHANGE; + dw_pcie_writel_rc(pp, PCIE_LINK_WIDTH_SPEED_CONTROL, tmp); + + 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; + } + } - ret = imx6_pcie_wait_for_speed_change(imx6_pcie); + /* Make sure link training is finished as well! */ + ret = imx6_pcie_wait_for_link(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! */ - ret = imx6_pcie_wait_for_link(imx6_pcie); - if (ret) { - dev_err(dev, "Failed to bring link up!\n"); - goto err_reset_phy; + } else { + dev_info(dev, "Link: Gen2 disabled\n"); } tmp = dw_pcie_readl_rc(pp, PCIE_RC_LCSR);