From patchwork Sun Jan 8 16:41:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Khoronzhuk X-Patchwork-Id: 9503521 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5CD5460757 for ; Sun, 8 Jan 2017 16:42:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 48CE72793B for ; Sun, 8 Jan 2017 16:42:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3DEB42832F; Sun, 8 Jan 2017 16:42:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D296627FB2 for ; Sun, 8 Jan 2017 16:42:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756464AbdAHQlY (ORCPT ); Sun, 8 Jan 2017 11:41:24 -0500 Received: from mail-lf0-f43.google.com ([209.85.215.43]:33770 "EHLO mail-lf0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753989AbdAHQlN (ORCPT ); Sun, 8 Jan 2017 11:41:13 -0500 Received: by mail-lf0-f43.google.com with SMTP id k86so81784673lfi.0 for ; Sun, 08 Jan 2017 08:41:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cDIZCCUE125ooeFqf8qgfgwwBe1c6Xdt2ZVUqvzKX2Q=; b=TbqeRqdByDbR5EiSyujA/IjY+sW4jT1Hz02gGh1uzmXuS6wgAUusTsxqBBUqIcqveY iPzsp+wAz5n+tioJwokoZXfNMaoMkYtSbSR4KZGVxDv5k5atgxPU9NUD8KjziMOtHesA YeyRfh3wAm0PRIoiPQQyD48gOotticZm/ooV4= 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=cDIZCCUE125ooeFqf8qgfgwwBe1c6Xdt2ZVUqvzKX2Q=; b=sV4r6q9kIRnOZvZxhs3ZNccO+IHuBhvLSwpgKcJdiy1q2GRTN9v7Kn3ckuggRC93GH 2fx5JBaVND/lrPkOc1PicJsIs5It06wZFwzoJxljXKqz5e3mSuYXqzz81xuhE0EPi9jk eeIxQVDPKz2FUEzsdPzjh03oS8ak1dSAIByM2aSh8Tl6XASfZHUSmm3Kyl3c8cfME2Bl tVtA38cpn5nayXg/sCqqd4hWXtVbSLcBcs+0dkWTra+4kpYeN9MmSvADNn/NDIKGYN9z 37IQGNSRPhTN1N+KNsHE66D2vAC3x7b1C8rXg3HuKUGM2SbYeiQc/BpNCTahwoUcLa3K Urmw== X-Gm-Message-State: AIkVDXIdg3ZBTUzIpJJhMKKZ0Qmk6GsiuX6XFfbDbBTxFu54EUnxt0iKlxItrIHRqURB2Cse X-Received: by 10.25.169.73 with SMTP id s70mr4829949lfe.23.1483893671801; Sun, 08 Jan 2017 08:41:11 -0800 (PST) Received: from localhost.localdomain (183-224-132-95.pool.ukrtel.net. [95.132.224.183]) by smtp.gmail.com with ESMTPSA id c77sm20196895lfg.29.2017.01.08.08.41.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 08 Jan 2017 08:41:11 -0800 (PST) From: Ivan Khoronzhuk To: netdev@vger.kernel.org, mugunthanvnm@ti.com Cc: linux-omap@vger.kernel.org, grygorii.strashko@ti.com, linux-kernel@vger.kernel.org, Ivan Khoronzhuk Subject: [PATCH 4/4] net: ethernet: ti: cpsw: don't duplicate common res in rx handler Date: Sun, 8 Jan 2017 18:41:03 +0200 Message-Id: <1483893663-15673-5-git-send-email-ivan.khoronzhuk@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1483893663-15673-1-git-send-email-ivan.khoronzhuk@linaro.org> References: <1483893663-15673-1-git-send-email-ivan.khoronzhuk@linaro.org> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP No need to duplicate the same function in rx handler to get info if any interface is running. Signed-off-by: Ivan Khoronzhuk --- drivers/net/ethernet/ti/cpsw.c | 40 ++++++++++++++++------------------------ 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index daae87f..458298d 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -671,6 +671,18 @@ static void cpsw_intr_disable(struct cpsw_common *cpsw) return; } +static int cpsw_common_res_usage_state(struct cpsw_common *cpsw) +{ + u32 i; + u32 usage_count = 0; + + for (i = 0; i < cpsw->data.slaves; i++) + if (netif_running(cpsw->slaves[i].ndev)) + usage_count++; + + return usage_count; +} + static void cpsw_tx_handler(void *token, int len, int status) { struct netdev_queue *txq; @@ -703,18 +715,10 @@ static void cpsw_rx_handler(void *token, int len, int status) cpsw_dual_emac_src_port_detect(cpsw, status, ndev, skb); if (unlikely(status < 0) || unlikely(!netif_running(ndev))) { - bool ndev_status = false; - struct cpsw_slave *slave = cpsw->slaves; - int n; - - if (cpsw->data.dual_emac) { - /* In dual emac mode check for all interfaces */ - for (n = cpsw->data.slaves; n; n--, slave++) - if (netif_running(slave->ndev)) - ndev_status = true; - } - - if (ndev_status && (status >= 0)) { + /* In dual emac mode check for all interfaces */ + if (cpsw->data.dual_emac && + cpsw_common_res_usage_state(cpsw) && + (status >= 0)) { /* The packet received is for the interface which * is already down and the other interface is up * and running, instead of freeing which results @@ -1234,18 +1238,6 @@ static void cpsw_get_ethtool_stats(struct net_device *ndev, } } -static int cpsw_common_res_usage_state(struct cpsw_common *cpsw) -{ - u32 i; - u32 usage_count = 0; - - for (i = 0; i < cpsw->data.slaves; i++) - if (netif_running(cpsw->slaves[i].ndev)) - usage_count++; - - return usage_count; -} - static inline int cpsw_tx_packet_submit(struct cpsw_priv *priv, struct sk_buff *skb, struct cpdma_chan *txch)