From patchwork Sat Jul 30 00:33:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iyappan Subramanian X-Patchwork-Id: 654232 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 3s1RRj3B6Xz9t1w for ; Sat, 30 Jul 2016 10:34:09 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=apm.com header.i=@apm.com header.b=IqsSseu6; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753807AbcG3Adu (ORCPT ); Fri, 29 Jul 2016 20:33:50 -0400 Received: from mail-pa0-f42.google.com ([209.85.220.42]:35789 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752852AbcG3Ad0 (ORCPT ); Fri, 29 Jul 2016 20:33:26 -0400 Received: by mail-pa0-f42.google.com with SMTP id iw10so35328515pac.2 for ; Fri, 29 Jul 2016 17:33:26 -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=xQ2P/VF8zIvlF2iFPXgVUOirUJcKUzCKty33rpyRDeI=; b=IqsSseu6IBdBdfU1iDxakRdnD/E0AQWWdxFjYQWXeXdSgXPOho7PX04BL7TN4/JqpS G8eHY2FLojs9DzOral3we3cxLERWfyYt05gVM6V5QkCg5VjNBnpK4OCGu0RSj4oH24Kw pN1fwXEhiZowx9sDV0bRljZFq5M750GlaMef8= 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=xQ2P/VF8zIvlF2iFPXgVUOirUJcKUzCKty33rpyRDeI=; b=ITEEMpAY5Ni3DC7PTQHGDuElLL+9s5wA598Q5LVyYgleFw57CKMJZsgqHrcWJRjpH+ G6HVp1e7RB0jp9zbqsRPD81Zfz2ehVSMuK+9djJ09dJYt9LS4BsSbTqol8ileWp973lf 6kHIjH5r4NW48PxOWmbM2kJ5cawyUDfH+9cdFI3tA3A6bgxO/x5jQzjMOWPr1MegceF4 gHbCM2CgJ8pq5si6h71VF9XR5rn2AcLmb+dQ/DGb7mL+Yy6awqe04BUsGIytu8KcMxhb e85NHUwTyuKexzUQTPHTnKXl3wpCIgl2yMIg8dUR6+tqFGrAejB97NHHkS5E+XR9KdO9 vaHQ== X-Gm-Message-State: AEkooutXnuGd3aXl7fK+v9+bl2GCPdHgyWnOkhhvR/fXxkwc3cbugr3vqISJgqhHjDqbHY7C X-Received: by 10.66.236.39 with SMTP id ur7mr73050722pac.6.1469838806089; Fri, 29 Jul 2016 17:33:26 -0700 (PDT) Received: from isubrama-dev.amcc.com ([206.80.4.98]) by smtp.gmail.com with ESMTPSA id o2sm27724157pfg.10.2016.07.29.17.33.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 29 Jul 2016 17:33:25 -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 02/10] drivers: net: xgene: fix: Add dma_unmap_single Date: Fri, 29 Jul 2016 17:33:55 -0700 Message-Id: <1469838843-19943-3-git-send-email-isubramanian@apm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1469838843-19943-1-git-send-email-isubramanian@apm.com> References: <1469838843-19943-1-git-send-email-isubramanian@apm.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In addition to xgene_enet_delete_bufpool() freeing skbs, their associated dma memory should also be unmapped. Signed-off-by: Iyappan Subramanian --- drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c index d1d6b5e..5246457 100644 --- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c @@ -72,7 +72,6 @@ static int xgene_enet_refill_bufpool(struct xgene_enet_desc_ring *buf_pool, skb = netdev_alloc_skb_ip_align(ndev, len); if (unlikely(!skb)) return -ENOMEM; - buf_pool->rx_skb[tail] = skb; dma_addr = dma_map_single(dev, skb->data, len, DMA_FROM_DEVICE); if (dma_mapping_error(dev, dma_addr)) { @@ -81,6 +80,8 @@ static int xgene_enet_refill_bufpool(struct xgene_enet_desc_ring *buf_pool, return -EINVAL; } + buf_pool->rx_skb[tail] = skb; + raw_desc->m1 = cpu_to_le64(SET_VAL(DATAADDR, dma_addr) | SET_VAL(BUFDATALEN, bufdatalen) | SET_BIT(COHERENT)); @@ -102,12 +103,21 @@ static u8 xgene_enet_hdr_len(const void *data) static void xgene_enet_delete_bufpool(struct xgene_enet_desc_ring *buf_pool) { + struct device *dev = ndev_to_dev(buf_pool->ndev); + struct xgene_enet_raw_desc16 *raw_desc; + dma_addr_t dma_addr; int i; /* Free up the buffers held by hardware */ for (i = 0; i < buf_pool->slots; i++) { - if (buf_pool->rx_skb[i]) + if (buf_pool->rx_skb[i]) { dev_kfree_skb_any(buf_pool->rx_skb[i]); + + raw_desc = &buf_pool->raw_desc16[i]; + dma_addr = GET_VAL(DATAADDR, le64_to_cpu(raw_desc->m1)); + dma_unmap_single(dev, dma_addr, XGENE_ENET_MAX_MTU, + DMA_FROM_DEVICE); + } } }