From patchwork Fri Nov 4 18:19:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Frias X-Patchwork-Id: 691381 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 3t9VVT491fz9vDS for ; Sat, 5 Nov 2016 05:19:45 +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="AXEgTBYx"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S938669AbcKDST2 (ORCPT ); Fri, 4 Nov 2016 14:19:28 -0400 Received: from smtpoutz26.laposte.net ([194.117.213.101]:52922 "EHLO smtp.laposte.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S935148AbcKDST1 (ORCPT ); Fri, 4 Nov 2016 14:19:27 -0400 Received: from smtp.laposte.net (localhost [127.0.0.1]) by lpn-prd-vrout014 (Postfix) with ESMTP id A243F11F2AB for ; Fri, 4 Nov 2016 19:19:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=laposte.net; s=mail0; t=1478283565; bh=XSgNPy1tVr9bI7yIeSFMmAzM8iDEfGRDvDDGCUS8S+Q=; h=Subject:To:References:Cc:From:Date:In-Reply-To; b=AXEgTBYxangVNx5wqj7uNuz53036fRYTwgN1lC2Quij8Yqg9HOwTbdnL/ESBHvFT9 4HaomPH4bsjvtWRjM53Y5Wp4jrORxeWVpORbbmQWpIus3AEULcLjTUZ4m9Vl3a6Gep xAL2KppXQkZwowlRju8LhBcr7Hu9FPY6TlizKP/YXa963/6zAQ1A12LmYsw2a/deeT sC6kRO0fylKCapHLMu7E4c4wipCB33nsZLwioekCLBH7zDW6mV98TvepQJyZPtxoeL 8BpGoKgO5E5ziG+IBWLsEfa5ElYo4sDp+QUwlME1yFzLUa9sRemZqhOd5dGkrVAqMt B/glK0Va1l/Zg== Received: from smtp.laposte.net (localhost [127.0.0.1]) by lpn-prd-vrout014 (Postfix) with ESMTP id 957C1121555 for ; Fri, 4 Nov 2016 19:19:25 +0100 (CET) Received: from lpn-prd-vrin001 (lpn-prd-vrin001.laposte [10.128.63.2]) by lpn-prd-vrout014 (Postfix) with ESMTP id 910C911F2AB for ; Fri, 4 Nov 2016 19:19:25 +0100 (CET) Received: from lpn-prd-vrin001 (localhost [127.0.0.1]) by lpn-prd-vrin001 (Postfix) with ESMTP id 7BE0A366D6A for ; Fri, 4 Nov 2016 19:19:25 +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 2ADA7366D05; Fri, 4 Nov 2016 19:19:25 +0100 (CET) Subject: [PATCH v2 2/2] net: ethernet: nb8800: handle all RGMII definitions To: =?UTF-8?B?TcOlbnMgUnVsbGfDpXJk?= , "David S. Miller" , netdev References: <581CD0CA.9070506@laposte.net> Cc: LKML , Mason , Andrew Lunn From: Sebastian Frias Message-ID: <581CD12C.5000308@laposte.net> Date: Fri, 4 Nov 2016 19:19:24 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.8.0 MIME-Version: 1.0 In-Reply-To: <581CD0CA.9070506@laposte.net> X-VR-SrcIP: 92.154.11.170 X-VR-FullState: 0 X-VR-Score: -100 X-VR-Cause-1: gggruggvucftvghtrhhoucdtuddrfeelvddrkeelgdduudegucetufdoteggodetrfdotffvucfrrhho X-VR-Cause-2: fhhilhgvmecunfetrffquffvgfenuceurghilhhouhhtmecuhedttdenucesvcftvggtihhpihgvnhht X-VR-Cause-3: shculddquddttddmnecujfgurhepuffvfhfhkffffgggjggtgfesthejrgdttdefjeenucfhrhhomhep X-VR-Cause-4: ufgvsggrshhtihgrnhcuhfhrihgrshcuoehsfhekgeeslhgrphhoshhtvgdrnhgvtheqnecukfhppeel X-VR-Cause-5: vddrudehgedruddurddujedtnecurfgrrhgrmhepmhhouggvpehsmhhtphhouhhtpdhhvghloheplgdu X-VR-Cause-6: jedvrddvjedrtddrvddugegnpdhinhgvthepledvrdduheegrdduuddrudejtddpmhgrihhlfhhrohhm X-VR-Cause-7: pehsfhekgeeslhgrphhoshhtvgdrnhgvthdprhgtphhtthhopehmrghnshesmhgrnhhsrhdrtghomh 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 definitions: 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 pad mode for the HW to work properly. Signed-off-by: Sebastian Frias --- drivers/net/ethernet/aurora/nb8800.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/aurora/nb8800.c b/drivers/net/ethernet/aurora/nb8800.c index d2855c9..fba2699 100644 --- a/drivers/net/ethernet/aurora/nb8800.c +++ b/drivers/net/ethernet/aurora/nb8800.c @@ -598,6 +598,7 @@ static irqreturn_t nb8800_irq(int irq, void *dev_id) static void nb8800_mac_config(struct net_device *dev) { struct nb8800_priv *priv = netdev_priv(dev); + struct phy_device *phydev = dev->phydev; bool gigabit = priv->speed == SPEED_1000; u32 mac_mode_mask = RGMII_MODE | HALF_DUPLEX | GMAC_MODE; u32 mac_mode = 0; @@ -609,7 +610,7 @@ static void nb8800_mac_config(struct net_device *dev) mac_mode |= HALF_DUPLEX; if (gigabit) { - if (priv->phy_mode == PHY_INTERFACE_MODE_RGMII) + if (phy_interface_is_rgmii(phydev)) mac_mode |= RGMII_MODE; mac_mode |= GMAC_MODE; @@ -1278,9 +1279,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;