Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp424449imu; Wed, 12 Dec 2018 20:32:02 -0800 (PST) X-Google-Smtp-Source: AFSGD/UHafHRlwwe/NH0rtH57H5L2clCQwkJEslugX2n3nuLeqaW7fhFjYy8ftm4SygQqFxpvdWU X-Received: by 2002:a17:902:6909:: with SMTP id j9mr21530145plk.196.1544675522026; Wed, 12 Dec 2018 20:32:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544675522; cv=none; d=google.com; s=arc-20160816; b=rzuvoh/b04MK2CQIu1nEozbxM0LTwhHHWdIwHwauqdjSL0ul0HDOu8I1IscLQdfzzx lCD5XvZSSq1ARfSpyVpbUz2VbVCHpAWtptxwEYe9n/DscasQoXkXiDKdxWH4TENapjRI DyXhU/8+vvmpT5pKehp/8vRZ0fTrIFg7QplPmqcgDtqCLG7kj4Aro24OfMnFMnWzZF1t 62HSLh66FUPdLswt4FTLITLQaS/t4JeYboSCtKEy08cESGrd78UQjRHRKxd4tza5+s+V mK11kF6q/swrmaZa5q5LwAMfv2LiKFn+koBlpgAcxOyY37z5TLCVw51lAkliD2vJQM9y g1kQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Xp/dK3lWS+M/jyq0To9fYXZU79eN9QEbUtEYIEj5ATU=; b=CdLMUH8QBq9tXGQIEx9vff+tpyghxhfmSy0VF+voJlwZAqVQuiokL9yTe5SRFWSpOs ZfPejyBmngsirsEb7mwmz/lsyGmxlbBdSwhLD8iPm6RTJOeQfcHy/0vyP76iujrhZQIq K7183nDJbH9ZirqlzY2/wfNRrbOxEskrE0nuXvdUExl0CWKrVP5Rz5T/Y1NG0E71Xt41 idoah+i2XiD17TXFIyXNAgXE47aSOtqW3+nAklL+f7Lbca5bfAUbvi1MjInd7I57x4IB 9HEMfCqG+khs3/LOLFJseHanggunJLQWJViV3L3XAGnxDZc9YCkGuK80AO0lhBGKYLR6 3Kaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=rlB5yqmc; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c5si644394pgq.434.2018.12.12.20.31.47; Wed, 12 Dec 2018 20:32:01 -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; dkim=pass header.i=@kernel.org header.s=default header.b=rlB5yqmc; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728262AbeLMEa1 (ORCPT + 99 others); Wed, 12 Dec 2018 23:30:27 -0500 Received: from mail.kernel.org ([198.145.29.99]:43304 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728223AbeLMEaZ (ORCPT ); Wed, 12 Dec 2018 23:30:25 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4552920879; Thu, 13 Dec 2018 04:30:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544675424; bh=saA2gMFnkAL9Ocve+PFq2jgmMWxYge9eHkVsG+OqLvQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rlB5yqmczWBOHGgmjnKtKk08AO0Yhi+MCe7Ft46k+fg/DxCxHVb1g6lNg95aMt7My DkblwL0YDZ5tU6vcxbP+9dv3UfTDUA53dzKH9+tOb/7nXL3yQ+0U+9dVdlUeKpDLdY SR+dCw1Or3IEJdjvZywW/9LiS7WIZfKYeahKEXR8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Baruch Siach , Maxime Chevallier , Antoine Tenart , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 56/73] net: mvpp2: fix detection of 10G SFP modules Date: Wed, 12 Dec 2018 23:28:21 -0500 Message-Id: <20181213042838.75160-56-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181213042838.75160-1-sashal@kernel.org> References: <20181213042838.75160-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Baruch Siach [ Upstream commit 01b3fd5ac97caffb8e5d5bd85086da33db3b361f ] The mvpp2_phylink_validate() relies on the interface field of phylink_link_state to determine valid link modes. However, when called from phylink_sfp_module_insert() this field in not initialized. The default switch case then excludes 10G link modes. This allows 10G SFP modules that are detected correctly to be configured at max rate of 2.5G. Catch the uninitialized PHY mode case, and allow 10G rates. Fixes: d97c9f4ab000b ("net: mvpp2: 1000baseX support") Cc: Maxime Chevallier Cc: Antoine Tenart Acked-by: Russell King Signed-off-by: Baruch Siach Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c index a74002b43b51..1b3b64fea038 100644 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c @@ -4271,6 +4271,7 @@ static void mvpp2_phylink_validate(struct net_device *dev, switch (state->interface) { case PHY_INTERFACE_MODE_10GKR: + case PHY_INTERFACE_MODE_NA: phylink_set(mask, 10000baseCR_Full); phylink_set(mask, 10000baseSR_Full); phylink_set(mask, 10000baseLR_Full); -- 2.19.1