From patchwork Thu Mar 30 13:21:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Madalin Bucur X-Patchwork-Id: 745253 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vv50f5Lk7z9ryv for ; Fri, 31 Mar 2017 00:22:58 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3vv50f4VJGzDqMH for ; Fri, 31 Mar 2017 00:22:58 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0042.outbound.protection.outlook.com [104.47.34.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3vv4zP3ZwdzDqLP for ; Fri, 31 Mar 2017 00:21:51 +1100 (AEDT) Received: from CY1PR03CA0007.namprd03.prod.outlook.com (10.174.128.17) by CY1PR0301MB1962.namprd03.prod.outlook.com (10.164.1.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1005.10; Thu, 30 Mar 2017 13:21:47 +0000 Received: from BY2FFO11FD018.protection.gbl (2a01:111:f400:7c0c::184) by CY1PR03CA0007.outlook.office365.com (2603:10b6:600::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1005.10 via Frontend Transport; Thu, 30 Mar 2017 13:21:47 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BY2FFO11FD018.mail.protection.outlook.com (10.1.14.106) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.977.7 via Frontend Transport; Thu, 30 Mar 2017 13:21:46 +0000 Received: from fsr-fed2164-101.ea.freescale.net (fsr-fed2164-101.ea.freescale.net [10.171.73.197]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v2UDLh9J029528; Thu, 30 Mar 2017 06:21:44 -0700 From: Madalin Bucur To: Subject: [PATCH] fsl/fman: take into account all RGMII modes Date: Thu, 30 Mar 2017 16:21:40 +0300 Message-ID: <1490880100-13373-1-git-send-email-madalin.bucur@nxp.com> X-Mailer: git-send-email 2.1.0 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131353537070173730; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(39410400002)(39400400002)(39850400002)(39380400002)(39860400002)(39840400002)(39450400003)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(9170700003)(48376002)(104016004)(356003)(47776003)(81166006)(4326008)(36756003)(5660300001)(305945005)(85426001)(5003940100001)(105606002)(38730400002)(110136004)(106466001)(8676002)(8936002)(50466002)(50226002)(54906002)(2906002)(77096006)(8656002)(86362001)(50986999)(189998001)(43066003)(33646002)(2351001)(3450700001)(53936002)(6916009)(6666003); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0301MB1962; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; MX:1; A:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD018; 1:GiaJ5JLnLzy1OcwtIspmU2T3Kh9gpDHSsL+GCQ8/iKp0Hobbt+qsoYM+NBieIYKv+1DderlExap3BNWWnncRWGsfE6MC2vaAnMlNlnYNdhkw8i/89q6spY0WdwNo2wFzzl6PVCKBqb7ceSdN32EzyNcgU4JBl0aJiVge7XsJOJnAHll10JwoeIF2Kd2sjVF41eBQrajysG96t7yzmLStrYhXc66AdVOr/EQhTGEpnSTXpwwnqC1v62A6Nu/ZGsWH6bmzgAtAZwxubhoVugbWUsQPxTuEysrCN0iSxbrjjpx2omipbqe7awKeXFtXp6BLwaB5yU1eQdVPuEkFMONDlpA3KZukHsbmRML0mI1bvYzwMrGyAmbuVNOI4Bi0kfRN5zf/t1tx2Yd1UT72jwvcjdwyqpduJR6tXAOm8TTaeX2PGhLY1hYZoF9jbGlxzhNKACL3kQj0e+g1DibWZIbakshJofBFhnEMNIGKpWw0qz+jvYXj15z3ebLZPY2llY3I8Y2wqgdT1MQq/ZI6+qFeVXxYZ38qkJzxNEbgrA8fo6eCuklrnsBDK7u2VG8fRIL7N1J+KiE4xH0E4+7AiOYbONWJ4N81KjwwPjEcDg2/nGoslLWWIfOO+6la2u97YsoSB6j5BWDJrHD3tF+cjDJfSztG9IvCNiPyMEsZrNtjwzUO+ATcC0W49kw10RSRyUFlm+ICx0Ce2qDbZgI+arIDSA== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 405ea230-c0d1-4014-0e22-08d4776fb786 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030255075)(201703131430075)(201703131517081); SRVR:CY1PR0301MB1962; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1962; 3:zWtFb9IdlLm5tkkx6KPlPJJP1bQy1dwcVPuMNRshILUUKsP/AathJompfMp0tRUo13MFlD1TxAln6+gKzbxN4UnL0iZhiPbCVw3bc7NFLcZ4D+mOFNxnFbI7jDyrU1BtUSD/hfTEKO5cyPi9OU32c4CPaohzDtpJQyTn6M70Gq0n5Cas2CMpf9n6fHwH80/9L+3EDLb/QMS8ufw2fCLKInxRC1RwGj7Dx5NOzcF4qJGOit96f7gjSLnQn19OHV2USoxUM2fNSHjyKtKiKpOlb0Nk4+bq4QvdpqxnA8hPl4v+U0ycDIO94ydY1fRsa6Oct0cRGORbqawdtJnsB1RAMjoz7YNhr24B3897MQnGzR09qUVIyBKWL1ZXyqpcR+5jBV4J1fx/nkgU3yxd2q76t5Vc3FwWaBc2CP/9eNfrdhJslSnzkEh1N3sb5pXyQA4TLsEdfBya8DHqiUX79SRJTA== X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1962; 25:03TydWdXa+2wcWUZTWSNtRrnwbn0w7FVjc3mkpW5plPYOKK9FZcNsTFCvNUnAyI/mrWwPg3XCaxU/6M2VE6o+T+S0Mni7pgUUVI7EFWk9WXGRgVNddAMt6mjwlzbHwVw3Gds8ROkQBfrJ2Qt8dczx/nJ+yvt4dNbojUvy1p+bNDljaXz4XhP9Nk3nE4LIp5wxf0IV8QuJ09voF5S7eLo4yQtdlNINazqD207eos1Mrf6Z6HiX8T/a9W2Nsq/jgPUTBcdfeAAWjblbLnsD0mVlkPgC+73ZVvbtPK7SRGI1yRdW7KFQ/0Nwmo+8qY3whRkfH6hAqzEaOS1iU0VNeYn8c0HSwmML+zrKaQ9wvu56t1uvL58JxmeeDLYB1uvpFpHCrnTWVVi9gUqW1eFFN4CXMUC0pcUZSzk6EE7SAIbbXNUUid2pSB7PNSwX1bEs4Rb+seGhfK4lMcrUPHgR8+5lg==; 31:SHzuCrsv5ilctyHjuvZKEnxSWo8x8/GDWDn4GZu/TsKJNWfD66s1RfeEEtQmq11YgTwnNeMNwR83B0Cc4DsgL750eKqfzWxeLP4yPa16yx+BZWht6PljCEprODsFMsuy5/5fPZBj/ihC/T8QIZhgPPCDY/sqNXeFzTgGiB9zzZr3bAURoJ3ZbRzWfv7Y8Epy29NKncP16+9dXoEpkOJiojUJQlzAxN844o0/o5L1JXYt2DfyhvXHqloG//pPCYyBk33YOHHJaJSxQGy7jxsIoQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(601004)(2401047)(5005006)(13024025)(13017025)(13015025)(8121501046)(13018025)(13023025)(3002001)(10201501046)(6055026)(6096035)(20161123563025)(20161123556025)(201703131430075)(201703131448075)(201703131433075)(201703161259075)(20161123565025)(20161123561025); SRVR:CY1PR0301MB1962; BCL:0; PCL:0; RULEID:(400006); SRVR:CY1PR0301MB1962; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1962; 4:CY7JPfGRALj7jzOxsnF3Sdur8a263wdwcV408OXju1/iMdr6zds4RQgyRvXN1lSO253E/48Yrvmke1/x+E2qk1BzCIO1uJbDa5sfBUs6roxZS7q1mpVF+C0LpT6WMP3KRk2E4tEcrCDk97NpwfB0jygla5q8fnRGux7/VgacxEpRZWdlvPlLosE3qVeddLxrcrDQApBIlsWNbdsGJcy9bK4Yc0c2b4U+CnFvfofPJlVfC2nShTXgqKkh8v6NliWuMT34UI3KCDcBj8Zb0zUEc9HFikP51EF61SEQE3ZHQjreTUapgOIYb5puYXdPiRs8/YM4ispj3eiTMdUcJnC9eKpET3eONREbIDMMLTZl/ILMDiV20lT57CDmutwK11ARtntR/4c3ZrWAl1/B5KjCDOSGMWz4nA1Py/VhPfBsRq/KkYA6hZXhjbrRaCu6Zf4vaPIVBE5R4UadXxXCeMA81Am0NyaASkVMUcqlidEfOdGQyNOauaaRo+FRohOAxGw/lQVHAA+lo1tZYMdQYoaVrI4nEH4h25a2qUB7IMCqDRpCcrv7xmLlXotHDa+2QJ6irJUx30WUc2/Dc1pMLvj1OLjyqjuPFp1SS8Fz9E6fCO0bTKQMyT398D4MximkTUkrz5zFTdVVYRdJi5cbLYVAFvTAdXnDhxVFW1HPBn/cip0TLnSFZ3oUlJQB1gAD4YxsVUX4uSG+3+K+PaqyDFimzQPDDwlBmdVHr3U2VLl45LcyxY67gvJTqeqHJobOpk+329En4c/M/5/OkF5TeXcbwmvEQBtUwkpe1esg8wxQ1aVpjIbQM+D8ybmF88tfs1Ke54i58+HejFBS+CYNbU0utKPsxLjA1VAMjxvsIWJS5Js= X-Forefront-PRVS: 02622CEF0A X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB1962; 23:7/IN56/rHm+dZHVv9K+z+H6eA/eiK/hUGaVCfcj?= =?us-ascii?Q?2WabN4yipxdsGmjZwTvA3lJ+SDrbM90D1GyKKPfoy8AslwSjuvVG4YM4m4uA?= =?us-ascii?Q?D3Qr/fbs8DGn33qGvGEHHRcRtdb7jNzjFQX94MiZImX8kQY+w8reqsLUq8mW?= =?us-ascii?Q?tPzmLrd13do9JA4lnMd73m1xInQu9IptV3h1cadp2vibaHS0T6rPhrcrLBDk?= =?us-ascii?Q?ArnYx1CITHeTy97ACTaJhKhGydQg+d2mnOYaF8XEIOE2EtknUM7XB09I16Cd?= =?us-ascii?Q?IjG9l7uLss35+HiutXPsicyHfve2xlm7BgwXRw4yltx524UOjHB7FU1Jctu7?= =?us-ascii?Q?xDe/R3T8NxAyevXC0+/wiXFbvrtwJA9FdtS0sd3cNdaQ4zf7qT9ZtjQAA1D7?= =?us-ascii?Q?A/fgCE+rQLNKw7X6BjpkCUuLi38uWwM/DSlRTyX+0skJxpg+BkdclryEdLgK?= =?us-ascii?Q?s2zFYIs8iHAKBT4LwX6I8dTiMy4ncmwm3NR5fjZ9sJAn9DEDDIqcR85rPpcB?= =?us-ascii?Q?u6xyK2o9JiQGlsHEVqcKVfvvUQNCWaEwuz2dmlFnb8Hct70Ui1pcAGtUO/w+?= =?us-ascii?Q?FjwSLa5L7QVYgEiSkNpReVAZ/6ssnzaz+Mjajl/43cOG6pNRUWMMPJ3C8KYP?= =?us-ascii?Q?Gc5D+jAeFg5PWNP1JFh4XOYc8NLvuYnlUlIe5NBq8/pzQVy9IG6J6nRMkA1k?= =?us-ascii?Q?z7al8oxe9MB+BZ9Bhmej54JNIhYYvgd0QbBOrQ2L6NhoWj9CjUl0xjdk5huK?= =?us-ascii?Q?w5X6q5Wq3Ehkfd1QZSJiaE9EVXMMiQMYqxn119+yYjz6YEVgabrrLgMPCIcd?= =?us-ascii?Q?kUXtx+ffa1Y2wGzrmWL0cWMeYZcUNvNqdF56wAydwcE6VIBuYXbUOYH6SKvy?= =?us-ascii?Q?uH7c63RkyX/MM2KY7Sh5wSrqzfJjYGCYmnChQPuUjbzreDSnCenFmUcrOYUH?= =?us-ascii?Q?r3Q/fYFQoGROOMNnIfxjCd4B+8Xxyd/9aOj0HMiIf6npESLrtteYXiI1e+qf?= =?us-ascii?Q?h47OMWCaUJWOAJ5J4v65zXprqqvYRKD4dFLZ087ZpUjLaYZkr9Wmo6s1rEdM?= =?us-ascii?Q?ged6l7/+giouvPt7Cm8NbdydO0NtDSOZ2MYm3PJVuA0JKv+pL0mUNfAr92Iz?= =?us-ascii?Q?7gxYCQf4CNMm9DycgtGXl2ksRFgzScqCtpwE/CEcLWXRt0AntV53ZZZaoH/M?= =?us-ascii?Q?Dd8HnQlu/qSwsIsfql2ffEx8083PDGplquFTP?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1962; 6:BzeaZZLWYtuawd7Gs4oq+RwpWTmeJH7jeCKDAvQ8NEzhTwbcJO2OJQp3ulJFRcVaA2BK21qFS0gR8J1Ku2vgpkmg038BcERksCUEhDi4BkMzcmzBDgB+9HS4bhZ9jufR9Q8Ldx7uOXE9DuwCpo4ku2B7h01Zj5F388jWCoo9f9Y5Hpkqsj50cx/c4cORKgZVvovXNarSoiBpbh4CzgE3STqa7qxRst5Exotppj+irLAb3Pbwr9PSC/3ddxwjna8hb7mGgOyR8s5HokO/QlUt1xYzlSHeJgqrvBozdImTeKIhKNP+vmMp9i7uieNxfs2agdIehgXEEQ+snFkUrrREIVNzgF52hYS27VvFa9tsFy7KCOLBY7QKH+/iunqK8KxlUuN2ni+oP5FCMd+WG0abEQ==; 5:ArT42BLsrezRTVWVaXD3vASDkJw552hwu/uO05SoIHgGA0dihuOTfHyv2mqxIpGEyBz2d5WsW4XRNyLtUj4KRO73uXQatS7qzdu4AeQi+2uL1K3HrL6exRp1IItPVXqSGpI1pvtaeQk8oaFlx2JfAgYjM/LUHOnXC4WmtzCqSBNzDj5irKocxtl1absR2ou7; 24:KCIAOddh+Nmpj337r2jwA+Z4hw5C839AeE1xjy9NGLOR/LA9n27GD84FOC+fEkXAYYGwpW33XMmPvseAshsP/KemQinUwPULrnY4UPPeLag= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1962; 7:g2w20OLXdtrxa31vL/veaa6Ek0nHqmwrfYTUv4R6xXRleZAYbk8/cM08AtQg1AKbqXL1nB1JVBgV8mmefOPhN2NNL3oZ7vJBn50BwuOL3s9uee4PFy6pTrXRDM0nCtrhA1gag+wq2djX2qqdWcHyNdAXD/gnAK8NjHuZ3ygBfQc28TMZXs9DsBVAYVOGv+2FT7FUMK4iZe4uOPDIdLP+5a5DHzK1PkdkZHxOn/8HUTcN40pKRJk8ELuB7YRELKaHdVGiY5ST+0StcdG8dmOoh50BSDXJ+Db0K/EEt1FwVXQTf2PhCRIubBwb/2L0lOlJJYsO1GVo1VCmzldkTKUwlA== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Mar 2017 13:21:46.8301 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0301MB1962 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: madalin.bucur@nxp.com Cc: Madalin Bucur , linuxppc-dev@lists.ozlabs.org, davem@davemloft.net, linux-kernel@vger.kernel.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Accept the internal delay RGMII variants. Signed-off-by: Madalin Bucur --- drivers/net/ethernet/freescale/fman/fman_dtsec.c | 8 +++++++- drivers/net/ethernet/freescale/fman/fman_memac.c | 5 ++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/freescale/fman/fman_dtsec.c b/drivers/net/ethernet/freescale/fman/fman_dtsec.c index 84ea130..98bba10 100644 --- a/drivers/net/ethernet/freescale/fman/fman_dtsec.c +++ b/drivers/net/ethernet/freescale/fman/fman_dtsec.c @@ -381,6 +381,9 @@ static int init(struct dtsec_regs __iomem *regs, struct dtsec_cfg *cfg, /* check RGMII support */ if (iface == PHY_INTERFACE_MODE_RGMII || + iface == PHY_INTERFACE_MODE_RGMII_ID || + iface == PHY_INTERFACE_MODE_RGMII_RXID || + iface == PHY_INTERFACE_MODE_RGMII_TXID || iface == PHY_INTERFACE_MODE_RMII) if (tmp & DTSEC_ID2_INT_REDUCED_OFF) return -EINVAL; @@ -390,7 +393,10 @@ static int init(struct dtsec_regs __iomem *regs, struct dtsec_cfg *cfg, if (tmp & DTSEC_ID2_INT_REDUCED_OFF) return -EINVAL; - is_rgmii = iface == PHY_INTERFACE_MODE_RGMII; + is_rgmii = iface == PHY_INTERFACE_MODE_RGMII || + iface == PHY_INTERFACE_MODE_RGMII_ID || + iface == PHY_INTERFACE_MODE_RGMII_RXID || + iface == PHY_INTERFACE_MODE_RGMII_TXID; is_sgmii = iface == PHY_INTERFACE_MODE_SGMII; is_qsgmii = iface == PHY_INTERFACE_MODE_QSGMII; diff --git a/drivers/net/ethernet/freescale/fman/fman_memac.c b/drivers/net/ethernet/freescale/fman/fman_memac.c index cd6a53e..c029688 100644 --- a/drivers/net/ethernet/freescale/fman/fman_memac.c +++ b/drivers/net/ethernet/freescale/fman/fman_memac.c @@ -443,7 +443,10 @@ static int init(struct memac_regs __iomem *regs, struct memac_cfg *cfg, break; default: tmp |= IF_MODE_GMII; - if (phy_if == PHY_INTERFACE_MODE_RGMII) + if (phy_if == PHY_INTERFACE_MODE_RGMII || + phy_if == PHY_INTERFACE_MODE_RGMII_ID || + phy_if == PHY_INTERFACE_MODE_RGMII_RXID || + phy_if == PHY_INTERFACE_MODE_RGMII_TXID) tmp |= IF_MODE_RGMII | IF_MODE_RGMII_AUTO; } iowrite32be(tmp, ®s->if_mode);