{"id":807343,"url":"http://patchwork.ozlabs.org/api/1.2/patches/807343/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/1504046592-24779-1-git-send-email-isubramanian@apm.com/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.2/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1504046592-24779-1-git-send-email-isubramanian@apm.com>","list_archive_url":null,"date":"2017-08-29T22:43:12","name":"drivers: net: xgene: Correct probe sequence handling","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"79c2711248173dfac1a0eb6e0e53cd2bf74c2061","submitter":{"id":47568,"url":"http://patchwork.ozlabs.org/api/1.2/people/47568/?format=json","name":"Iyappan Subramanian","email":"isubramanian@apm.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.2/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/1504046592-24779-1-git-send-email-isubramanian@apm.com/mbox/","series":[{"id":500,"url":"http://patchwork.ozlabs.org/api/1.2/series/500/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=500","date":"2017-08-29T22:43:12","name":"drivers: net: xgene: Correct probe sequence handling","version":1,"mbox":"http://patchwork.ozlabs.org/series/500/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/807343/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807343/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (1024-bit key;\n\tunprotected) header.d=apm.com header.i=@apm.com header.b=\"lWYI4hn3\";\n\tdkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xhkF75KVLz9sD9\n\tfor ;\n\tWed, 30 Aug 2017 08:43:23 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751310AbdH2WnV (ORCPT );\n\tTue, 29 Aug 2017 18:43:21 -0400","from mail-pg0-f53.google.com ([74.125.83.53]:35724 \"EHLO\n\tmail-pg0-f53.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751270AbdH2WnU (ORCPT\n\t); Tue, 29 Aug 2017 18:43:20 -0400","by mail-pg0-f53.google.com with SMTP id 63so14665493pgc.2\n\tfor ; Tue, 29 Aug 2017 15:43:19 -0700 (PDT)","from isubrama-dev.amcc.com ([206.80.4.98])\n\tby smtp.gmail.com with ESMTPSA id\n\td67sm6935982pfg.27.2017.08.29.15.43.17\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tTue, 29 Aug 2017 15:43:18 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=apm.com; s=apm;\n\th=from:to:cc:subject:date:message-id;\n\tbh=TpAWZn2aLl6SBtbyAVvw6mlUIyJkdVqlBfZk/Sw02XU=;\n\tb=lWYI4hn3hpggR14eX4KWAKVWRbNG7ec1AYU4YCLUqhfrm0jhm2kRML+pGmEhF8CgSF\n\tvx+YzrWwPIuNLbVrjHy2idzw6vHeKhpnAJDqpX9fespwHOcIK/U9FZuM8BZiyuPxN5tU\n\tH8WSp2Mwf7IBiTBdzgPdnsFsAkL++qSbiSbYs=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id;\n\tbh=TpAWZn2aLl6SBtbyAVvw6mlUIyJkdVqlBfZk/Sw02XU=;\n\tb=Ej4VvUYlVeQKEzyJ0RfJlvHk0TT7HOkqCjjGw8hCP3zLalJkncsNgnanx00RFsaFU9\n\tJ6nUkWwx5edmE2jWdgwcqpRP/4G2nGxF1aUMxeFDTEXsI+QZ2EciKlFp5npDr8rMfZAy\n\tYJi4EBzXlmSN+qGWB7tFWEW4sJoAF7gs2t7o5RvjoUzMmvRJ0j6qra4V2hWhI/oo0Lmz\n\tZ2+3BmtZB0e51XpXQCHp1lXO2/juOs0+BzI8OoKn3UuZrBcC9YDbA5qouwdiUTxn85jc\n\tMKA57UU2NA7mwgS0abzufUHAZKWHBdG97HcKkDLG3nD02Pj6BQLI3Uwk3FMrP8Dhd8jM\n\tAeBg==","X-Gm-Message-State":"AHYfb5hFFUcl0NnwFMS8RwnctX3qc8aMRRIPozTSVnJy7VLNdkD7tfQZ\n\tlCYbe40jxcd4PPPy","X-Received":"by 10.84.211.150 with SMTP id c22mr2305438pli.23.1504046599541; \n\tTue, 29 Aug 2017 15:43:19 -0700 (PDT)","From":"Iyappan Subramanian ","To":"davem@davemloft.net, netdev@vger.kernel.org","Cc":"linux-arm-kernel@lists.infradead.org, dnelson@redhat.com,\n\tpatches@apm.com, Quan Nguyen ,\n\tIyappan Subramanian ","Subject":"[PATCH] drivers: net: xgene: Correct probe sequence handling","Date":"Tue, 29 Aug 2017 15:43:12 -0700","Message-Id":"<1504046592-24779-1-git-send-email-isubramanian@apm.com>","X-Mailer":"git-send-email 2.7.4","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: Quan Nguyen \n\nThe phy is connected at early stage of probe but not properly\ndisconnected if error occurs. This patch fixes the issue.\n\nAlso changing the return type of xgene_enet_check_phy_handle(),\nsince this function always returns success.\n\nSigned-off-by: Quan Nguyen \nSigned-off-by: Iyappan Subramanian \n---\n drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 27 ++++++++++++------------\n 1 file changed, 13 insertions(+), 14 deletions(-)","diff":"diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c\nindex 1d307f2..6e253d9 100644\n--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c\n+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c\n@@ -1661,21 +1661,21 @@ static int xgene_enet_get_irqs(struct xgene_enet_pdata *pdata)\n \treturn 0;\n }\n \n-static int xgene_enet_check_phy_handle(struct xgene_enet_pdata *pdata)\n+static void xgene_enet_check_phy_handle(struct xgene_enet_pdata *pdata)\n {\n \tint ret;\n \n \tif (pdata->phy_mode == PHY_INTERFACE_MODE_XGMII)\n-\t\treturn 0;\n+\t\treturn;\n \n \tif (!IS_ENABLED(CONFIG_MDIO_XGENE))\n-\t\treturn 0;\n+\t\treturn;\n \n \tret = xgene_enet_phy_connect(pdata->ndev);\n \tif (!ret)\n \t\tpdata->mdio_driver = true;\n \n-\treturn 0;\n+\treturn;\n }\n \n static void xgene_enet_gpiod_get(struct xgene_enet_pdata *pdata)\n@@ -1779,10 +1779,6 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata)\n \tif (ret)\n \t\treturn ret;\n \n-\tret = xgene_enet_check_phy_handle(pdata);\n-\tif (ret)\n-\t\treturn ret;\n-\n \txgene_enet_gpiod_get(pdata);\n \n \tpdata->clk = devm_clk_get(&pdev->dev, NULL);\n@@ -2097,9 +2093,11 @@ static int xgene_enet_probe(struct platform_device *pdev)\n \t\tgoto err;\n \t}\n \n+\txgene_enet_check_phy_handle(pdata);\n+\n \tret = xgene_enet_init_hw(pdata);\n \tif (ret)\n-\t\tgoto err;\n+\t\tgoto err2;\n \n \tlink_state = pdata->mac_ops->link_state;\n \tif (pdata->phy_mode == PHY_INTERFACE_MODE_XGMII) {\n@@ -2117,29 +2115,30 @@ static int xgene_enet_probe(struct platform_device *pdev)\n \tspin_lock_init(&pdata->stats_lock);\n \tret = xgene_extd_stats_init(pdata);\n \tif (ret)\n-\t\tgoto err2;\n+\t\tgoto err1;\n \n \txgene_enet_napi_add(pdata);\n \tret = register_netdev(ndev);\n \tif (ret) {\n \t\tnetdev_err(ndev, \"Failed to register netdev\\n\");\n-\t\tgoto err2;\n+\t\tgoto err1;\n \t}\n \n \treturn 0;\n \n-err2:\n+err1:\n \t/*\n \t * If necessary, free_netdev() will call netif_napi_del() and undo\n \t * the effects of xgene_enet_napi_add()'s calls to netif_napi_add().\n \t */\n \n+\txgene_enet_delete_desc_rings(pdata);\n+\n+err2:\n \tif (pdata->mdio_driver)\n \t\txgene_enet_phy_disconnect(pdata);\n \telse if (phy_interface_mode_is_rgmii(pdata->phy_mode))\n \t\txgene_enet_mdio_remove(pdata);\n-err1:\n-\txgene_enet_delete_desc_rings(pdata);\n err:\n \tfree_netdev(ndev);\n \treturn ret;\n","prefixes":[]}