Received: by 10.213.65.68 with SMTP id h4csp38280imn; Mon, 19 Mar 2018 18:47:42 -0700 (PDT) X-Google-Smtp-Source: AG47ELvOFjhz942VqwbFAvZakvm4NetBqq8VPJ50/tbJ7mbKhRbrO16OcIhOgIHn9tLQIPcxcM6p X-Received: by 10.98.21.209 with SMTP id 200mr172861pfv.232.1521510462881; Mon, 19 Mar 2018 18:47:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521510462; cv=none; d=google.com; s=arc-20160816; b=bn/g68245hIbnPLnAfJM4I8jprDbADSkLyGLlzSD1DWRIJHF1e/O6nbjBvkktgEKCY AgX7NCB2yHQMOCD0YLB1D/SA94DJKmBv44fHvrLSBClzSBVow5FXTuxZpKILjR/L1dus DOALyklkDxQBMSyWD42YCIljLKPOXYcCD+uPurcvCfQYFfL4sGvuGJv7xBQcZAwpyB7C sSCQ9Z8tLPHaeRkflwxH5piTA0xEbtmXWsxRS3u2ckpTDSQGMJvZibnO5u6CwtfZnBNs hu8T11LOE7icfnaqz3g0LenIUSBOuzhkfg+k1qnGDNuyc8MOv7mg189YFgUPO7YQp2wb Lz4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=gL21BlfTNmFLf9NC9gTEMPuwukS0BnRx1L7KJn9XWbM=; b=BKFWgVJazTTjBHXHtfMKH//OPZJ/OCcXQqWrB11lpzaYCFoWpi0uXAndBWuuH29149 RNVA9o7MW4SFkLm+vUHm3cYG9U9ivjju1oeRJdCrUkx6TbXBcmG6utMY2J7FUCdB6O2l ef7fGQc4i3nTZSyhZHkUiYiqxaafGitBsQOUEelUs6JCps8ZpBjLL+cvvXvxXKGQDvZY 7J+bW6GeM/HA1nAHmoNSre6oQC+E1YVOq0yKe/CzAajyNOS065lam8NF00Llk3qlim7m R7/4Q8yxFVbWti3XSkG6ve8UQD4/3QDuxN7jP5fIdh7FRTZgj+t9RGX3WIsogx1EHDHx uYxw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n128si382536pga.29.2018.03.19.18.47.28; Mon, 19 Mar 2018 18:47:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935988AbeCSTdm (ORCPT + 99 others); Mon, 19 Mar 2018 15:33:42 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:48748 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031339AbeCSSXA (ORCPT ); Mon, 19 Mar 2018 14:23:00 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id C6D7012AB; Mon, 19 Mar 2018 18:22:59 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yuval Mintz , "David S. Miller" , Sasha Levin Subject: [PATCH 4.9 115/241] qed: Correct MSI-x for storage Date: Mon, 19 Mar 2018 19:06:20 +0100 Message-Id: <20180319180755.968501050@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180319180751.172155436@linuxfoundation.org> References: <20180319180751.172155436@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: "Mintz, Yuval" [ Upstream commit 2f78227874754b1e10cd348fd6e7693b0dabb3f6 ] When qedr is enabled, qed would try dividing the msi-x vectors between L2 and RoCE, starting with L2 and providing it with sufficient vectors for its queues. Problem is qed would also do that for storage partitions, and as those don't need queues it would lead qed to award those partitions with 0 msi-x vectors, causing them to believe theye're using INTa and preventing them from operating. Fixes: 51ff17251c9c ("qed: Add support for RoCE hw init") Signed-off-by: Yuval Mintz Signed-off-by: David S. Miller Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/qlogic/qed/qed_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/net/ethernet/qlogic/qed/qed_main.c +++ b/drivers/net/ethernet/qlogic/qed/qed_main.c @@ -711,7 +711,8 @@ static int qed_slowpath_setup_int(struct cdev->int_params.fp_msix_cnt = cdev->int_params.out.num_vectors - cdev->num_hwfns; - if (!IS_ENABLED(CONFIG_QED_RDMA)) + if (!IS_ENABLED(CONFIG_QED_RDMA) || + QED_LEADING_HWFN(cdev)->hw_info.personality != QED_PCI_ETH_ROCE) return 0; for_each_hwfn(cdev, i)