Commit fdeba0b5 authored Feb 05, 2024 by David S. Miller

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>

parents eef00a82 0f4d6f01

drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1084,7 +1084,7 @@ nfp_tunnel_add_shared_mac(struct nfp_app app, struct net_device netdev,
		u16 nfp_mac_idx = 0;

		entry = nfp_tunnel_lookup_offloaded_macs(app, netdev->dev_addr);
		if (entry && nfp_tunnel_is_mac_idx_global(entry->index)) {
		if (entry && (nfp_tunnel_is_mac_idx_global(entry->index) \|\| netif_is_lag_port(netdev))) {
		if (entry->bridge_count \|\|
		!nfp_flower_is_supported_bridge(netdev)) {
		nfp_tunnel_offloaded_macs_inc_ref_and_link(entry,

drivers/net/ethernet/netronome/nfp/nfp_net_common.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -2776,6 +2776,7 @@ static void nfp_net_netdev_init(struct nfp_net *nn)
		case NFP_NFD_VER_NFD3:
		netdev->netdev_ops = &nfp_nfd3_netdev_ops;
		netdev->xdp_features \|= NETDEV_XDP_ACT_XSK_ZEROCOPY;
		netdev->xdp_features \|= NETDEV_XDP_ACT_REDIRECT;
		break;
		case NFP_NFD_VER_NFDK:
		netdev->netdev_ops = &nfp_nfdk_netdev_ops;

drivers/net/ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -537,11 +537,13 @@ static int enable_bars(struct nfp6000_pcie *nfp, u16 interface)
		const u32 barcfg_msix_general =
		NFP_PCIE_BAR_PCIE2CPP_MapType(
		NFP_PCIE_BAR_PCIE2CPP_MapType_GENERAL) \|
		NFP_PCIE_BAR_PCIE2CPP_LengthSelect_32BIT;
		NFP_PCIE_BAR_PCIE2CPP_LengthSelect(
		NFP_PCIE_BAR_PCIE2CPP_LengthSelect_32BIT);
		const u32 barcfg_msix_xpb =
		NFP_PCIE_BAR_PCIE2CPP_MapType(
		NFP_PCIE_BAR_PCIE2CPP_MapType_BULK) \|
		NFP_PCIE_BAR_PCIE2CPP_LengthSelect_32BIT \|
		NFP_PCIE_BAR_PCIE2CPP_LengthSelect(
		NFP_PCIE_BAR_PCIE2CPP_LengthSelect_32BIT) \|
		NFP_PCIE_BAR_PCIE2CPP_Target_BaseAddress(
		NFP_CPP_TARGET_ISLAND_XPB);
		const u32 barcfg_explicit[4] = {