From patchwork Wed Dec 13 09:22:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Russell King (Oracle)" X-Patchwork-Id: 847906 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=armlinux.org.uk header.i=@armlinux.org.uk header.b="XwNqMJw/"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yxWRw1qD5z9sBW for ; Wed, 13 Dec 2017 20:22:20 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751479AbdLMJWR (ORCPT ); Wed, 13 Dec 2017 04:22:17 -0500 Received: from pandora.armlinux.org.uk ([78.32.30.218]:56068 "EHLO pandora.armlinux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750737AbdLMJWL (ORCPT ); Wed, 13 Dec 2017 04:22:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2014; h=Date:Sender:Message-Id:Content-Type:Content-Transfer-Encoding:MIME-Version:Subject:Cc:To:From; bh=JWPRv/gRoAut86xQkTTX3qrXpKKysYcAQ2+OhE2SlNg=; b=XwNqMJw/dHNnEbgQvfNzauf8AWRUdoTkgvlqkyXpvfllE7EbIx6UQOtI836vFgmK40E/UbMnzFSVLMrmblPUIN8+nWtSbeM/K7UaBQgVUP3BIg0jf1CG6e1sJGin0uwsPFcC6bjAPmQhENo9jwOVAgixe4TdAHHw8sDf//UTfnQ=; Received: from e0022681537dd.dyn.armlinux.org.uk ([2001:4d48:ad52:3201:222:68ff:fe15:37dd]:44872 helo=rmk-PC.armlinux.org.uk) by pandora.armlinux.org.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1eP3Eq-0000hH-OC; Wed, 13 Dec 2017 09:22:04 +0000 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.82_1-5b7a7c0-XX) (envelope-from ) id 1eP3Ep-0000ZC-UN; Wed, 13 Dec 2017 09:22:03 +0000 From: Russell King To: Andrew Lunn , Florian Fainelli Cc: Jon Nettleton , netdev@vger.kernel.org Subject: [PATCH] net: phy: marvell: avoid configuring fiber page for SGMII-to-Copper MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Wed, 13 Dec 2017 09:22:03 +0000 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When in SGMII-to-Copper mode, the fiber page is used for the MAC facing link, and does not require configuration of the fiber auto-negotiation settings. Avoid trying. Signed-off-by: Russell King Reviewed-by: Andrew Lunn --- drivers/net/phy/marvell.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 1e3996b41af5..710110ead6ad 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -678,6 +678,10 @@ static int m88e1510_config_aneg(struct phy_device *phydev) if (err < 0) goto error; + /* Do not touch the fiber page if we're in copper->sgmii mode */ + if (phydev->interface == PHY_INTERFACE_MODE_SGMII) + return 0; + /* Then the fiber link */ err = marvell_set_page(phydev, MII_MARVELL_FIBER_PAGE); if (err < 0)