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: 9610129 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7635360414 for ; Wed, 8 Mar 2017 01:10:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 677B02855B for ; Wed, 8 Mar 2017 01:10:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5C1C6285AA; Wed, 8 Mar 2017 01:10:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E8BCE2855B for ; Wed, 8 Mar 2017 01:10:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=YwuPQZ2P5j9SF6MSVDGYIbY735NfUPSO+Rbb5DKZ2fs=; b=qcVBcfuLk5yfDE7VRjFTu2uYGn BJbl0kGpCkyskyLzAhjLe/PvblxMHJbxwBpA1KwYbs9XbnmJJOGnfqmqSMABH7OmpNi55boOwvcV1 2h4dnI+Z4+wZLnEJ4rwGYk+3F/PKsSn+ANtF8fMO3I5HytUAQSmQ+VMvGi4lsge2LxOx3vgP+kZj4 NS0arYv1BAWejsSLeLEetspEF7v+gdtpbLxJwm/z6JxtM5/Ybbd0xgrh5c09mzSElMyTHorCbjKqu MI6l0mq/KgJYHkMEK10Jx/KnlHIAwhh5WIKK0z153FRuNeY4VeyF0BQlqFUartKaYRDU+a49wFlN5 LmR7Wiag==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1clQ7l-0007LG-GM; Wed, 08 Mar 2017 01:10:41 +0000 Received: from mail-pg0-x232.google.com ([2607:f8b0:400e:c05::232]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1clQ5M-0004X2-IV for linux-arm-kernel@lists.infradead.org; Wed, 08 Mar 2017 01:08:14 +0000 Received: by mail-pg0-x232.google.com with SMTP id b129so6712917pgc.2 for ; Tue, 07 Mar 2017 17:07:52 -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=tJL0zGRXxOS6N2UqV6ganb5x+gbhe2wxjZ5NuXXs7+bt+cFMMakBdoT8xZW7J0IGE5 CzeLWJ2xw6KrHSMZOm1qpdkdWgqzsFPH4/CFg9FzW1LEplI9MCQ9CMA+pfXPLUwGfUFE uUyPGpGWy2wMMS9F0FYWs36VxzSS5R+NpqAf8xLZV7yRwtWGYlxHutK1GWDdyFXdd09+ NA1OXk+eZ0/2UvwgxVvDjvh+0EEadPAgzdEjmrgcuHwuYvjBjK51rGKxE+rmUiG+PtF6 k0+8QKOmyacIZXHK0KB9EcgpDxGp4h+Mk/YSlE5KFTGv3Aza0Q/Wb8Gjn+KNTNs8Thkj EwRA== X-Gm-Message-State: AMke39kv5kvrepo5E7D6HUTgRYJ+vX0AZc6iaB76UMtvpU/nFKgJgLc38XFQ8oUKk1wkPdzI 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170307_170812_890582_7D9A6A0D X-CRM114-Status: GOOD ( 12.45 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kchudgar@apm.com, patches@apm.com, linux-arm-kernel@lists.infradead.org, Iyappan Subramanian MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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);