| Message ID | 20210103012544.3259029-2-martin.blumenstingl@googlemail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: dsa: lantiq_gswip: two fixes for -net/-stable | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Guessed tree name to be net-next |
| netdev/subject_prefix | warning | Target tree name not specified in the subject |
| netdev/cc_maintainers | success | CCed 8 of 8 maintainers |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 10 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
| netdev/stable | fail | Stable CC detected: Cc: stable@vger.kernel.org |
On 1/3/21 2:25 AM, Martin Blumenstingl wrote: > Enable GSWIP_MII_CFG_EN also for internal PHYs to make traffic flow. > Without this the PHY link is detected properly and ethtool statistics > for TX are increasing but there's no RX traffic coming in. > > Fixes: 14fceff4771e51 ("net: dsa: Add Lantiq / Intel DSA driver for vrx200") > Cc: stable@vger.kernel.org > Suggested-by: Hauke Mehrtens <hauke@hauke-m.de> > Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Acked-by: Hauke Mehrtens <hauke@hauke-m.de> > --- > drivers/net/dsa/lantiq_gswip.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/net/dsa/lantiq_gswip.c b/drivers/net/dsa/lantiq_gswip.c > index 09701c17f3f6..5d378c8026f0 100644 > --- a/drivers/net/dsa/lantiq_gswip.c > +++ b/drivers/net/dsa/lantiq_gswip.c > @@ -1541,9 +1541,7 @@ static void gswip_phylink_mac_link_up(struct dsa_switch *ds, int port, > { > struct gswip_priv *priv = ds->priv; > > - /* Enable the xMII interface only for the external PHY */ > - if (interface != PHY_INTERFACE_MODE_INTERNAL) > - gswip_mii_mask_cfg(priv, 0, GSWIP_MII_CFG_EN, port); > + gswip_mii_mask_cfg(priv, 0, GSWIP_MII_CFG_EN, port); > } > > static void gswip_get_strings(struct dsa_switch *ds, int port, u32 stringset, >
On Sun, Jan 03, 2021 at 02:25:43AM +0100, Martin Blumenstingl wrote: > Enable GSWIP_MII_CFG_EN also for internal PHYs to make traffic flow. > Without this the PHY link is detected properly and ethtool statistics > for TX are increasing but there's no RX traffic coming in. > > Fixes: 14fceff4771e51 ("net: dsa: Add Lantiq / Intel DSA driver for vrx200") > Cc: stable@vger.kernel.org Hi Martin No need to Cc: stable. David or Jakub will handle the backport to stable. You should however set the subject to [PATCH net 1/2] and base the patches on the net tree, not net-next. Andrew
Hi Andrew, On Sun, Jan 3, 2021 at 3:09 AM Andrew Lunn <andrew@lunn.ch> wrote: > > On Sun, Jan 03, 2021 at 02:25:43AM +0100, Martin Blumenstingl wrote: > > Enable GSWIP_MII_CFG_EN also for internal PHYs to make traffic flow. > > Without this the PHY link is detected properly and ethtool statistics > > for TX are increasing but there's no RX traffic coming in. > > > > Fixes: 14fceff4771e51 ("net: dsa: Add Lantiq / Intel DSA driver for vrx200") > > Cc: stable@vger.kernel.org > > Hi Martin > > No need to Cc: stable. David or Jakub will handle the backport to > stable. You should however set the subject to [PATCH net 1/2] and > base the patches on the net tree, not net-next. do you recommend re-sending these patches and changing the subject? the lantiq_gswip.c driver is identical in -net and -net-next and so the patch will apply fine in both cases Best regards, Martin
On 1/2/21 5:25 PM, Martin Blumenstingl wrote: > Enable GSWIP_MII_CFG_EN also for internal PHYs to make traffic flow. > Without this the PHY link is detected properly and ethtool statistics > for TX are increasing but there's no RX traffic coming in. > > Fixes: 14fceff4771e51 ("net: dsa: Add Lantiq / Intel DSA driver for vrx200") > Cc: stable@vger.kernel.org > Suggested-by: Hauke Mehrtens <hauke@hauke-m.de> > Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
On Sun, 3 Jan 2021 03:12:21 +0100 Martin Blumenstingl wrote: > Hi Andrew, > > On Sun, Jan 3, 2021 at 3:09 AM Andrew Lunn <andrew@lunn.ch> wrote: > > > > On Sun, Jan 03, 2021 at 02:25:43AM +0100, Martin Blumenstingl wrote: > > > Enable GSWIP_MII_CFG_EN also for internal PHYs to make traffic flow. > > > Without this the PHY link is detected properly and ethtool statistics > > > for TX are increasing but there's no RX traffic coming in. > > > > > > Fixes: 14fceff4771e51 ("net: dsa: Add Lantiq / Intel DSA driver for vrx200") > > > Cc: stable@vger.kernel.org > > > > Hi Martin > > > > No need to Cc: stable. David or Jakub will handle the backport to > > stable. You should however set the subject to [PATCH net 1/2] and > > base the patches on the net tree, not net-next. > do you recommend re-sending these patches and changing the subject? > the lantiq_gswip.c driver is identical in -net and -net-next and so > the patch will apply fine in both cases Resend is pretty much always a safe bet. But since as you said trees are identical at the moment I made an exception applied as is :) Thanks everyone!
Hi Jakub, On Mon, Jan 4, 2021 at 10:52 PM Jakub Kicinski <kuba@kernel.org> wrote: > > On Sun, 3 Jan 2021 03:12:21 +0100 Martin Blumenstingl wrote: > > Hi Andrew, > > > > On Sun, Jan 3, 2021 at 3:09 AM Andrew Lunn <andrew@lunn.ch> wrote: > > > > > > On Sun, Jan 03, 2021 at 02:25:43AM +0100, Martin Blumenstingl wrote: > > > > Enable GSWIP_MII_CFG_EN also for internal PHYs to make traffic flow. > > > > Without this the PHY link is detected properly and ethtool statistics > > > > for TX are increasing but there's no RX traffic coming in. > > > > > > > > Fixes: 14fceff4771e51 ("net: dsa: Add Lantiq / Intel DSA driver for vrx200") > > > > Cc: stable@vger.kernel.org > > > > > > Hi Martin > > > > > > No need to Cc: stable. David or Jakub will handle the backport to > > > stable. You should however set the subject to [PATCH net 1/2] and > > > base the patches on the net tree, not net-next. > > do you recommend re-sending these patches and changing the subject? > > the lantiq_gswip.c driver is identical in -net and -net-next and so > > the patch will apply fine in both cases > > Resend is pretty much always a safe bet. But since as you said trees > are identical at the moment I made an exception applied as is :) awesome, thank you! :-) Best regards, Martin
diff --git a/drivers/net/dsa/lantiq_gswip.c b/drivers/net/dsa/lantiq_gswip.c index 09701c17f3f6..5d378c8026f0 100644 --- a/drivers/net/dsa/lantiq_gswip.c +++ b/drivers/net/dsa/lantiq_gswip.c @@ -1541,9 +1541,7 @@ static void gswip_phylink_mac_link_up(struct dsa_switch *ds, int port, { struct gswip_priv *priv = ds->priv; - /* Enable the xMII interface only for the external PHY */ - if (interface != PHY_INTERFACE_MODE_INTERNAL) - gswip_mii_mask_cfg(priv, 0, GSWIP_MII_CFG_EN, port); + gswip_mii_mask_cfg(priv, 0, GSWIP_MII_CFG_EN, port); } static void gswip_get_strings(struct dsa_switch *ds, int port, u32 stringset,
Enable GSWIP_MII_CFG_EN also for internal PHYs to make traffic flow. Without this the PHY link is detected properly and ethtool statistics for TX are increasing but there's no RX traffic coming in. Fixes: 14fceff4771e51 ("net: dsa: Add Lantiq / Intel DSA driver for vrx200") Cc: stable@vger.kernel.org Suggested-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> --- drivers/net/dsa/lantiq_gswip.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)