Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp472387imm; Fri, 21 Sep 2018 03:24:50 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYv4mBTTupXxbRKiZZHACNJrJ8Dv4mJl667miRVAazk9G3RUtGPHYHBG2j+tY5mK0oqqIT0 X-Received: by 2002:a17:902:a58c:: with SMTP id az12-v6mr43813729plb.339.1537525490123; Fri, 21 Sep 2018 03:24:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537525490; cv=none; d=google.com; s=arc-20160816; b=tzrzkjLKPn2vFCeOeeFyygR7SopMNCy1d27nlpChb2YDe3sg9N8wHcCIUi2WFCRGEJ k3QwHfB9qMREu1iuesjki+yUbPpq6v5GKmOH6aFaM0UqcQc2KvMXjjqUv0qqiVIlOADn Hyf+NWAIyQ1UVY53mE9j7BReweBI23TNpPBkn1wJ7s8CHd+T/Y/Si/aHNptmxiB2+IS6 +LH/8mOyURtSgMj76m/erdOkgXfLxaxJ3Fb3UrsIZ/IWjI2bmMdHOTOPOUYAxXZ/UBOa ESIDT4p/Rm/d7PHcHo+s6cK12PaxRCTj3UZq7C5t7ff8NprR6WcVyG3XNG4caS7GGrrF S9JA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=g3JaPOStkKoEr3p7W5xTkdmOc+nnnrI10AWpPhzBLpY=; b=lkUqB+8l+AzIZt2AYv9Ec6O2FJaJ/F5XmRafXsLvOqTgcyALtxmRoOnj8hpd4oGUEq hMgU7sAkS3KQSRObg4VDKLYhwe1QLWrmN+q6fJtyR9DDiF8v3FrAxy9pMS2jBT5TfrBR vO5C6l0QN3XUSxbfgjdK05sxnI28EtIv4svieQ0szQ3LR29n1Fe1r9O3asoHShm2wCkF JS4CTJRINmhBxpKCdhpZnNYyALgS1L2iDiSdNQ/I6+aEk4o/tadZSTMrjH9GHpgL2F8K 3BPLhOUX8BeL5ImwhAZu/32UABJf5vz/sxGCrFf1l5qNvhonDu7EGTh8wpiZQx3OQsI6 PAug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=na9kILPe; 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 l5-v6si6526019pgo.145.2018.09.21.03.24.33; Fri, 21 Sep 2018 03:24:50 -0700 (PDT) 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=na9kILPe; 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 S2389863AbeIUQMK (ORCPT + 99 others); Fri, 21 Sep 2018 12:12:10 -0400 Received: from fllv0015.ext.ti.com ([198.47.19.141]:35046 "EHLO fllv0015.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389815AbeIUQMJ (ORCPT ); Fri, 21 Sep 2018 12:12:09 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id w8LANUUK030455; Fri, 21 Sep 2018 05:23:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1537525410; bh=g3JaPOStkKoEr3p7W5xTkdmOc+nnnrI10AWpPhzBLpY=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=na9kILPezSe4Y944bTJjEY5MkZTmeBubAdnaMKwrNPPEKVGLXoo+48DJOkc49MuOU IXM8jvKsOrwA0aRpz1g4ba+1+Mt7XoC0G1aSmlPA/eX2SP01O6bhV7mfHrbE7uoMK8 yGvOQyj+qiPZvcFqh3LXuzRJh+Tq56F2PqSX5ThQ= Received: from DFLE109.ent.ti.com (dfle109.ent.ti.com [10.64.6.30]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id w8LANUvf018699; Fri, 21 Sep 2018 05:23:30 -0500 Received: from DFLE105.ent.ti.com (10.64.6.26) by DFLE109.ent.ti.com (10.64.6.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1466.3; Fri, 21 Sep 2018 05:23:30 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DFLE105.ent.ti.com (10.64.6.26) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1466.3 via Frontend Transport; Fri, 21 Sep 2018 05:23:30 -0500 Received: from a0393678ub.dal.design.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id w8LAMEtJ032280; Fri, 21 Sep 2018 05:23:25 -0500 From: Kishon Vijay Abraham I To: Jingoo Han , Joao Pinto , Bjorn Helgaas , Rob Herring , Lorenzo Pieralisi , Murali Karicheri , Kishon Vijay Abraham I , CC: Mark Rutland , Santosh Shilimkar , Tero Kristo , Nishanth Menon , , , , Subject: [RFC PATCH 15/40] PCI: keystone: Cleanup PHY handling Date: Fri, 21 Sep 2018 15:51:30 +0530 Message-ID: <20180921102155.22839-16-kishon@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180921102155.22839-1-kishon@ti.com> References: <20180921102155.22839-1-kishon@ti.com> MIME-Version: 1.0 Content-Type: text/plain 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 Cleanup PHY handling by using devm_phy_optional_get to get PHYs if the PHYs are optional, creating a device link between the PHY device and the controller device and disable PHY on error cases here. Also invoke phy_reset() as part of enabling PHY. Signed-off-by: Kishon Vijay Abraham I --- drivers/pci/controller/dwc/pci-keystone.c | 133 +++++++++++++++++++--- 1 file changed, 115 insertions(+), 18 deletions(-) diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c index fe522b8c981f..b013776d9256 100644 --- a/drivers/pci/controller/dwc/pci-keystone.c +++ b/drivers/pci/controller/dwc/pci-keystone.c @@ -96,6 +96,9 @@ static void ks_pcie_stop_link(struct dw_pcie *pci); struct keystone_pcie { struct dw_pcie *pci; struct clk *clk; + int num_lanes; + struct phy **phy; + struct device_link **link; int msi_host_irq; struct device_node *msi_intc_np; struct irq_domain *legacy_irq_domain; @@ -748,23 +751,62 @@ static const struct dw_pcie_ops ks_pcie_dw_pcie_ops = { .link_up = ks_pcie_link_up, }; -static int __exit ks_pcie_remove(struct platform_device *pdev) +static void ks_pcie_disable_phy(struct keystone_pcie *ks_pcie) { - struct keystone_pcie *ks_pcie = platform_get_drvdata(pdev); + int num_lanes = ks_pcie->num_lanes; - clk_disable_unprepare(ks_pcie->clk); + while (num_lanes--) { + phy_power_off(ks_pcie->phy[num_lanes]); + phy_exit(ks_pcie->phy[num_lanes]); + } +} + +static int ks_pcie_enable_phy(struct keystone_pcie *ks_pcie) +{ + int i; + int ret; + int num_lanes = ks_pcie->num_lanes; + + for (i = 0; i < num_lanes; i++) { + ret = phy_reset(ks_pcie->phy[i]); + if (ret < 0) + goto err_phy; + + ret = phy_init(ks_pcie->phy[i]); + if (ret < 0) + goto err_phy; + + ret = phy_power_on(ks_pcie->phy[i]); + if (ret < 0) { + phy_exit(ks_pcie->phy[i]); + goto err_phy; + } + } return 0; + +err_phy: + while (--i >= 0) { + phy_power_off(ks_pcie->phy[i]); + phy_exit(ks_pcie->phy[i]); + } + + return ret; } static int __init ks_pcie_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; + struct device_node *np = dev->of_node; struct dw_pcie *pci; struct keystone_pcie *ks_pcie; - struct phy *phy; + struct device_link **link; + struct phy **phy; + u32 num_lanes; + char name[10]; int ret; int irq; + int i; ks_pcie = devm_kzalloc(dev, sizeof(*ks_pcie), GFP_KERNEL); if (!ks_pcie) @@ -777,43 +819,76 @@ static int __init ks_pcie_probe(struct platform_device *pdev) pci->dev = dev; pci->ops = &ks_pcie_dw_pcie_ops; - ks_pcie->pci = pci; + ret = of_property_read_u32(np, "num-lanes", &num_lanes); + if (ret) + num_lanes = 1; - /* initialize SerDes Phy if present */ - phy = devm_phy_get(dev, "pcie-phy"); - if (PTR_ERR_OR_ZERO(phy) == -EPROBE_DEFER) - return PTR_ERR(phy); + phy = devm_kzalloc(dev, sizeof(*phy) * num_lanes, GFP_KERNEL); + if (!phy) + return -ENOMEM; - if (!IS_ERR_OR_NULL(phy)) { - ret = phy_init(phy); - if (ret < 0) - return ret; + link = devm_kzalloc(dev, sizeof(*link) * num_lanes, GFP_KERNEL); + if (!link) + return -ENOMEM; + + for (i = 0; i < num_lanes; i++) { + snprintf(name, sizeof(name), "pcie-phy%d", i); + phy[i] = devm_phy_optional_get(dev, name); + if (IS_ERR(phy[i])) { + ret = PTR_ERR(phy[i]); + goto err_link; + } + + if (!phy[i]) + continue; + + link[i] = device_link_add(dev, &phy[i]->dev, DL_FLAG_STATELESS); + if (!link[i]) { + ret = -EINVAL; + goto err_link; + } } - ks_pcie->np = dev->of_node; + ks_pcie->num_lanes = num_lanes; + ks_pcie->phy = phy; + + ret = ks_pcie_enable_phy(ks_pcie); + if (ret) { + dev_err(dev, "failed to enable phy\n"); + goto err_link; + } + + ks_pcie->pci = pci; + ks_pcie->link = link; + ks_pcie->np = np; + ks_pcie->num_lanes = num_lanes; + ks_pcie->phy = phy; irq = platform_get_irq(pdev, 0); if (irq < 0) { dev_err(dev, "missing IRQ resource: %d\n", irq); - return irq; + ret = irq; + goto err_get_irq; } ret = devm_request_irq(dev, irq, ks_pcie_err_irq_handler, IRQF_SHARED, "ks-pcie-error-irq", ks_pcie); if (ret < 0) { dev_err(dev, "failed to request error IRQ %d\n", irq); - return ret; + goto err_get_irq; } platform_set_drvdata(pdev, ks_pcie); ks_pcie->clk = devm_clk_get(dev, "pcie"); if (IS_ERR(ks_pcie->clk)) { dev_err(dev, "Failed to get pcie rc clock\n"); - return PTR_ERR(ks_pcie->clk); + ret = PTR_ERR(ks_pcie->clk); + goto err_get_irq; } + ret = clk_prepare_enable(ks_pcie->clk); if (ret) - return ret; + goto err_get_irq; ret = ks_pcie_add_pcie_port(ks_pcie, pdev); if (ret < 0) @@ -825,9 +900,31 @@ static int __init ks_pcie_probe(struct platform_device *pdev) fail_clk: clk_disable_unprepare(ks_pcie->clk); +err_get_irq: + ks_pcie_disable_phy(ks_pcie); + +err_link: + while (--i >= 0 && link[i]) + device_link_del(link[i]); + return ret; } +static int __exit ks_pcie_remove(struct platform_device *pdev) +{ + struct keystone_pcie *ks_pcie = platform_get_drvdata(pdev); + struct device_link **link = ks_pcie->link; + int num_lanes = ks_pcie->num_lanes; + + clk_disable_unprepare(ks_pcie->clk); + ks_pcie_disable_phy(ks_pcie); + + while (num_lanes--) + device_link_del(link[num_lanes]); + + return 0; +} + static struct platform_driver ks_pcie_driver __refdata = { .probe = ks_pcie_probe, .remove = __exit_p(ks_pcie_remove), -- 2.17.1