From patchwork Fri Nov 4 15:05:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Frias X-Patchwork-Id: 691282 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3t9QC8713Wz9vFw for ; Sat, 5 Nov 2016 02:06:12 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=laposte.net header.i=@laposte.net header.b="A1Vsn8lM"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935296AbcKDPF4 (ORCPT ); Fri, 4 Nov 2016 11:05:56 -0400 Received: from smtpoutz29.laposte.net ([194.117.213.104]:44067 "EHLO smtp.laposte.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932272AbcKDPFz (ORCPT ); Fri, 4 Nov 2016 11:05:55 -0400 Received: from smtp.laposte.net (localhost [127.0.0.1]) by lpn-prd-vrout017 (Postfix) with ESMTP id 6840DA01C87 for ; Fri, 4 Nov 2016 16:05:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=laposte.net; s=mail0; t=1478271953; bh=mlIJOrrqD9xBWH1GzsNLV0wbxr337aaiRotUr8dDzvU=; h=To:Cc:From:Subject:Date; b=A1Vsn8lMsENWDRIO2/1zS5SwKuCtd7PSzPVTm6YyV087teE5WkbxoHvIxx82zJhZv Py3hahlaSD5qEWbxBv2XUN+KiVS+brAFYCduqrGJYsMuk5nJ4IWTbrtDQJJYR1BHxV Xab4650dvfnrZZdeOOvyI1VIXJfT5aKAROlbOcPlh2CcaJEHXEW9j8bnLW6VFFiPhy 9Tt9TSknOqDcVXSBKBSFfULLkXVro/m0IVmGgFA7fvg3U784N+r1loO9WSUgbSuP9k DGc0HHrkWu4U8J9bMQZrFKEGmTezypzaufGfpjHh+UDFnz8R79Su8ksMXjy4T7c34n Rz4QloazY8srA== Received: from smtp.laposte.net (localhost [127.0.0.1]) by lpn-prd-vrout017 (Postfix) with ESMTP id 5A608A01F1F for ; Fri, 4 Nov 2016 16:05:53 +0100 (CET) Received: from lpn-prd-vrin001 (lpn-prd-vrin001.laposte [10.128.63.2]) by lpn-prd-vrout017 (Postfix) with ESMTP id 57F6AA01C87 for ; Fri, 4 Nov 2016 16:05:53 +0100 (CET) Received: from lpn-prd-vrin001 (localhost [127.0.0.1]) by lpn-prd-vrin001 (Postfix) with ESMTP id 32302366D8A for ; Fri, 4 Nov 2016 16:05:53 +0100 (CET) Received: from [172.27.0.214] (APuteaux-554-1-100-170.w92-154.abo.wanadoo.fr [92.154.11.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by lpn-prd-vrin001 (Postfix) with ESMTPSA id EAA96366D09; Fri, 4 Nov 2016 16:05:52 +0100 (CET) To: =?UTF-8?B?TcOlbnMgUnVsbGfDpXJk?= , "David S. Miller" , netdev Cc: LKML , Mason , Andrew Lunn From: Sebastian Frias Subject: [PATCH 2/2] net: ethernet: nb8800: handle all RGMII declinations Message-ID: <581CA3D0.6080808@laposte.net> Date: Fri, 4 Nov 2016 16:05:52 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.8.0 MIME-Version: 1.0 X-VR-SrcIP: 92.154.11.170 X-VR-FullState: 0 X-VR-Score: -100 X-VR-Cause-1: gggruggvucftvghtrhhoucdtuddrfeelvddrkeelgdejhecutefuodetggdotefrodftvfcurfhrohhf X-VR-Cause-2: ihhlvgemucfntefrqffuvffgnecuuegrihhlohhuthemucehtddtnecusecvtfgvtghiphhivghnthhs X-VR-Cause-3: ucdlqddutddtmdenucfjughrpefvhffukffffgggtgfgsehtjegrtddtfeejnecuhfhrohhmpefuvggs X-VR-Cause-4: rghsthhirghnucfhrhhirghsuceoshhfkeegsehlrghpohhsthgvrdhnvghtqeenucfkphepledvrddu X-VR-Cause-5: heegrdduuddrudejtdenucfrrghrrghmpehmohguvgepshhmthhpohhuthdphhgvlhhopegludejvddr X-VR-Cause-6: vdejrddtrddvudegngdpihhnvghtpeelvddrudehgedruddurddujedtpdhmrghilhhfrhhomhepshhf X-VR-Cause-7: keegsehlrghpohhsthgvrdhnvghtpdhrtghpthhtohepmhgrnhhssehmrghnshhrrdgtohhm X-VR-AvState: No X-VR-State: 0 X-VR-State: 0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Commit a999589ccaae ("phylib: add RGMII-ID interface mode definition") and commit 7d400a4c5897 ("phylib: add PHY interface modes for internal delay for tx and rx only") added several RGMII declinations: PHY_INTERFACE_MODE_RGMII_ID, PHY_INTERFACE_MODE_RGMII_RXID and PHY_INTERFACE_MODE_RGMII_TXID to deal with internal delays. Those are all RGMII modes (1Gbit) and must be considered that way when setting the MAC Mode or the Pads Mode for the HW to work properly. Signed-off-by: Sebastian Frias --- drivers/net/ethernet/aurora/nb8800.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/aurora/nb8800.c b/drivers/net/ethernet/aurora/nb8800.c index d2855c9..6230ace 100644 --- a/drivers/net/ethernet/aurora/nb8800.c +++ b/drivers/net/ethernet/aurora/nb8800.c @@ -609,7 +609,10 @@ static void nb8800_mac_config(struct net_device *dev) mac_mode |= HALF_DUPLEX; if (gigabit) { - if (priv->phy_mode == PHY_INTERFACE_MODE_RGMII) + if (priv->phy_mode == PHY_INTERFACE_MODE_RGMII || + priv->phy_mode == PHY_INTERFACE_MODE_RGMII_ID || + priv->phy_mode == PHY_INTERFACE_MODE_RGMII_RXID || + priv->phy_mode == PHY_INTERFACE_MODE_RGMII_TXID) mac_mode |= RGMII_MODE; mac_mode |= GMAC_MODE; @@ -1278,9 +1281,8 @@ static int nb8800_tangox_init(struct net_device *dev) break; case PHY_INTERFACE_MODE_RGMII: - pad_mode = PAD_MODE_RGMII; - break; - + case PHY_INTERFACE_MODE_RGMII_ID: + case PHY_INTERFACE_MODE_RGMII_RXID: case PHY_INTERFACE_MODE_RGMII_TXID: pad_mode = PAD_MODE_RGMII; break;