From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B36BAC433EF for ; Fri, 15 Oct 2021 19:00:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 90CF761041 for ; Fri, 15 Oct 2021 19:00:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238254AbhJOTCo (ORCPT ); Fri, 15 Oct 2021 15:02:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34406 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238178AbhJOTCm (ORCPT ); Fri, 15 Oct 2021 15:02:42 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 61700C061570 for ; Fri, 15 Oct 2021 12:00:35 -0700 (PDT) Received: from gallifrey.ext.pengutronix.de ([2001:67c:670:201:5054:ff:fe8d:eefb] helo=[IPv6:::1]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mbSRM-0005Tk-5y; Fri, 15 Oct 2021 21:00:24 +0200 Message-ID: <57282e6ea0c01dc403c02e245e048d41ec696808.camel@pengutronix.de> Subject: Re: [PATCH v3 9/9] PCI: imx: add the imx8mm pcie support From: Lucas Stach To: Richard Zhu , tharvey@gateworks.com, kishon@ti.com, vkoul@kernel.org, robh@kernel.org, galak@kernel.crashing.org, shawnguo@kernel.org Cc: linux-phy@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de, linux-imx@nxp.com Date: Fri, 15 Oct 2021 21:00:22 +0200 In-Reply-To: <1634028078-2387-10-git-send-email-hongxing.zhu@nxp.com> References: <1634028078-2387-1-git-send-email-hongxing.zhu@nxp.com> <1634028078-2387-10-git-send-email-hongxing.zhu@nxp.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.40.4 (3.40.4-1.fc34) MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-SA-Exim-Connect-IP: 2001:67c:670:201:5054:ff:fe8d:eefb X-SA-Exim-Mail-From: l.stach@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Am Dienstag, dem 12.10.2021 um 16:41 +0800 schrieb Richard Zhu: > i.MX8MM PCIe works mostly like the i.MX8MQ one, but has a different PHY > and allows to output the internal PHY reference clock via the refclk pad. > Add the i.MX8MM PCIe support based on the standalone PHY driver. > > Signed-off-by: Richard Zhu > --- > drivers/pci/controller/dwc/pci-imx6.c | 63 ++++++++++++++++++++++++++- > 1 file changed, 61 insertions(+), 2 deletions(-) > > diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c > index 26f49f797b0f..73022e37b1c5 100644 > --- a/drivers/pci/controller/dwc/pci-imx6.c > +++ b/drivers/pci/controller/dwc/pci-imx6.c > @@ -29,6 +29,7 @@ > #include > #include > #include > +#include > #include > #include > > @@ -49,6 +50,7 @@ enum imx6_pcie_variants { > IMX6QP, > IMX7D, > IMX8MQ, > + IMX8MM, > }; > > #define IMX6_PCIE_FLAG_IMX6_PHY BIT(0) > @@ -80,6 +82,7 @@ struct imx6_pcie { > u32 tx_deemph_gen2_6db; > u32 tx_swing_full; > u32 tx_swing_low; > + u32 refclk_pad_mode; As Matthias already noticed: drop this. > struct regulator *vpcie; > struct regulator *vph; > void __iomem *phy_base; > @@ -88,6 +91,7 @@ struct imx6_pcie { > struct device *pd_pcie; > /* power domain for pcie phy */ > struct device *pd_pcie_phy; > + struct phy *phy; > const struct imx6_pcie_drvdata *drvdata; > }; > > @@ -372,6 +376,8 @@ static void imx6_pcie_assert_core_reset(struct imx6_pcie *imx6_pcie) > case IMX7D: > case IMX8MQ: > reset_control_assert(imx6_pcie->pciephy_reset); > + fallthrough; > + case IMX8MM: > reset_control_assert(imx6_pcie->apps_reset); > break; > case IMX6SX: > @@ -407,7 +413,8 @@ static void imx6_pcie_assert_core_reset(struct imx6_pcie *imx6_pcie) > > static unsigned int imx6_pcie_grp_offset(const struct imx6_pcie *imx6_pcie) > { > - WARN_ON(imx6_pcie->drvdata->variant != IMX8MQ); > + WARN_ON(imx6_pcie->drvdata->variant != IMX8MQ && > + imx6_pcie->drvdata->variant != IMX8MM); > return imx6_pcie->controller_id == 1 ? IOMUXC_GPR16 : IOMUXC_GPR14; > } > > @@ -447,6 +454,7 @@ static int imx6_pcie_enable_ref_clk(struct imx6_pcie *imx6_pcie) > case IMX7D: > break; > case IMX8MQ: > + case IMX8MM: > ret = clk_prepare_enable(imx6_pcie->pcie_aux); > if (ret) { > dev_err(dev, "unable to enable pcie_aux clock\n"); > @@ -522,6 +530,14 @@ static void imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie) > goto err_ref_clk; > } > > + switch (imx6_pcie->drvdata->variant) { > + case IMX8MM: > + if (phy_power_on(imx6_pcie->phy)) > + pr_info("unable to enable pcie phy clock\n"); It a implementation detail of the PHY driver that this just turns on the clock. dev_err("unable to power on PHY\n") or something like that. > + break; > + default: > + break; > + } > /* allow the clocks to stabilize */ > usleep_range(200, 500); > > @@ -538,6 +554,10 @@ static void imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie) > case IMX8MQ: > reset_control_deassert(imx6_pcie->pciephy_reset); > break; > + case IMX8MM: > + if (phy_init(imx6_pcie->phy) != 0) > + dev_err(dev, "Waiting for PHY ready timeout!\n"); > + break; > case IMX7D: > reset_control_deassert(imx6_pcie->pciephy_reset); > > @@ -614,6 +634,8 @@ static void imx6_pcie_configure_type(struct imx6_pcie *imx6_pcie) > static void imx6_pcie_init_phy(struct imx6_pcie *imx6_pcie) > { > switch (imx6_pcie->drvdata->variant) { > + case IMX8MM: > + break; > case IMX8MQ: > /* > * TODO: Currently this code assumes external > @@ -753,6 +775,7 @@ static void imx6_pcie_ltssm_enable(struct device *dev) > break; > case IMX7D: > case IMX8MQ: > + case IMX8MM: > reset_control_deassert(imx6_pcie->apps_reset); > break; > } > @@ -871,6 +894,7 @@ static void imx6_pcie_ltssm_disable(struct device *dev) > IMX6Q_GPR12_PCIE_CTL_2, 0); > break; > case IMX7D: > + case IMX8MM: > reset_control_assert(imx6_pcie->apps_reset); > break; > default: > @@ -930,6 +954,7 @@ static void imx6_pcie_clk_disable(struct imx6_pcie *imx6_pcie) > IMX7D_GPR12_PCIE_PHY_REFCLK_SEL); > break; > case IMX8MQ: > + case IMX8MM: > clk_disable_unprepare(imx6_pcie->pcie_aux); > break; > default: > @@ -985,6 +1010,7 @@ static int imx6_pcie_probe(struct platform_device *pdev) > struct imx6_pcie *imx6_pcie; > struct device_node *np; > struct resource *dbi_base; > + struct device_node *phy_node; > struct device_node *node = dev->of_node; > int ret; > u16 val; > @@ -1019,6 +1045,14 @@ static int imx6_pcie_probe(struct platform_device *pdev) > return PTR_ERR(imx6_pcie->phy_base); > } > > + imx6_pcie->phy = devm_phy_get(dev, "pcie-phy"); > + if (IS_ERR(imx6_pcie->phy)) { > + if (PTR_ERR(imx6_pcie->phy) == -EPROBE_DEFER) > + return -EPROBE_DEFER; > + /* Set NULL if there is no pcie-phy */ > + imx6_pcie->phy = NULL; > + } Move this into the i.MX8MM specific section below. The PHY is required on the 8MM and we should not ignore any errors. Regards, Lucas > + > dbi_base = platform_get_resource(pdev, IORESOURCE_MEM, 0); > pci->dbi_base = devm_ioremap_resource(dev, dbi_base); > if (IS_ERR(pci->dbi_base)) > @@ -1090,6 +1124,18 @@ static int imx6_pcie_probe(struct platform_device *pdev) > return PTR_ERR(imx6_pcie->apps_reset); > } > break; > + case IMX8MM: > + imx6_pcie->pcie_aux = devm_clk_get(dev, "pcie_aux"); > + if (IS_ERR(imx6_pcie->pcie_aux)) > + return dev_err_probe(dev, PTR_ERR(imx6_pcie->pcie_aux), > + "pcie_aux clock source missing or invalid\n"); > + imx6_pcie->apps_reset = devm_reset_control_get_exclusive(dev, > + "apps"); > + if (IS_ERR(imx6_pcie->apps_reset)) { > + dev_err(dev, "Failed to get PCIE APPS reset control\n"); > + return PTR_ERR(imx6_pcie->apps_reset); > + } > + break; > default: > break; > } > @@ -1130,6 +1176,14 @@ static int imx6_pcie_probe(struct platform_device *pdev) > &imx6_pcie->tx_swing_low)) > imx6_pcie->tx_swing_low = 127; > > + /* get PHY refclk pad mode if there is PHY node */ > + phy_node = of_parse_phandle(node, "phys", 0); > + if (phy_node) { > + of_property_read_u32(phy_node, "fsl,refclk-pad-mode", > + &imx6_pcie->refclk_pad_mode); > + of_node_put(phy_node); > + } > + > /* Limit link speed */ > pci->link_gen = 1; > of_property_read_u32(node, "fsl,max-link-speed", &pci->link_gen); > @@ -1202,6 +1256,10 @@ static const struct imx6_pcie_drvdata drvdata[] = { > [IMX8MQ] = { > .variant = IMX8MQ, > }, > + [IMX8MM] = { > + .variant = IMX8MM, > + .flags = IMX6_PCIE_FLAG_SUPPORTS_SUSPEND, > + }, > }; > > static const struct of_device_id imx6_pcie_of_match[] = { > @@ -1209,7 +1267,8 @@ static const struct of_device_id imx6_pcie_of_match[] = { > { .compatible = "fsl,imx6sx-pcie", .data = &drvdata[IMX6SX], }, > { .compatible = "fsl,imx6qp-pcie", .data = &drvdata[IMX6QP], }, > { .compatible = "fsl,imx7d-pcie", .data = &drvdata[IMX7D], }, > - { .compatible = "fsl,imx8mq-pcie", .data = &drvdata[IMX8MQ], } , > + { .compatible = "fsl,imx8mq-pcie", .data = &drvdata[IMX8MQ], }, > + { .compatible = "fsl,imx8mm-pcie", .data = &drvdata[IMX8MM], }, > {}, > }; > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 21B61C433FE for ; Fri, 15 Oct 2021 19:00:36 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CD9E261041 for ; Fri, 15 Oct 2021 19:00:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org CD9E261041 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Date:Cc:To:From:Subject:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=y6H9+UBTpKYeB0AfquURVtBk8/8yydSSh9/BUYOlYZM=; b=fg2nw647udbBLu 84GyY4TeY7JtskP+KMzcA2a9Mz3wFvY/s6pGvrsfNJN++nasbB9XWoOj9Q8klgE8LyOXv8Hj+zHfV 1zRck902haA7c8IDajhusr6ywoTGwtTgnDOymuUf6pKd42xbiB+cDMHlBr9crY1wMRdfW+b8d9pMe aLf97bdkvEY/TWx59cBZMNv9pZ4QgqyZXxJt0xL8tfcDvLQ73VnA0XIbnw/EvMd4rxkaW8E5uGQzi bFakaR5QkcuD3Oa8X7FIg+zFlfNi3GDsml0oLGnm/OSezHh6RFkrlrl08Q/e+ZyvnFUflc6DGdzav E61XYN8717O+mCFxySwQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mbSRX-008XMK-8Q; Fri, 15 Oct 2021 19:00:35 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mbSRT-008XJq-J0 for linux-phy@lists.infradead.org; Fri, 15 Oct 2021 19:00:33 +0000 Received: from gallifrey.ext.pengutronix.de ([2001:67c:670:201:5054:ff:fe8d:eefb] helo=[IPv6:::1]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mbSRM-0005Tk-5y; Fri, 15 Oct 2021 21:00:24 +0200 Message-ID: <57282e6ea0c01dc403c02e245e048d41ec696808.camel@pengutronix.de> Subject: Re: [PATCH v3 9/9] PCI: imx: add the imx8mm pcie support From: Lucas Stach To: Richard Zhu , tharvey@gateworks.com, kishon@ti.com, vkoul@kernel.org, robh@kernel.org, galak@kernel.crashing.org, shawnguo@kernel.org Cc: linux-phy@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de, linux-imx@nxp.com Date: Fri, 15 Oct 2021 21:00:22 +0200 In-Reply-To: <1634028078-2387-10-git-send-email-hongxing.zhu@nxp.com> References: <1634028078-2387-1-git-send-email-hongxing.zhu@nxp.com> <1634028078-2387-10-git-send-email-hongxing.zhu@nxp.com> User-Agent: Evolution 3.40.4 (3.40.4-1.fc34) MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:67c:670:201:5054:ff:fe8d:eefb X-SA-Exim-Mail-From: l.stach@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-phy@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211015_120031_835068_7F5C3B23 X-CRM114-Status: GOOD ( 28.23 ) X-BeenThere: linux-phy@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux Phy Mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-phy" Errors-To: linux-phy-bounces+linux-phy=archiver.kernel.org@lists.infradead.org Am Dienstag, dem 12.10.2021 um 16:41 +0800 schrieb Richard Zhu: > i.MX8MM PCIe works mostly like the i.MX8MQ one, but has a different PHY > and allows to output the internal PHY reference clock via the refclk pad. > Add the i.MX8MM PCIe support based on the standalone PHY driver. > > Signed-off-by: Richard Zhu > --- > drivers/pci/controller/dwc/pci-imx6.c | 63 ++++++++++++++++++++++++++- > 1 file changed, 61 insertions(+), 2 deletions(-) > > diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c > index 26f49f797b0f..73022e37b1c5 100644 > --- a/drivers/pci/controller/dwc/pci-imx6.c > +++ b/drivers/pci/controller/dwc/pci-imx6.c > @@ -29,6 +29,7 @@ > #include > #include > #include > +#include > #include > #include > > @@ -49,6 +50,7 @@ enum imx6_pcie_variants { > IMX6QP, > IMX7D, > IMX8MQ, > + IMX8MM, > }; > > #define IMX6_PCIE_FLAG_IMX6_PHY BIT(0) > @@ -80,6 +82,7 @@ struct imx6_pcie { > u32 tx_deemph_gen2_6db; > u32 tx_swing_full; > u32 tx_swing_low; > + u32 refclk_pad_mode; As Matthias already noticed: drop this. > struct regulator *vpcie; > struct regulator *vph; > void __iomem *phy_base; > @@ -88,6 +91,7 @@ struct imx6_pcie { > struct device *pd_pcie; > /* power domain for pcie phy */ > struct device *pd_pcie_phy; > + struct phy *phy; > const struct imx6_pcie_drvdata *drvdata; > }; > > @@ -372,6 +376,8 @@ static void imx6_pcie_assert_core_reset(struct imx6_pcie *imx6_pcie) > case IMX7D: > case IMX8MQ: > reset_control_assert(imx6_pcie->pciephy_reset); > + fallthrough; > + case IMX8MM: > reset_control_assert(imx6_pcie->apps_reset); > break; > case IMX6SX: > @@ -407,7 +413,8 @@ static void imx6_pcie_assert_core_reset(struct imx6_pcie *imx6_pcie) > > static unsigned int imx6_pcie_grp_offset(const struct imx6_pcie *imx6_pcie) > { > - WARN_ON(imx6_pcie->drvdata->variant != IMX8MQ); > + WARN_ON(imx6_pcie->drvdata->variant != IMX8MQ && > + imx6_pcie->drvdata->variant != IMX8MM); > return imx6_pcie->controller_id == 1 ? IOMUXC_GPR16 : IOMUXC_GPR14; > } > > @@ -447,6 +454,7 @@ static int imx6_pcie_enable_ref_clk(struct imx6_pcie *imx6_pcie) > case IMX7D: > break; > case IMX8MQ: > + case IMX8MM: > ret = clk_prepare_enable(imx6_pcie->pcie_aux); > if (ret) { > dev_err(dev, "unable to enable pcie_aux clock\n"); > @@ -522,6 +530,14 @@ static void imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie) > goto err_ref_clk; > } > > + switch (imx6_pcie->drvdata->variant) { > + case IMX8MM: > + if (phy_power_on(imx6_pcie->phy)) > + pr_info("unable to enable pcie phy clock\n"); It a implementation detail of the PHY driver that this just turns on the clock. dev_err("unable to power on PHY\n") or something like that. > + break; > + default: > + break; > + } > /* allow the clocks to stabilize */ > usleep_range(200, 500); > > @@ -538,6 +554,10 @@ static void imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie) > case IMX8MQ: > reset_control_deassert(imx6_pcie->pciephy_reset); > break; > + case IMX8MM: > + if (phy_init(imx6_pcie->phy) != 0) > + dev_err(dev, "Waiting for PHY ready timeout!\n"); > + break; > case IMX7D: > reset_control_deassert(imx6_pcie->pciephy_reset); > > @@ -614,6 +634,8 @@ static void imx6_pcie_configure_type(struct imx6_pcie *imx6_pcie) > static void imx6_pcie_init_phy(struct imx6_pcie *imx6_pcie) > { > switch (imx6_pcie->drvdata->variant) { > + case IMX8MM: > + break; > case IMX8MQ: > /* > * TODO: Currently this code assumes external > @@ -753,6 +775,7 @@ static void imx6_pcie_ltssm_enable(struct device *dev) > break; > case IMX7D: > case IMX8MQ: > + case IMX8MM: > reset_control_deassert(imx6_pcie->apps_reset); > break; > } > @@ -871,6 +894,7 @@ static void imx6_pcie_ltssm_disable(struct device *dev) > IMX6Q_GPR12_PCIE_CTL_2, 0); > break; > case IMX7D: > + case IMX8MM: > reset_control_assert(imx6_pcie->apps_reset); > break; > default: > @@ -930,6 +954,7 @@ static void imx6_pcie_clk_disable(struct imx6_pcie *imx6_pcie) > IMX7D_GPR12_PCIE_PHY_REFCLK_SEL); > break; > case IMX8MQ: > + case IMX8MM: > clk_disable_unprepare(imx6_pcie->pcie_aux); > break; > default: > @@ -985,6 +1010,7 @@ static int imx6_pcie_probe(struct platform_device *pdev) > struct imx6_pcie *imx6_pcie; > struct device_node *np; > struct resource *dbi_base; > + struct device_node *phy_node; > struct device_node *node = dev->of_node; > int ret; > u16 val; > @@ -1019,6 +1045,14 @@ static int imx6_pcie_probe(struct platform_device *pdev) > return PTR_ERR(imx6_pcie->phy_base); > } > > + imx6_pcie->phy = devm_phy_get(dev, "pcie-phy"); > + if (IS_ERR(imx6_pcie->phy)) { > + if (PTR_ERR(imx6_pcie->phy) == -EPROBE_DEFER) > + return -EPROBE_DEFER; > + /* Set NULL if there is no pcie-phy */ > + imx6_pcie->phy = NULL; > + } Move this into the i.MX8MM specific section below. The PHY is required on the 8MM and we should not ignore any errors. Regards, Lucas > + > dbi_base = platform_get_resource(pdev, IORESOURCE_MEM, 0); > pci->dbi_base = devm_ioremap_resource(dev, dbi_base); > if (IS_ERR(pci->dbi_base)) > @@ -1090,6 +1124,18 @@ static int imx6_pcie_probe(struct platform_device *pdev) > return PTR_ERR(imx6_pcie->apps_reset); > } > break; > + case IMX8MM: > + imx6_pcie->pcie_aux = devm_clk_get(dev, "pcie_aux"); > + if (IS_ERR(imx6_pcie->pcie_aux)) > + return dev_err_probe(dev, PTR_ERR(imx6_pcie->pcie_aux), > + "pcie_aux clock source missing or invalid\n"); > + imx6_pcie->apps_reset = devm_reset_control_get_exclusive(dev, > + "apps"); > + if (IS_ERR(imx6_pcie->apps_reset)) { > + dev_err(dev, "Failed to get PCIE APPS reset control\n"); > + return PTR_ERR(imx6_pcie->apps_reset); > + } > + break; > default: > break; > } > @@ -1130,6 +1176,14 @@ static int imx6_pcie_probe(struct platform_device *pdev) > &imx6_pcie->tx_swing_low)) > imx6_pcie->tx_swing_low = 127; > > + /* get PHY refclk pad mode if there is PHY node */ > + phy_node = of_parse_phandle(node, "phys", 0); > + if (phy_node) { > + of_property_read_u32(phy_node, "fsl,refclk-pad-mode", > + &imx6_pcie->refclk_pad_mode); > + of_node_put(phy_node); > + } > + > /* Limit link speed */ > pci->link_gen = 1; > of_property_read_u32(node, "fsl,max-link-speed", &pci->link_gen); > @@ -1202,6 +1256,10 @@ static const struct imx6_pcie_drvdata drvdata[] = { > [IMX8MQ] = { > .variant = IMX8MQ, > }, > + [IMX8MM] = { > + .variant = IMX8MM, > + .flags = IMX6_PCIE_FLAG_SUPPORTS_SUSPEND, > + }, > }; > > static const struct of_device_id imx6_pcie_of_match[] = { > @@ -1209,7 +1267,8 @@ static const struct of_device_id imx6_pcie_of_match[] = { > { .compatible = "fsl,imx6sx-pcie", .data = &drvdata[IMX6SX], }, > { .compatible = "fsl,imx6qp-pcie", .data = &drvdata[IMX6QP], }, > { .compatible = "fsl,imx7d-pcie", .data = &drvdata[IMX7D], }, > - { .compatible = "fsl,imx8mq-pcie", .data = &drvdata[IMX8MQ], } , > + { .compatible = "fsl,imx8mq-pcie", .data = &drvdata[IMX8MQ], }, > + { .compatible = "fsl,imx8mm-pcie", .data = &drvdata[IMX8MM], }, > {}, > }; > -- linux-phy mailing list linux-phy@lists.infradead.org https://lists.infradead.org/mailman/listinfo/linux-phy From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 39422C433F5 for ; Fri, 15 Oct 2021 19:02:17 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F1F1260C41 for ; Fri, 15 Oct 2021 19:02:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org F1F1260C41 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Date:Cc:To:From:Subject:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Ep+Ur2ccVcj/eZFu4g4PkyF6ej/uGIv653nAHcn3O14=; b=kgNYhBiV6Kp12l 6WxDRjJAUE5I4ovimaXi/X2nURBrUOdll5Xx+/JrNpYjgmLEoZOzzj7e4a0achhDKYtwHujUcd9wW 8uW8AOJEJB6clDSUHoHqfUslyNuIk2zQttZL4mEQEvNX0cJXkuz71yznYHDtv5fDp4B3+DDcnFctY UowqDgCaTv9ieRVF5jZGkhfiNBpOFFDGgBCZYvw5Zz0S0mAguUQ1uzcDMzF/Y1JbPkB0Nexs36T3D 9zv4OvpHApk5JtxibloOM7rIqvp8fwuIXMyLPOO14N3ZHuLUli1LYh7mwNdQ890lAvItg7faO8qWD QRRfAHEEw4tfjtU4Lsug==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mbSRc-008XOc-JJ; Fri, 15 Oct 2021 19:00:40 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mbSRX-008XM9-21 for linux-arm-kernel@lists.infradead.org; Fri, 15 Oct 2021 19:00:37 +0000 Received: from gallifrey.ext.pengutronix.de ([2001:67c:670:201:5054:ff:fe8d:eefb] helo=[IPv6:::1]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mbSRM-0005Tk-5y; Fri, 15 Oct 2021 21:00:24 +0200 Message-ID: <57282e6ea0c01dc403c02e245e048d41ec696808.camel@pengutronix.de> Subject: Re: [PATCH v3 9/9] PCI: imx: add the imx8mm pcie support From: Lucas Stach To: Richard Zhu , tharvey@gateworks.com, kishon@ti.com, vkoul@kernel.org, robh@kernel.org, galak@kernel.crashing.org, shawnguo@kernel.org Cc: linux-phy@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de, linux-imx@nxp.com Date: Fri, 15 Oct 2021 21:00:22 +0200 In-Reply-To: <1634028078-2387-10-git-send-email-hongxing.zhu@nxp.com> References: <1634028078-2387-1-git-send-email-hongxing.zhu@nxp.com> <1634028078-2387-10-git-send-email-hongxing.zhu@nxp.com> User-Agent: Evolution 3.40.4 (3.40.4-1.fc34) MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:67c:670:201:5054:ff:fe8d:eefb X-SA-Exim-Mail-From: l.stach@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211015_120035_294762_4BB31B4F X-CRM114-Status: GOOD ( 29.35 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Am Dienstag, dem 12.10.2021 um 16:41 +0800 schrieb Richard Zhu: > i.MX8MM PCIe works mostly like the i.MX8MQ one, but has a different PHY > and allows to output the internal PHY reference clock via the refclk pad. > Add the i.MX8MM PCIe support based on the standalone PHY driver. > > Signed-off-by: Richard Zhu > --- > drivers/pci/controller/dwc/pci-imx6.c | 63 ++++++++++++++++++++++++++- > 1 file changed, 61 insertions(+), 2 deletions(-) > > diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c > index 26f49f797b0f..73022e37b1c5 100644 > --- a/drivers/pci/controller/dwc/pci-imx6.c > +++ b/drivers/pci/controller/dwc/pci-imx6.c > @@ -29,6 +29,7 @@ > #include > #include > #include > +#include > #include > #include > > @@ -49,6 +50,7 @@ enum imx6_pcie_variants { > IMX6QP, > IMX7D, > IMX8MQ, > + IMX8MM, > }; > > #define IMX6_PCIE_FLAG_IMX6_PHY BIT(0) > @@ -80,6 +82,7 @@ struct imx6_pcie { > u32 tx_deemph_gen2_6db; > u32 tx_swing_full; > u32 tx_swing_low; > + u32 refclk_pad_mode; As Matthias already noticed: drop this. > struct regulator *vpcie; > struct regulator *vph; > void __iomem *phy_base; > @@ -88,6 +91,7 @@ struct imx6_pcie { > struct device *pd_pcie; > /* power domain for pcie phy */ > struct device *pd_pcie_phy; > + struct phy *phy; > const struct imx6_pcie_drvdata *drvdata; > }; > > @@ -372,6 +376,8 @@ static void imx6_pcie_assert_core_reset(struct imx6_pcie *imx6_pcie) > case IMX7D: > case IMX8MQ: > reset_control_assert(imx6_pcie->pciephy_reset); > + fallthrough; > + case IMX8MM: > reset_control_assert(imx6_pcie->apps_reset); > break; > case IMX6SX: > @@ -407,7 +413,8 @@ static void imx6_pcie_assert_core_reset(struct imx6_pcie *imx6_pcie) > > static unsigned int imx6_pcie_grp_offset(const struct imx6_pcie *imx6_pcie) > { > - WARN_ON(imx6_pcie->drvdata->variant != IMX8MQ); > + WARN_ON(imx6_pcie->drvdata->variant != IMX8MQ && > + imx6_pcie->drvdata->variant != IMX8MM); > return imx6_pcie->controller_id == 1 ? IOMUXC_GPR16 : IOMUXC_GPR14; > } > > @@ -447,6 +454,7 @@ static int imx6_pcie_enable_ref_clk(struct imx6_pcie *imx6_pcie) > case IMX7D: > break; > case IMX8MQ: > + case IMX8MM: > ret = clk_prepare_enable(imx6_pcie->pcie_aux); > if (ret) { > dev_err(dev, "unable to enable pcie_aux clock\n"); > @@ -522,6 +530,14 @@ static void imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie) > goto err_ref_clk; > } > > + switch (imx6_pcie->drvdata->variant) { > + case IMX8MM: > + if (phy_power_on(imx6_pcie->phy)) > + pr_info("unable to enable pcie phy clock\n"); It a implementation detail of the PHY driver that this just turns on the clock. dev_err("unable to power on PHY\n") or something like that. > + break; > + default: > + break; > + } > /* allow the clocks to stabilize */ > usleep_range(200, 500); > > @@ -538,6 +554,10 @@ static void imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie) > case IMX8MQ: > reset_control_deassert(imx6_pcie->pciephy_reset); > break; > + case IMX8MM: > + if (phy_init(imx6_pcie->phy) != 0) > + dev_err(dev, "Waiting for PHY ready timeout!\n"); > + break; > case IMX7D: > reset_control_deassert(imx6_pcie->pciephy_reset); > > @@ -614,6 +634,8 @@ static void imx6_pcie_configure_type(struct imx6_pcie *imx6_pcie) > static void imx6_pcie_init_phy(struct imx6_pcie *imx6_pcie) > { > switch (imx6_pcie->drvdata->variant) { > + case IMX8MM: > + break; > case IMX8MQ: > /* > * TODO: Currently this code assumes external > @@ -753,6 +775,7 @@ static void imx6_pcie_ltssm_enable(struct device *dev) > break; > case IMX7D: > case IMX8MQ: > + case IMX8MM: > reset_control_deassert(imx6_pcie->apps_reset); > break; > } > @@ -871,6 +894,7 @@ static void imx6_pcie_ltssm_disable(struct device *dev) > IMX6Q_GPR12_PCIE_CTL_2, 0); > break; > case IMX7D: > + case IMX8MM: > reset_control_assert(imx6_pcie->apps_reset); > break; > default: > @@ -930,6 +954,7 @@ static void imx6_pcie_clk_disable(struct imx6_pcie *imx6_pcie) > IMX7D_GPR12_PCIE_PHY_REFCLK_SEL); > break; > case IMX8MQ: > + case IMX8MM: > clk_disable_unprepare(imx6_pcie->pcie_aux); > break; > default: > @@ -985,6 +1010,7 @@ static int imx6_pcie_probe(struct platform_device *pdev) > struct imx6_pcie *imx6_pcie; > struct device_node *np; > struct resource *dbi_base; > + struct device_node *phy_node; > struct device_node *node = dev->of_node; > int ret; > u16 val; > @@ -1019,6 +1045,14 @@ static int imx6_pcie_probe(struct platform_device *pdev) > return PTR_ERR(imx6_pcie->phy_base); > } > > + imx6_pcie->phy = devm_phy_get(dev, "pcie-phy"); > + if (IS_ERR(imx6_pcie->phy)) { > + if (PTR_ERR(imx6_pcie->phy) == -EPROBE_DEFER) > + return -EPROBE_DEFER; > + /* Set NULL if there is no pcie-phy */ > + imx6_pcie->phy = NULL; > + } Move this into the i.MX8MM specific section below. The PHY is required on the 8MM and we should not ignore any errors. Regards, Lucas > + > dbi_base = platform_get_resource(pdev, IORESOURCE_MEM, 0); > pci->dbi_base = devm_ioremap_resource(dev, dbi_base); > if (IS_ERR(pci->dbi_base)) > @@ -1090,6 +1124,18 @@ static int imx6_pcie_probe(struct platform_device *pdev) > return PTR_ERR(imx6_pcie->apps_reset); > } > break; > + case IMX8MM: > + imx6_pcie->pcie_aux = devm_clk_get(dev, "pcie_aux"); > + if (IS_ERR(imx6_pcie->pcie_aux)) > + return dev_err_probe(dev, PTR_ERR(imx6_pcie->pcie_aux), > + "pcie_aux clock source missing or invalid\n"); > + imx6_pcie->apps_reset = devm_reset_control_get_exclusive(dev, > + "apps"); > + if (IS_ERR(imx6_pcie->apps_reset)) { > + dev_err(dev, "Failed to get PCIE APPS reset control\n"); > + return PTR_ERR(imx6_pcie->apps_reset); > + } > + break; > default: > break; > } > @@ -1130,6 +1176,14 @@ static int imx6_pcie_probe(struct platform_device *pdev) > &imx6_pcie->tx_swing_low)) > imx6_pcie->tx_swing_low = 127; > > + /* get PHY refclk pad mode if there is PHY node */ > + phy_node = of_parse_phandle(node, "phys", 0); > + if (phy_node) { > + of_property_read_u32(phy_node, "fsl,refclk-pad-mode", > + &imx6_pcie->refclk_pad_mode); > + of_node_put(phy_node); > + } > + > /* Limit link speed */ > pci->link_gen = 1; > of_property_read_u32(node, "fsl,max-link-speed", &pci->link_gen); > @@ -1202,6 +1256,10 @@ static const struct imx6_pcie_drvdata drvdata[] = { > [IMX8MQ] = { > .variant = IMX8MQ, > }, > + [IMX8MM] = { > + .variant = IMX8MM, > + .flags = IMX6_PCIE_FLAG_SUPPORTS_SUSPEND, > + }, > }; > > static const struct of_device_id imx6_pcie_of_match[] = { > @@ -1209,7 +1267,8 @@ static const struct of_device_id imx6_pcie_of_match[] = { > { .compatible = "fsl,imx6sx-pcie", .data = &drvdata[IMX6SX], }, > { .compatible = "fsl,imx6qp-pcie", .data = &drvdata[IMX6QP], }, > { .compatible = "fsl,imx7d-pcie", .data = &drvdata[IMX7D], }, > - { .compatible = "fsl,imx8mq-pcie", .data = &drvdata[IMX8MQ], } , > + { .compatible = "fsl,imx8mq-pcie", .data = &drvdata[IMX8MQ], }, > + { .compatible = "fsl,imx8mm-pcie", .data = &drvdata[IMX8MM], }, > {}, > }; > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel