Hi Antoine,
On Wed, Dec 12, 2018 at 03:14:51PM +0100, Antoine Tenart wrote:
> On Wed, Dec 12, 2018 at 10:30:33AM +0100, Antoine Tenart wrote:
> > On Tue, Dec 11, 2018 at 06:51:56PM +0000, Russell King - ARM Linux wrote:
> > > On Tue, Dec 11, 2018 at 07:53:42PM +0200, Baruch Siach wrote:
> > > > That is, something like this, right?
> > > >
> > > > diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
> > > > b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
> > > > index 125ea99418df..04cb0241ca2b 100644
> > > > --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
> > > > +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
> > > > @@ -4404,13 +4404,18 @@ static void mvpp2_phylink_validate(struct
> > > > net_device *dev,
> > > > switch (state->interface) {
> > > > case PHY_INTERFACE_MODE_10GKR:
> > > > case PHY_INTERFACE_MODE_XAUI:
> > > > + if (port->gop_id != 0)
> > > > + goto empty_set;
> > > > + /* Fall-through */
> > > > case PHY_INTERFACE_MODE_NA:
> > > > - phylink_set(mask, 10000baseCR_Full);
> > > > - phylink_set(mask, 10000baseSR_Full);
> > > > - phylink_set(mask, 10000baseLR_Full);
> > > > - phylink_set(mask, 10000baseLRM_Full);
> > > > - phylink_set(mask, 10000baseER_Full);
> > > > - phylink_set(mask, 10000baseKR_Full);
> > > > + if (port->gop_id == 0) {
> > > > + phylink_set(mask, 10000baseCR_Full);
> > > > + phylink_set(mask, 10000baseSR_Full);
> > > > + phylink_set(mask, 10000baseLR_Full);
> > > > + phylink_set(mask, 10000baseLRM_Full);
> > > > + phylink_set(mask, 10000baseER_Full);
> > > > + phylink_set(mask, 10000baseKR_Full);
> > > > + }
> > > > /* Fall-through */
> > > > case PHY_INTERFACE_MODE_RGMII:
> > > > case PHY_INTERFACE_MODE_RGMII_ID:
> > > >
> > >
> > > Yep, looks fine to me, thanks.
> >
> > This looks good, thanks! I'll send a v2.
>
> Well, I just got back to this, and looking at the beginning of the
> validate function invalid modes are already checked. So we do already
> have:
>
> case PHY_INTERFACE_MODE_10GKR:
> case PHY_INTERFACE_MODE_XAUI:
> if (port->gop_id != 0)
> goto empty_set;
> break;
>
> So it turns out the fix can be applied as-is.
Right. I should have known that. Thanks for the fix.
baruch
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- bar...@tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
