* enetc: fix bitfields, we are clearing wrong bits
@ 2021-03-21 16:25 Pavel Machek
2021-03-21 17:44 ` Vladimir Oltean
0 siblings, 1 reply; 3+ messages in thread
From: Pavel Machek @ 2021-03-21 16:25 UTC (permalink / raw)
To: kernel list, Claudiu Manoil, David S. Miller, Jakub Kicinski,
netdev
[-- Attachment #1: Type: text/plain, Size: 958 bytes --]
Bitfield manipulation in enetc_mac_config() looks wrong. Fix
it. Untested.
Signed-off-by: Pavel Machek (CIP) <pavel@denx.de>
diff --git a/drivers/net/ethernet/freescale/enetc/enetc_pf.c b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
index 224fc37a6757..b85079493933 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc_pf.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
@@ -505,7 +505,7 @@ static void enetc_mac_config(struct enetc_hw *hw, phy_interface_t phy_mode)
if (phy_interface_mode_is_rgmii(phy_mode)) {
val = enetc_port_rd(hw, ENETC_PM0_IF_MODE);
val &= ~ENETC_PM0_IFM_EN_AUTO;
- val &= ENETC_PM0_IFM_IFMODE_MASK;
+ val &= ~ENETC_PM0_IFM_IFMODE_MASK;
val |= ENETC_PM0_IFM_IFMODE_GMII | ENETC_PM0_IFM_RG;
enetc_port_wr(hw, ENETC_PM0_IF_MODE, val);
}
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: enetc: fix bitfields, we are clearing wrong bits
2021-03-21 16:25 enetc: fix bitfields, we are clearing wrong bits Pavel Machek
@ 2021-03-21 17:44 ` Vladimir Oltean
2021-03-21 17:49 ` Vladimir Oltean
0 siblings, 1 reply; 3+ messages in thread
From: Vladimir Oltean @ 2021-03-21 17:44 UTC (permalink / raw)
To: Pavel Machek
Cc: kernel list, Claudiu Manoil, David S. Miller, Jakub Kicinski,
netdev
On Sun, Mar 21, 2021 at 05:25:00PM +0100, Pavel Machek wrote:
> Bitfield manipulation in enetc_mac_config() looks wrong. Fix
> it. Untested.
>
> Signed-off-by: Pavel Machek (CIP) <pavel@denx.de>
>
> diff --git a/drivers/net/ethernet/freescale/enetc/enetc_pf.c b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
> index 224fc37a6757..b85079493933 100644
> --- a/drivers/net/ethernet/freescale/enetc/enetc_pf.c
> +++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
> @@ -505,7 +505,7 @@ static void enetc_mac_config(struct enetc_hw *hw, phy_interface_t phy_mode)
> if (phy_interface_mode_is_rgmii(phy_mode)) {
> val = enetc_port_rd(hw, ENETC_PM0_IF_MODE);
> val &= ~ENETC_PM0_IFM_EN_AUTO;
> - val &= ENETC_PM0_IFM_IFMODE_MASK;
> + val &= ~ENETC_PM0_IFM_IFMODE_MASK;
> val |= ENETC_PM0_IFM_IFMODE_GMII | ENETC_PM0_IFM_RG;
> enetc_port_wr(hw, ENETC_PM0_IF_MODE, val);
> }
>
> --
> DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Fixes: c76a97218dcb ("net: enetc: force the RGMII speed and duplex instead of operating in inband mode")
Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Note that for normal operation, the bug was inconsequential, due to the
fact that we write the IF_MODE register in two stages, first in
.phylink_mac_config (which incorrectly cleared out a bunch of stuff),
then we update the speed and duplex to the correct values in
.phylink_mac_link_up. Maybe loopback mode was broken.
Thanks!
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: enetc: fix bitfields, we are clearing wrong bits
2021-03-21 17:44 ` Vladimir Oltean
@ 2021-03-21 17:49 ` Vladimir Oltean
0 siblings, 0 replies; 3+ messages in thread
From: Vladimir Oltean @ 2021-03-21 17:49 UTC (permalink / raw)
To: Pavel Machek
Cc: kernel list, Claudiu Manoil, David S. Miller, Jakub Kicinski,
netdev
On Sun, Mar 21, 2021 at 07:44:19PM +0200, Vladimir Oltean wrote:
> On Sun, Mar 21, 2021 at 05:25:00PM +0100, Pavel Machek wrote:
> > Bitfield manipulation in enetc_mac_config() looks wrong. Fix
> > it. Untested.
> >
> > Signed-off-by: Pavel Machek (CIP) <pavel@denx.de>
> >
> > diff --git a/drivers/net/ethernet/freescale/enetc/enetc_pf.c b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
> > index 224fc37a6757..b85079493933 100644
> > --- a/drivers/net/ethernet/freescale/enetc/enetc_pf.c
> > +++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
> > @@ -505,7 +505,7 @@ static void enetc_mac_config(struct enetc_hw *hw, phy_interface_t phy_mode)
> > if (phy_interface_mode_is_rgmii(phy_mode)) {
> > val = enetc_port_rd(hw, ENETC_PM0_IF_MODE);
> > val &= ~ENETC_PM0_IFM_EN_AUTO;
> > - val &= ENETC_PM0_IFM_IFMODE_MASK;
> > + val &= ~ENETC_PM0_IFM_IFMODE_MASK;
> > val |= ENETC_PM0_IFM_IFMODE_GMII | ENETC_PM0_IFM_RG;
> > enetc_port_wr(hw, ENETC_PM0_IF_MODE, val);
> > }
> >
> > --
> > DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
> > HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
>
> Fixes: c76a97218dcb ("net: enetc: force the RGMII speed and duplex instead of operating in inband mode")
> Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
>
> Note that for normal operation, the bug was inconsequential, due to the
> fact that we write the IF_MODE register in two stages, first in
> .phylink_mac_config (which incorrectly cleared out a bunch of stuff),
> then we update the speed and duplex to the correct values in
> .phylink_mac_link_up. Maybe loopback mode was broken.
>
> Thanks!
I forgot to mention, target tree should be "net" and patch should be
queued up for stable.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-03-21 17:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-21 16:25 enetc: fix bitfields, we are clearing wrong bits Pavel Machek
2021-03-21 17:44 ` Vladimir Oltean
2021-03-21 17:49 ` Vladimir Oltean
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).