From patchwork Tue Jun 28 16:14:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chas Williams <3chas3@gmail.com> X-Patchwork-Id: 14436 X-Patchwork-Delegate: bruce.richardson@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id C5D052C67; Tue, 28 Jun 2016 18:15:20 +0200 (CEST) Received: from mail-qt0-f195.google.com (mail-qt0-f195.google.com [209.85.216.195]) by dpdk.org (Postfix) with ESMTP id 56EB82C66 for ; Tue, 28 Jun 2016 18:15:19 +0200 (CEST) Received: by mail-qt0-f195.google.com with SMTP id z36so1163033qtb.3 for ; Tue, 28 Jun 2016 09:15:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=SRrOVUG3e3rpvjbBwF1d77Rljd6kHBFlgLq81X0qdwc=; b=TgFltdsSXQMyAz6kjaVRmXybmj91vPoq51RgWmZowwLcAlg8qbhi4AjZWjtbZKW30N BsqU9RCAe1NbXYJtNYna9rZSKZFwrDRgkfy5AmDrTIOn6A0UoQA1bJ1gfFHl0UwDuxgG FndWH0XHTf8w6vOnUZi0jUz/6d42CT7sztPP0VkZ9lPyfn39VhpWZcIii/5Lg1kZWaCR HWPql33xYh0nDeBcTDBQJYam1uYJFyCk0C8vRXJGGjrfQE+tW78qhIon5PTH30cE9IpN slLbMGmvvPuRwFI+osluGNV7QGrvQ8giigtTjqvsIIOU0q6ut+Ndpl71UQmNJM13WjfL JF3A== 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; bh=SRrOVUG3e3rpvjbBwF1d77Rljd6kHBFlgLq81X0qdwc=; b=WzK4/3t2QEHbDAEqkyVYzBLFx3tEpG9w6t9v1Nz4I2XI/n3pnYqVSk0xdRBUHoQjfG Fik9D75YR2+BpHbm8KFyvQpui1bdBNXPbGBGkvJByVxk0tScc/7+bYc0r3r/iCygwXu9 teOg6XgKTLh6Az74v5VfWrwPUfbnLNXDALBGV4VlhmxGXdn4hbksFP3YQRNORVXX4Mr/ ZuUfc7HI9A7hmjF3dyYNMU8xA0zK9WESvL62uPd1L1t8ATiBah/L+BBVehfZNRK8BWKl YzvBqPaPZhGhAkkM31359NeMAHJ1FfHtDgsEBd1wVncWLvUgl2f+wqAaps1mu4a8CyGe 1PCw== X-Gm-Message-State: ALyK8tLCXW/siO1MTIAdofz3fIrE7Uu4/u8JQNKdX9stCUtUOSKZqA85UYgY6jG2hiG/pg== X-Received: by 10.237.35.152 with SMTP id j24mr3189495qtc.96.1467130497875; Tue, 28 Jun 2016 09:14:57 -0700 (PDT) Received: from monolith.home (pool-173-79-169-182.washdc.fios.verizon.net. [173.79.169.182]) by smtp.gmail.com with ESMTPSA id x47sm419466qtc.45.2016.06.28.09.14.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Jun 2016 09:14:57 -0700 (PDT) From: Chas Williams <3chas3@gmail.com> To: dev@dpdk.org Cc: harish.patil@qlogic.com, Chas Williams <3chas3@gmail.com> Date: Tue, 28 Jun 2016 12:14:50 -0400 Message-Id: <1467130490-21245-1-git-send-email-3chas3@gmail.com> X-Mailer: git-send-email 2.5.5 Subject: [dpdk-dev] [PATCH] bnx2x: Call bnx2x_init_rte() later X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" We need sc->igu_sb_cnt determined before calculating the number of queues we can support. Fixes: a787538ee754 ("bnx2x: fix MSIX vector and VF resource counts") Signed-off-by: Chas Williams <3chas3@gmail.com> Acked-by: Rasesh Mody --- drivers/net/bnx2x/bnx2x.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c index 3095d2b..10859c1 100644 --- a/drivers/net/bnx2x/bnx2x.c +++ b/drivers/net/bnx2x/bnx2x.c @@ -9682,9 +9682,6 @@ int bnx2x_attach(struct bnx2x_softc *sc) sc->state = BNX2X_STATE_CLOSED; - /* Init RTE stuff */ - bnx2x_init_rte(sc); - pci_write_long(sc, PCICFG_GRC_ADDRESS, PCICFG_VENDOR_ID_OFFSET); sc->igu_base_addr = IS_VF(sc) ? PXP_VF_ADDR_IGU_START : BAR_IGU_INTMEM; @@ -9702,6 +9699,9 @@ int bnx2x_attach(struct bnx2x_softc *sc) sc->igu_sb_cnt = 1; } + /* Init RTE stuff */ + bnx2x_init_rte(sc); + if (IS_PF(sc)) { /* get device info and set params */ if (bnx2x_get_device_info(sc) != 0) {