From patchwork Wed Mar 8 01:08:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iyappan Subramanian X-Patchwork-Id: 736420 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 3vdGMx1Xtzz9sN6 for ; Wed, 8 Mar 2017 12:36:45 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=apm.com header.i=@apm.com header.b="BvQIfmmE"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933487AbdCHBgn (ORCPT ); Tue, 7 Mar 2017 20:36:43 -0500 Received: from mail-pf0-f180.google.com ([209.85.192.180]:33127 "EHLO mail-pf0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933282AbdCHBgl (ORCPT ); Tue, 7 Mar 2017 20:36:41 -0500 Received: by mail-pf0-f180.google.com with SMTP id w189so7680601pfb.0 for ; Tue, 07 Mar 2017 17:35:12 -0800 (PST) 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=G1Curc9hMkDwwxDgkpBx5aymzjuMoPBJ4LWJ8wxAnek=; b=BvQIfmmE+ibnR+l8VPAujlMvr0iOf4s2FjuwchkZzSZnyRdw0QkwKU9XH3fsLH06C5 oSIAQBPp7eDWCj9qC8hmgK6BLQUzGz9UnF7DKG5g01ZXevWtwUsP3GK5JX/Qst95oIIu DWMcatF3Eq51aNE2TSqahvUWAyde80rWE9EsQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=G1Curc9hMkDwwxDgkpBx5aymzjuMoPBJ4LWJ8wxAnek=; b=Ns8EowCBmMHnAvHL7zP2WL9vHVN2OAMCo23vHj1qi66WDvc8YxxaH51yCKROWtx5Bs UCHYQnHChnZjpyDovYB10s0bacgsPcu0nTLNCjJRT2KpqbmgMY+k3wqHTHU/mByCio9r yRK4dy43dz/QOV8hB9ZuxRwLfP0+GaqVXQ6xXyTIsMrYgnmxRJdMxQS1yJ97fLJZrxtT 8pCikEp/dmT2L07hbiX83UjlSIk45f442k5oQ7cW5rgNd5ajHS4LNFHaF+/yS1SflfoS 7ukHs2xvto3DVO9OzXPIYcgs/zQDS7dSglqtSP84/XXTuUiA+nIGlW+fUoh++SL+3uDs XNWw== X-Gm-Message-State: AMke39nROsEFi5qVTpy8hHPUfnOQMdP4oEJxG/5jaIh9Yk9FS5GxzUcroVQynqNh4A8dlsRg X-Received: by 10.99.139.196 with SMTP id j187mr3625580pge.105.1488935271663; Tue, 07 Mar 2017 17:07:51 -0800 (PST) Received: from isubrama-dev.amcc.com ([206.80.4.98]) by smtp.gmail.com with ESMTPSA id u129sm1940478pfb.130.2017.03.07.17.07.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 07 Mar 2017 17:07:51 -0800 (PST) From: Iyappan Subramanian To: davem@davemloft.net, netdev@vger.kernel.org, andrew@lunn.ch, f.fainelli@gmail.com, David.Laight@aculab.com Cc: linux-arm-kernel@lists.infradead.org, patches@apm.com, kchudgar@apm.com, Iyappan Subramanian Subject: [PATCH v4 net-next 6/6] MAINTAINERS: Add entry for APM X-Gene SoC Ethernet (v2) driver Date: Tue, 7 Mar 2017 17:08:45 -0800 Message-Id: <1488935325-13603-7-git-send-email-isubramanian@apm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1488935325-13603-1-git-send-email-isubramanian@apm.com> References: <1488935325-13603-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 adds a MAINTAINERS entry for the ethernet driver for the on-chip ethernet interface which uses a linked list of DMA descriptor architecture (v2) for APM X-Gene SoCs. Signed-off-by: Iyappan Subramanian Signed-off-by: Keyur Chudgar --- MAINTAINERS | 6 ++++++ drivers/net/ethernet/apm/xgene-v2/mac.c | 2 +- drivers/net/ethernet/apm/xgene-v2/main.c | 8 ++++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index c265a5f..e04d3a6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -902,6 +902,12 @@ F: drivers/net/phy/mdio-xgene.c F: Documentation/devicetree/bindings/net/apm-xgene-enet.txt F: Documentation/devicetree/bindings/net/apm-xgene-mdio.txt +APPLIED MICRO (APM) X-GENE SOC ETHERNET (V2) DRIVER +M: Iyappan Subramanian +M: Keyur Chudgar +S: Supported +F: drivers/net/ethernet/apm/xgene-v2/ + APPLIED MICRO (APM) X-GENE SOC PMU M: Tai Nguyen S: Supported diff --git a/drivers/net/ethernet/apm/xgene-v2/mac.c b/drivers/net/ethernet/apm/xgene-v2/mac.c index 9c3d32d..c3189de 100644 --- a/drivers/net/ethernet/apm/xgene-v2/mac.c +++ b/drivers/net/ethernet/apm/xgene-v2/mac.c @@ -77,8 +77,8 @@ static void xge_mac_set_speed(struct xge_pdata *pdata) void xge_mac_set_station_addr(struct xge_pdata *pdata) { - u32 addr0, addr1; u8 *dev_addr = pdata->ndev->dev_addr; + u32 addr0, addr1; addr0 = (dev_addr[3] << 24) | (dev_addr[2] << 16) | (dev_addr[1] << 8) | dev_addr[0]; diff --git a/drivers/net/ethernet/apm/xgene-v2/main.c b/drivers/net/ethernet/apm/xgene-v2/main.c index b16ef43..ae76977 100644 --- a/drivers/net/ethernet/apm/xgene-v2/main.c +++ b/drivers/net/ethernet/apm/xgene-v2/main.c @@ -27,9 +27,9 @@ static int xge_get_resources(struct xge_pdata *pdata) { struct platform_device *pdev; struct net_device *ndev; - struct device *dev; - struct resource *res; int phy_mode, ret = 0; + struct resource *res; + struct device *dev; pdev = pdata->pdev; dev = &pdev->dev; @@ -190,9 +190,9 @@ static netdev_tx_t xge_start_xmit(struct sk_buff *skb, struct net_device *ndev) { struct xge_pdata *pdata = netdev_priv(ndev); struct device *dev = &pdata->pdev->dev; - static dma_addr_t dma_addr; struct xge_desc_ring *tx_ring; struct xge_raw_desc *raw_desc; + static dma_addr_t dma_addr; u64 addr_lo, addr_hi; void *pkt_buf; u8 tail; @@ -526,7 +526,7 @@ static int xge_close(struct net_device *ndev) static int xge_napi(struct napi_struct *napi, const int budget) { struct net_device *ndev = napi->dev; - struct xge_pdata *pdata = netdev_priv(ndev); + struct xge_pdata *pdata; int processed; pdata = netdev_priv(ndev);