Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09e5ae88 authored by Daniel Basilio's avatar Daniel Basilio Committed by Greg Kroah-Hartman
Browse files

nfp: use correct macro for LengthSelect in BAR config 



commit b3d4f7f2288901ed2392695919b3c0e24c1b4084 upstream.

The 1st and 2nd expansion BAR configuration registers are configured,
when the driver starts up, in variables 'barcfg_msix_general' and
'barcfg_msix_xpb', respectively. The 'LengthSelect' field is ORed in
from bit 0, which is incorrect. The 'LengthSelect' field should
start from bit 27.

This has largely gone un-noticed because
NFP_PCIE_BAR_PCIE2CPP_LengthSelect_32BIT happens to be 0.

Fixes: 4cb584e0 ("nfp: add CPP access core")
Cc: stable@vger.kernel.org # 4.11+
Signed-off-by: default avatarDaniel Basilio <daniel.basilio@corigine.com>
Signed-off-by: default avatarLouis Peens <louis.peens@corigine.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 228742b2

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

+4 −2
Original line number Diff line number Diff line
@@ -571,11 +571,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] = {