Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp7422866ybl; Tue, 24 Dec 2019 02:14:05 -0800 (PST) X-Google-Smtp-Source: APXvYqzvs+x9DOGEhnwHZ7kNoTGeNfFhR8/Kvm8V37X+zZ2mw4vu7dSub8J7pO8opSZf5rpC33CL X-Received: by 2002:a05:6830:1b7b:: with SMTP id d27mr39425822ote.78.1577182445783; Tue, 24 Dec 2019 02:14:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577182445; cv=none; d=google.com; s=arc-20160816; b=nc9OTcvl0rp1JWSoccHFwtYOLZvqQ7lU1I20/9bO2pxhi6V32iPwYAeS2nPvG9UvCk aF6XIkYnZjvvUJthlZoW6Fm96P1P+wX3HOi9YgG7o6cJBOoRBJSf4BAEMPN0fK04IAfd XZaupwn1Z9qCa1/IEwYh/PrDr/j0kBr7C1KBTzjO+UBamMw1Bzy8OMFl5LJcXfT/EyVp 9AA+ghfrM0IH5EvxBUu+ePRmkiXdnQKCFN73RRL7X7hUCv2sx8FfC9h2pfJiEQjLw4Vo Z1LX17Fr9HGUG/RGlTZyNfcLS0cqLt9xonM3brkefVLELXQOPyz/44e6Cd/ZeSIPuLCh EN5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject:dkim-signature; bh=fZ/FjEG+g2ooRftCs2RuoDuZGjQlsvmH9SEpS+6rfy0=; b=W0Wmn1qWrYBnzaXRqcRPANCAfcEW+gyCqPXe5vXyIQLTJxIdlR0IS1b5PDuk+BX2Bh jQqDrhtRCVeccl2iQbDLggTFzWZr8BhSXq0SexEWwA5+eMaNsBdO+yjYsZ1+QMG97h9Q LxoEkcYfafZLXA1rwR/pH//HASfktneZRL5pvz8DZy8BBDVnqeoDx9WRzitW8p0D6f6S bev/0Bw4qBvAoxurq5m+lhUccvRnqcVfzHx96eHGRlVxKbjqeZKdEwYmCPeYaXXxJJFV oGSb0vwc9aFBYkDCz8fKl3Ti9xoOS2gpV7T7+xXO9cLKDjHnLFqIvDBPqvxKK1EoqREH oTQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=O1T4sgWv; 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; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a15si8139310otq.83.2019.12.24.02.13.54; Tue, 24 Dec 2019 02:14:05 -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; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=O1T4sgWv; 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; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726206AbfLXKNE (ORCPT + 99 others); Tue, 24 Dec 2019 05:13:04 -0500 Received: from lelv0142.ext.ti.com ([198.47.23.249]:59112 "EHLO lelv0142.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726084AbfLXKND (ORCPT ); Tue, 24 Dec 2019 05:13:03 -0500 Received: from lelv0265.itg.ti.com ([10.180.67.224]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id xBOACnje002826; Tue, 24 Dec 2019 04:12:49 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1577182369; bh=fZ/FjEG+g2ooRftCs2RuoDuZGjQlsvmH9SEpS+6rfy0=; h=Subject:To:CC:References:From:Date:In-Reply-To; b=O1T4sgWvT4v0LaBOxKIwhfp7H2GgCTCbVIOb2QdjdOij33lskVhPryNOiQf+pntQk kVIXJSNvm00ph0UOmocEY3SX+oqjtfDHpnv6m/7tUuldQuTyBvmxLJxnrKn8++wIbI So/KPlxTyZEkc2njaPZ/aQd0dhbTtZ+3o6w081F8= Received: from DFLE108.ent.ti.com (dfle108.ent.ti.com [10.64.6.29]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id xBOACn6f119643 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 24 Dec 2019 04:12:49 -0600 Received: from DFLE100.ent.ti.com (10.64.6.21) by DFLE108.ent.ti.com (10.64.6.29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1847.3; Tue, 24 Dec 2019 04:12:47 -0600 Received: from lelv0327.itg.ti.com (10.180.67.183) by DFLE100.ent.ti.com (10.64.6.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1847.3 via Frontend Transport; Tue, 24 Dec 2019 04:12:47 -0600 Received: from [10.24.69.159] (ileax41-snat.itg.ti.com [10.172.224.153]) by lelv0327.itg.ti.com (8.15.2/8.15.2) with ESMTP id xBOACiZf017254; Tue, 24 Dec 2019 04:12:44 -0600 Subject: Re: [PATCH v2 3/3] PCI: amlogic: Use AXG PCIE and shared MIPI/PCIE PHYs To: Remi Pommarel , Yue Wang , Lorenzo Pieralisi , Andrew Murray , Kevin Hilman , Martin Blumenstingl , Neil Armstrong CC: Jerome Brunet , , , References: <20191223214529.20377-1-repk@triplefau.lt> <20191223214529.20377-4-repk@triplefau.lt> From: Kishon Vijay Abraham I Message-ID: Date: Tue, 24 Dec 2019 15:44:41 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.7.0 MIME-Version: 1.0 In-Reply-To: <20191223214529.20377-4-repk@triplefau.lt> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On 24/12/19 3:15 AM, Remi Pommarel wrote: > Now that PCIE PHY has been introduced for AXG, the whole has_shared_phy > logic can be mutualized between AXG and G12A platforms. > > This also makes use of the optional MIPI/PCIE shared fonctionality PHY > found on AXG platforms, which need to be used in order to have reliable > PCIE communications. > > Signed-off-by: Remi Pommarel > --- > drivers/pci/controller/dwc/pci-meson.c | 140 ++++++++----------------- > 1 file changed, 46 insertions(+), 94 deletions(-) > > diff --git a/drivers/pci/controller/dwc/pci-meson.c b/drivers/pci/controller/dwc/pci-meson.c > index 3772b02a5c55..3d12155c32f6 100644 > --- a/drivers/pci/controller/dwc/pci-meson.c > +++ b/drivers/pci/controller/dwc/pci-meson.c > @@ -66,7 +66,6 @@ > #define PORT_CLK_RATE 100000000UL > #define MAX_PAYLOAD_SIZE 256 > #define MAX_READ_REQ_SIZE 256 > -#define MESON_PCIE_PHY_POWERUP 0x1c > #define PCIE_RESET_DELAY 500 > #define PCIE_SHARED_RESET 1 > #define PCIE_NORMAL_RESET 0 > @@ -81,26 +80,19 @@ enum pcie_data_rate { > struct meson_pcie_mem_res { > void __iomem *elbi_base; > void __iomem *cfg_base; > - void __iomem *phy_base; > }; > > struct meson_pcie_clk_res { > struct clk *clk; > - struct clk *mipi_gate; > struct clk *port_clk; > struct clk *general_clk; > }; > > struct meson_pcie_rc_reset { > - struct reset_control *phy; > struct reset_control *port; > struct reset_control *apb; > }; > > -struct meson_pcie_param { > - bool has_shared_phy; > -}; > - > struct meson_pcie { > struct dw_pcie pci; > struct meson_pcie_mem_res mem_res; > @@ -108,7 +100,7 @@ struct meson_pcie { > struct meson_pcie_rc_reset mrst; > struct gpio_desc *reset_gpio; > struct phy *phy; > - const struct meson_pcie_param *param; > + struct phy *shared_phy; > }; > > static struct reset_control *meson_pcie_get_reset(struct meson_pcie *mp, > @@ -130,13 +122,6 @@ static int meson_pcie_get_resets(struct meson_pcie *mp) > { > struct meson_pcie_rc_reset *mrst = &mp->mrst; > > - if (!mp->param->has_shared_phy) { > - mrst->phy = meson_pcie_get_reset(mp, "phy", PCIE_SHARED_RESET); > - if (IS_ERR(mrst->phy)) > - return PTR_ERR(mrst->phy); > - reset_control_deassert(mrst->phy); > - } > - > mrst->port = meson_pcie_get_reset(mp, "port", PCIE_NORMAL_RESET); > if (IS_ERR(mrst->port)) > return PTR_ERR(mrst->port); > @@ -162,22 +147,6 @@ static void __iomem *meson_pcie_get_mem(struct platform_device *pdev, > return devm_ioremap_resource(dev, res); > } > > -static void __iomem *meson_pcie_get_mem_shared(struct platform_device *pdev, > - struct meson_pcie *mp, > - const char *id) > -{ > - struct device *dev = mp->pci.dev; > - struct resource *res; > - > - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, id); > - if (!res) { > - dev_err(dev, "No REG resource %s\n", id); > - return ERR_PTR(-ENXIO); > - } > - > - return devm_ioremap(dev, res->start, resource_size(res)); > -} > - > static int meson_pcie_get_mems(struct platform_device *pdev, > struct meson_pcie *mp) > { > @@ -189,14 +158,6 @@ static int meson_pcie_get_mems(struct platform_device *pdev, > if (IS_ERR(mp->mem_res.cfg_base)) > return PTR_ERR(mp->mem_res.cfg_base); > > - /* Meson AXG SoC has two PCI controllers use same phy register */ > - if (!mp->param->has_shared_phy) { > - mp->mem_res.phy_base = > - meson_pcie_get_mem_shared(pdev, mp, "phy"); > - if (IS_ERR(mp->mem_res.phy_base)) > - return PTR_ERR(mp->mem_res.phy_base); > - } > - > return 0; > } > > @@ -204,20 +165,40 @@ static int meson_pcie_power_on(struct meson_pcie *mp) > { > int ret = 0; > > - if (mp->param->has_shared_phy) { > - ret = phy_init(mp->phy); > - if (ret) > - return ret; > + ret = phy_init(mp->phy); > + if (ret) > + goto err; > > - ret = phy_power_on(mp->phy); > - if (ret) { > - phy_exit(mp->phy); > - return ret; > - } > - } else > - writel(MESON_PCIE_PHY_POWERUP, mp->mem_res.phy_base); > + ret = phy_init(mp->shared_phy); > + if (ret) > + goto exit; > + > + ret = phy_power_on(mp->phy); > + if (ret) > + goto shared_exit; > + > + ret = phy_power_on(mp->shared_phy); > + if (ret) > + goto power_off; > > return 0; > + > +power_off: > + phy_power_off(mp->phy); > +shared_exit: > + phy_exit(mp->shared_phy); > +exit: > + phy_exit(mp->phy); > +err: > + return ret; > +} > + > +static void meson_pcie_power_off(struct meson_pcie *mp) > +{ > + phy_power_off(mp->shared_phy); > + phy_power_off(mp->phy); > + phy_exit(mp->shared_phy); > + phy_exit(mp->phy); > } > > static int meson_pcie_reset(struct meson_pcie *mp) > @@ -225,16 +206,13 @@ static int meson_pcie_reset(struct meson_pcie *mp) > struct meson_pcie_rc_reset *mrst = &mp->mrst; > int ret = 0; > > - if (mp->param->has_shared_phy) { > - ret = phy_reset(mp->phy); > - if (ret) > - return ret; > - } else { > - reset_control_assert(mrst->phy); > - udelay(PCIE_RESET_DELAY); > - reset_control_deassert(mrst->phy); > - udelay(PCIE_RESET_DELAY); > - } > + ret = phy_reset(mp->phy); > + if (ret) > + return ret; > + > + ret = phy_reset(mp->shared_phy); > + if (ret) > + return ret; > > reset_control_assert(mrst->port); > reset_control_assert(mrst->apb); > @@ -286,12 +264,6 @@ static int meson_pcie_probe_clocks(struct meson_pcie *mp) > if (IS_ERR(res->port_clk)) > return PTR_ERR(res->port_clk); > > - if (!mp->param->has_shared_phy) { > - res->mipi_gate = meson_pcie_probe_clock(dev, "mipi", 0); > - if (IS_ERR(res->mipi_gate)) > - return PTR_ERR(res->mipi_gate); > - } > - > res->general_clk = meson_pcie_probe_clock(dev, "general", 0); > if (IS_ERR(res->general_clk)) > return PTR_ERR(res->general_clk); > @@ -562,7 +534,6 @@ static const struct dw_pcie_ops dw_pcie_ops = { > > static int meson_pcie_probe(struct platform_device *pdev) > { > - const struct meson_pcie_param *match_data; > struct device *dev = &pdev->dev; > struct dw_pcie *pci; > struct meson_pcie *mp; > @@ -576,18 +547,13 @@ static int meson_pcie_probe(struct platform_device *pdev) > pci->dev = dev; > pci->ops = &dw_pcie_ops; > > - match_data = of_device_get_match_data(dev); > - if (!match_data) { > - dev_err(dev, "failed to get match data\n"); > - return -ENODEV; > - } > - mp->param = match_data; > + mp->phy = devm_phy_get(dev, "pcie"); > + if (IS_ERR(mp->phy)) > + return PTR_ERR(mp->phy); > > - if (mp->param->has_shared_phy) { > - mp->phy = devm_phy_get(dev, "pcie"); > - if (IS_ERR(mp->phy)) > - return PTR_ERR(mp->phy); > - } > + mp->shared_phy = devm_phy_optional_get(dev, "shared"); > + if (IS_ERR(mp->phy)) > + return PTR_ERR(mp->phy); This also requires dt-binding updation.Is PCIe connected to two different PHYs here? Thanks Kishon