* [PATCH net-next v4] ravb: Add RZ/G2L MII interface support
@ 2022-09-14 17:53 Biju Das
2022-09-14 18:24 ` Sergey Shtylyov
0 siblings, 1 reply; 3+ messages in thread
From: Biju Das @ 2022-09-14 17:53 UTC (permalink / raw)
To: David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni
Cc: Biju Das, Sergey Shtylyov, Lad Prabhakar, netdev,
linux-renesas-soc, Geert Uytterhoeven, Chris Paterson, Biju Das
EMAC IP found on RZ/G2L Gb ethernet supports MII interface.
This patch adds support for selecting MII interface mode.
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
---
v3->v4:
* Dropped CXR35_HALFCYC_CLKSW1000 macro
* Added CXR35_HALFCYC_CLKSW, CXR35_SEL_XMII and CXR35_SEL_XMII_RGMII
macros.
v2->v3:
* Documented CXR35_HALFCYC_CLKSW1000 and CXR35_SEL_XMII_MII macros.
v1->v2:
* Fixed spaces->Tab around CXR35 description.
---
drivers/net/ethernet/renesas/ravb.h | 8 ++++++++
drivers/net/ethernet/renesas/ravb_main.c | 8 +++++++-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/renesas/ravb.h b/drivers/net/ethernet/renesas/ravb.h
index b980bce763d3..b445da0fa578 100644
--- a/drivers/net/ethernet/renesas/ravb.h
+++ b/drivers/net/ethernet/renesas/ravb.h
@@ -189,6 +189,7 @@ enum ravb_reg {
PSR = 0x0528,
PIPR = 0x052c,
CXR31 = 0x0530, /* RZ/G2L only */
+ CXR35 = 0x0540, /* RZ/G2L only */
MPR = 0x0558,
PFTCR = 0x055c,
PFRCR = 0x0560,
@@ -965,6 +966,13 @@ enum CXR31_BIT {
CXR31_SEL_LINK1 = 0x00000008,
};
+enum CXR35_BIT {
+ CXR35_HALFCYC_CLKSW = 0xffff0000,
+ CXR35_SEL_XMII = 0x00000003,
+ CXR35_SEL_XMII_RGMII = 0x00000000,
+ CXR35_SEL_XMII_MII = 0x00000002,
+};
+
enum CSR0_BIT {
CSR0_TPE = 0x00000010,
CSR0_RPE = 0x00000020,
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index b357ac4c56c5..421c8ff1ce1f 100644
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -540,7 +540,13 @@ static void ravb_emac_init_gbeth(struct net_device *ndev)
/* E-MAC interrupt enable register */
ravb_write(ndev, ECSIPR_ICDIP, ECSIPR);
- ravb_modify(ndev, CXR31, CXR31_SEL_LINK0 | CXR31_SEL_LINK1, CXR31_SEL_LINK0);
+ if (priv->phy_interface == PHY_INTERFACE_MODE_MII) {
+ ravb_modify(ndev, CXR31, CXR31_SEL_LINK0 | CXR31_SEL_LINK1, 0);
+ ravb_write(ndev, (1000 << 16) | CXR35_SEL_XMII_MII, CXR35);
+ } else {
+ ravb_modify(ndev, CXR31, CXR31_SEL_LINK0 | CXR31_SEL_LINK1,
+ CXR31_SEL_LINK0);
+ }
}
static void ravb_emac_init_rcar(struct net_device *ndev)
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net-next v4] ravb: Add RZ/G2L MII interface support
2022-09-14 17:53 [PATCH net-next v4] ravb: Add RZ/G2L MII interface support Biju Das
@ 2022-09-14 18:24 ` Sergey Shtylyov
2022-09-14 18:41 ` Biju Das
0 siblings, 1 reply; 3+ messages in thread
From: Sergey Shtylyov @ 2022-09-14 18:24 UTC (permalink / raw)
To: Biju Das, David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni
Cc: Lad Prabhakar, netdev, linux-renesas-soc, Geert Uytterhoeven,
Chris Paterson, Biju Das
On 9/14/22 8:53 PM, Biju Das wrote:
> EMAC IP found on RZ/G2L Gb ethernet supports MII interface.
> This patch adds support for selecting MII interface mode.
>
> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
> ---
> v3->v4:
> * Dropped CXR35_HALFCYC_CLKSW1000 macro
It's not macro...
> * Added CXR35_HALFCYC_CLKSW, CXR35_SEL_XMII and CXR35_SEL_XMII_RGMII
> macros.
Neither are these...
> v2->v3:
> * Documented CXR35_HALFCYC_CLKSW1000 and CXR35_SEL_XMII_MII macros.
> v1->v2:
> * Fixed spaces->Tab around CXR35 description.
> ---
> drivers/net/ethernet/renesas/ravb.h | 8 ++++++++
> drivers/net/ethernet/renesas/ravb_main.c | 8 +++++++-
> 2 files changed, 15 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/renesas/ravb.h b/drivers/net/ethernet/renesas/ravb.h
> index b980bce763d3..b445da0fa578 100644
> --- a/drivers/net/ethernet/renesas/ravb.h
> +++ b/drivers/net/ethernet/renesas/ravb.h
[...]
> @@ -965,6 +966,13 @@ enum CXR31_BIT {
> CXR31_SEL_LINK1 = 0x00000008,
> };
>
> +enum CXR35_BIT {
> + CXR35_HALFCYC_CLKSW = 0xffff0000,
Should come last...
[...]
> diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
> index b357ac4c56c5..421c8ff1ce1f 100644
> --- a/drivers/net/ethernet/renesas/ravb_main.c
> +++ b/drivers/net/ethernet/renesas/ravb_main.c
> @@ -540,7 +540,13 @@ static void ravb_emac_init_gbeth(struct net_device *ndev)
> /* E-MAC interrupt enable register */
> ravb_write(ndev, ECSIPR_ICDIP, ECSIPR);
>
> - ravb_modify(ndev, CXR31, CXR31_SEL_LINK0 | CXR31_SEL_LINK1, CXR31_SEL_LINK0);
> + if (priv->phy_interface == PHY_INTERFACE_MODE_MII) {
> + ravb_modify(ndev, CXR31, CXR31_SEL_LINK0 | CXR31_SEL_LINK1, 0);
> + ravb_write(ndev, (1000 << 16) | CXR35_SEL_XMII_MII, CXR35);
> + } else {
> + ravb_modify(ndev, CXR31, CXR31_SEL_LINK0 | CXR31_SEL_LINK1,
> + CXR31_SEL_LINK0);
Hm... According to the RZ/G2LC manual, we still have to set CSR35.HALFCYC_CLKSW to
1000 even for RGMII... We probably need something more sophisticated here, like a flag
in the *struct* ravb_hw_info...
[...]
MBR, Sergey
^ permalink raw reply [flat|nested] 3+ messages in thread
* RE: [PATCH net-next v4] ravb: Add RZ/G2L MII interface support
2022-09-14 18:24 ` Sergey Shtylyov
@ 2022-09-14 18:41 ` Biju Das
0 siblings, 0 replies; 3+ messages in thread
From: Biju Das @ 2022-09-14 18:41 UTC (permalink / raw)
To: Sergey Shtylyov, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni
Cc: Prabhakar Mahadev Lad, netdev, linux-renesas-soc,
Geert Uytterhoeven, Chris Paterson, Biju Das
Hi Sergey,
> Subject: Re: [PATCH net-next v4] ravb: Add RZ/G2L MII interface support
>
> On 9/14/22 8:53 PM, Biju Das wrote:
>
> > EMAC IP found on RZ/G2L Gb ethernet supports MII interface.
> > This patch adds support for selecting MII interface mode.
> >
> > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
> > ---
> > v3->v4:
> > * Dropped CXR35_HALFCYC_CLKSW1000 macro
>
> It's not macro...
>
> > * Added CXR35_HALFCYC_CLKSW, CXR35_SEL_XMII and CXR35_SEL_XMII_RGMII
> > macros.
>
> Neither are these...
>
> > v2->v3:
> > * Documented CXR35_HALFCYC_CLKSW1000 and CXR35_SEL_XMII_MII macros.
> > v1->v2:
> > * Fixed spaces->Tab around CXR35 description.
> > ---
> > drivers/net/ethernet/renesas/ravb.h | 8 ++++++++
> > drivers/net/ethernet/renesas/ravb_main.c | 8 +++++++-
> > 2 files changed, 15 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/ethernet/renesas/ravb.h
> > b/drivers/net/ethernet/renesas/ravb.h
> > index b980bce763d3..b445da0fa578 100644
> > --- a/drivers/net/ethernet/renesas/ravb.h
> > +++ b/drivers/net/ethernet/renesas/ravb.h
> [...]
> > @@ -965,6 +966,13 @@ enum CXR31_BIT {
> > CXR31_SEL_LINK1 = 0x00000008,
> > };
> >
> > +enum CXR35_BIT {
> > + CXR35_HALFCYC_CLKSW = 0xffff0000,
>
> Should come last...
Ok, will do. If everyone ok with it.
>
> [...]
> > diff --git a/drivers/net/ethernet/renesas/ravb_main.c
> > b/drivers/net/ethernet/renesas/ravb_main.c
> > index b357ac4c56c5..421c8ff1ce1f 100644
> > --- a/drivers/net/ethernet/renesas/ravb_main.c
> > +++ b/drivers/net/ethernet/renesas/ravb_main.c
> > @@ -540,7 +540,13 @@ static void ravb_emac_init_gbeth(struct net_device
> *ndev)
> > /* E-MAC interrupt enable register */
> > ravb_write(ndev, ECSIPR_ICDIP, ECSIPR);
> >
> > - ravb_modify(ndev, CXR31, CXR31_SEL_LINK0 | CXR31_SEL_LINK1,
> CXR31_SEL_LINK0);
> > + if (priv->phy_interface == PHY_INTERFACE_MODE_MII) {
> > + ravb_modify(ndev, CXR31, CXR31_SEL_LINK0 | CXR31_SEL_LINK1,
> 0);
> > + ravb_write(ndev, (1000 << 16) | CXR35_SEL_XMII_MII, CXR35);
> > + } else {
> > + ravb_modify(ndev, CXR31, CXR31_SEL_LINK0 | CXR31_SEL_LINK1,
> > + CXR31_SEL_LINK0);
>
> Hm... According to the RZ/G2LC manual, we still have to set
> CSR35.HALFCYC_CLKSW to
> 1000 even for RGMII... We probably need something more sophisticated here,
> like a flag in the *struct* ravb_hw_info...
Strictly not required, as it is based on In-band Status.
It is one of to do's in my backlog to add
XMII selection for PHY which does not support In-band Status.
Cheers,
Biju
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-09-14 18:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-14 17:53 [PATCH net-next v4] ravb: Add RZ/G2L MII interface support Biju Das
2022-09-14 18:24 ` Sergey Shtylyov
2022-09-14 18:41 ` Biju Das
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).