From patchwork Fri Nov 4 17:02:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Frias X-Patchwork-Id: 691334 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 3t9SnY66Q7z9vG1 for ; Sat, 5 Nov 2016 04:02:41 +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="fXrBr/2W"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964963AbcKDRCU (ORCPT ); Fri, 4 Nov 2016 13:02:20 -0400 Received: from smtpoutz298.laposte.net ([178.22.154.198]:50961 "EHLO smtp.laposte.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932588AbcKDRCT (ORCPT ); Fri, 4 Nov 2016 13:02:19 -0400 Received: from smtp.laposte.net (localhost [127.0.0.1]) by lpn-prd-vrout010 (Postfix) with ESMTP id 94EDB45AC7D for ; Fri, 4 Nov 2016 18:02:16 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=laposte.net; s=mail0; t=1478278936; bh=+uCzBACA2sUpXRKt/v45UaPmZJi7MIaEDNGi5+rLSAg=; h=Subject:To:References:Cc:From:Date:In-Reply-To; b=fXrBr/2WJ19AEu9SQIQX3jZykS8s3JJEBczitVotRFYTSzlqg0+1qz091bUd+LtEF 3qA/yJ/VFoMuGi8aO2BIFprRdf06bsWAH3ECztYyXh/xxqEh58AREDQKs+jhG24eky ZUJA3Yceglo/6YgJNc9R6aGwhGwHkJ7obkvYm7xePRLof8iTCgLGZIRDZW41TB2Sdc dzIUj+wUgZNl0D+m3RvyA8iKH7GKAlHV6ihKKoqWAAjzXxv8qpsDMRvzEVSwHlgaqT +8IJa4pl7VJ5uvKBKcbWFlYK38BKAZSFs22BvrBqIzeDh5/Fj6GMj2O8zt14bIBHfx 6asJtU2WyFz6g== Received: from smtp.laposte.net (localhost [127.0.0.1]) by lpn-prd-vrout010 (Postfix) with ESMTP id 8641845CC5F for ; Fri, 4 Nov 2016 18:02:16 +0100 (CET) Received: from lpn-prd-vrin003 (lpn-prd-vrin003.prosodie [10.128.63.4]) by lpn-prd-vrout010 (Postfix) with ESMTP id 8159045AC7D for ; Fri, 4 Nov 2016 18:02:16 +0100 (CET) Received: from lpn-prd-vrin003 (localhost [127.0.0.1]) by lpn-prd-vrin003 (Postfix) with ESMTP id 6F62E48DFE6 for ; Fri, 4 Nov 2016 18:02:16 +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-vrin003 (Postfix) with ESMTPSA id 9E24548DFBC; Fri, 4 Nov 2016 18:02:15 +0100 (CET) Subject: [PATCH v2 2/2 ] net: ethernet: nb8800: handle all RGMII definitions To: Florian Fainelli , =?UTF-8?B?TcOlbnMgUnVsbGfDpXJk?= , "David S. Miller" , netdev References: <581CA3D0.6080808@laposte.net> <8c491fff-4849-fa9b-0a0a-5a7a6870120d@gmail.com> Cc: LKML , Mason , Andrew Lunn From: Sebastian Frias Message-ID: <581CBF17.2010108@laposte.net> Date: Fri, 4 Nov 2016 18:02:15 +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: <8c491fff-4849-fa9b-0a0a-5a7a6870120d@gmail.com> X-VR-SrcIP: 92.154.11.170 X-VR-FullState: 0 X-VR-Score: -100 X-VR-Cause-1: gggruggvucftvghtrhhoucdtuddrfeelvddrkeelgdellecutefuodetggdotefrodftvfcurfhrohhf X-VR-Cause-2: ihhlvgemucfntefrqffuvffgnecuuegrihhlohhuthemucehtddtnecusecvtfgvtghiphhivghnthhs X-VR-Cause-3: ucdlqddutddtmdenucfjughrpefuvfhfhffkffgfgggjtgfgsehtjegrtddtfeehnecuhfhrohhmpefu X-VR-Cause-4: vggsrghsthhirghnucfhrhhirghsuceoshhfkeegsehlrghpohhsthgvrdhnvghtqeenucfkphepledv X-VR-Cause-5: rdduheegrdduuddrudejtdenucfrrghrrghmpehmohguvgepshhmthhpohhuthdphhgvlhhopegludej X-VR-Cause-6: vddrvdejrddtrddvudegngdpihhnvghtpeelvddrudehgedruddurddujedtpdhmrghilhhfrhhomhep X-VR-Cause-7: shhfkeegsehlrghpohhsthgvrdhnvghtpdhrtghpthhtohepfhdrfhgrihhnvghllhhisehgmhgrihhl X-VR-Cause-8: rdgtohhm 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;