Commit db48abba authored by Maxime Chevallier's avatar Maxime Chevallier Committed by David S. Miller
Browse files

net: ethernet: altera-tse: Convert to mdio-regmap and use PCS Lynx 



The newly introduced regmap-based MDIO driver allows for an easy mapping
of an mdiodevice onto the memory-mapped TSE PCS, which is actually a
Lynx PCS.

Convert Altera TSE to use this PCS instead of the pcs-altera-tse, which
is nothing more than a memory-mapped Lynx PCS.

Signed-off-by: default avatarMaxime Chevallier <maxime.chevallier@bootlin.com>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 642af0f9

drivers/net/ethernet/altera/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ config ALTERA_TSE 
	select PHYLIB

	select PHYLINK

	select PCS_ALTERA_TSE

	select MDIO_REGMAP

	select REGMAP_MMIO

	help

	  This driver supports the Altera Triple-Speed (TSE) Ethernet MAC.

drivers/net/ethernet/altera/altera_tse_main.c

+48 −9
Original line number Diff line number Diff line
@@ -27,14 +27,16 @@ 
#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/mii.h>

#include <linux/mdio/mdio-regmap.h>

#include <linux/netdevice.h>

#include <linux/of_device.h>

#include <linux/of_mdio.h>

#include <linux/of_net.h>

#include <linux/of_platform.h>

#include <linux/pcs-altera-tse.h>

#include <linux/pcs-lynx.h>

#include <linux/phy.h>

#include <linux/platform_device.h>

#include <linux/regmap.h>

#include <linux/skbuff.h>

#include <asm/cacheflush.h>
@@ -1132,13 +1134,16 @@ static int request_and_map(struct platform_device *pdev, const char *name, 
static int altera_tse_probe(struct platform_device *pdev)

{

	const struct of_device_id *of_id = NULL;

	struct regmap_config pcs_regmap_cfg;

	struct altera_tse_private *priv;

	struct mdio_regmap_config mrc;

	struct resource *control_port;

	struct regmap *pcs_regmap;

	struct resource *dma_res;

	struct resource *pcs_res;

	struct mii_bus *pcs_bus;

	struct net_device *ndev;

	void __iomem *descmap;

	int pcs_reg_width = 2;

	int ret = -ENODEV;



	ndev = alloc_etherdev(sizeof(struct altera_tse_private));
@@ -1255,12 +1260,32 @@ static int altera_tse_probe(struct platform_device *pdev) 
	 * address space, but if it's not the case, we fallback to the mdiophy0

	 * from the MAC's address space

	 */

	ret = request_and_map(pdev, "pcs", &pcs_res,

			      &priv->pcs_base);

	ret = request_and_map(pdev, "pcs", &pcs_res, &priv->pcs_base);

	if (ret) {

		/* If we can't find a dedicated resource for the PCS, fallback

		 * to the internal PCS, that has a different address stride

		 */

		priv->pcs_base = priv->mac_dev + tse_csroffs(mdio_phy0);

		pcs_reg_width = 4;

		pcs_regmap_cfg.reg_bits = 32;

		/* Values are MDIO-like values, on 16 bits */

		pcs_regmap_cfg.val_bits = 16;

		pcs_regmap_cfg.reg_shift = REGMAP_UPSHIFT(2);

	} else {

		pcs_regmap_cfg.reg_bits = 16;

		pcs_regmap_cfg.val_bits = 16;

		pcs_regmap_cfg.reg_shift = REGMAP_UPSHIFT(1);

	}



	/* Create a regmap for the PCS so that it can be used by the PCS driver */

	pcs_regmap = devm_regmap_init_mmio(&pdev->dev, priv->pcs_base,

					   &pcs_regmap_cfg);

	if (IS_ERR(pcs_regmap)) {

		ret = PTR_ERR(pcs_regmap);

		goto err_free_netdev;

	}

	mrc.regmap = pcs_regmap;

	mrc.parent = &pdev->dev;

	mrc.valid_addr = 0x0;



	/* Rx IRQ */

	priv->rx_irq = platform_get_irq_byname(pdev, "rx_irq");
@@ -1384,7 +1409,18 @@ static int altera_tse_probe(struct platform_device *pdev) 
			 (unsigned long) control_port->start, priv->rx_irq,

			 priv->tx_irq);



	priv->pcs = alt_tse_pcs_create(ndev, priv->pcs_base, pcs_reg_width);

	snprintf(mrc.name, MII_BUS_ID_SIZE, "%s-pcs-mii", ndev->name);

	pcs_bus = devm_mdio_regmap_register(&pdev->dev, &mrc);

	if (IS_ERR(pcs_bus)) {

		ret = PTR_ERR(pcs_bus);

		goto err_init_pcs;

	}



	priv->pcs = lynx_pcs_create_mdiodev(pcs_bus, 0);

	if (IS_ERR(priv->pcs)) {

		ret = PTR_ERR(priv->pcs);

		goto err_init_pcs;

	}



	priv->phylink_config.dev = &ndev->dev;

	priv->phylink_config.type = PHYLINK_NETDEV;
@@ -1407,12 +1443,13 @@ static int altera_tse_probe(struct platform_device *pdev) 
	if (IS_ERR(priv->phylink)) {

		dev_err(&pdev->dev, "failed to create phylink\n");

		ret = PTR_ERR(priv->phylink);

		goto err_init_phy;

		goto err_init_phylink;

	}



	return 0;



err_init_phy:

err_init_phylink:

	lynx_pcs_destroy(priv->pcs);

err_init_pcs:

	unregister_netdev(ndev);

err_register_netdev:

	netif_napi_del(&priv->napi);
@@ -1433,6 +1470,8 @@ static int altera_tse_remove(struct platform_device *pdev) 
	altera_tse_mdio_destroy(ndev);

	unregister_netdev(ndev);

	phylink_destroy(priv->phylink);

	lynx_pcs_destroy(priv->pcs);



	free_netdev(ndev);



	return 0;