| Message ID | 1470735283-23611-4-git-send-email-appanad@xilinx.com |
|---|---|
| State | RFC, archived |
| Delegated to: | David Miller |
| Headers | show |
On 08/09/2016 02:34 AM, Kedareswara rao Appana wrote: > This patch adds support for gmiitorgmii converter. > > The GMII to RGMII IP core provides the Reduced Gigabit Media > Independent Interface (RGMII) between Ethernet physical media > Devices and the Gigabit Ethernet controller. This core can > Switch dynamically between the three different speed modes of > Operation by configuring the converter register through mdio write. > > MDIO interface is used to set operating speed of Ethernet MAC. > > This converter sits between the MAC and the external phy > MAC <==> GMII2RGMII <==> RGMII_PHY This looks good, just a few things, see below: > > Signed-off-by: Kedareswara rao Appana <appanad@xilinx.com> > --- > Thanks a lot Andrew for your inputs. > Changes for v5: > --> Fixed return values in the probe as suggested by punnaiah. > --> Added a mask for the converter speed as suggested by punnaiah. > Changes for v4: > --> Updated phydev speed for all 3 speeds as suggested by zhuyj. > Changes for v3: > --> Updated the driver as suggested by Andrew. > Changes for v2: > --> Passed struct xphy pointer directly to the fix_mac_speed > API as suggested by the Florian. > --> Added checks for the phy-node fail case as suggested > by the Florian > > drivers/net/phy/Kconfig | 8 +++ > drivers/net/phy/Makefile | 1 + > drivers/net/phy/xilinx_gmii2rgmii.c | 121 ++++++++++++++++++++++++++++++++++++ > 3 files changed, 130 insertions(+) > create mode 100644 drivers/net/phy/xilinx_gmii2rgmii.c > > diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig > index 1b534ea..c79f347 100644 > --- a/drivers/net/phy/Kconfig > +++ b/drivers/net/phy/Kconfig > @@ -312,6 +312,14 @@ config MICROSEMI_PHY > ---help--- > Currently supports the VSC8531 and VSC8541 PHYs > > +config XILINX_GMII2RGMII > + tristate "Xilinx GMII2RGMII converter driver" > + default y Don't force that, or at least make the default based on the potential users/drivers here. > + ---help--- > + This driver support xilinx GMII to RGMII IP core it provides > + the Reduced Gigabit Media Independent Interface(RGMII) between > + Ethernet physical media devices and the Gigabit Ethernet controller. > + > endif # PHYLIB > > config MICREL_KS8995MA > diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile > index a713bd4..73d65ce 100644 > --- a/drivers/net/phy/Makefile > +++ b/drivers/net/phy/Makefile > @@ -50,3 +50,4 @@ obj-$(CONFIG_MDIO_BCM_IPROC) += mdio-bcm-iproc.o > obj-$(CONFIG_INTEL_XWAY_PHY) += intel-xway.o > obj-$(CONFIG_MDIO_HISI_FEMAC) += mdio-hisi-femac.o > obj-$(CONFIG_MDIO_XGENE) += mdio-xgene.o > +obj-$(CONFIG_XILINX_GMII2RGMII) += xilinx_gmii2rgmii.o > diff --git a/drivers/net/phy/xilinx_gmii2rgmii.c b/drivers/net/phy/xilinx_gmii2rgmii.c > new file mode 100644 > index 0000000..1456e27 > --- /dev/null > +++ b/drivers/net/phy/xilinx_gmii2rgmii.c > @@ -0,0 +1,121 @@ > +/* Xilinx GMII2RGMII Converter driver > + * > + * Copyright (C) 2016 Xilinx, Inc. > + * > + * Author: Kedareswara rao Appana <appanad@xilinx.com> > + * > + * Description: > + * This driver is developed for Xilinx GMII2RGMII Converter > + * > + * 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. > + */ > +#include <linux/module.h> > +#include <linux/kernel.h> > +#include <linux/mii.h> > +#include <linux/mdio.h> > +#include <linux/phy.h> > +#include <linux/of_mdio.h> > + > +#define XILINX_GMII2RGMII_REG 0x10 > +#define XILINX_GMII2RGMII_SPEED_MASK 0x2040 BMCR_SPEED1000 | BMCR_SPEED100 would be clearer here. > + > +struct gmii2rgmii { > + struct phy_device *phy_dev; > + struct phy_driver *phy_drv; > + struct phy_driver conv_phy_drv; > + int addr; > +}; > + > +static int xgmiitorgmii_read_status(struct phy_device *phydev) > +{ > + struct gmii2rgmii *priv = (struct gmii2rgmii *)phydev->priv; Casting is not required here, priv is void *. > + u16 val = 0; > + > + priv->phy_drv->read_status(phydev); > + > + val = mdiobus_read(phydev->mdio.bus, priv->addr, XILINX_GMII2RGMII_REG); > + val &= XILINX_GMII2RGMII_SPEED_MASK; > + > + switch (phydev->speed) { > + case SPEED_1000: > + val |= BMCR_SPEED1000; Is the fall through really intentional here? See genphy_setup_forced() for instance. > + case SPEED_100: > + val |= BMCR_SPEED100; > + case SPEED_10: > + val |= BMCR_SPEED10; > + } > + > + mdiobus_write(phydev->mdio.bus, priv->addr, XILINX_GMII2RGMII_REG, val); > + > + return 0; > +} [snip] > +static int __init xgmiitorgmii_init(void) > +{ > + return mdio_driver_register(&xgmiitorgmii_driver); > +} > +module_init(xgmiitorgmii_init); > + > +static void __exit xgmiitorgmii_cleanup(void) > +{ > + mdio_driver_unregister(&xgmiitorgmii_driver); > +} > +module_exit(xgmiitorgmii_cleanup); mdio_module_driver() does eliminate a bit of this boilerplate code.
Hi Florian, Thanks for the review... > > > > This converter sits between the MAC and the external phy MAC <==> > > GMII2RGMII <==> RGMII_PHY > > This looks good, just a few things, see below: Thanks... > > +config XILINX_GMII2RGMII > > + tristate "Xilinx GMII2RGMII converter driver" > > + default y > > Don't force that, or at least make the default based on the potential > users/drivers here. Ok sure will fix in the next version... > > > + ---help--- > > + This driver support xilinx GMII to RGMII IP core it provides > > + the Reduced Gigabit Media Independent Interface(RGMII) between > > + Ethernet physical media devices and the Gigabit Ethernet controller. > > + > > endif # PHYLIB <snip> > > +#define XILINX_GMII2RGMII_REG 0x10 > > +#define XILINX_GMII2RGMII_SPEED_MASK 0x2040 > > BMCR_SPEED1000 | BMCR_SPEED100 would be clearer here. Sure will fix... > > > + > > +struct gmii2rgmii { > > + struct phy_device *phy_dev; > > + struct phy_driver *phy_drv; > > + struct phy_driver conv_phy_drv; > > + int addr; > > +}; > > + > > +static int xgmiitorgmii_read_status(struct phy_device *phydev) { > > + struct gmii2rgmii *priv = (struct gmii2rgmii *)phydev->priv; > > Casting is not required here, priv is void *. Ok will remove... > > > + u16 val = 0; > > + > > + priv->phy_drv->read_status(phydev); > > + > > + val = mdiobus_read(phydev->mdio.bus, priv->addr, > XILINX_GMII2RGMII_REG); > > + val &= XILINX_GMII2RGMII_SPEED_MASK; > > + > > + switch (phydev->speed) { > > + case SPEED_1000: > > + val |= BMCR_SPEED1000; > > Is the fall through really intentional here? See genphy_setup_forced() for > instance. Ok will fix... > > > + case SPEED_100: > > + val |= BMCR_SPEED100; > > + case SPEED_10: > > + val |= BMCR_SPEED10; > > + } > > + > > + mdiobus_write(phydev->mdio.bus, priv->addr, > XILINX_GMII2RGMII_REG, > > +val); > > + > > + return 0; > > +} > [snip] > > > +static int __init xgmiitorgmii_init(void) { > > + return mdio_driver_register(&xgmiitorgmii_driver); > > +} > > +module_init(xgmiitorgmii_init); > > + > > +static void __exit xgmiitorgmii_cleanup(void) { > > + mdio_driver_unregister(&xgmiitorgmii_driver); > > +} > > +module_exit(xgmiitorgmii_cleanup); > > mdio_module_driver() does eliminate a bit of this boilerplate code. Sure will fix in the next version... Regards, Kedar. > -- > Florian
> Signed-off-by: Kedareswara rao Appana <appanad@xilinx.com> > --- > Thanks a lot Andrew for your inputs. > Changes for v5: > --> Fixed return values in the probe as suggested by punnaiah. > --> Added a mask for the converter speed as suggested by punnaiah. > +/* Xilinx GMII2RGMII Converter driver > + * > + * Copyright (C) 2016 Xilinx, Inc. > + * > + * Author: Kedareswara rao Appana <appanad@xilinx.com> Not cool https://github.com/lunn/linux/commit/03d375489ceb56e171056f44d0fe9c34ca5a098e Notice the Not-Signed-off-by: Andrew Lunn <andrew@lunn.ch> and the Copyright i added? In various emails i gave you the basic idea how this should be done, a framework of code, and then took your code which did not even compile and made the core of it work. This is as much my code as your code, so i expect my Copyright to be kept on this code. And since this is my code, i need to give a Signed-off-by, which i was not yet ready to give since the code was not complete or working. Please put both my Copyright back and Not-Signed-Off-by back and post the next version as RFC. Once i'm happy this code is O.K, i will give you a Signed-off-by. Andrew
Hi Andrew, > > > Signed-off-by: Kedareswara rao Appana <appanad@xilinx.com> > > --- > > Thanks a lot Andrew for your inputs. > > Changes for v5: > > --> Fixed return values in the probe as suggested by punnaiah. > > --> Added a mask for the converter speed as suggested by punnaiah. > > +/* Xilinx GMII2RGMII Converter driver > > + * > > + * Copyright (C) 2016 Xilinx, Inc. > > + * > > + * Author: Kedareswara rao Appana <appanad@xilinx.com> > > Not cool > > https://github.com/lunn/linux/commit/03d375489ceb56e171056f44d0fe9c34ca > 5a098e > > Notice the > > Not-Signed-off-by: Andrew Lunn <andrew@lunn.ch> > > and the Copyright i added? > > In various emails i gave you the basic idea how this should be done, a framework > of code, and then took your code which did not even compile and made the core > of it work. This is as much my code as your code, so i expect my Copyright to be > kept on this code. And since this is my code, i need to give a Signed-off-by, > which i was not yet ready to give since the code was not complete or working. > > Please put both my Copyright back and Not-Signed-Off-by back and post the > next version as RFC. Once i'm happy this code is O.K, i will give you a Signed-off- > by. Sorry I should have been included your copyright. I missed it... I didn't included your SOF because. AFAIK without explicit permission of the other person we shouldn't include SOF. That's why I didn't included your SOF and thanked for your efforts after SOF. Sorry if my understanding is wrong. There are few comments for this patch series and I fixed it and sent the v6 version. V6 version of patch series already got merged on the net-next. Sent the patch by updating the driver with your copy right "net: phy: Update copyright info". Sorry for the noise will fix these type of issues next time onwards... Regards, Kedar.
> > https://github.com/lunn/linux/commit/03d375489ceb56e171056f44d0fe9c34ca > > 5a098e > > > > Notice the > > > > Not-Signed-off-by: Andrew Lunn <andrew@lunn.ch> > > > > and the Copyright i added? > > > > In various emails i gave you the basic idea how this should be done, a framework > > of code, and then took your code which did not even compile and made the core > > of it work. This is as much my code as your code, so i expect my Copyright to be > > kept on this code. And since this is my code, i need to give a Signed-off-by, > > which i was not yet ready to give since the code was not complete or working. > > > > Please put both my Copyright back and Not-Signed-Off-by back and post the > > next version as RFC. Once i'm happy this code is O.K, i will give you a Signed-off- > > by. > > Sorry I should have been included your copyright. > > I missed it... > I didn't included your SOF because. > AFAIK without explicit permission of the other person we shouldn't include SOF. > That's why I didn't included your SOF and thanked for your efforts after SOF. > Sorry if my understanding is wrong. Without a SOB you cannot submit the patch for inclusion at all. You should however reproduce tags which have been given, i.e. you should of kept my Not-Signed-Off-by: making it clear i have not yet given permission for this code to go into mainline. Andrew
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig index 1b534ea..c79f347 100644 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig @@ -312,6 +312,14 @@ config MICROSEMI_PHY ---help--- Currently supports the VSC8531 and VSC8541 PHYs +config XILINX_GMII2RGMII + tristate "Xilinx GMII2RGMII converter driver" + default y + ---help--- + This driver support xilinx GMII to RGMII IP core it provides + the Reduced Gigabit Media Independent Interface(RGMII) between + Ethernet physical media devices and the Gigabit Ethernet controller. + endif # PHYLIB config MICREL_KS8995MA diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile index a713bd4..73d65ce 100644 --- a/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile @@ -50,3 +50,4 @@ obj-$(CONFIG_MDIO_BCM_IPROC) += mdio-bcm-iproc.o obj-$(CONFIG_INTEL_XWAY_PHY) += intel-xway.o obj-$(CONFIG_MDIO_HISI_FEMAC) += mdio-hisi-femac.o obj-$(CONFIG_MDIO_XGENE) += mdio-xgene.o +obj-$(CONFIG_XILINX_GMII2RGMII) += xilinx_gmii2rgmii.o diff --git a/drivers/net/phy/xilinx_gmii2rgmii.c b/drivers/net/phy/xilinx_gmii2rgmii.c new file mode 100644 index 0000000..1456e27 --- /dev/null +++ b/drivers/net/phy/xilinx_gmii2rgmii.c @@ -0,0 +1,121 @@ +/* Xilinx GMII2RGMII Converter driver + * + * Copyright (C) 2016 Xilinx, Inc. + * + * Author: Kedareswara rao Appana <appanad@xilinx.com> + * + * Description: + * This driver is developed for Xilinx GMII2RGMII Converter + * + * 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. + */ +#include <linux/module.h> +#include <linux/kernel.h> +#include <linux/mii.h> +#include <linux/mdio.h> +#include <linux/phy.h> +#include <linux/of_mdio.h> + +#define XILINX_GMII2RGMII_REG 0x10 +#define XILINX_GMII2RGMII_SPEED_MASK 0x2040 + +struct gmii2rgmii { + struct phy_device *phy_dev; + struct phy_driver *phy_drv; + struct phy_driver conv_phy_drv; + int addr; +}; + +static int xgmiitorgmii_read_status(struct phy_device *phydev) +{ + struct gmii2rgmii *priv = (struct gmii2rgmii *)phydev->priv; + u16 val = 0; + + priv->phy_drv->read_status(phydev); + + val = mdiobus_read(phydev->mdio.bus, priv->addr, XILINX_GMII2RGMII_REG); + val &= XILINX_GMII2RGMII_SPEED_MASK; + + switch (phydev->speed) { + case SPEED_1000: + val |= BMCR_SPEED1000; + case SPEED_100: + val |= BMCR_SPEED100; + case SPEED_10: + val |= BMCR_SPEED10; + } + + mdiobus_write(phydev->mdio.bus, priv->addr, XILINX_GMII2RGMII_REG, val); + + return 0; +} + +int xgmiitorgmii_probe(struct mdio_device *mdiodev) +{ + struct device *dev = &mdiodev->dev; + struct device_node *np = dev->of_node, *phy_node; + struct gmii2rgmii *priv; + + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + phy_node = of_parse_phandle(np, "phy-handle", 0); + if (IS_ERR(phy_node)) { + dev_err(dev, "Couldn't parse phy-handle\n"); + return -ENODEV; + } + + priv->phy_dev = of_phy_find_device(phy_node); + if (!priv->phy_dev) { + dev_info(dev, "Couldn't find phydev\n"); + return -EPROBE_DEFER; + } + + priv->addr = mdiodev->addr; + priv->phy_drv = priv->phy_dev->drv; + memcpy(&priv->conv_phy_drv, priv->phy_dev->drv, + sizeof(struct phy_driver)); + priv->conv_phy_drv.read_status = xgmiitorgmii_read_status; + priv->phy_dev->priv = priv; + priv->phy_dev->drv = &priv->conv_phy_drv; + + return 0; +} + +static const struct of_device_id xgmiitorgmii_of_match[] = { + { .compatible = "xlnx,gmii-to-rgmii-1.0" }, + {}, +}; +MODULE_DEVICE_TABLE(of, xgmiitorgmii_of_match); + +static struct mdio_driver xgmiitorgmii_driver = { + .probe = xgmiitorgmii_probe, + .mdiodrv.driver = { + .name = "xgmiitorgmii", + .of_match_table = xgmiitorgmii_of_match, + }, +}; + +static int __init xgmiitorgmii_init(void) +{ + return mdio_driver_register(&xgmiitorgmii_driver); +} +module_init(xgmiitorgmii_init); + +static void __exit xgmiitorgmii_cleanup(void) +{ + mdio_driver_unregister(&xgmiitorgmii_driver); +} +module_exit(xgmiitorgmii_cleanup); + +MODULE_DESCRIPTION("Xilinx GMII2RGMII converter driver"); +MODULE_LICENSE("GPL");
This patch adds support for gmiitorgmii converter. The GMII to RGMII IP core provides the Reduced Gigabit Media Independent Interface (RGMII) between Ethernet physical media Devices and the Gigabit Ethernet controller. This core can Switch dynamically between the three different speed modes of Operation by configuring the converter register through mdio write. MDIO interface is used to set operating speed of Ethernet MAC. This converter sits between the MAC and the external phy MAC <==> GMII2RGMII <==> RGMII_PHY Signed-off-by: Kedareswara rao Appana <appanad@xilinx.com> --- Thanks a lot Andrew for your inputs. Changes for v5: --> Fixed return values in the probe as suggested by punnaiah. --> Added a mask for the converter speed as suggested by punnaiah. Changes for v4: --> Updated phydev speed for all 3 speeds as suggested by zhuyj. Changes for v3: --> Updated the driver as suggested by Andrew. Changes for v2: --> Passed struct xphy pointer directly to the fix_mac_speed API as suggested by the Florian. --> Added checks for the phy-node fail case as suggested by the Florian drivers/net/phy/Kconfig | 8 +++ drivers/net/phy/Makefile | 1 + drivers/net/phy/xilinx_gmii2rgmii.c | 121 ++++++++++++++++++++++++++++++++++++ 3 files changed, 130 insertions(+) create mode 100644 drivers/net/phy/xilinx_gmii2rgmii.c