Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp856375imu; Tue, 11 Dec 2018 08:36:05 -0800 (PST) X-Google-Smtp-Source: AFSGD/UL0urtUSDikpUphEaqVzAtYJEH/KsTVA0sderHyuFcnEHL7Nvw5fvOOIssFTmAn3fuwN6V X-Received: by 2002:a63:cf56:: with SMTP id b22mr14305457pgj.336.1544546165333; Tue, 11 Dec 2018 08:36:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544546165; cv=none; d=google.com; s=arc-20160816; b=rO0GC3zhDVUHNWqoZEV1Mh9x0WsJw2d5fTcGqc19EX9LAcqAsKKWs7WrRRn3Hgl5B8 P2DvDJV5NtOYtayv+wA95ByDzRsrZiPajQkCk+kbgSnBXVHRMRN8VUS1DZLadBrSWrYe Zsxkskre8CCmhwZAFVULAXJcQica2EGe6DL/cl9FBngcTDU3abe8yoE76VlieEsJxR5b X3DeSwzJw7Q8vuxspRXkox3OMR6VxIeumOOldvZTM1SjyZqbpBRbaDQHc1S+0lH0KyZd YFl2YOQrjKt5dgdk1XN0bf0TD4hKKMKOaj5r+2+VqBNM6RK++RSKVK2zHDk0YRXtmmf4 wvYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=+tM7jtw2OCC9WY4lULU1VjOhi+nlQ67UbMqCdfeHkLE=; b=izfhAUzNmc1NxTYhPUUqZfBohUbrjidNRatQKKDwayakEklrwdq/POXVbwe75HP+1h BcpsDEFWfqHRbzs/PN7bi8qLXAwBbDzHmnEQ9qf08z8xmwXCHUE2aPu2MjRegS9ePtr1 BETToKDoe8VyOFnr19wfCGtfQyAwM2g4IYrUXHiabUDsCGgQL7UX7X0Fts5wY5tu8Zes ImKgAz3fpN2TTCJJ5drfxTlofVKm/wr0fIHaNJ29qmAEhOvD+jSPTszQXCChXJBRxRkB cujbeLfMIN1H82j+T1gztP+W7RYaTnkMUS/bKHqd2d5Vc5AoL6tsl7oAAW1EBxYxH3/J Qhgw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n5si12059022pgl.485.2018.12.11.08.35.50; Tue, 11 Dec 2018 08:36:05 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727666AbeLKQdJ (ORCPT + 99 others); Tue, 11 Dec 2018 11:33:09 -0500 Received: from mail.bootlin.com ([62.4.15.54]:59083 "EHLO mail.bootlin.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726906AbeLKQdJ (ORCPT ); Tue, 11 Dec 2018 11:33:09 -0500 Received: by mail.bootlin.com (Postfix, from userid 110) id CA20E206D8; Tue, 11 Dec 2018 17:33:06 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mail.bootlin.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT shortcircuit=ham autolearn=disabled version=3.4.2 Received: from localhost (aaubervilliers-681-1-89-7.w90-88.abo.wanadoo.fr [90.88.30.7]) by mail.bootlin.com (Postfix) with ESMTPSA id 99EF220D17; Tue, 11 Dec 2018 17:32:56 +0100 (CET) From: Antoine Tenart To: davem@davemloft.net, linux@armlinux.org.uk Cc: Antoine Tenart , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, thomas.petazzoni@bootlin.com, maxime.chevallier@bootlin.com, gregory.clement@bootlin.com, miquel.raynal@bootlin.com, nadavh@marvell.com, stefanc@marvell.com, ymarkman@marvell.com, mw@semihalf.com, Baruch Siach Subject: [PATCH net] net: mvpp2: 10G modes aren't supported on all ports Date: Tue, 11 Dec 2018 17:32:28 +0100 Message-Id: <20181211163228.26130-1-antoine.tenart@bootlin.com> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The mvpp2_phylink_validate() function sets all modes that are supported by a given PPv2 port. A recent change made all ports to advertise they support 10G modes in certain cases. This is not true, as only the port #0 can do so. This patch fixes it. Fixes: 01b3fd5ac97c ("net: mvpp2: fix detection of 10G SFP modules") Cc: Baruch Siach Signed-off-by: Antoine Tenart --- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c index 125ea99418df..88aa488054a8 100644 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c @@ -4405,12 +4405,14 @@ static void mvpp2_phylink_validate(struct net_device *dev, case PHY_INTERFACE_MODE_10GKR: case PHY_INTERFACE_MODE_XAUI: case PHY_INTERFACE_MODE_NA: - phylink_set(mask, 10000baseCR_Full); - phylink_set(mask, 10000baseSR_Full); - phylink_set(mask, 10000baseLR_Full); - phylink_set(mask, 10000baseLRM_Full); - phylink_set(mask, 10000baseER_Full); - phylink_set(mask, 10000baseKR_Full); + if (port->gop_id == 0) { + phylink_set(mask, 10000baseCR_Full); + phylink_set(mask, 10000baseSR_Full); + phylink_set(mask, 10000baseLR_Full); + phylink_set(mask, 10000baseLRM_Full); + phylink_set(mask, 10000baseER_Full); + phylink_set(mask, 10000baseKR_Full); + } /* Fall-through */ case PHY_INTERFACE_MODE_RGMII: case PHY_INTERFACE_MODE_RGMII_ID: -- 2.19.2