* [PATCH v3 0/2] net: ethernet: nb8800: Do not apply TX delay at MAC level
@ 2016-11-04 18:21 Sebastian Frias
2016-11-04 18:22 ` [PATCH v3 1/2] " Sebastian Frias
2016-11-04 18:23 ` [PATCH v3 2/2] net: ethernet: nb8800: handle all RGMII definitions Sebastian Frias
0 siblings, 2 replies; 6+ messages in thread
From: Sebastian Frias @ 2016-11-04 18:21 UTC (permalink / raw)
To: Måns Rullgård, David S. Miller, netdev; +Cc: LKML, Mason, Andrew Lunn
This is v3 of the series, it fixes formatting issues of v2.
In v2 of the series, only the second patch:
"net: ethernet: nb8800: handle all RGMII definitions" is modified
to account for Florian's suggestion.
Sebastian Frias (2):
net: ethernet: nb8800: Do not apply TX delay at MAC level
net: ethernet: nb8800: handle all RGMII definitions
drivers/net/ethernet/aurora/nb8800.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
--
1.7.11.2
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v3 1/2] net: ethernet: nb8800: Do not apply TX delay at MAC level
2016-11-04 18:21 [PATCH v3 0/2] net: ethernet: nb8800: Do not apply TX delay at MAC level Sebastian Frias
@ 2016-11-04 18:22 ` Sebastian Frias
2016-11-04 18:23 ` [PATCH v3 2/2] net: ethernet: nb8800: handle all RGMII definitions Sebastian Frias
1 sibling, 0 replies; 6+ messages in thread
From: Sebastian Frias @ 2016-11-04 18:22 UTC (permalink / raw)
To: Måns Rullgård, David S. Miller, netdev; +Cc: LKML, Mason, Andrew Lunn
The delay can be applied at PHY or MAC level, but since
PHY drivers will apply the delay at PHY level when using
one of the "internal delay" declinations of RGMII mode
(like PHY_INTERFACE_MODE_RGMII_TXID), applying it again
at MAC level causes issues.
Signed-off-by: Sebastian Frias <sf84@laposte.net>
---
drivers/net/ethernet/aurora/nb8800.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/aurora/nb8800.c b/drivers/net/ethernet/aurora/nb8800.c
index b59aa35..d2855c9 100644
--- a/drivers/net/ethernet/aurora/nb8800.c
+++ b/drivers/net/ethernet/aurora/nb8800.c
@@ -1282,7 +1282,7 @@ static int nb8800_tangox_init(struct net_device *dev)
break;
case PHY_INTERFACE_MODE_RGMII_TXID:
- pad_mode = PAD_MODE_RGMII | PAD_MODE_GTX_CLK_DELAY;
+ pad_mode = PAD_MODE_RGMII;
break;
default:
--
1.7.11.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v3 2/2] net: ethernet: nb8800: handle all RGMII definitions
2016-11-04 18:21 [PATCH v3 0/2] net: ethernet: nb8800: Do not apply TX delay at MAC level Sebastian Frias
2016-11-04 18:22 ` [PATCH v3 1/2] " Sebastian Frias
@ 2016-11-04 18:23 ` Sebastian Frias
2016-11-05 12:58 ` Måns Rullgård
1 sibling, 1 reply; 6+ messages in thread
From: Sebastian Frias @ 2016-11-04 18:23 UTC (permalink / raw)
To: Måns Rullgård, David S. Miller, netdev; +Cc: LKML, Mason, Andrew Lunn
Commit a999589ccaae ("phylib: add RGMII-ID interface mode definition")
and commit 7d400a4c5897 ("phylib: add PHY interface modes for internal
delay for tx and rx only") added several RGMII definitions:
PHY_INTERFACE_MODE_RGMII_ID, PHY_INTERFACE_MODE_RGMII_RXID and
PHY_INTERFACE_MODE_RGMII_TXID to deal with internal delays.
Those are all RGMII modes (1Gbit) and must be considered that way when
setting the MAC mode or the pad mode for the HW to work properly.
Signed-off-by: Sebastian Frias <sf84@laposte.net>
---
drivers/net/ethernet/aurora/nb8800.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/aurora/nb8800.c b/drivers/net/ethernet/aurora/nb8800.c
index d2855c9..fba2699 100644
--- a/drivers/net/ethernet/aurora/nb8800.c
+++ b/drivers/net/ethernet/aurora/nb8800.c
@@ -598,6 +598,7 @@ static irqreturn_t nb8800_irq(int irq, void *dev_id)
static void nb8800_mac_config(struct net_device *dev)
{
struct nb8800_priv *priv = netdev_priv(dev);
+ struct phy_device *phydev = dev->phydev;
bool gigabit = priv->speed == SPEED_1000;
u32 mac_mode_mask = RGMII_MODE | HALF_DUPLEX | GMAC_MODE;
u32 mac_mode = 0;
@@ -609,7 +610,7 @@ static void nb8800_mac_config(struct net_device *dev)
mac_mode |= HALF_DUPLEX;
if (gigabit) {
- if (priv->phy_mode == PHY_INTERFACE_MODE_RGMII)
+ if (phy_interface_is_rgmii(phydev))
mac_mode |= RGMII_MODE;
mac_mode |= GMAC_MODE;
@@ -1278,9 +1279,8 @@ static int nb8800_tangox_init(struct net_device *dev)
break;
case PHY_INTERFACE_MODE_RGMII:
- pad_mode = PAD_MODE_RGMII;
- break;
-
+ case PHY_INTERFACE_MODE_RGMII_ID:
+ case PHY_INTERFACE_MODE_RGMII_RXID:
case PHY_INTERFACE_MODE_RGMII_TXID:
pad_mode = PAD_MODE_RGMII;
break;
--
1.7.11.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v3 2/2] net: ethernet: nb8800: handle all RGMII definitions
2016-11-04 18:23 ` [PATCH v3 2/2] net: ethernet: nb8800: handle all RGMII definitions Sebastian Frias
@ 2016-11-05 12:58 ` Måns Rullgård
2016-11-07 10:01 ` Sebastian Frias
0 siblings, 1 reply; 6+ messages in thread
From: Måns Rullgård @ 2016-11-05 12:58 UTC (permalink / raw)
To: Sebastian Frias; +Cc: David S. Miller, netdev, LKML, Mason, Andrew Lunn
Sebastian Frias <sf84@laposte.net> writes:
> Commit a999589ccaae ("phylib: add RGMII-ID interface mode definition")
> and commit 7d400a4c5897 ("phylib: add PHY interface modes for internal
> delay for tx and rx only") added several RGMII definitions:
> PHY_INTERFACE_MODE_RGMII_ID, PHY_INTERFACE_MODE_RGMII_RXID and
> PHY_INTERFACE_MODE_RGMII_TXID to deal with internal delays.
>
> Those are all RGMII modes (1Gbit) and must be considered that way when
> setting the MAC mode or the pad mode for the HW to work properly.
>
> Signed-off-by: Sebastian Frias <sf84@laposte.net>
> ---
> drivers/net/ethernet/aurora/nb8800.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/ethernet/aurora/nb8800.c b/drivers/net/ethernet/aurora/nb8800.c
> index d2855c9..fba2699 100644
> --- a/drivers/net/ethernet/aurora/nb8800.c
> +++ b/drivers/net/ethernet/aurora/nb8800.c
> @@ -598,6 +598,7 @@ static irqreturn_t nb8800_irq(int irq, void *dev_id)
> static void nb8800_mac_config(struct net_device *dev)
> {
> struct nb8800_priv *priv = netdev_priv(dev);
> + struct phy_device *phydev = dev->phydev;
> bool gigabit = priv->speed == SPEED_1000;
> u32 mac_mode_mask = RGMII_MODE | HALF_DUPLEX | GMAC_MODE;
> u32 mac_mode = 0;
> @@ -609,7 +610,7 @@ static void nb8800_mac_config(struct net_device *dev)
> mac_mode |= HALF_DUPLEX;
>
> if (gigabit) {
> - if (priv->phy_mode == PHY_INTERFACE_MODE_RGMII)
> + if (phy_interface_is_rgmii(phydev))
> mac_mode |= RGMII_MODE;
>
> mac_mode |= GMAC_MODE;
As I said before, this part can/should be applied separately, although
personally I probably wouldn't have bothered adding a single-use variable.
> @@ -1278,9 +1279,8 @@ static int nb8800_tangox_init(struct net_device *dev)
> break;
>
> case PHY_INTERFACE_MODE_RGMII:
> - pad_mode = PAD_MODE_RGMII;
> - break;
> -
> + case PHY_INTERFACE_MODE_RGMII_ID:
> + case PHY_INTERFACE_MODE_RGMII_RXID:
> case PHY_INTERFACE_MODE_RGMII_TXID:
> pad_mode = PAD_MODE_RGMII;
> break;
> --
> 1.7.11.2
>
--
Måns Rullgård
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v3 2/2] net: ethernet: nb8800: handle all RGMII definitions
2016-11-05 12:58 ` Måns Rullgård
@ 2016-11-07 10:01 ` Sebastian Frias
2016-11-07 11:51 ` Måns Rullgård
0 siblings, 1 reply; 6+ messages in thread
From: Sebastian Frias @ 2016-11-07 10:01 UTC (permalink / raw)
To: Måns Rullgård; +Cc: David S. Miller, netdev, LKML, Mason, Andrew Lunn
Hi Måns,
On 11/05/2016 01:58 PM, Måns Rullgård wrote:
>> if (gigabit) {
>> - if (priv->phy_mode == PHY_INTERFACE_MODE_RGMII)
>> + if (phy_interface_is_rgmii(phydev))
>> mac_mode |= RGMII_MODE;
>>
>> mac_mode |= GMAC_MODE;
>
> As I said before, this part can/should be applied separately, although
> personally I probably wouldn't have bothered adding a single-use variable.
It was for consistency with other functions that use 'phydev', but I don't
mind making the changes.
Just to be clear, when you say "can/should be applied separately", do you
mean that this patch should not be part of a series, and that I should split
the series into separate patches?
Best regards,
Sebastian
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v3 2/2] net: ethernet: nb8800: handle all RGMII definitions
2016-11-07 10:01 ` Sebastian Frias
@ 2016-11-07 11:51 ` Måns Rullgård
0 siblings, 0 replies; 6+ messages in thread
From: Måns Rullgård @ 2016-11-07 11:51 UTC (permalink / raw)
To: Sebastian Frias; +Cc: David S. Miller, netdev, LKML, Mason, Andrew Lunn
Sebastian Frias <sf84@laposte.net> writes:
> Hi Måns,
>
> On 11/05/2016 01:58 PM, Måns Rullgård wrote:
>>> if (gigabit) {
>>> - if (priv->phy_mode == PHY_INTERFACE_MODE_RGMII)
>>> + if (phy_interface_is_rgmii(phydev))
>>> mac_mode |= RGMII_MODE;
>>>
>>> mac_mode |= GMAC_MODE;
>>
>> As I said before, this part can/should be applied separately, although
>> personally I probably wouldn't have bothered adding a single-use variable.
>
> It was for consistency with other functions that use 'phydev', but I don't
> mind making the changes.
>
> Just to be clear, when you say "can/should be applied separately", do you
> mean that this patch should not be part of a series, and that I should split
> the series into separate patches?
I meant that this change should be made regardless of the others and can
be done separately if desired.
--
Måns Rullgård
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-11-07 11:51 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-04 18:21 [PATCH v3 0/2] net: ethernet: nb8800: Do not apply TX delay at MAC level Sebastian Frias
2016-11-04 18:22 ` [PATCH v3 1/2] " Sebastian Frias
2016-11-04 18:23 ` [PATCH v3 2/2] net: ethernet: nb8800: handle all RGMII definitions Sebastian Frias
2016-11-05 12:58 ` Måns Rullgård
2016-11-07 10:01 ` Sebastian Frias
2016-11-07 11:51 ` Måns Rullgård
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).