{"id":806682,"url":"http://patchwork.ozlabs.org/api/1.0/patches/806682/?format=json","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.0/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<1503942035-24924-8-git-send-email-michael.chan@broadcom.com>","date":"2017-08-28T17:40:31","name":"[net-next,07/11] bnxt_en: Reduce default rings on multi-port cards.","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"3d212e516e811d6ae9c73576af25ba3148f8150b","submitter":{"id":68365,"url":"http://patchwork.ozlabs.org/api/1.0/people/68365/?format=json","name":"Michael Chan","email":"michael.chan@broadcom.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.0/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/1503942035-24924-8-git-send-email-michael.chan@broadcom.com/mbox/","series":[{"id":225,"url":"http://patchwork.ozlabs.org/api/1.0/series/225/?format=json","date":"2017-08-28T17:40:24","name":"bnxt_en: Updates.","version":1,"mbox":"http://patchwork.ozlabs.org/series/225/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/806682/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (1024-bit key;\n\tunprotected) header.d=broadcom.com header.i=@broadcom.com\n\theader.b=\"Ptx+8HCt\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xgzb32GWGz9sP5\n\tfor ;\n\tTue, 29 Aug 2017 03:41:19 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751759AbdH1RlQ (ORCPT );\n\tMon, 28 Aug 2017 13:41:16 -0400","from mail-qt0-f181.google.com ([209.85.216.181]:36285 \"EHLO\n\tmail-qt0-f181.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751478AbdH1Rk6 (ORCPT\n\t); Mon, 28 Aug 2017 13:40:58 -0400","by mail-qt0-f181.google.com with SMTP id v29so5266207qtv.3\n\tfor ; Mon, 28 Aug 2017 10:40:57 -0700 (PDT)","from localhost.dhcp.broadcom.net ([192.19.255.250])\n\tby smtp.gmail.com with ESMTPSA id\n\t20sm592006qtu.52.2017.08.28.10.40.56\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tMon, 28 Aug 2017 10:40:57 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=broadcom.com; s=google;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=c8cQQQBYPi4nLZr1R6xzrHe6KfuAK2jO7yMLKUQkIXs=;\n\tb=Ptx+8HCtkRNay4X+Gf7z+68WGrGtanoBXFPXghBzvNyZV9Ah2Bhs2f5crao0X/LUKp\n\t1jwi5NxA201Q3KFgWai7LZ1DqDBQTAxmqex7q0f6zKBHo5VtDlQRQ+CgcLxmOTuJzQ98\n\tqoHpSiCq8djob5RAIzR7mcPXtv4RbSXrwPp6Q=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=c8cQQQBYPi4nLZr1R6xzrHe6KfuAK2jO7yMLKUQkIXs=;\n\tb=nY8ty4sCWKNTF3Ht65uOrMZa7OPFFG2GARW2ZS6Zg348IDMVkzqmz7lOGNuizFYi2q\n\tu9a7VpCNyDANqRvS6gAyxeVKw+R14DeiQpqeTIZRNsXH4fUJKmM4Z2torjt2+ZS8oMse\n\t69hADTtn6qMlDz7nQ7HBimFKWeI+Vub56dzm6KKMhrdxYOz7ELHTeqYvVaKbSqsD9wOb\n\tybyV2WG4Pldv8NWyg6fTrKujs3MVLAi7QzZ9Igx4mPEDZ8NY7fe58njQ+XVVlCKxEhJR\n\tHkA/dogNkXn4fz3PsBxBQYD3PKP4qsMw0s1RPCvoWd+uQoraq0NqD7dmtBE9sM5FhRtY\n\td0pw==","X-Gm-Message-State":"AHYfb5hEwusKT22860M4GL41z8ftYGvxi+fYINyImNAhcgMykuqdyqr8\n\tD7tflYOjKL/U2LecryU=","X-Received":"by 10.200.54.88 with SMTP id n24mr1873906qtb.91.1503942057376;\n\tMon, 28 Aug 2017 10:40:57 -0700 (PDT)","From":"Michael Chan ","To":"davem@davemloft.net","Cc":"netdev@vger.kernel.org","Subject":"[PATCH net-next 07/11] bnxt_en: Reduce default rings on multi-port\n\tcards.","Date":"Mon, 28 Aug 2017 13:40:31 -0400","Message-Id":"<1503942035-24924-8-git-send-email-michael.chan@broadcom.com>","X-Mailer":"git-send-email 1.8.3.1","In-Reply-To":"<1503942035-24924-1-git-send-email-michael.chan@broadcom.com>","References":"<1503942035-24924-1-git-send-email-michael.chan@broadcom.com>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"Reduce default rings from 8 to 4 on multi-port cards to reduce memory\nusage.\n\nSigned-off-by: Michael Chan \n---\n drivers/net/ethernet/broadcom/bnxt/bnxt.c | 13 +++++++++----\n drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 +\n 2 files changed, 10 insertions(+), 4 deletions(-)","diff":"diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c\nindex a34fcdd..4406f91 100644\n--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c\n+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c\n@@ -5795,6 +5795,8 @@ static int bnxt_hwrm_phy_qcaps(struct bnxt *bp)\n \t\tlink_info->support_auto_speeds =\n \t\t\tle16_to_cpu(resp->supported_speeds_auto_mode);\n \n+\tbp->port_count = resp->port_cnt;\n+\n hwrm_phy_qcaps_exit:\n \tmutex_unlock(&bp->hwrm_cmd_lock);\n \treturn rc;\n@@ -7877,6 +7879,9 @@ static int bnxt_set_dflt_rings(struct bnxt *bp, bool sh)\n \tif (sh)\n \t\tbp->flags |= BNXT_FLAG_SHARED_RINGS;\n \tdflt_rings = netif_get_num_default_rss_queues();\n+\t/* Reduce default rings to reduce memory usage on multi-port cards */\n+\tif (bp->port_count > 1)\n+\t\tdflt_rings = min_t(int, dflt_rings, 4);\n \trc = bnxt_get_dflt_rings(bp, &max_rx_rings, &max_tx_rings, sh);\n \tif (rc)\n \t\treturn rc;\n@@ -8049,6 +8054,10 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)\n \tbnxt_ethtool_init(bp);\n \tbnxt_dcb_init(bp);\n \n+\trc = bnxt_probe_phy(bp);\n+\tif (rc)\n+\t\tgoto init_err_pci_clean;\n+\n \tbnxt_set_rx_skb_mode(bp, false);\n \tbnxt_set_tpa_flags(bp);\n \tbnxt_set_ring_params(bp);\n@@ -8083,10 +8092,6 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)\n \tif (dev->hw_features & NETIF_F_HW_VLAN_CTAG_RX)\n \t\tbp->flags |= BNXT_FLAG_STRIP_VLAN;\n \n-\trc = bnxt_probe_phy(bp);\n-\tif (rc)\n-\t\tgoto init_err_pci_clean;\n-\n \trc = bnxt_init_int_mode(bp);\n \tif (rc)\n \t\tgoto init_err_pci_clean;\ndiff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h\nindex 3521e46..86af8ea 100644\n--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h\n+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h\n@@ -1207,6 +1207,7 @@ struct bnxt {\n \tu8\t\t\tnge_port_cnt;\n \t__le16\t\t\tnge_fw_dst_port_id;\n \tu8\t\t\tport_partition_type;\n+\tu8\t\t\tport_count;\n \tu16\t\t\tbr_mode;\n \n \tu16\t\t\trx_coal_ticks;\n","prefixes":["net-next","07/11"]}