On Thu, Jan 09, 2025 at 09:11:05PM +0800, Lei Wei wrote:
>
>
> On 1/8/2025 6:03 PM, Simon Horman wrote:
> > On Wed, Jan 08, 2025 at 10:50:26AM +0800, Lei Wei wrote:
> > > This patch adds the following PCS functionality for the PCS driver
> > > for IPQ9574 SoC:
> > >
> > > a.) Parses PCS MII DT nodes and instantiate each MII PCS instance.
> > > b.) Exports PCS instance get and put APIs. The network driver calls
> > > the PCS get API to get and associate the PCS instance with the port
> > > MAC.
> > > c.) PCS phylink operations for SGMII/QSGMII interface modes.
> > >
> > > Signed-off-by: Lei Wei <quic_leiwei@xxxxxxxxxxx>
> >
> > ...
> >
> > > +static int ipq_pcs_enable(struct phylink_pcs *pcs)
> > > +{
> > > + struct ipq_pcs_mii *qpcs_mii = phylink_pcs_to_qpcs_mii(pcs);
> > > + struct ipq_pcs *qpcs = qpcs_mii->qpcs;
> > > + int index = qpcs_mii->index;
> > > + int ret;
> > > +
> > > + ret = clk_prepare_enable(qpcs_mii->rx_clk);
> > > + if (ret) {
> > > + dev_err(qpcs->dev, "Failed to enable MII %d RX clock\n", index);
> > > + return ret;
> > > + }
> > > +
> > > + ret = clk_prepare_enable(qpcs_mii->tx_clk);
> > > + if (ret) {
> > > + dev_err(qpcs->dev, "Failed to enable MII %d TX clock\n", index);
> > > + return ret;
> >
> > Hi Lei Wei,
> >
> > I think you need something like the following to avoid leaking qpcs_mii->rx_clk.
> >
> > goto err_disable_unprepare_rx_clk;
> > }
> >
> > return 0;
> >
> > err_disable_unprepare_rx_clk:
> > clk_disable_unprepare(qpcs_mii->rx_clk);
> > return ret;
> > }
> >
> > Flagged by Smatch.
> >
>
> We had a conversation with Russell King in v2 that even if the phylink pcs
> enable sequence encounters an error, it does not unwind the steps it has
> already done. So we removed the call to unprepare in case of error here,
> since an error here is essentially fatal in this path with no unwind
> possibility.
>
> https://lore.kernel.org/all/38d7191f-e4bf-4457-9898-bb2b186ec3c7@xxxxxxxxxxx/
>
> However to satisfy this smatch warning/error, we may need to revert back to
> the adding the unprepare call in case of error. Request Russel to comment as
> well if this is fine.
>
> Is it possible to share the log/command-options of the smatch failure so
> that we can reproduce this? Thanks.
As I previously stated, the problem is that an error in this path is
basically unrecoverable. Therefore, I don't see any point in trying to
clean up.
We could probably do a bit better in phylink, and report the error, so
something like this:
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 0ae96d1376b4..62385c46118f 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -1401,11 +1401,21 @@ static void phylink_major_config(struct phylink *pl, bool restart,
phylink_mac_config(pl, state);
- if (pl->pcs)
- phylink_pcs_post_config(pl->pcs, state->interface);
+ if (pl->pcs) {
+ err = phylink_pcs_post_config(pl->pcs, state->interface);
+ if (err < 0)
+ phylink_err(pl, "%s (%ps) failed: %pe\n",
+ "pcs_post_config",
+ pl->pcs->pcs_post_config, ERR_PTR(err));
+ }
- if (pl->pcs_state == PCS_STATE_STARTING || pcs_changed)
- phylink_pcs_enable(pl->pcs);
+ if (pl->pcs_state == PCS_STATE_STARTING || pcs_changed) {
+ err = phylink_pcs_enable(pl->pcs);
+ if (err < 0)
+ phylink_err(pl, "%s (%ps) failed: %pe\n",
+ "pcs_enable",
+ pl->pcs->pcs_enable, ERR_PTR(err));
+ }
neg_mode = pl->act_link_an_mode;
if (pl->pcs && pl->pcs->neg_mode)
but trying to unwind the state back to what it was previously on an
error doesn't make any sense.
For example, by this time, the PHY could have switched interface modes
on us because the media changed speed. If we fail to switch to the new
interface mode, then even if we _could_ restore the previous
confinguration, that would result in the PHY using a different
interface mode to the host, and there would still be no link.
If a major_config() operation ever fails, then the affected network
interface is basically dead.
So, is there any point in adding code to clean up after an error in
things like .pcs_enable() methods? Nice to have, but it doesn't solve
the problem that the network interface is still dead as a result of
the error.
--
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
