From patchwork Sat Aug 13 05:05:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iyappan Subramanian X-Patchwork-Id: 658942 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 3sB8pT51LNz9sDG for ; Sat, 13 Aug 2016 15:05:37 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=apm.com header.i=@apm.com header.b=m2Ts8HtU; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753022AbcHMFFe (ORCPT ); Sat, 13 Aug 2016 01:05:34 -0400 Received: from mail-pf0-f180.google.com ([209.85.192.180]:35860 "EHLO mail-pf0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752737AbcHMFE5 (ORCPT ); Sat, 13 Aug 2016 01:04:57 -0400 Received: by mail-pf0-f180.google.com with SMTP id h186so2048805pfg.3 for ; Fri, 12 Aug 2016 22:04:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apm.com; s=apm; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=W7IoN71r7jOOx/IpIZJ7UHvmNl05gbNAFKXgPX2wX18=; b=m2Ts8HtUA7WRp4LVEvtabkpLuZRJPJHG+Z+algWEZhf1Qe1i4OZEcK5H3OBiCK33Pt 76IkxbVSS0ZxZpBiDHbHN9UQmkgTVDkHDn06iM/LjbNGGHClBc8mYUG7exIyt4qD4d0Q zgwJDYqQuL2xW6aiYfc8hEG62DUDScz8tJJYw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=W7IoN71r7jOOx/IpIZJ7UHvmNl05gbNAFKXgPX2wX18=; b=DLHa/u6WYqFC7g1X9CNjz6CyMM2WGIm1RwErHyFYJshbWbQPB80EXZUpTwviQXAle9 OLYWLpV/Yc1JzgvqSWkOoDv79XXxLxnDYG6kKZrMcMq/+mi25Z3o/zcVQKLcBF/meefI e+4Ap2gSw6rF0Ey1WWRgmUuVPqyert2Zd38YAZe8BHlHOnSU7XdauYcDpeHgSxAEBjkB gHtGzPb2lJcHQ76yOTd+y2mUrc9zrIrlrpxNAi7CMY9fhleNAUfKuSU8xV/cLDXNVifk 81BIec3cknWCK7r2v6kq0cL1njMtMOz0VTrNOih/pZvo9rtwXU+DSWZWZLi7tYR0PzKf E5XA== X-Gm-Message-State: AEkooutDjFq7Yp+Dmtr8bGdxFBlEKqJIOGSWHPUf1wHcGdr7NMG+a9ev1Kl6sQYpsp5/TizF X-Received: by 10.98.73.24 with SMTP id w24mr33616041pfa.27.1471064696673; Fri, 12 Aug 2016 22:04:56 -0700 (PDT) Received: from isubrama-dev.amcc.com ([206.80.4.98]) by smtp.gmail.com with ESMTPSA id o2sm16753965pfg.10.2016.08.12.22.04.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 12 Aug 2016 22:04:56 -0700 (PDT) From: Iyappan Subramanian To: davem@davemloft.net, netdev@vger.kernel.org, devicetree@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, patches@apm.com, linux@armlinux.org.uk, Iyappan Subramanian Subject: [PATCH net-next v2 06/12] drivers: net: xgene: Change port init sequence Date: Fri, 12 Aug 2016 22:05:42 -0700 Message-Id: <1471064748-28033-7-git-send-email-isubramanian@apm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1471064748-28033-1-git-send-email-isubramanian@apm.com> References: <1471064748-28033-1-git-send-email-isubramanian@apm.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch rearranges the port initialization sequence as recommended by hardware specification. This patch also removes, mac_init() call from xgene_enet_link_state(), as it was not required. Signed-off-by: Iyappan Subramanian Tested-by: Fushen Chen --- drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c b/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c index 9c6ad0d..d53c053 100644 --- a/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c @@ -216,12 +216,12 @@ static void xgene_xgmac_init(struct xgene_enet_pdata *pdata) data |= CFG_RSIF_FPBUFF_TIMEOUT_EN; xgene_enet_wr_csr(pdata, XG_RSIF_CONFIG_REG_ADDR, data); - xgene_enet_wr_csr(pdata, XG_CFG_BYPASS_ADDR, RESUME_TX); - xgene_enet_wr_csr(pdata, XGENET_RX_DV_GATE_REG_0_ADDR, 0); xgene_enet_rd_csr(pdata, XG_ENET_SPARE_CFG_REG_ADDR, &data); data |= BIT(12); xgene_enet_wr_csr(pdata, XG_ENET_SPARE_CFG_REG_ADDR, data); xgene_enet_wr_csr(pdata, XG_ENET_SPARE_CFG_REG_1_ADDR, 0x82); + xgene_enet_wr_csr(pdata, XGENET_RX_DV_GATE_REG_0_ADDR, 0); + xgene_enet_wr_csr(pdata, XG_CFG_BYPASS_ADDR, RESUME_TX); } static void xgene_xgmac_rx_enable(struct xgene_enet_pdata *pdata) @@ -366,7 +366,6 @@ static void xgene_enet_link_state(struct work_struct *work) if (link_status) { if (!netif_carrier_ok(ndev)) { netif_carrier_on(ndev); - xgene_xgmac_init(pdata); xgene_xgmac_rx_enable(pdata); xgene_xgmac_tx_enable(pdata); netdev_info(ndev, "Link is Up - 10Gbps\n");