mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

drivers: net: xgene-v2: Add MDIO support 

Added phy management support by using phy abstraction layer APIs.

Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Iyappan Subramanian 2017-03-21 18:18:02 -07:00 committed by David S. Miller
parent 9bdf64d511
commit ea8ab16ab2
6 changed files with 182 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/apm/xgene-v2/Makefile
View File

@ -2,5 +2,5 @@
# Makefile for APM X-Gene Ethernet v2 driver
#
xgene-enet-v2-objs := main.o mac.o enet.o ring.o
xgene-enet-v2-objs := main.o mac.o enet.o ring.o mdio.o
obj-$(CONFIG_NET_XGENE_V2) += xgene-enet-v2.o

2
drivers/net/ethernet/apm/xgene-v2/mac.c
View File

@ -27,7 +27,7 @@ void xge_mac_reset(struct xge_pdata *pdata)
xge_wr_csr(pdata, MAC_CONFIG_1, 0);
}
static void xge_mac_set_speed(struct xge_pdata *pdata)
void xge_mac_set_speed(struct xge_pdata *pdata)
{
u32 icm0, icm2, ecm0, mc2;
u32 intf_ctrl, rgmii;

1
drivers/net/ethernet/apm/xgene-v2/mac.h
View File

@ -101,6 +101,7 @@ static inline u32 xgene_get_reg_bits(u32 var, int pos, int len)
struct xge_pdata;
void xge_mac_reset(struct xge_pdata *pdata);
void xge_mac_set_speed(struct xge_pdata *pdata);
void xge_mac_enable(struct xge_pdata *pdata);
void xge_mac_disable(struct xge_pdata *pdata);
void xge_mac_init(struct xge_pdata *pdata);

11
drivers/net/ethernet/apm/xgene-v2/main.c
View File

@ -500,9 +500,10 @@ static int xge_open(struct net_device *ndev)
xge_intr_enable(pdata);
xge_wr_csr(pdata, DMARXCTRL, 1);
phy_start(ndev->phydev);
xge_mac_enable(pdata);
netif_start_queue(ndev);
netif_carrier_on(ndev);
return 0;
}
@ -511,9 +512,9 @@ static int xge_close(struct net_device *ndev)
{
struct xge_pdata *pdata = netdev_priv(ndev);
netif_carrier_off(ndev);
netif_stop_queue(ndev);
xge_mac_disable(pdata);
phy_stop(ndev->phydev);
xge_intr_disable(pdata);
xge_free_irq(ndev);
@ -683,9 +684,12 @@ static int xge_probe(struct platform_device *pdev)
if (ret)
goto err;
ret = xge_mdio_config(ndev);
if (ret)
goto err;
netif_napi_add(ndev, &pdata->napi, xge_napi, NAPI_POLL_WEIGHT);
netif_carrier_off(ndev);
ret = register_netdev(ndev);
if (ret) {
netdev_err(ndev, "Failed to register netdev\n");
@ -713,6 +717,7 @@ static int xge_remove(struct platform_device *pdev)
dev_close(ndev);
rtnl_unlock();
xge_mdio_remove(ndev);
unregister_netdev(ndev);
free_netdev(ndev);

4
drivers/net/ethernet/apm/xgene-v2/main.h
View File

@ -65,6 +65,7 @@ struct xge_pdata {
struct xge_desc_ring *rx_ring;
struct platform_device *pdev;
char irq_name[IRQ_ID_SIZE];
struct mii_bus *mdio_bus;
struct net_device *ndev;
struct napi_struct napi;
struct xge_stats stats;
@ -72,4 +73,7 @@ struct xge_pdata {
u8 nbufs;
};
int xge_mdio_config(struct net_device *ndev);
void xge_mdio_remove(struct net_device *ndev);
#endif /* __XGENE_ENET_V2_MAIN_H__ */

167
drivers/net/ethernet/apm/xgene-v2/mdio.c Normal file
View File

@ -0,0 +1,167 @@
/*
* Applied Micro X-Gene SoC Ethernet v2 Driver
*
* Copyright (c) 2017, Applied Micro Circuits Corporation
* Author(s): Iyappan Subramanian <isubramanian@apm.com>
* Keyur Chudgar <kchudgar@apm.com>
*
* 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; either version 2 of the License, or (at your
* option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "main.h"
static int xge_mdio_write(struct mii_bus *bus, int phy_id, int reg, u16 data)
{
struct xge_pdata *pdata = bus->priv;
u32 done, val = 0;
u8 wait = 10;
SET_REG_BITS(&val, PHY_ADDR, phy_id);
SET_REG_BITS(&val, REG_ADDR, reg);
xge_wr_csr(pdata, MII_MGMT_ADDRESS, val);
xge_wr_csr(pdata, MII_MGMT_CONTROL, data);
do {
usleep_range(5, 10);
done = xge_rd_csr(pdata, MII_MGMT_INDICATORS);
} while ((done & MII_MGMT_BUSY) && wait--);
if (done & MII_MGMT_BUSY) {
dev_err(&bus->dev, "MII_MGMT write failed\n");
return -ETIMEDOUT;
}
return 0;
}
static int xge_mdio_read(struct mii_bus *bus, int phy_id, int reg)
{
struct xge_pdata *pdata = bus->priv;
u32 data, done, val = 0;
u8 wait = 10;
SET_REG_BITS(&val, PHY_ADDR, phy_id);
SET_REG_BITS(&val, REG_ADDR, reg);
xge_wr_csr(pdata, MII_MGMT_ADDRESS, val);
xge_wr_csr(pdata, MII_MGMT_COMMAND, MII_READ_CYCLE);
do {
usleep_range(5, 10);
done = xge_rd_csr(pdata, MII_MGMT_INDICATORS);
} while ((done & MII_MGMT_BUSY) && wait--);
if (done & MII_MGMT_BUSY) {
dev_err(&bus->dev, "MII_MGMT read failed\n");
return -ETIMEDOUT;
}
data = xge_rd_csr(pdata, MII_MGMT_STATUS);
xge_wr_csr(pdata, MII_MGMT_COMMAND, 0);
return data;
}
static void xge_adjust_link(struct net_device *ndev)
{
struct xge_pdata *pdata = netdev_priv(ndev);
struct phy_device *phydev = ndev->phydev;
if (phydev->link) {
if (pdata->phy_speed != phydev->speed) {
pdata->phy_speed = phydev->speed;
xge_mac_set_speed(pdata);
xge_mac_enable(pdata);
phy_print_status(phydev);
}
} else {
if (pdata->phy_speed != SPEED_UNKNOWN) {
pdata->phy_speed = SPEED_UNKNOWN;
xge_mac_disable(pdata);
phy_print_status(phydev);
}
}
}
void xge_mdio_remove(struct net_device *ndev)
{
struct xge_pdata *pdata = netdev_priv(ndev);
struct mii_bus *mdio_bus = pdata->mdio_bus;
if (ndev->phydev)
phy_disconnect(ndev->phydev);
if (mdio_bus->state == MDIOBUS_REGISTERED)
mdiobus_unregister(mdio_bus);
mdiobus_free(mdio_bus);
}
int xge_mdio_config(struct net_device *ndev)
{
struct xge_pdata *pdata = netdev_priv(ndev);
struct device *dev = &pdata->pdev->dev;
struct mii_bus *mdio_bus;
struct phy_device *phydev;
int ret;
mdio_bus = mdiobus_alloc();
if (!mdio_bus)
return -ENOMEM;
mdio_bus->name = "APM X-Gene Ethernet (v2) MDIO Bus";
mdio_bus->read = xge_mdio_read;
mdio_bus->write = xge_mdio_write;
mdio_bus->priv = pdata;
mdio_bus->parent = dev;
snprintf(mdio_bus->id, MII_BUS_ID_SIZE, "%s-mii", dev_name(dev));
pdata->mdio_bus = mdio_bus;
mdio_bus->phy_mask = 0x1;
ret = mdiobus_register(mdio_bus);
if (ret)
goto err;
phydev = phy_find_first(mdio_bus);
if (!phydev) {
dev_err(dev, "no PHY found\n");
goto err;
}
phydev = phy_connect(ndev, phydev_name(phydev),
&xge_adjust_link,
pdata->resources.phy_mode);
if (IS_ERR(phydev)) {
netdev_err(ndev, "Could not attach to PHY\n");
ret = PTR_ERR(phydev);
goto err;
}
phydev->supported &= ~(SUPPORTED_10baseT_Half |
SUPPORTED_10baseT_Full |
SUPPORTED_100baseT_Half |
SUPPORTED_100baseT_Full |
SUPPORTED_1000baseT_Half |
SUPPORTED_AUI |
SUPPORTED_MII |
SUPPORTED_FIBRE |
SUPPORTED_BNC);
phydev->advertising = phydev->supported;
pdata->phy_speed = SPEED_UNKNOWN;
return 0;
err:
xge_mdio_remove(ndev);
return ret;
}