Message ID | 1477934018-13968-1-git-send-email-geert+renesas@glider.be (mailing list archive) |
---|---|
State | Superseded |
Commit | 735ea633e42060546cabe8430efbc00d4be1790a |
Delegated to: | Geert Uytterhoeven |
Headers | show |
From: Geert Uytterhoeven <geert+renesas@glider.be> Date: Mon, 31 Oct 2016 18:13:38 +0100 > 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> > --- > Tested on: > - r8a7795/salvator-x with R-Car H3 ES1.0 (limited to 100Mbps), > - r8a7795/salvator-x with R-Car H3 ES1.1 (1Gbps), > - r8a7796/salvator-x with R-Car M3-W ES1.0 (1Gbps). > > This is marked as an RFC because it depends on: > A) the soc_device_match() infrastructure, > B) Renesas SoC core ESx.y handling. > Hence I think the best merge strategy is to let this patch go in through > Simon's Renesas tree. > > David: If you agree, can you please provide your ack? Thanks! Sure, no problem: Acked-by: David S. Miller <davem@davemloft.net>
On Mon, Oct 31, 2016 at 01:24:31PM -0400, David Miller wrote: > From: Geert Uytterhoeven <geert+renesas@glider.be> > Date: Mon, 31 Oct 2016 18:13:38 +0100 > > > 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> > > --- > > Tested on: > > - r8a7795/salvator-x with R-Car H3 ES1.0 (limited to 100Mbps), > > - r8a7795/salvator-x with R-Car H3 ES1.1 (1Gbps), > > - r8a7796/salvator-x with R-Car M3-W ES1.0 (1Gbps). > > > > This is marked as an RFC because it depends on: > > A) the soc_device_match() infrastructure, > > B) Renesas SoC core ESx.y handling. > > Hence I think the best merge strategy is to let this patch go in through > > Simon's Renesas tree. > > > > David: If you agree, can you please provide your ack? Thanks! > > Sure, no problem: > > Acked-by: David S. Miller <davem@davemloft.net> Thanks Dave. Geert, please repost or otherwise ping me once the dependencies are in place and I should queue this up.
Hello. On 10/31/2016 08:13 PM, Geert Uytterhoeven wrote: > 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> > --- > Tested on: > - r8a7795/salvator-x with R-Car H3 ES1.0 (limited to 100Mbps), > - r8a7795/salvator-x with R-Car H3 ES1.1 (1Gbps), > - r8a7796/salvator-x with R-Car M3-W ES1.0 (1Gbps). > > This is marked as an RFC because it depends on: > A) the soc_device_match() infrastructure, > B) Renesas SoC core ESx.y handling. > Hence I think the best merge strategy is to let this patch go in through > Simon's Renesas tree. I'm not seeing soc_device_match() and friends even in renesas.git repo... What else do I need to review this patch? MBR, Sergei
Hi Sergei, On Wed, Nov 9, 2016 at 8:02 PM, Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> wrote: > On 10/31/2016 08:13 PM, Geert Uytterhoeven wrote: > >> 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> >> --- >> Tested on: >> - r8a7795/salvator-x with R-Car H3 ES1.0 (limited to 100Mbps), >> - r8a7795/salvator-x with R-Car H3 ES1.1 (1Gbps), >> - r8a7796/salvator-x with R-Car M3-W ES1.0 (1Gbps). >> >> This is marked as an RFC because it depends on: >> A) the soc_device_match() infrastructure, >> B) Renesas SoC core ESx.y handling. >> Hence I think the best merge strategy is to let this patch go in through >> Simon's Renesas tree. > > I'm not seeing soc_device_match() and friends even in renesas.git repo... > What else do I need to review this patch? [PATCH v2 0/7] soc: renesas: Identify SoC and register with the SoC bus The dependencies are included in renesas-drivers-2016-11-08-v4.9-rc4 (more specifically branch topic/renesas-soc-id-v2). Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
On Tue, Nov 01, 2016 at 10:32:17AM +0100, Simon Horman wrote: > On Mon, Oct 31, 2016 at 01:24:31PM -0400, David Miller wrote: > > From: Geert Uytterhoeven <geert+renesas@glider.be> > > Date: Mon, 31 Oct 2016 18:13:38 +0100 > > > > > 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> > > > --- > > > Tested on: > > > - r8a7795/salvator-x with R-Car H3 ES1.0 (limited to 100Mbps), > > > - r8a7795/salvator-x with R-Car H3 ES1.1 (1Gbps), > > > - r8a7796/salvator-x with R-Car M3-W ES1.0 (1Gbps). > > > > > > This is marked as an RFC because it depends on: > > > A) the soc_device_match() infrastructure, > > > B) Renesas SoC core ESx.y handling. > > > Hence I think the best merge strategy is to let this patch go in through > > > Simon's Renesas tree. > > > > > > David: If you agree, can you please provide your ack? Thanks! > > > > Sure, no problem: > > > > Acked-by: David S. Miller <davem@davemloft.net> > > Thanks Dave. > > Geert, please repost or otherwise ping me once the dependencies are in > place and I should queue this up. For the record, I have queued this up for v4.10.
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c index 27cfec3154c8e0f2..bf3109a413ac5721 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> @@ -977,6 +978,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) { @@ -1011,10 +1017,10 @@ static int ravb_phy_init(struct net_device *ndev) return -ENOENT; } - /* 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)) { int err; err = phy_set_max_speed(phydev, SPEED_100);
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> --- Tested on: - r8a7795/salvator-x with R-Car H3 ES1.0 (limited to 100Mbps), - r8a7795/salvator-x with R-Car H3 ES1.1 (1Gbps), - r8a7796/salvator-x with R-Car M3-W ES1.0 (1Gbps). This is marked as an RFC because it depends on: A) the soc_device_match() infrastructure, B) Renesas SoC core ESx.y handling. Hence I think the best merge strategy is to let this patch go in through Simon's Renesas tree. David: If you agree, can you please provide your ack? Thanks! --- drivers/net/ethernet/renesas/ravb_main.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)