From patchwork Fri Oct 31 22:51:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 405706 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 071C1140077 for ; Sat, 1 Nov 2014 09:52:39 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758155AbaJaWwd (ORCPT ); Fri, 31 Oct 2014 18:52:33 -0400 Received: from mail-pa0-f54.google.com ([209.85.220.54]:37954 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757131AbaJaWwc (ORCPT ); Fri, 31 Oct 2014 18:52:32 -0400 Received: by mail-pa0-f54.google.com with SMTP id rd3so8523066pab.41 for ; Fri, 31 Oct 2014 15:52:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Fa9TgaL94sh3YIlxfaqZHNfK3JvSb3GyaQD8/xulRTo=; b=SImOTpRF1N6rLN9Uj/j7QH5m6k3a8Mf8v1F8trIOiToCovo4Sd7DvI/VUmPmGzdtXO vwBZxvaRbofUikJ2s8z1dvvNnBA23QKul/dX3S3iu7qZvKZ1pTuBAThi5ZxL1x7UKD7o DCITb+GHcT894R2Cxb/YEcdai4B1QPsM8tsxH8+TksEOeQqCreNpUC3pp1SIZGu73wGy sE3Zb9KXWid2YgNSydakaXfRtqRJ4CNnu5S3nyMxYrrnkdKgxuvzkzUCoBQTSmPjFmRy 4/E14b9BdoUuiU038tXCdMH0bZXMv5m+Kfre2TH76mRkl+vLVUy3nXG16uGY4OYToKWt fg4Q== X-Received: by 10.68.108.36 with SMTP id hh4mr27885744pbb.108.1414795951710; Fri, 31 Oct 2014 15:52:31 -0700 (PDT) Received: from fainelli-desktop.broadcom.com (5520-maca-inet1-outside.broadcom.com. [216.31.211.11]) by mx.google.com with ESMTPSA id qg7sm10900465pac.13.2014.10.31.15.52.30 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 31 Oct 2014 15:52:31 -0700 (PDT) From: Florian Fainelli To: netdev@vger.kernel.org Cc: davem@davemloft.net, Florian Fainelli Subject: [PATCH net 1/2] net: systemport: fix DMA allocation/freeing sizes Date: Fri, 31 Oct 2014 15:51:34 -0700 Message-Id: <1414795895-31612-2-git-send-email-f.fainelli@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1414795895-31612-1-git-send-email-f.fainelli@gmail.com> References: <1414795895-31612-1-git-send-email-f.fainelli@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We should not be allocating a single byte of DMA coherent memory, but instead a full-sized struct dma_desc (8 bytes). Fixes: 80105befdb4b ("net: systemport: add Broadcom SYSTEMPORT Ethernet MAC driver") Signed-off-by: Florian Fainelli --- drivers/net/ethernet/broadcom/bcmsysport.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c index 3a6778a667f4..c81bf74685c0 100644 --- a/drivers/net/ethernet/broadcom/bcmsysport.c +++ b/drivers/net/ethernet/broadcom/bcmsysport.c @@ -1110,7 +1110,8 @@ static int bcm_sysport_init_tx_ring(struct bcm_sysport_priv *priv, /* We just need one DMA descriptor which is DMA-able, since writing to * the port will allocate a new descriptor in its internal linked-list */ - p = dma_zalloc_coherent(kdev, 1, &ring->desc_dma, GFP_KERNEL); + p = dma_zalloc_coherent(kdev, sizeof(struct dma_desc), &ring->desc_dma, + GFP_KERNEL); if (!p) { netif_err(priv, hw, priv->netdev, "DMA alloc failed\n"); return -ENOMEM; @@ -1183,7 +1184,8 @@ static void bcm_sysport_fini_tx_ring(struct bcm_sysport_priv *priv, ring->cbs = NULL; if (ring->desc_dma) { - dma_free_coherent(kdev, 1, ring->desc_cpu, ring->desc_dma); + dma_free_coherent(kdev, sizeof(struct dma_desc), + ring->desc_cpu, ring->desc_dma); ring->desc_dma = 0; } ring->size = 0;