diff mbox

[net,v4,2/3] net: libphy: Add stubs to hook IEEE MMD Register reads and writes

Message ID 1404092124-18704-3-git-send-email-vbridgers2013@gmail.com
State Changes Requested, archived
Delegated to: David Miller
Headers show

Commit Message

Vince Bridgers June 30, 2014, 1:35 a.m. UTC
The Micrel ksz9021 PHY does not support standard IEEE standard MMD
extended register access, therefore requires stubs to fail the read
register method and do nothing for the write register method when
libphy attempts to read and/or configure Energy Efficient Ethernet
features in PHYS that do support those features. This problem
was observed on an Altera Cyclone V SOC development kit that
uses the Synopsys EMAC and the Micrel ksz9021 PHY. This patch
was tested on the same board, and Energy Efficient Ethernet is
now disabled as expected since the Micrel PHY does not support that
feature.

Signed-off-by: Vince Bridgers <vbridgers2013@gmail.com>
---
V4: Correct error when editing for V3
V3: Remove unnecessary returns from void functions.
V2: Split libphy and Micrel specific changes into 2 patches
    based on review comments
---
 drivers/net/phy/micrel.c |   22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

Comments

Florian Fainelli June 30, 2014, 10:53 p.m. UTC | #1
2014-06-29 18:35 GMT-07:00 Vince Bridgers <vbridgers2013@gmail.com>:
> The Micrel ksz9021 PHY does not support standard IEEE standard MMD
> extended register access, therefore requires stubs to fail the read
> register method and do nothing for the write register method when
> libphy attempts to read and/or configure Energy Efficient Ethernet
> features in PHYS that do support those features. This problem
> was observed on an Altera Cyclone V SOC development kit that
> uses the Synopsys EMAC and the Micrel ksz9021 PHY. This patch
> was tested on the same board, and Energy Efficient Ethernet is
> now disabled as expected since the Micrel PHY does not support that
> feature.
>
> Signed-off-by: Vince Bridgers <vbridgers2013@gmail.com>

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>

> ---
> V4: Correct error when editing for V3
> V3: Remove unnecessary returns from void functions.
> V2: Split libphy and Micrel specific changes into 2 patches
>     based on review comments
> ---
>  drivers/net/phy/micrel.c |   22 ++++++++++++++++++++++
>  1 file changed, 22 insertions(+)
>
> diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
> index bc7c7d2..40ff138 100644
> --- a/drivers/net/phy/micrel.c
> +++ b/drivers/net/phy/micrel.c
> @@ -420,6 +420,26 @@ static int ksz8873mll_config_aneg(struct phy_device *phydev)
>         return 0;
>  }
>
> +/* This routine returns -1 as an indication to the caller that the
> + * Micrel ksz9021 10/100/1000 PHY does not support standard IEEE
> + * MMD extended PHY registers.
> + */
> +static int
> +ksz9021_rd_mmd_phyreg(struct phy_device *phydev, int ptrad, int devnum,
> +                     int regnum)
> +{
> +       return -1;
> +}
> +
> +/* This routine does nothing since the Micrel ksz9021 does not support
> + * standard IEEE MMD extended PHY registers.
> + */
> +static void
> +ksz9021_wr_mmd_phyreg(struct phy_device *phydev, int ptrad, int devnum,
> +                     int regnum, u32 val)
> +{
> +}
> +
>  static struct phy_driver ksphy_driver[] = {
>  {
>         .phy_id         = PHY_ID_KS8737,
> @@ -565,6 +585,8 @@ static struct phy_driver ksphy_driver[] = {
>         .config_intr    = ksz9021_config_intr,
>         .suspend        = genphy_suspend,
>         .resume         = genphy_resume,
> +       .rd_mmd_indirect = ksz9021_rd_mmd_phyreg,
> +       .wr_mmd_indirect = ksz9021_wr_mmd_phyreg,
>         .driver         = { .owner = THIS_MODULE, },
>  }, {
>         .phy_id         = PHY_ID_KSZ9031,
> --
> 1.7.9.5
>
diff mbox

Patch

diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index bc7c7d2..40ff138 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -420,6 +420,26 @@  static int ksz8873mll_config_aneg(struct phy_device *phydev)
 	return 0;
 }
 
+/* This routine returns -1 as an indication to the caller that the
+ * Micrel ksz9021 10/100/1000 PHY does not support standard IEEE
+ * MMD extended PHY registers.
+ */
+static int
+ksz9021_rd_mmd_phyreg(struct phy_device *phydev, int ptrad, int devnum,
+		      int regnum)
+{
+	return -1;
+}
+
+/* This routine does nothing since the Micrel ksz9021 does not support
+ * standard IEEE MMD extended PHY registers.
+ */
+static void
+ksz9021_wr_mmd_phyreg(struct phy_device *phydev, int ptrad, int devnum,
+		      int regnum, u32 val)
+{
+}
+
 static struct phy_driver ksphy_driver[] = {
 {
 	.phy_id		= PHY_ID_KS8737,
@@ -565,6 +585,8 @@  static struct phy_driver ksphy_driver[] = {
 	.config_intr	= ksz9021_config_intr,
 	.suspend	= genphy_suspend,
 	.resume		= genphy_resume,
+	.rd_mmd_indirect = ksz9021_rd_mmd_phyreg,
+	.wr_mmd_indirect = ksz9021_wr_mmd_phyreg,
 	.driver		= { .owner = THIS_MODULE, },
 }, {
 	.phy_id		= PHY_ID_KSZ9031,