* [PATCH v2 net-next 0/2] ravb: Support 1Gbps on R-Car H3 ES1.1+ and R-Car M3-W
@ 2017-01-27 18:35 Simon Horman
2017-01-27 18:35 ` [PATCH v2 net-next 1/2] ravb: Add tx and rx clock internal delays mode of APSR Simon Horman
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Simon Horman @ 2017-01-27 18:35 UTC (permalink / raw)
To: David Miller, Sergei Shtylyov; +Cc: Magnus Damm, netdev, linux-renesas-soc
Hi,
this series adds support for gigabit communication to the Renesas EthernetAVB
controller when used in conjunction with R-Car Gen3 H3 ES1.1+ and M3-W SoCs.
Gigabit is already supported with R-Car Gen 2 SoCs.
The patch from Geert was previously posted for inclusion in v4.10 and
acked by Dave for that purpose. It was, however, not accepted by the
ARM SoC maintainers.
The path from Mizuguchi-san is to address timing problems observed with
gigabit transfers. I would like it considered although my own testing on
M3-W did not show any timing problems.
Changes since v1:
* Address various feedback for "APSR" patch as noted in its changelog
Geert Uytterhoeven (1):
ravb: Support 1Gbps on R-Car H3 ES1.1+ and R-Car M3-W
Kazuya Mizuguchi (1):
ravb: Add tx and rx clock internal delays mode of APSR
drivers/net/ethernet/renesas/ravb.h | 10 ++++++++++
drivers/net/ethernet/renesas/ravb_main.c | 34 ++++++++++++++++++++++++++++++--
2 files changed, 42 insertions(+), 2 deletions(-)
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 net-next 1/2] ravb: Add tx and rx clock internal delays mode of APSR
2017-01-27 18:35 [PATCH v2 net-next 0/2] ravb: Support 1Gbps on R-Car H3 ES1.1+ and R-Car M3-W Simon Horman
@ 2017-01-27 18:35 ` Simon Horman
2017-01-27 19:05 ` Sergei Shtylyov
2017-01-27 18:35 ` [PATCH v2 net-next 2/2] ravb: Support 1Gbps on R-Car H3 ES1.1+ and R-Car M3-W Simon Horman
2017-01-29 23:36 ` [PATCH v2 net-next 0/2] " David Miller
2 siblings, 1 reply; 6+ messages in thread
From: Simon Horman @ 2017-01-27 18:35 UTC (permalink / raw)
To: David Miller, Sergei Shtylyov; +Cc: Magnus Damm, netdev, linux-renesas-soc
From: Kazuya Mizuguchi <kazuya.mizuguchi.ks@renesas.com>
This patch enables tx and rx clock internal delay modes (TDM and RDM).
This is to address a failure in the case of 1Gbps communication using the
by salvator-x board with the KSZ9031RNX phy. This has been reported to
occur with both the r8a7795 (H3) and r8a7796 (M3-W) SoCs.
With this change APSR internal delay modes are enabled for
"rgmii-id", "rgmii-rxid" and "rgmii-txid" phy modes as follows:
phy mode | ASPR delay mode
-----------+----------------
rgmii-id | TDM and RDM
rgmii-rxid | RDM
rgmii-txid | TDM
Signed-off-by: Kazuya Mizuguchi <kazuya.mizuguchi.ks@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
v2 [Simon Horman]
* As suggested by Sergei Shtylyov
- Add a comment to indicate that APSR_DM appears to be undocumented.
- Move chip_id check outside of ravb_set_delay_mode for consistency
- Call ravb_modify() once in ravb_set_delay_mode()
* Enhance comment before calls to ravb_set_delay_mode()
* Remove unnecessary break from end of switch statement.
v1 [Simon Horman]
- Combined patches
- Reworded changelog
v0 [Kazuya Mizuguchi]
---
drivers/net/ethernet/renesas/ravb.h | 10 ++++++++++
drivers/net/ethernet/renesas/ravb_main.c | 24 ++++++++++++++++++++++++
2 files changed, 34 insertions(+)
diff --git a/drivers/net/ethernet/renesas/ravb.h b/drivers/net/ethernet/renesas/ravb.h
index f1109661a533..0525bd696d5d 100644
--- a/drivers/net/ethernet/renesas/ravb.h
+++ b/drivers/net/ethernet/renesas/ravb.h
@@ -76,6 +76,7 @@ enum ravb_reg {
CDAR20 = 0x0060,
CDAR21 = 0x0064,
ESR = 0x0088,
+ APSR = 0x008C, /* R-Car Gen3 only */
RCR = 0x0090,
RQC0 = 0x0094,
RQC1 = 0x0098,
@@ -248,6 +249,15 @@ enum ESR_BIT {
ESR_EIL = 0x00001000,
};
+/* APSR */
+enum APSR_BIT {
+ APSR_MEMS = 0x00000002,
+ APSR_CMSW = 0x00000010,
+ APSR_DM = 0x00006000, /* Undocumented? */
+ APSR_DM_RDM = 0x00002000,
+ APSR_DM_TDM = 0x00004000,
+};
+
/* RCR */
enum RCR_BIT {
RCR_EFFS = 0x00000001,
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index 89ac1e3f6175..f655c1c23765 100644
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -1904,6 +1904,22 @@ static void ravb_set_config_mode(struct net_device *ndev)
}
}
+static void ravb_set_delay_mode(struct net_device *ndev)
+{
+ struct ravb_private *priv = netdev_priv(ndev);
+ int set = 0;
+
+ if (priv->phy_interface == PHY_INTERFACE_MODE_RGMII_ID ||
+ priv->phy_interface == PHY_INTERFACE_MODE_RGMII_RXID)
+ set |= APSR_DM_RDM;
+
+ if (priv->phy_interface == PHY_INTERFACE_MODE_RGMII_ID ||
+ priv->phy_interface == PHY_INTERFACE_MODE_RGMII_TXID)
+ set |= APSR_DM_TDM;
+
+ ravb_modify(ndev, APSR, APSR_DM, set);
+}
+
static int ravb_probe(struct platform_device *pdev)
{
struct device_node *np = pdev->dev.of_node;
@@ -2016,6 +2032,10 @@ static int ravb_probe(struct platform_device *pdev)
/* Request GTI loading */
ravb_modify(ndev, GCCR, GCCR_LTI, GCCR_LTI);
+ if (priv->chip_id != RCAR_GEN2)
+ /* Set tx and rx clock internal delay modes */
+ ravb_set_delay_mode(ndev);
+
/* Allocate descriptor base address table */
priv->desc_bat_size = sizeof(struct ravb_desc) * DBAT_ENTRY_NUM;
priv->desc_bat = dma_alloc_coherent(ndev->dev.parent, priv->desc_bat_size,
@@ -2152,6 +2172,10 @@ static int __maybe_unused ravb_resume(struct device *dev)
/* Request GTI loading */
ravb_modify(ndev, GCCR, GCCR_LTI, GCCR_LTI);
+ if (priv->chip_id != RCAR_GEN2)
+ /* Set tx and rx clock internal delay modes */
+ ravb_set_delay_mode(ndev);
+
/* Restore descriptor base address table */
ravb_write(ndev, priv->desc_bat_dma, DBAT);
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 net-next 2/2] ravb: Support 1Gbps on R-Car H3 ES1.1+ and R-Car M3-W
2017-01-27 18:35 [PATCH v2 net-next 0/2] ravb: Support 1Gbps on R-Car H3 ES1.1+ and R-Car M3-W Simon Horman
2017-01-27 18:35 ` [PATCH v2 net-next 1/2] ravb: Add tx and rx clock internal delays mode of APSR Simon Horman
@ 2017-01-27 18:35 ` Simon Horman
2017-01-29 23:36 ` [PATCH v2 net-next 0/2] " David Miller
2 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2017-01-27 18:35 UTC (permalink / raw)
To: David Miller, Sergei Shtylyov; +Cc: Magnus Damm, netdev, linux-renesas-soc
From: Geert Uytterhoeven <geert+renesas@glider.be>
The limitation to 10/100Mbit speeds on R-Car Gen3 is valid for R-Car H3
ES1.0 only. Check for the exact SoC model to allow 1Gbps on newer
revisions of R-Car H3, and on R-Car M3-W.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
---
drivers/net/ethernet/renesas/ravb_main.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index f655c1c23765..6626bc5a6d7a 100644
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -31,6 +31,7 @@
#include <linux/pm_runtime.h>
#include <linux/slab.h>
#include <linux/spinlock.h>
+#include <linux/sys_soc.h>
#include <asm/div64.h>
@@ -973,6 +974,11 @@ static void ravb_adjust_link(struct net_device *ndev)
phy_print_status(phydev);
}
+static const struct soc_device_attribute r8a7795es10[] = {
+ { .soc_id = "r8a7795", .revision = "ES1.0", },
+ { /* sentinel */ }
+};
+
/* PHY init function */
static int ravb_phy_init(struct net_device *ndev)
{
@@ -1008,10 +1014,10 @@ static int ravb_phy_init(struct net_device *ndev)
goto err_deregister_fixed_link;
}
- /* This driver only support 10/100Mbit speeds on Gen3
+ /* This driver only support 10/100Mbit speeds on R-Car H3 ES1.0
* at this time.
*/
- if (priv->chip_id == RCAR_GEN3) {
+ if (soc_device_match(r8a7795es10)) {
err = phy_set_max_speed(phydev, SPEED_100);
if (err) {
netdev_err(ndev, "failed to limit PHY to 100Mbit/s\n");
--
2.7.0.rc3.207.g0ac5344
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 net-next 1/2] ravb: Add tx and rx clock internal delays mode of APSR
2017-01-27 18:35 ` [PATCH v2 net-next 1/2] ravb: Add tx and rx clock internal delays mode of APSR Simon Horman
@ 2017-01-27 19:05 ` Sergei Shtylyov
2017-01-27 19:40 ` Simon Horman
0 siblings, 1 reply; 6+ messages in thread
From: Sergei Shtylyov @ 2017-01-27 19:05 UTC (permalink / raw)
To: Simon Horman, David Miller; +Cc: Magnus Damm, netdev, linux-renesas-soc
On 01/27/2017 09:35 PM, Simon Horman wrote:
> From: Kazuya Mizuguchi <kazuya.mizuguchi.ks@renesas.com>
>
> This patch enables tx and rx clock internal delay modes (TDM and RDM).
>
> This is to address a failure in the case of 1Gbps communication using the
> by salvator-x board with the KSZ9031RNX phy. This has been reported to
> occur with both the r8a7795 (H3) and r8a7796 (M3-W) SoCs.
>
> With this change APSR internal delay modes are enabled for
> "rgmii-id", "rgmii-rxid" and "rgmii-txid" phy modes as follows:
>
> phy mode | ASPR delay mode
> -----------+----------------
> rgmii-id | TDM and RDM
> rgmii-rxid | RDM
> rgmii-txid | TDM
>
> Signed-off-by: Kazuya Mizuguchi <kazuya.mizuguchi.ks@renesas.com>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> ---
> v2 [Simon Horman]
> * As suggested by Sergei Shtylyov
> - Add a comment to indicate that APSR_DM appears to be undocumented.
> - Move chip_id check outside of ravb_set_delay_mode for consistency
> - Call ravb_modify() once in ravb_set_delay_mode()
> * Enhance comment before calls to ravb_set_delay_mode()
Well, I meant to say that the comment should precede the body of the
function, not be repeated at every call...
> * Remove unnecessary break from end of switch statement.
Come on, you did remove all the *switch*. :-)
>
> v1 [Simon Horman]
> - Combined patches
> - Reworded changelog
>
> v0 [Kazuya Mizuguchi]
> ---
> drivers/net/ethernet/renesas/ravb.h | 10 ++++++++++
> drivers/net/ethernet/renesas/ravb_main.c | 24 ++++++++++++++++++++++++
> 2 files changed, 34 insertions(+)
>
> diff --git a/drivers/net/ethernet/renesas/ravb.h b/drivers/net/ethernet/renesas/ravb.h
> index f1109661a533..0525bd696d5d 100644
> --- a/drivers/net/ethernet/renesas/ravb.h
> +++ b/drivers/net/ethernet/renesas/ravb.h
[...]
> @@ -248,6 +249,15 @@ enum ESR_BIT {
> ESR_EIL = 0x00001000,
> };
>
> +/* APSR */
> +enum APSR_BIT {
> + APSR_MEMS = 0x00000002,
> + APSR_CMSW = 0x00000010,
> + APSR_DM = 0x00006000, /* Undocumented? */
> + APSR_DM_RDM = 0x00002000,
> + APSR_DM_TDM = 0x00004000,
The field values are also undocumented if the field is...
[...]
MBR, Sergei
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 net-next 1/2] ravb: Add tx and rx clock internal delays mode of APSR
2017-01-27 19:05 ` Sergei Shtylyov
@ 2017-01-27 19:40 ` Simon Horman
0 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2017-01-27 19:40 UTC (permalink / raw)
To: Sergei Shtylyov; +Cc: David Miller, Magnus Damm, netdev, linux-renesas-soc
On Fri, Jan 27, 2017 at 10:05:58PM +0300, Sergei Shtylyov wrote:
> On 01/27/2017 09:35 PM, Simon Horman wrote:
>
> >From: Kazuya Mizuguchi <kazuya.mizuguchi.ks@renesas.com>
> >
> >This patch enables tx and rx clock internal delay modes (TDM and RDM).
> >
> >This is to address a failure in the case of 1Gbps communication using the
> >by salvator-x board with the KSZ9031RNX phy. This has been reported to
> >occur with both the r8a7795 (H3) and r8a7796 (M3-W) SoCs.
> >
> >With this change APSR internal delay modes are enabled for
> >"rgmii-id", "rgmii-rxid" and "rgmii-txid" phy modes as follows:
> >
> >phy mode | ASPR delay mode
> >-----------+----------------
> >rgmii-id | TDM and RDM
> >rgmii-rxid | RDM
> >rgmii-txid | TDM
> >
> >Signed-off-by: Kazuya Mizuguchi <kazuya.mizuguchi.ks@renesas.com>
> >Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
>
> Acked-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
>
> >---
> >v2 [Simon Horman]
> >* As suggested by Sergei Shtylyov
> > - Add a comment to indicate that APSR_DM appears to be undocumented.
> > - Move chip_id check outside of ravb_set_delay_mode for consistency
> > - Call ravb_modify() once in ravb_set_delay_mode()
> >* Enhance comment before calls to ravb_set_delay_mode()
>
> Well, I meant to say that the comment should precede the body of the
> function, not be repeated at every call...
I scratched my head trying to work out what you meant... and guessed wrong.
> >* Remove unnecessary break from end of switch statement.
>
> Come on, you did remove all the *switch*. :-)
Yes, after I wrote the comment above :)
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 net-next 0/2] ravb: Support 1Gbps on R-Car H3 ES1.1+ and R-Car M3-W
2017-01-27 18:35 [PATCH v2 net-next 0/2] ravb: Support 1Gbps on R-Car H3 ES1.1+ and R-Car M3-W Simon Horman
2017-01-27 18:35 ` [PATCH v2 net-next 1/2] ravb: Add tx and rx clock internal delays mode of APSR Simon Horman
2017-01-27 18:35 ` [PATCH v2 net-next 2/2] ravb: Support 1Gbps on R-Car H3 ES1.1+ and R-Car M3-W Simon Horman
@ 2017-01-29 23:36 ` David Miller
2 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2017-01-29 23:36 UTC (permalink / raw)
To: horms+renesas; +Cc: sergei.shtylyov, magnus.damm, netdev, linux-renesas-soc
From: Simon Horman <horms+renesas@verge.net.au>
Date: Fri, 27 Jan 2017 19:35:18 +0100
> this series adds support for gigabit communication to the Renesas EthernetAVB
> controller when used in conjunction with R-Car Gen3 H3 ES1.1+ and M3-W SoCs.
> Gigabit is already supported with R-Car Gen 2 SoCs.
>
> The patch from Geert was previously posted for inclusion in v4.10 and
> acked by Dave for that purpose. It was, however, not accepted by the
> ARM SoC maintainers.
>
> The path from Mizuguchi-san is to address timing problems observed with
> gigabit transfers. I would like it considered although my own testing on
> M3-W did not show any timing problems.
Series applied, thanks Simon.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-01-29 23:36 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-27 18:35 [PATCH v2 net-next 0/2] ravb: Support 1Gbps on R-Car H3 ES1.1+ and R-Car M3-W Simon Horman
2017-01-27 18:35 ` [PATCH v2 net-next 1/2] ravb: Add tx and rx clock internal delays mode of APSR Simon Horman
2017-01-27 19:05 ` Sergei Shtylyov
2017-01-27 19:40 ` Simon Horman
2017-01-27 18:35 ` [PATCH v2 net-next 2/2] ravb: Support 1Gbps on R-Car H3 ES1.1+ and R-Car M3-W Simon Horman
2017-01-29 23:36 ` [PATCH v2 net-next 0/2] " David Miller
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.