From patchwork Sat Aug 13 05:05:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iyappan Subramanian X-Patchwork-Id: 658933 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 3sB8nm0tFYz9sC4 for ; Sat, 13 Aug 2016 15:05:00 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=apm.com header.i=@apm.com header.b=jecRW+nG; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752710AbcHMFE5 (ORCPT ); Sat, 13 Aug 2016 01:04:57 -0400 Received: from mail-pf0-f174.google.com ([209.85.192.174]:35856 "EHLO mail-pf0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752455AbcHMFEy (ORCPT ); Sat, 13 Aug 2016 01:04:54 -0400 Received: by mail-pf0-f174.google.com with SMTP id h186so2048442pfg.3 for ; Fri, 12 Aug 2016 22:04:53 -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=Gt7u4LSFwRCzU/szAqn63oqkKcotXVi4KjTVks83f3s=; b=jecRW+nGVAt4AIJEnDbSnExC4Ayzi3gTyYLmOydK6T5FF+7rIhvp7ilx3Pnh+Voyem rjkPEXTwOAcgDj1NRx2zw8V5LXMeXH7SNCclhBiyOKxL2ShXlb7MlRCYh5XRExCBUGFv RWA6y4idPhS4i4O/sxPjpVOV16EECMW8kVGyY= 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=Gt7u4LSFwRCzU/szAqn63oqkKcotXVi4KjTVks83f3s=; b=DCSdO6dDg57cXQX8Xlp+olCMypCEoXhYt3hNW1LMJY7XxgN8WZXElu0jZHRuhkHwQd gPlf6sajJ0xHhmAtKG6JvzTwZhgi2rqWF4nSdb9TC2gmPm3OlxEWrRLtBJkhIMmNWmGQ KeYlUCHXPCgBaX758Wdd9RyAfzsqG8Ixi6IrhyZl4O6GYPOOEug6D3O03r02Hg0PIk8Y SeATh9B8hlEwSUbN94riIUmBtiG1CmHosY7y8QWVlZ5rr7hlCt4Z8dV4h/k3xctfFk9J Wr5IK469sOIwaBOGdYh2ShQrZBg9M7D1ZjDTAWgxFH+AO+AIvpFlRS16huU8P3mTrLPP ginw== X-Gm-Message-State: AEkoouvE+56CsdvUcnPeToxnsIIRvE3cj7Tx17MM+DYinJ3ZzOXEQ08/KTAOuNNjYKqj1vCg X-Received: by 10.98.201.138 with SMTP id l10mr33271306pfk.77.1471064693370; Fri, 12 Aug 2016 22:04:53 -0700 (PDT) Received: from isubrama-dev.amcc.com ([206.80.4.98]) by smtp.gmail.com with ESMTPSA id o2sm16753965pfg.10.2016.08.12.22.04.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 12 Aug 2016 22:04:52 -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 v2 03/12] drivers: net: xgene: fix: Delete descriptor rings and buffer pools Date: Fri, 12 Aug 2016 22:05:39 -0700 Message-Id: <1471064748-28033-4-git-send-email-isubramanian@apm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1471064748-28033-1-git-send-email-isubramanian@apm.com> References: <1471064748-28033-1-git-send-email-isubramanian@apm.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org xgene_enet_init_hw() should delete any descriptor rings and buffer pools setup should le_ops->cle_init() return an error. Signed-off-by: Iyappan Subramanian --- drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c index c1fd33d..6b36e0f 100644 --- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c @@ -1462,10 +1462,8 @@ static int xgene_enet_init_hw(struct xgene_enet_pdata *pdata) buf_pool = pdata->rx_ring[i]->buf_pool; xgene_enet_init_bufpool(buf_pool); ret = xgene_enet_refill_bufpool(buf_pool, pdata->rx_buff_cnt); - if (ret) { - xgene_enet_delete_desc_rings(pdata); - return ret; - } + if (ret) + goto err; } dst_ring_num = xgene_enet_dst_ring_num(pdata->rx_ring[0]); @@ -1482,7 +1480,7 @@ static int xgene_enet_init_hw(struct xgene_enet_pdata *pdata) ret = pdata->cle_ops->cle_init(pdata); if (ret) { netdev_err(ndev, "Preclass Tree init error\n"); - return ret; + goto err; } } else { pdata->port_ops->cle_bypass(pdata, dst_ring_num, buf_pool->id); @@ -1492,6 +1490,10 @@ static int xgene_enet_init_hw(struct xgene_enet_pdata *pdata) pdata->mac_ops->init(pdata); return ret; + +err: + xgene_enet_delete_desc_rings(pdata); + return ret; } static void xgene_enet_setup_ops(struct xgene_enet_pdata *pdata)