From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christian Lamparter Subject: [PATCH] net: ibm: emac: support RGMII-[RX|TX]ID phymode Date: Sun, 17 Dec 2017 22:51:22 +0100 Message-ID: <20171217215122.24045-1-chunkeey@gmail.com> Cc: "David S . Miller" , Andrew Lunn , Christophe Jaillet To: netdev@vger.kernel.org Return-path: Received: from mail-wm0-f65.google.com ([74.125.82.65]:36294 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752540AbdLQVv0 (ORCPT ); Sun, 17 Dec 2017 16:51:26 -0500 Received: by mail-wm0-f65.google.com with SMTP id b76so26264666wmg.1 for ; Sun, 17 Dec 2017 13:51:25 -0800 (PST) Sender: netdev-owner@vger.kernel.org List-ID: The RGMII spec allows compliance for devices that implement an internal delay on TXC and/or RXC inside the transmitter. This patch adds the necessary RGMII_[RX|TX]ID mode code to handle such PHYs with the emac driver. Signed-off-by: Christian Lamparter --- drivers/net/ethernet/ibm/emac/core.c | 3 +++ drivers/net/ethernet/ibm/emac/emac.h | 3 +++ drivers/net/ethernet/ibm/emac/rgmii.c | 9 +++++++++ 3 files changed, 15 insertions(+) diff --git a/drivers/net/ethernet/ibm/emac/core.c b/drivers/net/ethernet/ibm/emac/core.c index 7feff2450ed6..820173bee168 100644 --- a/drivers/net/ethernet/ibm/emac/core.c +++ b/drivers/net/ethernet/ibm/emac/core.c @@ -201,6 +201,9 @@ static inline int emac_phy_supports_gige(int phy_mode) { return phy_mode == PHY_MODE_GMII || phy_mode == PHY_MODE_RGMII || + phy_mode == PHY_MODE_RGMII_ID || + phy_mode == PHY_MODE_RGMII_RXID || + phy_mode == PHY_MODE_RGMII_TXID || phy_mode == PHY_MODE_SGMII || phy_mode == PHY_MODE_TBI || phy_mode == PHY_MODE_RTBI; diff --git a/drivers/net/ethernet/ibm/emac/emac.h b/drivers/net/ethernet/ibm/emac/emac.h index 5afcc27ceebb..8c6d2af7281b 100644 --- a/drivers/net/ethernet/ibm/emac/emac.h +++ b/drivers/net/ethernet/ibm/emac/emac.h @@ -112,6 +112,9 @@ struct emac_regs { #define PHY_MODE_RMII PHY_INTERFACE_MODE_RMII #define PHY_MODE_SMII PHY_INTERFACE_MODE_SMII #define PHY_MODE_RGMII PHY_INTERFACE_MODE_RGMII +#define PHY_MODE_RGMII_ID PHY_INTERFACE_MODE_RGMII_ID +#define PHY_MODE_RGMII_RXID PHY_INTERFACE_MODE_RGMII_RXID +#define PHY_MODE_RGMII_TXID PHY_INTERFACE_MODE_RGMII_TXID #define PHY_MODE_TBI PHY_INTERFACE_MODE_TBI #define PHY_MODE_GMII PHY_INTERFACE_MODE_GMII #define PHY_MODE_RTBI PHY_INTERFACE_MODE_RTBI diff --git a/drivers/net/ethernet/ibm/emac/rgmii.c b/drivers/net/ethernet/ibm/emac/rgmii.c index c4a1ac38bba8..7963adffbb1c 100644 --- a/drivers/net/ethernet/ibm/emac/rgmii.c +++ b/drivers/net/ethernet/ibm/emac/rgmii.c @@ -55,6 +55,9 @@ static inline int rgmii_valid_mode(int phy_mode) return phy_mode == PHY_MODE_GMII || phy_mode == PHY_MODE_MII || phy_mode == PHY_MODE_RGMII || + phy_mode == PHY_MODE_RGMII_ID || + phy_mode == PHY_MODE_RGMII_RXID || + phy_mode == PHY_MODE_RGMII_TXID || phy_mode == PHY_MODE_TBI || phy_mode == PHY_MODE_RTBI; } @@ -63,6 +66,9 @@ static inline const char *rgmii_mode_name(int mode) { switch (mode) { case PHY_MODE_RGMII: + case PHY_MODE_RGMII_ID: + case PHY_MODE_RGMII_RXID: + case PHY_MODE_RGMII_TXID: return "RGMII"; case PHY_MODE_TBI: return "TBI"; @@ -81,6 +87,9 @@ static inline u32 rgmii_mode_mask(int mode, int input) { switch (mode) { case PHY_MODE_RGMII: + case PHY_MODE_RGMII_ID: + case PHY_MODE_RGMII_RXID: + case PHY_MODE_RGMII_TXID: return RGMII_FER_RGMII(input); case PHY_MODE_TBI: return RGMII_FER_TBI(input); -- 2.15.1