From patchwork Thu Apr 4 05:57:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Byungho An X-Patchwork-Id: 233622 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 AB1142C00C1 for ; Thu, 4 Apr 2013 16:57:19 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763537Ab3DDF5M (ORCPT ); Thu, 4 Apr 2013 01:57:12 -0400 Received: from mailout3.samsung.com ([203.254.224.33]:64524 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755433Ab3DDF5L (ORCPT ); Thu, 4 Apr 2013 01:57:11 -0400 Received: from epcpsbgr1.samsung.com (u141.gpu120.samsung.co.kr [203.254.230.141]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MKP00EV8V74CWK0@mailout3.samsung.com> for netdev@vger.kernel.org; Thu, 04 Apr 2013 14:57:04 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.48]) by epcpsbgr1.samsung.com (EPCPMTA) with SMTP id 2C.14.20872.F261D515; Thu, 04 Apr 2013 14:57:03 +0900 (KST) X-AuditID: cbfee68d-b7f786d000005188-e6-515d162f0fec Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id BD.E4.13494.F261D515; Thu, 04 Apr 2013 14:57:03 +0900 (KST) Received: from DObh74an01 ([12.23.120.86]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MKP008NFV72YA11@mmp1.samsung.com>; Thu, 04 Apr 2013 14:57:02 +0900 (KST) From: Byungho An To: netdev@vger.kernel.org Cc: 'Giuseppe CAVALLARO' , =?ks_c_5601-1987?B?J7HosbnB+Cc=?= , cpgs@samsung.com Subject: [net-next] stmmac: modified pcs mode support for SGMII Date: Thu, 04 Apr 2013 14:57:01 +0900 Message-id: <00b401ce30f9$3a628c50$af27a4f0$%an@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=ks_c_5601-1987 Content-transfer-encoding: 7bit X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac4w+Tmme/YLoQ8cRBmwTfV2YmVWmA== Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrAIsWRmVeSWpSXmKPExsVy+t8zA119sdhAg+aFkhYvD2la9C64ymZx bIGYxf/XWxkdWDz6tqxi9Hj6Yy+zx+dNcgHMUVw2Kak5mWWpRfp2CVwZK79MZitYKVSx+9Uq 9gbG87xdjJwcEgImElcWv2SGsMUkLtxbz9bFyMUhJLCMUWLd/5XMMEW3Pp1jgkgsYpSYtmsn C4Tzi1Hi3NyfbCBVbAJqEs0zL4PZIgJSEh93bGcHKWIWaGCUmPHwOStIQljAXmLl2xUsIDaL gKpE15y7YDavgI3E5XVX2CBsQYkfk++BxZkFDCTez+pjhbDlJTaveQt0EgfQSeoSj/7qQuzS k7i5+i1UuYjEvhfvGEH2SgisY5d49X071C4BiW+TD7FA9MpKbDoA9ZmkxMEVN1gmMIrNQrJ5 FpLNs5BsnoVkxQJGllWMoqkFyQXFSelFhnrFibnFpXnpesn5uZsYIbHVu4Px9gHrQ4zJQOsn MkuJJucDYzOvJN7Q2MzIwtTE1NjI3NKMNGElcV61FutAIYH0xJLU7NTUgtSi+KLSnNTiQ4xM HJxSDYxXMlWzOG4uj8q8OXNXL/PZKVpb2njuuMWm8LXvs2pOqlgg9VfsstHfbK/+Vy2F2ZYd 2wx2GMya9fLW09+c2+bmXtJxeJfjvrvqM8eCM1/7MxsuPt3w6xSbTpf0P9vUpcty5X/1b4re +Dr7yaPgxInH7T9yRnqU/LzXwpqUc/2XYuXkqCdTrs5SYinOSDTUYi4qTgQA0RYCP8MCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuplleLIzCtJLcpLzFFi42I5/e+xgK6+WGygwa0lIhYvD2la9C64ymZx bIGYxf/XWxkdWDz6tqxi9Hj6Yy+zx+dNcgHMUQ2MNhmpiSmpRQqpecn5KZl56bZK3sHxzvGm ZgaGuoaWFuZKCnmJuam2Si4+AbpumTlAy5QUyhJzSoFCAYnFxUr6dpgmhIa46VrANEbo+oYE wfUYGaCBhHWMGSu/TGYrWClUsfvVKvYGxvO8XYycHBICJhK3Pp1jgrDFJC7cW8/WxcjFISSw iFFi2q6dLBDOL0aJc3N/soFUsQmoSTTPvAxmiwhISXzcsZ0dpIhZoIFRYsbD56wgCWEBe4mV b1ewgNgsAqoSXXPugtm8AjYSl9ddYYOwBSV+TL4HFmcWMJB4P6uPFcKWl9i85i1zFyMH0Enq Eo/+6kLs0pO4ufotVLmIxL4X7xgnMArMQjJpFpJJs5BMmoWkZQEjyypG0dSC5ILipPRcI73i xNzi0rx0veT83E2M4Mh9Jr2DcVWDxSFGAQ5GJR7eFf4xgUKsiWXFlbmHGCU4mJVEeN15YgOF eFMSK6tSi/Lji0pzUosPMSYDPTqRWUo0OR+YVPJK4g2NTcyMLI3MLIxMzM1JE1YS5z3Yah0o JJCeWJKanZpakFoEs4WJg1OqgZF/eQ/vbQ721/9PWSzzMQlOa+H7dsjpofCOxvf5kRlqBY5X 63Sn7sp5/SZbecFhXtMlD7do98WkltQHir3dMSHy64Yrd17YLC9I8vPXuXKA/9ScpK7bExdu XlW43kf25ZeNq6/ofM6/XLeC9enS00oqLTcn5TsbBjzPYhJtzvwQ8tyto+FTipQSS3FGoqEW c1FxIgBqAN2uIAMAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch modifies the pcs mode support for SGMII. Even though SGMII does auto-negotiation with phy, it needs stmmac_init_phy and stmmac_mdio_register function for initializing phy. Signed-off-by: Byungho An --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) if (ret < 0) { @@ -2677,7 +2680,8 @@ int stmmac_dvr_remove(struct net_device *ndev) priv->hw->dma->stop_tx(priv->ioaddr); stmmac_set_mac(priv->ioaddr, false); - if (!priv->pcs) + if (priv->pcs != STMMAC_PCS_RGMII && priv->pcs != STMMAC_PCS_TBI && + priv->pcs != STMMAC_PCS_RTBI) stmmac_mdio_unregister(ndev); netif_carrier_off(ndev); unregister_netdev(ndev); -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 6b26d31..3ac9bd7 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -1504,7 +1504,8 @@ static int stmmac_open(struct net_device *dev) stmmac_check_ether_addr(priv); - if (!priv->pcs) { + if (priv->pcs != STMMAC_PCS_RGMII && priv->pcs != STMMAC_PCS_TBI && + priv->pcs != STMMAC_PCS_RTBI) { ret = stmmac_init_phy(dev); if (ret) { pr_err("%s: Cannot attach to PHY (error: %d)\n", @@ -1607,7 +1608,8 @@ static int stmmac_open(struct net_device *dev) /* Using PCS we cannot dial with the phy registers at this stage * so we do not support extra feature like EEE. */ - if (!priv->pcs) + if (priv->pcs != STMMAC_PCS_RGMII && priv->pcs != STMMAC_PCS_TBI && + priv->pcs != STMMAC_PCS_RTBI) priv->eee_enabled = stmmac_eee_init(priv); stmmac_init_tx_coalesce(priv); @@ -2637,7 +2639,8 @@ struct stmmac_priv *stmmac_dvr_probe(struct device *device, stmmac_check_pcs_mode(priv); - if (!priv->pcs) { + if (priv->pcs != STMMAC_PCS_RGMII && priv->pcs != STMMAC_PCS_TBI && + priv->pcs != STMMAC_PCS_RTBI) { /* MDIO bus Registration */ ret = stmmac_mdio_register(ndev);