From patchwork Wed Apr 6 02:26:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Troy Kisky X-Patchwork-Id: 8757731 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1EB239F336 for ; Wed, 6 Apr 2016 02:37:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4DD6B202A1 for ; Wed, 6 Apr 2016 02:37:18 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8A1F520295 for ; Wed, 6 Apr 2016 02:37:17 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1andJj-00086j-0X; Wed, 06 Apr 2016 02:35:39 +0000 Received: from mail-pa0-x233.google.com ([2607:f8b0:400e:c03::233]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1andDC-0007lg-8L for linux-arm-kernel@lists.infradead.org; Wed, 06 Apr 2016 02:28:56 +0000 Received: by mail-pa0-x233.google.com with SMTP id fe3so22791732pab.1 for ; Tue, 05 Apr 2016 19:28:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=boundarydevices-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NWmJRQd+VfEZZVjETuas3KDU36ySN70xOhhaTfdJ1l4=; b=JXkgYecLx4s7VOvg2R7FGQPS2K8vb4uLLcjiDW5m3PQsyQT19UHp5Sgz495PerXTSG VoZ9LASX6hnfHV51BBelKS9ycs+yVPHeE4KLMCXfXRzqhfuE5OYmwdpwnWx33k14wc/R 8DhNDojp88JZhuEjFzjLGR7ANHQOI4ZDFqM+mEr79GWBDAp9A4g6+BwjWTFv5eap+Dv5 6UlOA+GEH2WsocWmw2mlaC8RL3Q5PnTp6dWIqu28j4LnOluD5ZFjbT3zJSlQ6IitgyTc BSV1w+ZlU0IcJ5GdoSY2wcJqKt9fenwPU5MUIzBNfsFF+c4+WEt1/8FoCwgxBguKUrtu 02IA== 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=NWmJRQd+VfEZZVjETuas3KDU36ySN70xOhhaTfdJ1l4=; b=YV9HK3aePjlIxZP/n/ZU9ztva1tbYyL1DOY82whGfiFB/SSBwTl8jaln+Xfw9z3GCA MXoEAUHpBDqunm4N6v8hhO9qxq8FLhLrKAFyBSo9qCgl3geOXPiDipJJx1YoXsYlPy7Z 5m5tkfoGLL43oAyauajDUFgLq/sZlTFhzzuNWJYBLBhfzoFmIYkzHakJ8gMBEM7dnOAw 8aZcYEjMwtoS+U0xmeAXZg3QDMaWA5sMbecpJ8DH5iUlVElpgO7i4ZQSQH58ePBx+7Vb OVM7zFOVx6JhKlHmASuQVFZE6e/zvS6z/P0H1WxocgTIwASyln0sdKZlwdVr/Dz5zfl2 tA0A== X-Gm-Message-State: AD7BkJLbW21+glFE3BIc16bSbj6lo5drwcCbXIyrTwnhUm1svVN3B1QbJnpWrmwl0U1aMw== X-Received: by 10.66.141.76 with SMTP id rm12mr68112773pab.30.1459909715348; Tue, 05 Apr 2016 19:28:35 -0700 (PDT) Received: from localhost.localdomain (wsip-70-184-93-199.ph.ph.cox.net. [70.184.93.199]) by smtp.googlemail.com with ESMTPSA id l14sm528682pfi.23.2016.04.05.19.28.33 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 05 Apr 2016 19:28:34 -0700 (PDT) From: Troy Kisky To: netdev@vger.kernel.org, davem@davemloft.net, fugang.duan@nxp.com, lznuaa@gmail.com Subject: [PATCH net-next V3 16/16] net: fec: don't set cbd_bufaddr unless no mapping error Date: Tue, 5 Apr 2016 19:26:02 -0700 Message-Id: <1459909562-22865-17-git-send-email-troy.kisky@boundarydevices.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1459909562-22865-1-git-send-email-troy.kisky@boundarydevices.com> References: <1459909562-22865-1-git-send-email-troy.kisky@boundarydevices.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160405_192854_412264_C739918A X-CRM114-Status: GOOD ( 12.22 ) X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: andrew@lunn.ch, stillcompiling@gmail.com, arnd@arndb.de, sergei.shtylyov@cogentembedded.com, Troy Kisky , gerg@uclinux.org, fabio.estevam@nxp.com, johannes@sipsolutions.net, l.stach@pengutronix.de, linux-arm-kernel@lists.infradead.org, tremyfr@gmail.com MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Not assigning cbd_bufaddr on error will prevent trying to unmap the error in case the FEC is reset. Signed-off-by: Troy Kisky --- v3: no change --- drivers/net/ethernet/freescale/fec_main.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index 101d820..c2ed8be 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -600,7 +600,7 @@ fec_enet_txq_put_hdr_tso(struct fec_enet_priv_tx_q *txq, int hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb); struct bufdesc_ex *ebdp = container_of(bdp, struct bufdesc_ex, desc); void *bufaddr; - unsigned long dmabuf; + dma_addr_t dmabuf; unsigned int estatus = 0; bufaddr = txq->tso_hdrs + index * TSO_HEADER_SIZE; @@ -1295,17 +1295,21 @@ fec_enet_new_rxbdp(struct net_device *ndev, struct bufdesc *bdp, struct sk_buff { struct fec_enet_private *fep = netdev_priv(ndev); int off; + dma_addr_t dmabuf; off = ((unsigned long)skb->data) & fep->rx_align; if (off) skb_reserve(skb, fep->rx_align + 1 - off); - bdp->cbd_bufaddr = cpu_to_fec32(dma_map_single(&fep->pdev->dev, skb->data, FEC_ENET_RX_FRSIZE - fep->rx_align, DMA_FROM_DEVICE)); - if (dma_mapping_error(&fep->pdev->dev, fec32_to_cpu(bdp->cbd_bufaddr))) { + dmabuf = dma_map_single(&fep->pdev->dev, skb->data, + FEC_ENET_RX_FRSIZE - fep->rx_align, + DMA_FROM_DEVICE); + if (dma_mapping_error(&fep->pdev->dev, dmabuf)) { if (net_ratelimit()) netdev_err(ndev, "Rx DMA memory map failed\n"); return -ENOMEM; } + bdp->cbd_bufaddr = cpu_to_fec32(dmabuf); return 0; }