From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Maxime Chevallier , "David S . Miller" , Sasha Levin Subject: [PATCH AUTOSEL 4.18 60/92] net: mvpp2: make sure we use single queue mode on PPv2.1 Date: Sat, 15 Sep 2018 01:30:31 +0000 Message-ID: <20180915012944.179481-59-alexander.levin@microsoft.com> References: <20180915012944.179481-1-alexander.levin@microsoft.com> In-Reply-To: <20180915012944.179481-1-alexander.levin@microsoft.com> Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: From: Maxime Chevallier [ Upstream commit 1e27a628e3f444f53ab8099dfb31c5156e38d112 ] The PPv2 driver defines 2 "queue_modes" : - QDIST_SINGLE_MODE, where each port share one rx queue vector between all CPUs - QDIST_MULTI_MODE, where each port has one rx queue vector per CPU. Multi queue mode isn't available on PPv2.1, make sure we fallback to single mode when running on this revision. Signed-off-by: Maxime Chevallier Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/= ethernet/marvell/mvpp2/mvpp2_main.c index 0319ed9ef8b8..f7f08e3fa761 100644 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c @@ -5011,6 +5011,12 @@ static int mvpp2_probe(struct platform_device *pdev) (unsigned long)of_device_get_match_data(&pdev->dev); } =20 + /* multi queue mode isn't supported on PPV2.1, fallback to single + * mode + */ + if (priv->hw_version =3D=3D MVPP21) + queue_mode =3D MVPP2_QDIST_SINGLE_MODE; + res =3D platform_get_resource(pdev, IORESOURCE_MEM, 0); base =3D devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(base)) --=20 2.17.1