From patchwork Wed Oct 25 22:04:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Berger X-Patchwork-Id: 830406 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="li1U3nTk"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yMklW0FKDz9t4V for ; Thu, 26 Oct 2017 09:07:35 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932343AbdJYWH1 (ORCPT ); Wed, 25 Oct 2017 18:07:27 -0400 Received: from mail-qk0-f194.google.com ([209.85.220.194]:50359 "EHLO mail-qk0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932278AbdJYWFI (ORCPT ); Wed, 25 Oct 2017 18:05:08 -0400 Received: by mail-qk0-f194.google.com with SMTP id o187so1986559qke.7; Wed, 25 Oct 2017 15:05:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ik+rHRD5WXus/hAYRtrpDHAwIUVHlQa3Y+ZPXvMQotA=; b=li1U3nTknUy/GKvS9qmWHekXr948cdVEa3Ghb2uI1880zkqk0oY1LRpLB4ueZwnYMx RHkR1shVN7Grekl9RXilFlrrzgX8I5psmdDGRxxCnfJkymOl0QgWS81RKVcGTPwe5qgb oVaFEfemcNkQ5YJ/4SRHq2TSER/YKjivtkqIPoeDtiO6OilTRXN5xJpy6NBaY05J7Ioz evqJi//ookf10eU3GgJXoz2o8jv22FFNuq8prOWvmBAcn2nE/vZ88KcEX76jPAT+hkhe WaC53Qvvo/kAkS54h9ah6/ZhxVzC2riMC73mwnBOWQtLVLR9vV7QFSj37iT7RaDPL8ng 6MXA== 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=ik+rHRD5WXus/hAYRtrpDHAwIUVHlQa3Y+ZPXvMQotA=; b=GPD2fMznoIIjgULiR6eyY3ebyIlNQf4s3CDwKMFPhFBMx3YppK2XvSYc8pyMYyqA/k BaCBT8oo0iVPAzJvJ0JvfrBGcTRz2Mz360RDXop4qrTZvn6w4STmEyQU4ogajEK/p7cq DzHO5aIEBbDBoujx4+3ewPlS8yHvokhS/SgQP1imSfKF6MjM3PY8VqfRNXdU4KTf1agz KMipLZaKTqLEsWUg2/Nr2JEdniXKERXqNjZl0Rvdg3t9wUbApaj5QKLDzeQleSaXE+XM E7QCkh32V5Y7CZYq8yulE6GhaZZPreD5oT96BU8pp1mbQ9PhIprEkiw4acwIm77EN81+ 9dCw== X-Gm-Message-State: AMCzsaUATKuaRMGmaU7AalABfr9fuSaeWG/gB8CooS6yRbaRqeuLKjHS pMoIhKFI57yIpMqn1yrRSPo= X-Google-Smtp-Source: ABhQp+QhUcEMVHS7BHjcn8t1w7kZvFy4Q7AlKgg0pEAn65gV/O/JThTorNubPHfdySv9KfBSiKGAPg== X-Received: by 10.55.26.90 with SMTP id a87mr4981199qka.132.1508969107849; Wed, 25 Oct 2017 15:05:07 -0700 (PDT) Received: from stb-bld-02.irv.broadcom.com ([192.19.255.250]) by smtp.gmail.com with ESMTPSA id f38sm2690246qtf.17.2017.10.25.15.05.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Oct 2017 15:05:07 -0700 (PDT) From: Doug Berger To: Florian Fainelli Cc: Doug Berger , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 2/9] net: bcmgenet: prevent duplicate calls of bcmgenet_dma_teardown Date: Wed, 25 Oct 2017 15:04:12 -0700 Message-Id: <20171025220419.24951-3-opendmb@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171025220419.24951-1-opendmb@gmail.com> References: <20171025220419.24951-1-opendmb@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When bcmgenet_dma_teardown is called from bcmgenet_fini_dma it ends up getting called twice from the bcmgenet_close and bcmgenet_suspend functions (once directly and once inside the bcmgenet_fini_dma call). This commit removes the call from bcmgenet_fini_dma and ensures that bcmgenet_dma_teardown is called before bcmgenet_fini_dma in all paths of execution. Fixes: 4a0c081eff43 ("net: bcmgenet: call bcmgenet_dma_teardown in bcmgenet_fini_dma") Signed-off-by: Doug Berger --- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c index f6e8e01be1c8..78368466eb70 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -2505,9 +2505,6 @@ static void bcmgenet_fini_dma(struct bcmgenet_priv *priv) bcmgenet_fini_rx_napi(priv); bcmgenet_fini_tx_napi(priv); - /* disable DMA */ - bcmgenet_dma_teardown(priv); - for (i = 0; i < priv->num_tx_bds; i++) { cb = priv->tx_cbs + i; skb = bcmgenet_free_tx_cb(&priv->pdev->dev, cb); @@ -2930,6 +2927,7 @@ static int bcmgenet_open(struct net_device *dev) err_irq0: free_irq(priv->irq0, priv); err_fini_dma: + bcmgenet_dma_teardown(priv); bcmgenet_fini_dma(priv); err_clk_disable: if (priv->internal_phy)