From patchwork Sun Dec 8 05:48:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasesh Mody X-Patchwork-Id: 298749 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 B15562C00B5 for ; Sun, 8 Dec 2013 16:49:31 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751876Ab3LHFt2 (ORCPT ); Sun, 8 Dec 2013 00:49:28 -0500 Received: from mx0b-000f0801.pphosted.com ([67.231.152.113]:38530 "EHLO mx0b-000f0801.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751745Ab3LHFt0 (ORCPT ); Sun, 8 Dec 2013 00:49:26 -0500 Received: from pps.filterd (m0000700 [127.0.0.1]) by mx0b-000f0801.pphosted.com (8.14.5/8.14.5) with SMTP id rB85lobk017115; Sat, 7 Dec 2013 21:49:25 -0800 Received: from hq1wp-exchub01.corp.brocade.com ([144.49.131.13]) by mx0b-000f0801.pphosted.com with ESMTP id 1gkn061rk5-4 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT); Sat, 07 Dec 2013 21:49:25 -0800 Received: from blc-10-1.brocade.com (10.70.4.101) by HQ1WP-EXCHUB01.corp.brocade.com (10.70.36.101) with Microsoft SMTP Server (TLS) id 14.3.123.3; Sat, 7 Dec 2013 21:49:24 -0800 Received: from blc-10-1.brocade.com (localhost.localdomain [127.0.0.1]) by blc-10-1.brocade.com (8.13.1/8.13.8) with ESMTP id rB85nNmf032490; Sat, 7 Dec 2013 21:49:23 -0800 Received: (from rmody@localhost) by blc-10-1.brocade.com (8.13.1/8.13.8/Submit) id rB85nNAU032487; Sat, 7 Dec 2013 21:49:23 -0800 From: Rasesh Mody To: CC: , , Rasesh Mody Subject: [net-next 07/13] bna: Fix Stale MTU used to Configure Multi-buffer RX Date: Sat, 7 Dec 2013 21:48:38 -0800 Message-ID: <1386481724-32367-8-git-send-email-rmody@brocade.com> X-Mailer: git-send-email 1.8.3.rc2 In-Reply-To: <1386481724-32367-1-git-send-email-rmody@brocade.com> References: <1386481724-32367-1-git-send-email-rmody@brocade.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.11.72, 1.0.14, 0.0.0000 definitions=2013-12-07_03:2013-12-06, 2013-12-07, 1970-01-01 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=1 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=7.0.1-1305240000 definitions=main-1312070304 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Change Details: - Rx initialization uses MTU. ENET MTU set should be called before setting up Rx. Added checks to make sure that reinit is called only when required. Signed-off-by: Rasesh Mody --- drivers/net/ethernet/brocade/bna/bnad.c | 32 +++++++++++++++++++++++++------- drivers/net/ethernet/brocade/bna/bnad.h | 6 +----- 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c index 849de5a..508f5fc 100644 --- a/drivers/net/ethernet/brocade/bna/bnad.c +++ b/drivers/net/ethernet/brocade/bna/bnad.c @@ -2013,6 +2013,7 @@ err_return: static void bnad_init_rx_config(struct bnad *bnad, struct bna_rx_config *rx_config) { + memset(rx_config, 0, sizeof(*rx_config)); rx_config->rx_type = BNA_RX_T_REGULAR; rx_config->num_paths = bnad->num_rxp_per_rx; rx_config->coalescing_timeo = bnad->rx_coalescing_timeo; @@ -2035,6 +2036,7 @@ bnad_init_rx_config(struct bnad *bnad, struct bna_rx_config *rx_config) } rx_config->frame_size = BNAD_FRAME_SIZE(bnad->netdev->mtu); + rx_config->q0_multi_buf = BNA_STATUS_T_DISABLED; /* BNA_RXP_SINGLE - one data-buffer queue * BNA_RXP_SLR - one small-buffer and one large-buffer queues @@ -2044,7 +2046,8 @@ bnad_init_rx_config(struct bnad *bnad, struct bna_rx_config *rx_config) rx_config->rxp_type = BNA_RXP_SLR; if (BNAD_PCI_DEV_IS_CAT2(bnad) && - bnad_enable_multi_buffer(rx_config->frame_size)) { + bnad_enable_multi_buffer && + rx_config->frame_size > 4096) { /* though size_routing_enable is set in SLR, * small packets may get routed to same rxq. * set buf_size to 2048 instead of PAGE_SIZE. @@ -2092,8 +2095,16 @@ bnad_reinit_rx(struct bnad *bnad) for (rx_id = 0; rx_id < bnad->num_rx; rx_id++) { if (!bnad->rx_info[rx_id].rx) continue; - count++; bnad_destroy_rx(bnad, rx_id); + } + + spin_lock_irqsave(&bnad->bna_lock, flags); + bna_enet_mtu_set(&bnad->bna.enet, + BNAD_FRAME_SIZE(bnad->netdev->mtu), NULL); + spin_unlock_irqrestore(&bnad->bna_lock, flags); + + for (rx_id = 0; rx_id < bnad->num_rx; rx_id++) { + count++; current_err = bnad_setup_rx(bnad, rx_id); if (current_err && !err) { err = current_err; @@ -3262,7 +3273,7 @@ bnad_change_mtu(struct net_device *netdev, int new_mtu) { int err, mtu; struct bnad *bnad = netdev_priv(netdev); - u32 rx_count = 0; + u32 rx_count = 0, frame, new_frame; if (new_mtu + ETH_HLEN < ETH_ZLEN || new_mtu > BNAD_JUMBO_MTU) return -EINVAL; @@ -3272,15 +3283,22 @@ bnad_change_mtu(struct net_device *netdev, int new_mtu) mtu = netdev->mtu; netdev->mtu = new_mtu; + frame = BNAD_FRAME_SIZE(mtu); + new_frame = BNAD_FRAME_SIZE(new_mtu); + /* check if multi-buffer needs to be enabled */ - if (BNAD_PCI_DEV_IS_CAT2(bnad) && - bnad_reinit_rx_needed(BNAD_FRAME_SIZE(new_mtu))) - rx_count = bnad_reinit_rx(bnad); + if (BNAD_PCI_DEV_IS_CAT2(bnad) && bnad_enable_multi_buffer && + netif_running(bnad->netdev)) { + /* only when transition is over 4K */ + if ((frame <= 4096 && new_frame > 4096) || + (frame > 4096 && new_frame <= 4096)) + rx_count = bnad_reinit_rx(bnad); + } /* rx_count > 0 - new rx created * - Linux set err = 0 and return */ - err = bnad_mtu_set(bnad, new_mtu); + err = bnad_mtu_set(bnad, new_frame); if (err) err = -EBUSY; diff --git a/drivers/net/ethernet/brocade/bna/bnad.h b/drivers/net/ethernet/brocade/bna/bnad.h index d1dc930..f2b50d9 100644 --- a/drivers/net/ethernet/brocade/bna/bnad.h +++ b/drivers/net/ethernet/brocade/bna/bnad.h @@ -263,11 +263,7 @@ struct bnad_rx_unmap_q { #define BNAD_PCI_DEV_IS_CAT2(_bnad) \ ((_bnad)->pcidev->device == BFA_PCI_DEVICE_ID_CT2) -#define bnad_enable_multi_buffer(_mtu) \ - bnad_reinit_rx_needed((_mtu)) - -#define bnad_reinit_rx_needed(_frame) \ - (bnad_multi_buffer_rx && (_frame) > 4096) +#define bnad_enable_multi_buffer bnad_multi_buffer_rx /* Bit mask values for bnad->cfg_flags */ #define BNAD_CF_DIM_ENABLED 0x01 /* DIM */