Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6a95a24 authored by Jon Mason's avatar Jon Mason Committed by David S. Miller
Browse files

net: ethernet: bgmac: Add platform device support 



The bcma portion of the driver has been split off into a bcma specific
driver.  This has been mirrored for the platform driver.  The last
references to the bcma core struct have been changed into a generic
function call.  These function calls are wrappers to either the original
bcma code or new platform functions that access the same areas via MMIO.
This necessitated adding function pointers for both platform and bcma to
hide which backend is being used from the generic bgmac code.

Signed-off-by: default avatarJon Mason <jon.mason@broadcom.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Tested-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent db791eb2

drivers/net/ethernet/broadcom/Kconfig

+22 −1
Original line number Diff line number Diff line
@@ -140,10 +140,18 @@ config BNX2X_SRIOV 
	  allows for virtual function acceleration in virtual environments.



config BGMAC

	tristate "BCMA bus GBit core support"

	tristate

	help

	  This enables the integrated ethernet controller support for many

	  Broadcom (mostly iProc) SoCs. An appropriate bus interface driver

	  needs to be enabled to select this.



config BGMAC_BCMA

	tristate "Broadcom iProc GBit BCMA support"

	depends on BCMA && BCMA_HOST_SOC

	depends on HAS_DMA

	depends on BCM47XX || ARCH_BCM_5301X || COMPILE_TEST

	select BGMAC

	select PHYLIB

	select FIXED_PHY

	---help---
@@ -152,6 +160,19 @@ config BGMAC 
	  In case of using this driver on BCM4706 it's also requires to enable

	  BCMA_DRIVER_GMAC_CMN to make it work.



config BGMAC_PLATFORM

	tristate "Broadcom iProc GBit platform support"

	depends on HAS_DMA

	depends on ARCH_BCM_IPROC || COMPILE_TEST

	depends on OF

	select BGMAC

	select PHYLIB

	select FIXED_PHY

	default ARCH_BCM_IPROC

	---help---

	  Say Y here if you want to use the Broadcom iProc Gigabit Ethernet

	  controller through the generic platform interface



config SYSTEMPORT

	tristate "Broadcom SYSTEMPORT internal MAC support"

	depends on OF

drivers/net/ethernet/broadcom/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ obj-$(CONFIG_CNIC) += cnic.o 
obj-$(CONFIG_BNX2X) += bnx2x/

obj-$(CONFIG_SB1250_MAC) += sb1250-mac.o

obj-$(CONFIG_TIGON3) += tg3.o

obj-$(CONFIG_BGMAC) += bgmac.o bgmac-bcma-mdio.o

obj-$(CONFIG_BGMAC) += bgmac.o

obj-$(CONFIG_BGMAC_BCMA) += bgmac-bcma.o bgmac-bcma-mdio.o

obj-$(CONFIG_BGMAC_PLATFORM) += bgmac-platform.o

obj-$(CONFIG_SYSTEMPORT) += bcmsysport.o

obj-$(CONFIG_BNXT) += bnxt/

drivers/net/ethernet/broadcom/bgmac-bcma-mdio.c

+2 −0
Original line number Diff line number Diff line
@@ -245,6 +245,7 @@ struct mii_bus *bcma_mdio_mii_register(struct bcma_device *core, u8 phyaddr) 
	kfree(bcma_mdio);

	return ERR_PTR(err);

}

EXPORT_SYMBOL_GPL(bcma_mdio_mii_register);



void bcma_mdio_mii_unregister(struct mii_bus *mii_bus)

{
@@ -259,6 +260,7 @@ void bcma_mdio_mii_unregister(struct mii_bus *mii_bus) 
	mdiobus_free(mii_bus);

	kfree(bcma_mdio);

}

EXPORT_SYMBOL_GPL(bcma_mdio_mii_unregister);



MODULE_AUTHOR("Rafał Miłecki");

MODULE_LICENSE("GPL");

drivers/net/ethernet/broadcom/bgmac-bcma.c

0 → 100644
+315 −0
Original line number Diff line number Diff line 
/*

 * Driver for (BCM4706)? GBit MAC core on BCMA bus.

 *

 * Copyright (C) 2012 Rafał Miłecki <zajec5@gmail.com>

 *

 * Licensed under the GNU/GPL. See COPYING for details.

 */



#define pr_fmt(fmt)		KBUILD_MODNAME ": " fmt



#include <linux/bcma/bcma.h>

#include <linux/brcmphy.h>

#include <linux/etherdevice.h>

#include "bgmac.h"



static inline bool bgmac_is_bcm4707_family(struct bcma_device *core)

{

	switch (core->bus->chipinfo.id) {

	case BCMA_CHIP_ID_BCM4707:

	case BCMA_CHIP_ID_BCM47094:

	case BCMA_CHIP_ID_BCM53018:

		return true;

	default:

		return false;

	}

}



/**************************************************

 * BCMA bus ops

 **************************************************/



static u32 bcma_bgmac_read(struct bgmac *bgmac, u16 offset)

{

	return bcma_read32(bgmac->bcma.core, offset);

}



static void bcma_bgmac_write(struct bgmac *bgmac, u16 offset, u32 value)

{

	bcma_write32(bgmac->bcma.core, offset, value);

}



static u32 bcma_bgmac_idm_read(struct bgmac *bgmac, u16 offset)

{

	return bcma_aread32(bgmac->bcma.core, offset);

}



static void bcma_bgmac_idm_write(struct bgmac *bgmac, u16 offset, u32 value)

{

	return bcma_awrite32(bgmac->bcma.core, offset, value);

}



static bool bcma_bgmac_clk_enabled(struct bgmac *bgmac)

{

	return bcma_core_is_enabled(bgmac->bcma.core);

}



static void bcma_bgmac_clk_enable(struct bgmac *bgmac, u32 flags)

{

	bcma_core_enable(bgmac->bcma.core, flags);

}



static void bcma_bgmac_cco_ctl_maskset(struct bgmac *bgmac, u32 offset,

				       u32 mask, u32 set)

{

	struct bcma_drv_cc *cc = &bgmac->bcma.core->bus->drv_cc;



	bcma_chipco_chipctl_maskset(cc, offset, mask, set);

}



static u32 bcma_bgmac_get_bus_clock(struct bgmac *bgmac)

{

	struct bcma_drv_cc *cc = &bgmac->bcma.core->bus->drv_cc;



	return bcma_pmu_get_bus_clock(cc);

}



static void bcma_bgmac_cmn_maskset32(struct bgmac *bgmac, u16 offset, u32 mask,

				     u32 set)

{

	bcma_maskset32(bgmac->bcma.cmn, offset, mask, set);

}



static const struct bcma_device_id bgmac_bcma_tbl[] = {

	BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_4706_MAC_GBIT,

		  BCMA_ANY_REV, BCMA_ANY_CLASS),

	BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_MAC_GBIT, BCMA_ANY_REV,

		  BCMA_ANY_CLASS),

	{},

};

MODULE_DEVICE_TABLE(bcma, bgmac_bcma_tbl);



/* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipattach */

static int bgmac_probe(struct bcma_device *core)

{

	struct ssb_sprom *sprom = &core->bus->sprom;

	struct mii_bus *mii_bus;

	struct bgmac *bgmac;

	u8 *mac;

	int err;



	bgmac = kzalloc(sizeof(*bgmac), GFP_KERNEL);

	if (!bgmac)

		return -ENOMEM;



	bgmac->bcma.core = core;

	bgmac->dev = &core->dev;

	bgmac->dma_dev = core->dma_dev;

	bgmac->irq = core->irq;



	bcma_set_drvdata(core, bgmac);



	switch (core->core_unit) {

	case 0:

		mac = sprom->et0mac;

		break;

	case 1:

		mac = sprom->et1mac;

		break;

	case 2:

		mac = sprom->et2mac;

		break;

	default:

		dev_err(bgmac->dev, "Unsupported core_unit %d\n",

			core->core_unit);

		err = -ENOTSUPP;

		goto err;

	}



	ether_addr_copy(bgmac->mac_addr, mac);



	/* On BCM4706 we need common core to access PHY */

	if (core->id.id == BCMA_CORE_4706_MAC_GBIT &&

	    !core->bus->drv_gmac_cmn.core) {

		dev_err(bgmac->dev, "GMAC CMN core not found (required for BCM4706)\n");

		err = -ENODEV;

		goto err;

	}

	bgmac->bcma.cmn = core->bus->drv_gmac_cmn.core;



	switch (core->core_unit) {

	case 0:

		bgmac->phyaddr = sprom->et0phyaddr;

		break;

	case 1:

		bgmac->phyaddr = sprom->et1phyaddr;

		break;

	case 2:

		bgmac->phyaddr = sprom->et2phyaddr;

		break;

	}

	bgmac->phyaddr &= BGMAC_PHY_MASK;

	if (bgmac->phyaddr == BGMAC_PHY_MASK) {

		dev_err(bgmac->dev, "No PHY found\n");

		err = -ENODEV;

		goto err;

	}

	dev_info(bgmac->dev, "Found PHY addr: %d%s\n", bgmac->phyaddr,

		 bgmac->phyaddr == BGMAC_PHY_NOREGS ? " (NOREGS)" : "");



	if (!bgmac_is_bcm4707_family(core)) {

		mii_bus = bcma_mdio_mii_register(core, bgmac->phyaddr);

		if (!IS_ERR(mii_bus)) {

			err = PTR_ERR(mii_bus);

			goto err;

		}



		bgmac->mii_bus = mii_bus;

	}



	if (core->bus->hosttype == BCMA_HOSTTYPE_PCI) {

		dev_err(bgmac->dev, "PCI setup not implemented\n");

		err = -ENOTSUPP;

		goto err1;

	}



	bgmac->has_robosw = !!(core->bus->sprom.boardflags_lo &

			       BGMAC_BFL_ENETROBO);

	if (bgmac->has_robosw)

		dev_warn(bgmac->dev, "Support for Roboswitch not implemented\n");



	if (core->bus->sprom.boardflags_lo & BGMAC_BFL_ENETADM)

		dev_warn(bgmac->dev, "Support for ADMtek ethernet switch not implemented\n");



	/* Feature Flags */

	switch (core->bus->chipinfo.id) {

	case BCMA_CHIP_ID_BCM5357:

		bgmac->feature_flags |= BGMAC_FEAT_SET_RXQ_CLK;

		bgmac->feature_flags |= BGMAC_FEAT_CLKCTLST;

		bgmac->feature_flags |= BGMAC_FEAT_FLW_CTRL1;

		bgmac->feature_flags |= BGMAC_FEAT_SW_TYPE_PHY;

		if (core->bus->chipinfo.pkg == BCMA_PKG_ID_BCM47186) {

			bgmac->feature_flags |= BGMAC_FEAT_IOST_ATTACHED;

			bgmac->feature_flags |= BGMAC_FEAT_SW_TYPE_RGMII;

		}

		if (core->bus->chipinfo.pkg == BCMA_PKG_ID_BCM5358)

			bgmac->feature_flags |= BGMAC_FEAT_SW_TYPE_EPHYRMII;

		break;

	case BCMA_CHIP_ID_BCM53572:

		bgmac->feature_flags |= BGMAC_FEAT_SET_RXQ_CLK;

		bgmac->feature_flags |= BGMAC_FEAT_CLKCTLST;

		bgmac->feature_flags |= BGMAC_FEAT_FLW_CTRL1;

		bgmac->feature_flags |= BGMAC_FEAT_SW_TYPE_PHY;

		if (core->bus->chipinfo.pkg == BCMA_PKG_ID_BCM47188) {

			bgmac->feature_flags |= BGMAC_FEAT_SW_TYPE_RGMII;

			bgmac->feature_flags |= BGMAC_FEAT_IOST_ATTACHED;

		}

		break;

	case BCMA_CHIP_ID_BCM4749:

		bgmac->feature_flags |= BGMAC_FEAT_SET_RXQ_CLK;

		bgmac->feature_flags |= BGMAC_FEAT_CLKCTLST;

		bgmac->feature_flags |= BGMAC_FEAT_FLW_CTRL1;

		bgmac->feature_flags |= BGMAC_FEAT_SW_TYPE_PHY;

		if (core->bus->chipinfo.pkg == 10) {

			bgmac->feature_flags |= BGMAC_FEAT_SW_TYPE_RGMII;

			bgmac->feature_flags |= BGMAC_FEAT_IOST_ATTACHED;

		}

		break;

	case BCMA_CHIP_ID_BCM4716:

		bgmac->feature_flags |= BGMAC_FEAT_CLKCTLST;

		/* fallthrough */

	case BCMA_CHIP_ID_BCM47162:

		bgmac->feature_flags |= BGMAC_FEAT_FLW_CTRL2;

		bgmac->feature_flags |= BGMAC_FEAT_SET_RXQ_CLK;

		break;

	/* bcm4707_family */

	case BCMA_CHIP_ID_BCM4707:

	case BCMA_CHIP_ID_BCM47094:

	case BCMA_CHIP_ID_BCM53018:

		bgmac->feature_flags |= BGMAC_FEAT_CLKCTLST;

		bgmac->feature_flags |= BGMAC_FEAT_NO_RESET;

		bgmac->feature_flags |= BGMAC_FEAT_FORCE_SPEED_2500;

		break;

	default:

		bgmac->feature_flags |= BGMAC_FEAT_CLKCTLST;

		bgmac->feature_flags |= BGMAC_FEAT_SET_RXQ_CLK;

	}



	if (!bgmac_is_bcm4707_family(core) && core->id.rev > 2)

		bgmac->feature_flags |= BGMAC_FEAT_MISC_PLL_REQ;



	if (core->id.id == BCMA_CORE_4706_MAC_GBIT) {

		bgmac->feature_flags |= BGMAC_FEAT_CMN_PHY_CTL;

		bgmac->feature_flags |= BGMAC_FEAT_NO_CLR_MIB;

	}



	if (core->id.rev >= 4) {

		bgmac->feature_flags |= BGMAC_FEAT_CMDCFG_SR_REV4;

		bgmac->feature_flags |= BGMAC_FEAT_TX_MASK_SETUP;

		bgmac->feature_flags |= BGMAC_FEAT_RX_MASK_SETUP;

	}



	bgmac->read = bcma_bgmac_read;

	bgmac->write = bcma_bgmac_write;

	bgmac->idm_read = bcma_bgmac_idm_read;

	bgmac->idm_write = bcma_bgmac_idm_write;

	bgmac->clk_enabled = bcma_bgmac_clk_enabled;

	bgmac->clk_enable = bcma_bgmac_clk_enable;

	bgmac->cco_ctl_maskset = bcma_bgmac_cco_ctl_maskset;

	bgmac->get_bus_clock = bcma_bgmac_get_bus_clock;

	bgmac->cmn_maskset32 = bcma_bgmac_cmn_maskset32;



	err = bgmac_enet_probe(bgmac);

	if (err)

		goto err1;



	return 0;



err1:

	bcma_mdio_mii_unregister(bgmac->mii_bus);

err:

	kfree(bgmac);

	bcma_set_drvdata(core, NULL);



	return err;

}



static void bgmac_remove(struct bcma_device *core)

{

	struct bgmac *bgmac = bcma_get_drvdata(core);



	bcma_mdio_mii_unregister(bgmac->mii_bus);

	bgmac_enet_remove(bgmac);

	bcma_set_drvdata(core, NULL);

	kfree(bgmac);

}



static struct bcma_driver bgmac_bcma_driver = {

	.name		= KBUILD_MODNAME,

	.id_table	= bgmac_bcma_tbl,

	.probe		= bgmac_probe,

	.remove		= bgmac_remove,

};



static int __init bgmac_init(void)

{

	int err;



	err = bcma_driver_register(&bgmac_bcma_driver);

	if (err)

		return err;

	pr_info("Broadcom 47xx GBit MAC driver loaded\n");



	return 0;

}



static void __exit bgmac_exit(void)

{

	bcma_driver_unregister(&bgmac_bcma_driver);

}



module_init(bgmac_init)

module_exit(bgmac_exit)



MODULE_AUTHOR("Rafał Miłecki");

MODULE_LICENSE("GPL");

drivers/net/ethernet/broadcom/bgmac-platform.c

0 → 100644
+189 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 Broadcom

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License as

 * published by the Free Software Foundation version 2.

 *

 * This program is distributed "as is" WITHOUT ANY WARRANTY of any

 * kind, whether express or implied; without even the implied warranty

 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#define pr_fmt(fmt)		KBUILD_MODNAME ": " fmt



#include <linux/bcma/bcma.h>

#include <linux/etherdevice.h>

#include <linux/of_address.h>

#include <linux/of_net.h>

#include "bgmac.h"



static u32 platform_bgmac_read(struct bgmac *bgmac, u16 offset)

{

	return readl(bgmac->plat.base + offset);

}



static void platform_bgmac_write(struct bgmac *bgmac, u16 offset, u32 value)

{

	writel(value, bgmac->plat.base + offset);

}



static u32 platform_bgmac_idm_read(struct bgmac *bgmac, u16 offset)

{

	return readl(bgmac->plat.idm_base + offset);

}



static void platform_bgmac_idm_write(struct bgmac *bgmac, u16 offset, u32 value)

{

	return writel(value, bgmac->plat.idm_base + offset);

}



static bool platform_bgmac_clk_enabled(struct bgmac *bgmac)

{

	if ((bgmac_idm_read(bgmac, BCMA_IOCTL) &

	     (BCMA_IOCTL_CLK | BCMA_IOCTL_FGC)) != BCMA_IOCTL_CLK)

		return false;

	if (bgmac_idm_read(bgmac, BCMA_RESET_CTL) & BCMA_RESET_CTL_RESET)

		return false;

	return true;

}



static void platform_bgmac_clk_enable(struct bgmac *bgmac, u32 flags)

{

	bgmac_idm_write(bgmac, BCMA_IOCTL,

			(BCMA_IOCTL_CLK | BCMA_IOCTL_FGC | flags));

	bgmac_idm_read(bgmac, BCMA_IOCTL);



	bgmac_idm_write(bgmac, BCMA_RESET_CTL, 0);

	bgmac_idm_read(bgmac, BCMA_RESET_CTL);

	udelay(1);



	bgmac_idm_write(bgmac, BCMA_IOCTL, (BCMA_IOCTL_CLK | flags));

	bgmac_idm_read(bgmac, BCMA_IOCTL);

	udelay(1);

}



static void platform_bgmac_cco_ctl_maskset(struct bgmac *bgmac, u32 offset,

					   u32 mask, u32 set)

{

	/* This shouldn't be encountered */

	WARN_ON(1);

}



static u32 platform_bgmac_get_bus_clock(struct bgmac *bgmac)

{

	/* This shouldn't be encountered */

	WARN_ON(1);



	return 0;

}



static void platform_bgmac_cmn_maskset32(struct bgmac *bgmac, u16 offset,

					 u32 mask, u32 set)

{

	/* This shouldn't be encountered */

	WARN_ON(1);

}



static int bgmac_probe(struct platform_device *pdev)

{

	struct device_node *np = pdev->dev.of_node;

	struct bgmac *bgmac;

	struct resource *regs;

	const u8 *mac_addr;



	bgmac = devm_kzalloc(&pdev->dev, sizeof(*bgmac), GFP_KERNEL);

	if (!bgmac)

		return -ENOMEM;



	platform_set_drvdata(pdev, bgmac);



	/* Set the features of the 4707 family */

	bgmac->feature_flags |= BGMAC_FEAT_CLKCTLST;

	bgmac->feature_flags |= BGMAC_FEAT_NO_RESET;

	bgmac->feature_flags |= BGMAC_FEAT_FORCE_SPEED_2500;

	bgmac->feature_flags |= BGMAC_FEAT_CMDCFG_SR_REV4;

	bgmac->feature_flags |= BGMAC_FEAT_TX_MASK_SETUP;

	bgmac->feature_flags |= BGMAC_FEAT_RX_MASK_SETUP;



	bgmac->dev = &pdev->dev;

	bgmac->dma_dev = &pdev->dev;



	mac_addr = of_get_mac_address(np);

	if (mac_addr)

		ether_addr_copy(bgmac->mac_addr, mac_addr);

	else

		dev_warn(&pdev->dev, "MAC address not present in device tree\n");



	bgmac->irq = platform_get_irq(pdev, 0);

	if (bgmac->irq < 0) {

		dev_err(&pdev->dev, "Unable to obtain IRQ\n");

		return bgmac->irq;

	}



	regs = platform_get_resource_byname(pdev, IORESOURCE_MEM, "amac_base");

	if (!regs) {

		dev_err(&pdev->dev, "Unable to obtain base resource\n");

		return -EINVAL;

	}



	bgmac->plat.base = devm_ioremap_resource(&pdev->dev, regs);

	if (IS_ERR(bgmac->plat.base)) {

		dev_err(&pdev->dev, "Unable to map base resource\n");

		return PTR_ERR(bgmac->plat.base);

	}



	regs = platform_get_resource_byname(pdev, IORESOURCE_MEM, "idm_base");

	if (!regs) {

		dev_err(&pdev->dev, "Unable to obtain idm resource\n");

		return -EINVAL;

	}



	bgmac->plat.idm_base = devm_ioremap_resource(&pdev->dev, regs);

	if (!bgmac->plat.idm_base) {

		dev_err(&pdev->dev, "Unable to map idm resource\n");

		return PTR_ERR(bgmac->plat.idm_base);

	}



	bgmac->read = platform_bgmac_read;

	bgmac->write = platform_bgmac_write;

	bgmac->idm_read = platform_bgmac_idm_read;

	bgmac->idm_write = platform_bgmac_idm_write;

	bgmac->clk_enabled = platform_bgmac_clk_enabled;

	bgmac->clk_enable = platform_bgmac_clk_enable;

	bgmac->cco_ctl_maskset = platform_bgmac_cco_ctl_maskset;

	bgmac->get_bus_clock = platform_bgmac_get_bus_clock;

	bgmac->cmn_maskset32 = platform_bgmac_cmn_maskset32;



	return bgmac_enet_probe(bgmac);

}



static int bgmac_remove(struct platform_device *pdev)

{

	struct bgmac *bgmac = platform_get_drvdata(pdev);



	bgmac_enet_remove(bgmac);



	return 0;

}



static const struct of_device_id bgmac_of_enet_match[] = {

	{.compatible = "brcm,amac",},

	{.compatible = "brcm,nsp-amac",},

	{},

};



MODULE_DEVICE_TABLE(of, bgmac_of_enet_match);



static struct platform_driver bgmac_enet_driver = {

	.driver = {

		.name  = "bgmac-enet",

		.of_match_table = bgmac_of_enet_match,

	},

	.probe = bgmac_probe,

	.remove = bgmac_remove,

};



module_platform_driver(bgmac_enet_driver);

MODULE_LICENSE("GPL");