From: Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org>
To: cyril@ti.com
Cc: "netdev\@vger.kernel.org" <netdev@vger.kernel.org>,
"David S. Miller" <davem@davemloft.net>
Subject: Re: [patch 1/1] phy/marvell: fix 88e1121 support
Date: Tue, 19 Oct 2010 13:49:20 +0200 [thread overview]
Message-ID: <87y69ue727.fsf@lechat.rtp-net.org> (raw)
In-Reply-To: <4CBD785E.8040704@ti.com> (Cyril Chemparathy's message of "Tue\, 19 Oct 2010 06\:52\:14 -0400")
Cyril Chemparathy <cyril@ti.com> writes:
> Hi Arnaud,
Hi,
>
> On 10/18/2010 06:29 PM, Arnaud Patard wrote:
>> Commit c477d0447db08068a497e7beb892b2b2a7bff64b added support for RGMII
>> rx/tx delays except that it ends up clearing rx/tx delays bit for modes
>> differents that RGMII*ID. Due to this, ethernet is not working anymore
>> on my guruplug server +. This patch is fixing that.
>>
>> Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
>> Index: linux-2.6/drivers/net/phy/marvell.c
>> ===================================================================
>> --- linux-2.6.orig/drivers/net/phy/marvell.c 2010-10-18 22:46:09.000000000 +0200
>> +++ linux-2.6/drivers/net/phy/marvell.c 2010-10-19 00:20:22.000000000 +0200
>> @@ -196,20 +196,27 @@
>> MII_88E1121_PHY_MSCR_PAGE);
>> if (err < 0)
>> return err;
>> - mscr = phy_read(phydev, MII_88E1121_PHY_MSCR_REG) &
>> - MII_88E1121_PHY_MSCR_DELAY_MASK;
>>
>> - if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID)
>> - mscr |= (MII_88E1121_PHY_MSCR_RX_DELAY |
>> - MII_88E1121_PHY_MSCR_TX_DELAY);
>> - else if (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID)
>> - mscr |= MII_88E1121_PHY_MSCR_RX_DELAY;
>> - else if (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID)
>> - mscr |= MII_88E1121_PHY_MSCR_TX_DELAY;
>> + if ((phydev->interface == PHY_INTERFACE_MODE_RGMII) ||
>> + (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) ||
>> + (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID) ||
>> + (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID)) {
>>
>> - err = phy_write(phydev, MII_88E1121_PHY_MSCR_REG, mscr);
>> - if (err < 0)
>> - return err;
>> + mscr = phy_read(phydev, MII_88E1121_PHY_MSCR_REG) &
>> + MII_88E1121_PHY_MSCR_DELAY_MASK;
>> +
>> + if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID)
>> + mscr |= (MII_88E1121_PHY_MSCR_RX_DELAY |
>> + MII_88E1121_PHY_MSCR_TX_DELAY);
>> + else if (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID)
>> + mscr |= MII_88E1121_PHY_MSCR_RX_DELAY;
>> + else if (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID)
>> + mscr |= MII_88E1121_PHY_MSCR_TX_DELAY;
>> +
>> + err = phy_write(phydev, MII_88E1121_PHY_MSCR_REG, mscr);
>> + if (err < 0)
>> + return err;
>> + }
>>
>> phy_write(phydev, MII_88E1121_PHY_PAGE, oldpage);
>
> That looks more correct. Just out of curiosity, what is the interface
> mode on your platform?
The interface is in GMII mode iirc. The device is the ethernet embedded
in the Kirkwood SoC with a 88e1121 phy connected. It's handled by the
mv643xx_eth driver and the marvell phy driver.
Arnaud
next prev parent reply other threads:[~2010-10-19 11:47 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20101018214401.053486146@rtp-net.org>
2010-10-18 21:44 ` [patch 1/1] phy/marvell: fix 88e1121 support Arnaud Patard
2010-10-18 22:02 ` Cyril Chemparathy
2010-10-18 22:29 ` [patch 0/1] " Arnaud Patard
2010-10-18 22:29 ` Arnaud Patard
2010-10-19 10:52 ` Cyril Chemparathy
2010-10-19 11:49 ` Arnaud Patard [this message]
2010-10-21 11:00 ` David Miller
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=87y69ue727.fsf@lechat.rtp-net.org \
--to=arnaud.patard@rtp-net.org \
--cc=cyril@ti.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.