Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge branch 'nfp-fixes'

Louis Peens says:

====================
nfp: a few simple driver fixes

This is combining a few unrelated one-liner fixes which have been
floating around internally into a single series. I'm not sure what is
the least amount of overhead for reviewers, this or a separate
submission per-patch? I guess it probably depends on personal
preference, but please let me know if there is a strong preference to
rather split these in the future.

Summary:

Patch1: Fixes an old issue which was hidden because 0 just so happens to
be the correct value.
Patch2: Fixes a corner case for flower offloading with bond ports
Patch3: Re-enables the 'NETDEV_XDP_ACT_REDIRECT', which was accidentally
disabled after a previous refactor.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

+6 -3
+1 -1
drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c
··· 1084 1084 u16 nfp_mac_idx = 0; 1085 1085 1086 1086 entry = nfp_tunnel_lookup_offloaded_macs(app, netdev->dev_addr); 1087 - if (entry && nfp_tunnel_is_mac_idx_global(entry->index)) { 1087 + if (entry && (nfp_tunnel_is_mac_idx_global(entry->index) || netif_is_lag_port(netdev))) { 1088 1088 if (entry->bridge_count || 1089 1089 !nfp_flower_is_supported_bridge(netdev)) { 1090 1090 nfp_tunnel_offloaded_macs_inc_ref_and_link(entry,
+1
drivers/net/ethernet/netronome/nfp/nfp_net_common.c
··· 2776 2776 case NFP_NFD_VER_NFD3: 2777 2777 netdev->netdev_ops = &nfp_nfd3_netdev_ops; 2778 2778 netdev->xdp_features |= NETDEV_XDP_ACT_XSK_ZEROCOPY; 2779 + netdev->xdp_features |= NETDEV_XDP_ACT_REDIRECT; 2779 2780 break; 2780 2781 case NFP_NFD_VER_NFDK: 2781 2782 netdev->netdev_ops = &nfp_nfdk_netdev_ops;
+4 -2
drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c
··· 537 537 const u32 barcfg_msix_general = 538 538 NFP_PCIE_BAR_PCIE2CPP_MapType( 539 539 NFP_PCIE_BAR_PCIE2CPP_MapType_GENERAL) | 540 - NFP_PCIE_BAR_PCIE2CPP_LengthSelect_32BIT; 540 + NFP_PCIE_BAR_PCIE2CPP_LengthSelect( 541 + NFP_PCIE_BAR_PCIE2CPP_LengthSelect_32BIT); 541 542 const u32 barcfg_msix_xpb = 542 543 NFP_PCIE_BAR_PCIE2CPP_MapType( 543 544 NFP_PCIE_BAR_PCIE2CPP_MapType_BULK) | 544 - NFP_PCIE_BAR_PCIE2CPP_LengthSelect_32BIT | 545 + NFP_PCIE_BAR_PCIE2CPP_LengthSelect( 546 + NFP_PCIE_BAR_PCIE2CPP_LengthSelect_32BIT) | 545 547 NFP_PCIE_BAR_PCIE2CPP_Target_BaseAddress( 546 548 NFP_CPP_TARGET_ISLAND_XPB); 547 549 const u32 barcfg_explicit[4] = {