Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp1897757imu; Wed, 12 Dec 2018 06:16:20 -0800 (PST) X-Google-Smtp-Source: AFSGD/XTBj3puvHbHvwFyrZkPLf/dybQLwRi/E5NLg8rL3iMqm+jWSZV+fGXQMUQbj2V815NI5jK X-Received: by 2002:a17:902:9f93:: with SMTP id g19mr19632090plq.195.1544624180144; Wed, 12 Dec 2018 06:16:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544624180; cv=none; d=google.com; s=arc-20160816; b=Dqeyqx9sy0egexEsKD5k2uWJv0+Krx8D7n5GehnhrlJdJ8Jj2/FkGU82X+ZPSvblCJ PHBCvP8bghbng8fXPnMavEPnqQVuZm6+bJ8K2c2JRxp9CG9pP6M6XPNBEVlWb+btfiDe 8aFjp2ske6hDqHW5kycZCJTAIpOdIbSE9lyaZfjgDRZ1isAsVf/y8SmSP0+70N4uUUSv tA7/ymEe3Ejtvow5hF7lG0FOdG6QGNncj67URr/4nxWiiYPUDSKouIpgEeG/RRevkdvE ElkrUMrxF4Yedia0qkZ34yG2FL5eQygC6xMROmKTrii71HdGr1sVihH0n4e+UE2D5Hcm dGCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-transfer-encoding:content-disposition:mime-version :references:message-id:subject:cc:to:from:date; bh=oKM7shvcH0VYb4gUcfqcxpbkKB+ofGrWOrtNU6pRTFo=; b=irMaslRi2R5bjY4DxjZA47MDF2+aXa1hIkhVJMyOkUqgp2vUMEGMahTWEPzuY0uUnO jbrk/smaC1dVTWPOoNplRl1T+U9MFC6JvXtqGgQqGEll4o4uDHKyaFmIbH2JfENMq+41 q2xx7Jfrc0KZti1/QnoHqAOB6Z0xBwla431WkyLerQuaIRwXj3Ni+UD8f6Cgk6l896nH Ckej6oAyvUwAp5NG3f7SC0cC5TKiXHezJpw8NtAn97oM2ejlHvktBIQZ/6s/zHy0hMMs z3q3OCWl2VR+CScUIDL1zBe3LgTbgYhTDMDztT+7lt9CzyrRIp2kHWUmg1GbqdzhS6Mx PcVw== 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 d8si13155738pgh.505.2018.12.12.06.16.05; Wed, 12 Dec 2018 06:16:20 -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 S1727290AbeLLOPE (ORCPT + 99 others); Wed, 12 Dec 2018 09:15:04 -0500 Received: from mail.bootlin.com ([62.4.15.54]:37644 "EHLO mail.bootlin.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726169AbeLLOPE (ORCPT ); Wed, 12 Dec 2018 09:15:04 -0500 Received: by mail.bootlin.com (Postfix, from userid 110) id ADDB8208E3; Wed, 12 Dec 2018 15:15:01 +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, URIBL_BLOCKED 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 792842037D; Wed, 12 Dec 2018 15:14:51 +0100 (CET) Date: Wed, 12 Dec 2018 15:14:51 +0100 From: Antoine Tenart To: Russell King - ARM Linux Cc: Baruch Siach , Antoine Tenart , davem@davemloft.net, 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 Subject: Re: [PATCH net] net: mvpp2: 10G modes aren't supported on all ports Message-ID: <20181212141451.GC3219@kwain> References: <20181211163228.26130-1-antoine.tenart@bootlin.com> <20181211163635.GG30658@n2100.armlinux.org.uk> <877egg6jbt.fsf@tkos.co.il> <20181211185156.GH30658@n2100.armlinux.org.uk> <20181212093033.GA3219@kwain> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20181212093033.GA3219@kwain> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On Wed, Dec 12, 2018 at 10:30:33AM +0100, Antoine Tenart wrote: > On Tue, Dec 11, 2018 at 06:51:56PM +0000, Russell King - ARM Linux wrote: > > On Tue, Dec 11, 2018 at 07:53:42PM +0200, Baruch Siach wrote: > > > That is, something like this, right? > > > > > > diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c > > > index 125ea99418df..04cb0241ca2b 100644 > > > --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c > > > +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c > > > @@ -4404,13 +4404,18 @@ static void mvpp2_phylink_validate(struct net_device *dev, > > > switch (state->interface) { > > > case PHY_INTERFACE_MODE_10GKR: > > > case PHY_INTERFACE_MODE_XAUI: > > > + if (port->gop_id != 0) > > > + goto empty_set; > > > + /* Fall-through */ > > > 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: > > > > > > > Yep, looks fine to me, thanks. > > This looks good, thanks! I'll send a v2. Well, I just got back to this, and looking at the beginning of the validate function invalid modes are already checked. So we do already have: case PHY_INTERFACE_MODE_10GKR: case PHY_INTERFACE_MODE_XAUI: if (port->gop_id != 0) goto empty_set; break; So it turns out the fix can be applied as-is. Thanks! Antoine -- Antoine T?nart, Bootlin Embedded Linux and Kernel engineering https://bootlin.com