| Message ID | 1613652123-19021-1-git-send-email-stefanc@marvell.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 0a8a800027f124845c3ce0b5c3dfed6f268b13bb |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: mvpp2: skip RSS configurations on loopback port | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | success | CCed 5 of 5 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: 5 this patch: 5 |
| 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, 86 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 5 this patch: 5 |
| netdev/header_inline | success | Link |
| netdev/stable | success | Stable not CCed |
Hi, czw., 18 lut 2021 o 13:42 <stefanc@marvell.com> napisał(a): > > From: Stefan Chulski <stefanc@marvell.com> > > PPv2 loopback port doesn't support RSS, so we should > skip RSS configurations for this port. > > Signed-off-by: Stefan Chulski <stefanc@marvell.com> > --- > drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 25 +++++++++++--------- > 1 file changed, 14 insertions(+), 11 deletions(-) > > diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c > index 10c17d1..d415447 100644 > --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c > +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c > @@ -4699,9 +4699,10 @@ static void mvpp2_irqs_deinit(struct mvpp2_port *port) > } > } > > -static bool mvpp22_rss_is_supported(void) > +static bool mvpp22_rss_is_supported(struct mvpp2_port *port) > { > - return queue_mode == MVPP2_QDIST_MULTI_MODE; > + return (queue_mode == MVPP2_QDIST_MULTI_MODE) && > + !(port->flags & MVPP2_F_LOOPBACK); > } > > static int mvpp2_open(struct net_device *dev) > @@ -5513,7 +5514,7 @@ static int mvpp2_ethtool_get_rxnfc(struct net_device *dev, > struct mvpp2_port *port = netdev_priv(dev); > int ret = 0, i, loc = 0; > > - if (!mvpp22_rss_is_supported()) > + if (!mvpp22_rss_is_supported(port)) > return -EOPNOTSUPP; > > switch (info->cmd) { > @@ -5548,7 +5549,7 @@ static int mvpp2_ethtool_set_rxnfc(struct net_device *dev, > struct mvpp2_port *port = netdev_priv(dev); > int ret = 0; > > - if (!mvpp22_rss_is_supported()) > + if (!mvpp22_rss_is_supported(port)) > return -EOPNOTSUPP; > > switch (info->cmd) { > @@ -5569,7 +5570,9 @@ static int mvpp2_ethtool_set_rxnfc(struct net_device *dev, > > static u32 mvpp2_ethtool_get_rxfh_indir_size(struct net_device *dev) > { > - return mvpp22_rss_is_supported() ? MVPP22_RSS_TABLE_ENTRIES : 0; > + struct mvpp2_port *port = netdev_priv(dev); > + > + return mvpp22_rss_is_supported(port) ? MVPP22_RSS_TABLE_ENTRIES : 0; > } > > static int mvpp2_ethtool_get_rxfh(struct net_device *dev, u32 *indir, u8 *key, > @@ -5578,7 +5581,7 @@ static int mvpp2_ethtool_get_rxfh(struct net_device *dev, u32 *indir, u8 *key, > struct mvpp2_port *port = netdev_priv(dev); > int ret = 0; > > - if (!mvpp22_rss_is_supported()) > + if (!mvpp22_rss_is_supported(port)) > return -EOPNOTSUPP; > > if (indir) > @@ -5596,7 +5599,7 @@ static int mvpp2_ethtool_set_rxfh(struct net_device *dev, const u32 *indir, > struct mvpp2_port *port = netdev_priv(dev); > int ret = 0; > > - if (!mvpp22_rss_is_supported()) > + if (!mvpp22_rss_is_supported(port)) > return -EOPNOTSUPP; > > if (hfunc != ETH_RSS_HASH_NO_CHANGE && hfunc != ETH_RSS_HASH_CRC32) > @@ -5617,7 +5620,7 @@ static int mvpp2_ethtool_get_rxfh_context(struct net_device *dev, u32 *indir, > struct mvpp2_port *port = netdev_priv(dev); > int ret = 0; > > - if (!mvpp22_rss_is_supported()) > + if (!mvpp22_rss_is_supported(port)) > return -EOPNOTSUPP; > if (rss_context >= MVPP22_N_RSS_TABLES) > return -EINVAL; > @@ -5639,7 +5642,7 @@ static int mvpp2_ethtool_set_rxfh_context(struct net_device *dev, > struct mvpp2_port *port = netdev_priv(dev); > int ret; > > - if (!mvpp22_rss_is_supported()) > + if (!mvpp22_rss_is_supported(port)) > return -EOPNOTSUPP; > > if (hfunc != ETH_RSS_HASH_NO_CHANGE && hfunc != ETH_RSS_HASH_CRC32) > @@ -5956,7 +5959,7 @@ static int mvpp2_port_init(struct mvpp2_port *port) > mvpp2_cls_oversize_rxq_set(port); > mvpp2_cls_port_config(port); > > - if (mvpp22_rss_is_supported()) > + if (mvpp22_rss_is_supported(port)) > mvpp22_port_rss_init(port); > > /* Provide an initial Rx packet size */ > @@ -6861,7 +6864,7 @@ static int mvpp2_port_probe(struct platform_device *pdev, > dev->hw_features |= features | NETIF_F_RXCSUM | NETIF_F_GRO | > NETIF_F_HW_VLAN_CTAG_FILTER; > > - if (mvpp22_rss_is_supported()) { > + if (mvpp22_rss_is_supported(port)) { > dev->hw_features |= NETIF_F_RXHASH; > dev->features |= NETIF_F_NTUPLE; > } > -- > 1.9.1 > Reviewed-by: Marcin Wojtas <mw@semihalf.com> Thanks!
Hello: This patch was applied to netdev/net.git (refs/heads/master): On Thu, 18 Feb 2021 14:42:03 +0200 you wrote: > From: Stefan Chulski <stefanc@marvell.com> > > PPv2 loopback port doesn't support RSS, so we should > skip RSS configurations for this port. > > Signed-off-by: Stefan Chulski <stefanc@marvell.com> > > [...] Here is the summary with links: - [net-next] net: mvpp2: skip RSS configurations on loopback port https://git.kernel.org/netdev/net/c/0a8a800027f1 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c index 10c17d1..d415447 100644 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c @@ -4699,9 +4699,10 @@ static void mvpp2_irqs_deinit(struct mvpp2_port *port) } } -static bool mvpp22_rss_is_supported(void) +static bool mvpp22_rss_is_supported(struct mvpp2_port *port) { - return queue_mode == MVPP2_QDIST_MULTI_MODE; + return (queue_mode == MVPP2_QDIST_MULTI_MODE) && + !(port->flags & MVPP2_F_LOOPBACK); } static int mvpp2_open(struct net_device *dev) @@ -5513,7 +5514,7 @@ static int mvpp2_ethtool_get_rxnfc(struct net_device *dev, struct mvpp2_port *port = netdev_priv(dev); int ret = 0, i, loc = 0; - if (!mvpp22_rss_is_supported()) + if (!mvpp22_rss_is_supported(port)) return -EOPNOTSUPP; switch (info->cmd) { @@ -5548,7 +5549,7 @@ static int mvpp2_ethtool_set_rxnfc(struct net_device *dev, struct mvpp2_port *port = netdev_priv(dev); int ret = 0; - if (!mvpp22_rss_is_supported()) + if (!mvpp22_rss_is_supported(port)) return -EOPNOTSUPP; switch (info->cmd) { @@ -5569,7 +5570,9 @@ static int mvpp2_ethtool_set_rxnfc(struct net_device *dev, static u32 mvpp2_ethtool_get_rxfh_indir_size(struct net_device *dev) { - return mvpp22_rss_is_supported() ? MVPP22_RSS_TABLE_ENTRIES : 0; + struct mvpp2_port *port = netdev_priv(dev); + + return mvpp22_rss_is_supported(port) ? MVPP22_RSS_TABLE_ENTRIES : 0; } static int mvpp2_ethtool_get_rxfh(struct net_device *dev, u32 *indir, u8 *key, @@ -5578,7 +5581,7 @@ static int mvpp2_ethtool_get_rxfh(struct net_device *dev, u32 *indir, u8 *key, struct mvpp2_port *port = netdev_priv(dev); int ret = 0; - if (!mvpp22_rss_is_supported()) + if (!mvpp22_rss_is_supported(port)) return -EOPNOTSUPP; if (indir) @@ -5596,7 +5599,7 @@ static int mvpp2_ethtool_set_rxfh(struct net_device *dev, const u32 *indir, struct mvpp2_port *port = netdev_priv(dev); int ret = 0; - if (!mvpp22_rss_is_supported()) + if (!mvpp22_rss_is_supported(port)) return -EOPNOTSUPP; if (hfunc != ETH_RSS_HASH_NO_CHANGE && hfunc != ETH_RSS_HASH_CRC32) @@ -5617,7 +5620,7 @@ static int mvpp2_ethtool_get_rxfh_context(struct net_device *dev, u32 *indir, struct mvpp2_port *port = netdev_priv(dev); int ret = 0; - if (!mvpp22_rss_is_supported()) + if (!mvpp22_rss_is_supported(port)) return -EOPNOTSUPP; if (rss_context >= MVPP22_N_RSS_TABLES) return -EINVAL; @@ -5639,7 +5642,7 @@ static int mvpp2_ethtool_set_rxfh_context(struct net_device *dev, struct mvpp2_port *port = netdev_priv(dev); int ret; - if (!mvpp22_rss_is_supported()) + if (!mvpp22_rss_is_supported(port)) return -EOPNOTSUPP; if (hfunc != ETH_RSS_HASH_NO_CHANGE && hfunc != ETH_RSS_HASH_CRC32) @@ -5956,7 +5959,7 @@ static int mvpp2_port_init(struct mvpp2_port *port) mvpp2_cls_oversize_rxq_set(port); mvpp2_cls_port_config(port); - if (mvpp22_rss_is_supported()) + if (mvpp22_rss_is_supported(port)) mvpp22_port_rss_init(port); /* Provide an initial Rx packet size */ @@ -6861,7 +6864,7 @@ static int mvpp2_port_probe(struct platform_device *pdev, dev->hw_features |= features | NETIF_F_RXCSUM | NETIF_F_GRO | NETIF_F_HW_VLAN_CTAG_FILTER; - if (mvpp22_rss_is_supported()) { + if (mvpp22_rss_is_supported(port)) { dev->hw_features |= NETIF_F_RXHASH; dev->features |= NETIF_F_NTUPLE; }