| Message ID | 20201116094638.15500-1-andre.przywara@arm.com |
|---|---|
| State | Accepted |
| Commit | 219a5d5a975a9e561e801dea6c23e98f0c363683 |
| Delegated to: | Andre Przywara |
| Headers | show |
| Series | net: sun8i-emac: Allow all RGMII PHY modes | expand |
On 11/16/20 10:46 AM, Andre Przywara wrote: > So far all GBit users of the sun8i-emac driver were using the "rgmii" > PHY mode, even though this turns out to be mostly wrong. It just worked > because the PHY driver doesn't do the proper setup (yet). > In fact for most boards the "rgmii-id" or "rgmii-txid" PHY modes are the > correct ones. > > To allow the DTs to describe the phy-mode correctly, and to stay > compatible with Linux, at least allow those other RGMII modes in the > driver. > > This avoids breakage if mainline DTs will be synced with U-Boot. > > An almost identical patch (f1239d8aa84d) was merged into the Linux driver > and has been backported to stable kernels. > > Signed-off-by: Andre Przywara <andre.przywara@arm.com> Hello Joe, could we get this into v2021.01, please? Acked-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
On 30/11/2020 17:23, Heinrich Schuchardt wrote: Hi Joe, > On 11/16/20 10:46 AM, Andre Przywara wrote: >> So far all GBit users of the sun8i-emac driver were using the "rgmii" >> PHY mode, even though this turns out to be mostly wrong. It just worked >> because the PHY driver doesn't do the proper setup (yet). >> In fact for most boards the "rgmii-id" or "rgmii-txid" PHY modes are the >> correct ones. >> >> To allow the DTs to describe the phy-mode correctly, and to stay >> compatible with Linux, at least allow those other RGMII modes in the >> driver. >> >> This avoids breakage if mainline DTs will be synced with U-Boot. >> >> An almost identical patch (f1239d8aa84d) was merged into the Linux driver >> and has been backported to stable kernels. >> >> Signed-off-by: Andre Przywara <andre.przywara@arm.com> Are you going to take this through your tree? Or are you OK with me merging this through u-boot-sunxi? We depend on this for a DT update, which relies on those new PHY modes. Cheers, Andre > > Hello Joe, > > could we get this into v2021.01, please? > > Acked-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
On Wed, Jan 13, 2021 at 4:43 PM André Przywara <andre.przywara@arm.com> wrote: > > On 30/11/2020 17:23, Heinrich Schuchardt wrote: > > Hi Joe, > > > On 11/16/20 10:46 AM, Andre Przywara wrote: > >> So far all GBit users of the sun8i-emac driver were using the "rgmii" > >> PHY mode, even though this turns out to be mostly wrong. It just worked > >> because the PHY driver doesn't do the proper setup (yet). > >> In fact for most boards the "rgmii-id" or "rgmii-txid" PHY modes are the > >> correct ones. > >> > >> To allow the DTs to describe the phy-mode correctly, and to stay > >> compatible with Linux, at least allow those other RGMII modes in the > >> driver. > >> > >> This avoids breakage if mainline DTs will be synced with U-Boot. > >> > >> An almost identical patch (f1239d8aa84d) was merged into the Linux driver > >> and has been backported to stable kernels. > >> > >> Signed-off-by: Andre Przywara <andre.przywara@arm.com> > > Are you going to take this through your tree? > Or are you OK with me merging this through u-boot-sunxi? > We depend on this for a DT update, which relies on those new PHY modes. Feel free to take it through your tree. Cheers, -Joe > Cheers, > Andre > > > > > Hello Joe, > > > > could we get this into v2021.01, please? > > > > Acked-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c index 4524604126c..5db33f5c135 100644 --- a/drivers/net/sun8i_emac.c +++ b/drivers/net/sun8i_emac.c @@ -353,6 +353,9 @@ static int sun8i_emac_set_syscon(struct sun8i_eth_pdata *pdata, /* default */ break; case PHY_INTERFACE_MODE_RGMII: + case PHY_INTERFACE_MODE_RGMII_ID: + case PHY_INTERFACE_MODE_RGMII_RXID: + case PHY_INTERFACE_MODE_RGMII_TXID: reg |= SC_EPIT | SC_ETCS_INT_GMII; break; case PHY_INTERFACE_MODE_RMII:
So far all GBit users of the sun8i-emac driver were using the "rgmii" PHY mode, even though this turns out to be mostly wrong. It just worked because the PHY driver doesn't do the proper setup (yet). In fact for most boards the "rgmii-id" or "rgmii-txid" PHY modes are the correct ones. To allow the DTs to describe the phy-mode correctly, and to stay compatible with Linux, at least allow those other RGMII modes in the driver. This avoids breakage if mainline DTs will be synced with U-Boot. An almost identical patch (f1239d8aa84d) was merged into the Linux driver and has been backported to stable kernels. Signed-off-by: Andre Przywara <andre.przywara@arm.com> --- drivers/net/sun8i_emac.c | 3 +++ 1 file changed, 3 insertions(+)