From patchwork Tue Dec 2 10:26:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eli Cohen X-Patchwork-Id: 416807 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 D9F6F140213 for ; Tue, 2 Dec 2014 21:26:44 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754438AbaLBK0m (ORCPT ); Tue, 2 Dec 2014 05:26:42 -0500 Received: from mail-wg0-f41.google.com ([74.125.82.41]:35760 "EHLO mail-wg0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753571AbaLBK0h (ORCPT ); Tue, 2 Dec 2014 05:26:37 -0500 Received: by mail-wg0-f41.google.com with SMTP id y19so16575840wgg.28 for ; Tue, 02 Dec 2014 02:26:36 -0800 (PST) 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:in-reply-to :references; bh=SdsJYOoM6KnzgU+dKGg7bdXc4JPBduRnVY3fDp3VMYg=; b=fyw8LBO9uqADxVW/OzxmI5WvZHfSLA+CCRFdPe14Qxp6msvSw6XZ1QakJq2S2DMkVZ xCiE1HOzyM6HJuOTWfN6YMX/0rnZYsEchGvAYIdUpYXZNH+fS4OZKn5cXH9h6siVN1Yh KNBm9k9rDreD76pyoprUxeheJ0h8PPoHdC1HcYve0FTBtgEyUaWRTMIzYqZEbu3MLGa9 L6k/ms3lCa+HuofY40hvcDIS2TrZwXdfCbNznOX+rqcadg9pVJ3Zj/PAtzI8wyctMfmy OW4zUrUynsFidzHVIIUxfirFgEEDQpmCHyFRCWLVPOIG6jz4qKUf3sYqlJ7VmMVM0ucF Bvrg== X-Gm-Message-State: ALoCoQkUNcxxRiuJATG9J5CVrvlbE93bj2iA96oxe7pK4JyWd7LaIZkcoe0cOvEWtjbYo6pEABYD X-Received: by 10.194.92.148 with SMTP id cm20mr103388445wjb.88.1417515996259; Tue, 02 Dec 2014 02:26:36 -0800 (PST) Received: from localhost (out.voltaire.com. [193.47.165.251]) by mx.google.com with ESMTPSA id cq4sm31300511wjc.35.2014.12.02.02.26.35 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 02 Dec 2014 02:26:35 -0800 (PST) From: Eli Cohen X-Google-Original-From: Eli Cohen To: davem@davemloft.net Cc: roland@kernel.org, linux-rdma@vger.kernel.org, netdev@vger.kernel.org, ogerlitz@mellanox.com, amirv@mellanox.com, Eli Cohen Subject: [PATCH net-next 3/9] net/mlx5_core: Fix command queue size enforcement Date: Tue, 2 Dec 2014 12:26:13 +0200 Message-Id: <1417515979-22418-4-git-send-email-eli@mellanox.com> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1417515979-22418-1-git-send-email-eli@mellanox.com> References: <1417515979-22418-1-git-send-email-eli@mellanox.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Command queue descriptor page size is 4KB and not the page size used by the kernel. Signed-off-by: Eli Cohen --- drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c index 368c6c5ea014..a2853057c779 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c @@ -1363,7 +1363,7 @@ int mlx5_cmd_init(struct mlx5_core_dev *dev) goto err_map; } - if (cmd->log_sz + cmd->log_stride > PAGE_SHIFT) { + if (cmd->log_sz + cmd->log_stride > MLX5_ADAPTER_PAGE_SHIFT) { dev_err(&dev->pdev->dev, "command queue size overflow\n"); err = -EINVAL; goto err_map;