Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp9651842ybi; Wed, 24 Jul 2019 07:43:10 -0700 (PDT) X-Google-Smtp-Source: APXvYqz0/13msybXPqZ0fOPgzaYcajcPJdNtCV27gpvGZcfCdWqvnV/4lWDS7slMjBFLAY4zqZAL X-Received: by 2002:a17:902:2869:: with SMTP id e96mr83139944plb.203.1563979390094; Wed, 24 Jul 2019 07:43:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563979390; cv=none; d=google.com; s=arc-20160816; b=KNOSd60qPUgiRUgTcsnSKloJGTDPEHkd9A4SCe/7mI5CZ00dGQtoAuHcGSlPvMTYYb XyTxHl3zAgZxNJTOvqnK9q69o1z/lP1X7oohxk2gADm1AbgHSNDmmn+c2V1l8yw2uYpn 6+KSyvRuZtmfOHWPkyPfVGj/qXiCD7tyi3cth4Id1E0WclvBZxE1b/S0S7SPOtG+ADKh mE8XMZAHW4Rl4AbI83rZsDXyfDASykbrW+RY+Hdg36LJGYQafzyhVSpJZx5xE688nox8 AveT9v7Yh8CloPeKE6hqmLnYkarEObdd34bvg1hvnnoHUxBHuKUKL1fvc37u3+XARauP FSuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=TNBDSM//ZkrLparqdq5qtFa1xp8sr7/+afUsd+hr0WY=; b=w4RXQy+/KclVfcC2A6fh9zBwmxr3e4hcFKgaXsQlD/rVG+UrQFk/vI83KNBW+VK7IK G4ibaOXIB8JqzEDh5fCgMH3dMV864rmK+ZZhQaXH9Qne7PEGUfT65RlHJeoO2cOd7oFF /iJydI36D+QcgY+A2Cy5oI/q1R0EY8m5n4bwycAkLlCHiigTIQHx+nktzg41rk2utvVb KflbhzYPJ+PX6jyfz/wUJX73qw0+jtvjCxhlIyeOPhzFMuTPgXZ0qU7aG/26VWwKwMBx Q5C4PMghkPxLA6yW6hMAKABhXg4rj0yefbwvNEW4bqV9WHkdMiNXVoSpWaMveJYIQ8hq pCqA== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s12si14210993plp.63.2019.07.24.07.42.55; Wed, 24 Jul 2019 07:43:10 -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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728374AbfGXOlz (ORCPT + 99 others); Wed, 24 Jul 2019 10:41:55 -0400 Received: from inva020.nxp.com ([92.121.34.13]:42096 "EHLO inva020.nxp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726470AbfGXOlq (ORCPT ); Wed, 24 Jul 2019 10:41:46 -0400 Received: from inva020.nxp.com (localhost [127.0.0.1]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id BC4661A037E; Wed, 24 Jul 2019 16:41:43 +0200 (CEST) Received: from inva024.eu-rdc02.nxp.com (inva024.eu-rdc02.nxp.com [134.27.226.22]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id B00951A0157; Wed, 24 Jul 2019 16:41:43 +0200 (CEST) Received: from fsr-ub1664-016.ea.freescale.net (fsr-ub1664-016.ea.freescale.net [10.171.71.216]) by inva024.eu-rdc02.nxp.com (Postfix) with ESMTP id 4765D205D8; Wed, 24 Jul 2019 16:41:43 +0200 (CEST) From: Claudiu Manoil To: "David S . Miller" Cc: andrew@lunn.ch, Rob Herring , Li Yang , alexandru.marginean@nxp.com, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next v1 2/4] enetc: Add mdio bus driver for the PCIe MDIO endpoint Date: Wed, 24 Jul 2019 17:41:39 +0300 Message-Id: <1563979301-596-3-git-send-email-claudiu.manoil@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1563979301-596-1-git-send-email-claudiu.manoil@nxp.com> References: <1563979301-596-1-git-send-email-claudiu.manoil@nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ENETC ports can manage the MDIO bus via local register interface. However there's also a centralized way to manage the MDIO bus, via the MDIO PCIe endpoint device integrated by the same root complex that also integrates the ENETC ports (eth controllers). Depending on board design and use case, centralized access to MDIO may be better than using local ENETC port registers. For instance, on the LS1028A QDS board where MDIO muxing is requiered. Also, the LS1028A on-chip switch doesn't have a local MDIO register interface. The current patch registers the above PCIe enpoint as a separate MDIO bus and provides a driver for it by re-using the code used for local MDIO access. It also allows the ENETC port PHYs to be managed by this driver if the local "mdio" node is missing from the ENETC port node. Signed-off-by: Claudiu Manoil --- v1 - fixed mdio bus allocation - requested only BAR0 region, as it's the only one used by the driver .../net/ethernet/freescale/enetc/enetc_mdio.c | 90 +++++++++++++++++++ .../net/ethernet/freescale/enetc/enetc_pf.c | 5 +- 2 files changed, 94 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/freescale/enetc/enetc_mdio.c b/drivers/net/ethernet/freescale/enetc/enetc_mdio.c index 1e3cd21c13ee..378cc8dd27f9 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc_mdio.c +++ b/drivers/net/ethernet/freescale/enetc/enetc_mdio.c @@ -190,3 +190,93 @@ void enetc_mdio_remove(struct enetc_pf *pf) if (pf->mdio) mdiobus_unregister(pf->mdio); } + +#define ENETC_MDIO_DEV_ID 0xee01 +#define ENETC_MDIO_DEV_NAME "FSL PCIe IE Central MDIO" +#define ENETC_MDIO_BUS_NAME ENETC_MDIO_DEV_NAME " Bus" +#define ENETC_MDIO_DRV_NAME ENETC_MDIO_DEV_NAME " driver" +#define ENETC_MDIO_DRV_ID "fsl_enetc_mdio" + +static int enetc_pci_mdio_probe(struct pci_dev *pdev, + const struct pci_device_id *ent) +{ + struct enetc_mdio_regs __iomem **regsp; + struct device *dev = &pdev->dev; + struct mii_bus *bus; + int err; + + bus = devm_mdiobus_alloc_size(dev, sizeof(*regsp)); + if (!bus) + return -ENOMEM; + + bus->name = ENETC_MDIO_BUS_NAME; + bus->read = enetc_mdio_read; + bus->write = enetc_mdio_write; + bus->parent = dev; + regsp = bus->priv; + snprintf(bus->id, MII_BUS_ID_SIZE, "%s", dev_name(dev)); + + pcie_flr(pdev); + err = pci_enable_device_mem(pdev); + if (err) { + dev_err(dev, "device enable failed\n"); + return err; + } + + err = pci_request_region(pdev, 0, ENETC_MDIO_DRV_ID); + if (err) { + dev_err(dev, "pci_request_region failed\n"); + goto err_pci_mem_reg; + } + + *regsp = pci_iomap_range(pdev, 0, ENETC_MDIO_REG_OFFSET, 0); + if (!bus->priv) { + err = -ENXIO; + dev_err(dev, "iomap failed\n"); + goto err_ioremap; + } + + err = of_mdiobus_register(bus, dev->of_node); + if (err) + goto err_mdiobus_reg; + + pci_set_drvdata(pdev, bus); + + return 0; + +err_mdiobus_reg: + iounmap(*regsp); +err_ioremap: + pci_release_mem_regions(pdev); +err_pci_mem_reg: + pci_disable_device(pdev); + + return err; +} + +static void enetc_pci_mdio_remove(struct pci_dev *pdev) +{ + struct mii_bus *bus = pci_get_drvdata(pdev); + + mdiobus_unregister(bus); + iounmap(bus_to_enetc_regs(bus)); + pci_release_mem_regions(pdev); + pci_disable_device(pdev); +} + +static const struct pci_device_id enetc_pci_mdio_id_table[] = { + { PCI_DEVICE(PCI_VENDOR_ID_FREESCALE, ENETC_MDIO_DEV_ID) }, + { 0, } /* End of table. */ +}; +MODULE_DEVICE_TABLE(pci, enetc_mdio_id_table); + +static struct pci_driver enetc_pci_mdio_driver = { + .name = ENETC_MDIO_DRV_ID, + .id_table = enetc_pci_mdio_id_table, + .probe = enetc_pci_mdio_probe, + .remove = enetc_pci_mdio_remove, +}; +module_pci_driver(enetc_pci_mdio_driver); + +MODULE_DESCRIPTION(ENETC_MDIO_DRV_NAME); +MODULE_LICENSE("Dual BSD/GPL"); diff --git a/drivers/net/ethernet/freescale/enetc/enetc_pf.c b/drivers/net/ethernet/freescale/enetc/enetc_pf.c index 258b3cb38a6f..7d6513ff8507 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc_pf.c +++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.c @@ -750,6 +750,7 @@ static int enetc_of_get_phy(struct enetc_ndev_priv *priv) { struct enetc_pf *pf = enetc_si_priv(priv->si); struct device_node *np = priv->dev->of_node; + struct device_node *mdio_np; int err; if (!np) { @@ -773,7 +774,9 @@ static int enetc_of_get_phy(struct enetc_ndev_priv *priv) priv->phy_node = of_node_get(np); } - if (!of_phy_is_fixed_link(np)) { + mdio_np = of_get_child_by_name(np, "mdio"); + if (mdio_np) { + of_node_put(mdio_np); err = enetc_mdio_probe(pf); if (err) { of_node_put(priv->phy_node); -- 2.17.1