Add paging support to the QCA AR8031/33 PHY. This will be needed if we
add support for the .config_inband_aneg callback, see series [1]. But it
also turns out, that the driver already accessed the fiber page all along
without proper locking. Patch 2 will fix that.
[1] https://lore.kernel.org/netdev/[email protected]/
Michael Walle (2):
net: phy: at803x: add pages support to AR8031/33
net: phy: at803x: use proper locking in at803x_aneg_done()
drivers/net/phy/at803x.c | 72 ++++++++++++++++++++++++++++------------
1 file changed, 51 insertions(+), 21 deletions(-)
--
2.20.1
at803x_aneg_done() checks if auto-negotiation is completed on the SGMII
side. This doesn't take the mdio bus lock and the page switching is
open-coded. Now that we have proper page support, just use
phy_read_paged(). Also use phydev->interface to check if we have an
SGMII link instead of reading the mode register and be a bit more
precise on the warning message.
Signed-off-by: Michael Walle <[email protected]>
---
drivers/net/phy/at803x.c | 37 ++++++++++++++++---------------------
1 file changed, 16 insertions(+), 21 deletions(-)
diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
index a3aa10f14638..8abaea7ae6bd 100644
--- a/drivers/net/phy/at803x.c
+++ b/drivers/net/phy/at803x.c
@@ -756,32 +756,27 @@ static void at803x_link_change_notify(struct phy_device *phydev)
static int at803x_aneg_done(struct phy_device *phydev)
{
- int ccr;
-
- int aneg_done = genphy_aneg_done(phydev);
- if (aneg_done != BMSR_ANEGCOMPLETE)
- return aneg_done;
+ int ret, val;
- /*
- * in SGMII mode, if copper side autoneg is successful,
- * also check SGMII side autoneg result
- */
- ccr = phy_read(phydev, AT803X_REG_CHIP_CONFIG);
- if ((ccr & AT803X_MODE_CFG_MASK) != AT803X_MODE_CFG_SGMII)
- return aneg_done;
- /* switch to SGMII/fiber page */
- phy_write(phydev, AT803X_REG_CHIP_CONFIG, ccr & ~AT803X_BT_BX_REG_SEL);
+ ret = genphy_aneg_done(phydev);
- /* check if the SGMII link is OK. */
- if (!(phy_read(phydev, AT803X_PSSR) & AT803X_PSSR_MR_AN_COMPLETE)) {
- phydev_warn(phydev, "803x_aneg_done: SGMII link is not ok\n");
- aneg_done = 0;
+ /* In SGMII mode, if copper side autoneg is successful, also check
+ * SGMII side autoneg result.
+ */
+ if (phydev->interface == PHY_INTERFACE_MODE_SGMII &&
+ ret == BMSR_ANEGCOMPLETE) {
+ val = phy_read_paged(phydev, AT803X_FIBER_PAGE, AT803X_PSSR);
+ if (val < 0)
+ return val;
+
+ if (!(val & AT803X_PSSR_MR_AN_COMPLETE)) {
+ phydev_warn(phydev, "SGMII autoneg isn't completed\n");
+ return 0;
+ }
}
- /* switch back to copper page */
- phy_write(phydev, AT803X_REG_CHIP_CONFIG, ccr | AT803X_BT_BX_REG_SEL);
- return aneg_done;
+ return ret;
}
static int at803x_read_status(struct phy_device *phydev)
--
2.20.1
Hi Michael,
On Sun, Feb 14, 2021 at 02:04:05AM +0100, Michael Walle wrote:
> at803x_aneg_done() checks if auto-negotiation is completed on the SGMII
> side. This doesn't take the mdio bus lock and the page switching is
> open-coded. Now that we have proper page support, just use
> phy_read_paged(). Also use phydev->interface to check if we have an
> SGMII link instead of reading the mode register and be a bit more
> precise on the warning message.
>
> Signed-off-by: Michael Walle <[email protected]>
> ---
How did you test this patch?
Am 14. Februar 2021 02:57:33 MEZ schrieb Vladimir Oltean <[email protected]>:
>Hi Michael,
>
>On Sun, Feb 14, 2021 at 02:04:05AM +0100, Michael Walle wrote:
>> at803x_aneg_done() checks if auto-negotiation is completed on the
>SGMII
>> side. This doesn't take the mdio bus lock and the page switching is
>> open-coded. Now that we have proper page support, just use
>> phy_read_paged(). Also use phydev->interface to check if we have an
>> SGMII link instead of reading the mode register and be a bit more
>> precise on the warning message.
>>
>> Signed-off-by: Michael Walle <[email protected]>
>> ---
>
>How did you test this patch?
I'm afraid it's just compile time tested.
-michael
On Sun, Feb 14, 2021 at 03:18:49AM +0100, Michael Walle wrote:
> Am 14. Februar 2021 02:57:33 MEZ schrieb Vladimir Oltean <[email protected]>:
> >Hi Michael,
> >
> >On Sun, Feb 14, 2021 at 02:04:05AM +0100, Michael Walle wrote:
> >> at803x_aneg_done() checks if auto-negotiation is completed on the
> >SGMII
> >> side. This doesn't take the mdio bus lock and the page switching is
> >> open-coded. Now that we have proper page support, just use
> >> phy_read_paged(). Also use phydev->interface to check if we have an
> >> SGMII link instead of reading the mode register and be a bit more
> >> precise on the warning message.
> >>
> >> Signed-off-by: Michael Walle <[email protected]>
> >> ---
> >
> >How did you test this patch?
>
> I'm afraid it's just compile time tested.
I'm asking because at803x_aneg_done has been dead code for more than 2
years now. Unreachable. And while it was reachable it was buggy and an
abuse of the phylib API. So you might want to just delete this function
instead. Context:
https://lkml.org/lkml/2020/5/30/375
Am 2021-02-14 03:24, schrieb Vladimir Oltean:
> On Sun, Feb 14, 2021 at 03:18:49AM +0100, Michael Walle wrote:
>> Am 14. Februar 2021 02:57:33 MEZ schrieb Vladimir Oltean
>> <[email protected]>:
>> >Hi Michael,
>> >
>> >On Sun, Feb 14, 2021 at 02:04:05AM +0100, Michael Walle wrote:
>> >> at803x_aneg_done() checks if auto-negotiation is completed on the
>> >SGMII
>> >> side. This doesn't take the mdio bus lock and the page switching is
>> >> open-coded. Now that we have proper page support, just use
>> >> phy_read_paged(). Also use phydev->interface to check if we have an
>> >> SGMII link instead of reading the mode register and be a bit more
>> >> precise on the warning message.
>> >>
>> >> Signed-off-by: Michael Walle <[email protected]>
>> >> ---
>> >
>> >How did you test this patch?
>>
>> I'm afraid it's just compile time tested.
>
> I'm asking because at803x_aneg_done has been dead code for more than 2
> years now. Unreachable. And while it was reachable it was buggy and an
> abuse of the phylib API. So you might want to just delete this function
> instead. Context:
> https://lkml.org/lkml/2020/5/30/375
Are you sure? While it isn't called from phylib, it might be called from
some drivers directly or indirectly if they use phy_speed_down(). But
it is questionable if this is much of a use then.
That being said, if no one objects, I'd remove it, too.
-michael
On Sun, Feb 14, 2021 at 09:48:53PM +0100, Michael Walle wrote:
> Am 2021-02-14 03:24, schrieb Vladimir Oltean:
> > On Sun, Feb 14, 2021 at 03:18:49AM +0100, Michael Walle wrote:
> > > Am 14. Februar 2021 02:57:33 MEZ schrieb Vladimir Oltean <[email protected]>:
> > > >Hi Michael,
> > > >
> > > >On Sun, Feb 14, 2021 at 02:04:05AM +0100, Michael Walle wrote:
> > > >> at803x_aneg_done() checks if auto-negotiation is completed on the SGMII
> > > >> side. This doesn't take the mdio bus lock and the page switching is
> > > >> open-coded. Now that we have proper page support, just use
> > > >> phy_read_paged(). Also use phydev->interface to check if we have an
> > > >> SGMII link instead of reading the mode register and be a bit more
> > > >> precise on the warning message.
> > > >>
> > > >> Signed-off-by: Michael Walle <[email protected]>
> > > >> ---
> > > >
> > > >How did you test this patch?
> > >
> > > I'm afraid it's just compile time tested.
> >
> > I'm asking because at803x_aneg_done has been dead code for more than 2
> > years now. Unreachable. And while it was reachable it was buggy and an
> > abuse of the phylib API. So you might want to just delete this function
> > instead. Context:
> > https://lkml.org/lkml/2020/5/30/375
>
> Are you sure? While it isn't called from phylib, it might be called from
> some drivers directly or indirectly if they use phy_speed_down().
> But it is questionable if this is much of a use then.
>
> That being said, if no one objects, I'd remove it, too.
It might, true, but it is certainly of no use.