mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH 1/2 v3] smc91111: add fixup for qemu phy support
Date: Sun, 22 Sep 2013 20:28:50 +0200	[thread overview]
Message-ID: <20130922182850.GO30088@pengutronix.de> (raw)
In-Reply-To: <1379826744-7499-1-git-send-email-plagnioj@jcrosoft.com>

On Sun, Sep 22, 2013 at 07:12:23AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> as today qemu does not support phy, it will return always 0x0 to any read
> on the mii bus. So the phy_id is 0 and the link is donw.
> 
> To have the norwork running on versatilpb & other qenu board for the link up
> at 100Mbps.
> 
> Only enable if qemu_fixup is set.
> 
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

Applied, thanks

Sascha

> ---
>  drivers/net/smc91111.c | 30 +++++++++++++++++++++++++++++-
>  include/net/smc91111.h | 14 ++++++++++++++
>  2 files changed, 43 insertions(+), 1 deletion(-)
>  create mode 100644 include/net/smc91111.h
> 
> diff --git a/drivers/net/smc91111.c b/drivers/net/smc91111.c
> index b868cbf..ba81e24 100644
> --- a/drivers/net/smc91111.c
> +++ b/drivers/net/smc91111.c
> @@ -66,6 +66,7 @@
>  #include <clock.h>
>  #include <io.h>
>  #include <linux/phy.h>
> +#include <net/smc91111.h>
>  
>  /*---------------------------------------------------------------
>   .
> @@ -446,6 +447,7 @@ struct smc91c111_priv {
>  	struct mii_bus miibus;
>  	struct accessors a;
>  	void __iomem *base;
> +	int qemu_fixup;
>  };
>  
>  #if (SMC_DEBUG > 2 )
> @@ -882,6 +884,7 @@ static void smc91c111_enable(struct eth_device *edev)
>  static int smc91c111_eth_open(struct eth_device *edev)
>  {
>  	struct smc91c111_priv *priv = (struct smc91c111_priv *)edev->priv;
> +	int ret;
>  
>  	/* Configure the Receive/Phy Control register */
>  	SMC_SELECT_BANK(priv, 0);
> @@ -889,8 +892,27 @@ static int smc91c111_eth_open(struct eth_device *edev)
>  
>  	smc91c111_enable(edev);
>  
> -	return phy_device_connect(edev, &priv->miibus, 0, NULL,
> +	ret = phy_device_connect(edev, &priv->miibus, 0, NULL,
>  				 0, PHY_INTERFACE_MODE_NA);
> +
> +	if (ret)
> +		return ret;
> +
> +	if (priv->qemu_fixup && edev->phydev->phy_id == 0x00000000) {
> +		struct phy_device *dev = edev->phydev;
> +
> +		dev->speed = SPEED_100;
> +		dev->duplex = DUPLEX_FULL;
> +		dev->autoneg = !AUTONEG_ENABLE;
> +		dev->force = 1;
> +		dev->link = 1;
> +
> +		dev_info(edev->parent, "phy with id 0x%08x detected this might be qemu\n",
> +			dev->phy_id);
> +		dev_info(edev->parent, "force link at 100Mpbs\n");
> +	}
> +
> +	return 0;
>  }
>  
>  static int smc91c111_eth_send(struct eth_device *edev, void *packet,
> @@ -1286,6 +1308,12 @@ static int smc91c111_probe(struct device_d *dev)
>  
>  	priv = edev->priv;
>  
> +	if (dev->platform_data) {
> +		struct smc91c111_pdata *pdata = dev->platform_data;
> +
> +		priv->qemu_fixup = pdata->qemu_fixup;
> +	}
> +
>  	priv->a = access_via_32bit;
>  
>  	edev->init = smc91c111_init_dev;
> diff --git a/include/net/smc91111.h b/include/net/smc91111.h
> new file mode 100644
> index 0000000..0b2d49b
> --- /dev/null
> +++ b/include/net/smc91111.h
> @@ -0,0 +1,14 @@
> +/*
> + * Copyright (C) 2013 Jean-Christophe PLAGNIOL-VILLARD <plagnio@jcrosoft.com>
> + *
> + * Under GPLv2 only
> + */
> +
> +#ifndef __SMC91111_H__
> +#define __SMC91111_H__
> +
> +struct smc91c111_pdata {
> +	int qemu_fixup;
> +};
> +
> +#endif /* __SMC91111_H__ */
> -- 
> 1.8.4.rc3
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

      parent reply	other threads:[~2013-09-22 18:29 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-22  5:12 Jean-Christophe PLAGNIOL-VILLARD
2013-09-22  5:12 ` [PATCH 2/2 v3] versatilepb: enable qemu fixup Jean-Christophe PLAGNIOL-VILLARD
2013-09-22 18:28 ` Sascha Hauer [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130922182850.GO30088@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=plagnioj@jcrosoft.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox