Re: [PATCH stable 4.9 v2] net: dsa: bcm_sf2: force pause link settings

On Thu, Jul 07, 2022 at 09:53:04AM -0700, Florian Fainelli wrote:

...

IEEE 802.3 says "The PAUSE function shall be enabled according to Table 28B–3 only if the highest common denominator is a full duplex technology."

Indeed, sorry about that, so I suppose the incremental patch would do, since we do not support changing pause frame auto-negotiation settings in 4.9:

diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c index 562b5eb23d90..f3d61f2bb0f7 100644 --- a/drivers/net/dsa/bcm_sf2.c +++ b/drivers/net/dsa/bcm_sf2.c @@ -669,15 +669,18 @@ static void bcm_sf2_sw_adjust_link(struct dsa_switch *ds, int port, break; }

•   if (phydev->pause)
  

•           rmt_adv = LPA_PAUSE_CAP;
  

•   if (phydev->asym_pause)
  

•           rmt_adv |= LPA_PAUSE_ASYM;
  

•   if (phydev->advertising & ADVERTISED_Pause)
  

•           lcl_adv = ADVERTISE_PAUSE_CAP;
  

•   if (phydev->advertising & ADVERTISED_Asym_Pause)
  

•           lcl_adv |= ADVERTISE_PAUSE_ASYM;
  

•   flowctrl = mii_resolve_flowctrl_fdx(lcl_adv, rmt_adv);
  

•   if (phydev->duplex == DUPLEX_FULL &&
  

•       phydev->autoneg == AUTONEG_ENABLE) {
  

•           if (phydev->pause)
  

•                   rmt_adv = LPA_PAUSE_CAP;
  

•           if (phydev->asym_pause)
  

•                   rmt_adv |= LPA_PAUSE_ASYM;
  

•           if (phydev->advertising & ADVERTISED_Pause)
  

•                   lcl_adv = ADVERTISE_PAUSE_CAP;
  

•           if (phydev->advertising & ADVERTISED_Asym_Pause)
  

•                   lcl_adv |= ADVERTISE_PAUSE_ASYM;
  

•           flowctrl = mii_resolve_flowctrl_fdx(lcl_adv, rmt_adv);
  

•   }
  
    if (phydev->link)
            reg |= LINK_STS;
  

Yes, this looks OK, thank you.