From patchwork Tue Jul 14 21:56:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 495271 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 B14031402C2 for ; Wed, 15 Jul 2015 07:57:01 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751818AbbGNV45 (ORCPT ); Tue, 14 Jul 2015 17:56:57 -0400 Received: from mail-lb0-f172.google.com ([209.85.217.172]:33060 "EHLO mail-lb0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750835AbbGNV44 (ORCPT ); Tue, 14 Jul 2015 17:56:56 -0400 Received: by lbbyj8 with SMTP id yj8so14109926lbb.0 for ; Tue, 14 Jul 2015 14:56:55 -0700 (PDT) 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:organization :user-agent:mime-version:content-transfer-encoding:content-type; bh=e8k5HSGjahXFhSa3fB89iN4BnBgsrk27zLr4x2TLfkc=; b=IkNB8BnRYjvFlS3xOr/eLmWCfW1ozRB4EzaQEzIWcJvY+80MvlmsZVmp1irEEI25iz idbZ8mxjOCPul54c4IqoDVKi0Z/ALWO2SKYfwufhnqkBS1CZ+pbPib9SMymxXYvhu+8N PBGfvER24TkHuVmM3OXeMUy2x1C4Fk6YMUs/LsSWy92dyHz/SMwEw36i6ZzAUTvIAJ1G AJwAqK2+Co/mxVukAZsTD5rAnlgWBcOhbGRpqjzoaicJt+iOmUQkuaDp2c777dKWI0/V nXu8Zx64bnbgbmniQ2dWb3p7jODN0tgoHeWrIYOt2C9RkIAWNPrZTiJWcdn20TSAS+Ab OKBw== X-Gm-Message-State: ALoCoQmjaOhi46xrBtKViqvtudDg1aSHtd5APm/L1FsdDD/QiHyyc4UawXWSAHJRb7Ko6EvVk43s X-Received: by 10.152.29.97 with SMTP id j1mr768159lah.104.1436911015230; Tue, 14 Jul 2015 14:56:55 -0700 (PDT) Received: from wasted.cogentembedded.com (ppp26-205.pppoe.mtu-net.ru. [81.195.26.205]) by smtp.gmail.com with ESMTPSA id gg1sm567211lbc.27.2015.07.14.14.56.53 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Jul 2015 14:56:54 -0700 (PDT) From: Sergei Shtylyov To: netdev@vger.kernel.org Cc: linux-sh@vger.kernel.org Subject: [PATCH] ravb: do not invalidate cache for RX buffer twice Date: Wed, 15 Jul 2015 00:56:52 +0300 Message-ID: <4759713.2ulGRKsd9L@wasted.cogentembedded.com> Organization: Cogent Embedded Inc. User-Agent: KMail/4.14.9 (Linux/4.0.6-200.fc21.x86_64; KDE/4.14.9; x86_64; ; ) MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org First, dma_sync_single_for_cpu() shouldn't have been called in the first place (it's a streaming DMA API). dma_unmap_single() should have been called instead. Second, dma_unmap_single() call after handing the buffer to napi_gro_receive() makes little sense. Signed-off-by: Sergei Shtylyov --- The patch is against Dave Miller's 'net.git' repo. Don't know why I missed this DMA API misuse while working on the driver. :-< drivers/net/ethernet/renesas/ravb_main.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: net/drivers/net/ethernet/renesas/ravb_main.c =================================================================== --- net.orig/drivers/net/ethernet/renesas/ravb_main.c +++ net/drivers/net/ethernet/renesas/ravb_main.c @@ -543,10 +543,9 @@ static bool ravb_rx(struct net_device *n skb = priv->rx_skb[q][entry]; priv->rx_skb[q][entry] = NULL; - dma_sync_single_for_cpu(&ndev->dev, - le32_to_cpu(desc->dptr), - ALIGN(PKT_BUF_SZ, 16), - DMA_FROM_DEVICE); + dma_unmap_single(&ndev->dev, le32_to_cpu(desc->dptr), + ALIGN(PKT_BUF_SZ, 16), + DMA_FROM_DEVICE); get_ts &= (q == RAVB_NC) ? RAVB_RXTSTAMP_TYPE_V2_L2_EVENT : ~RAVB_RXTSTAMP_TYPE_V2_L2_EVENT; @@ -584,9 +583,6 @@ static bool ravb_rx(struct net_device *n if (!skb) break; /* Better luck next round. */ ravb_set_buffer_align(skb); - dma_unmap_single(&ndev->dev, le32_to_cpu(desc->dptr), - ALIGN(PKT_BUF_SZ, 16), - DMA_FROM_DEVICE); dma_addr = dma_map_single(&ndev->dev, skb->data, le16_to_cpu(desc->ds_cc), DMA_FROM_DEVICE);