From patchwork Wed Feb 11 14:40:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eli Cohen X-Patchwork-Id: 438793 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 4032614028E for ; Thu, 12 Feb 2015 01:40:48 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752848AbbBKOko (ORCPT ); Wed, 11 Feb 2015 09:40:44 -0500 Received: from mail-wi0-f176.google.com ([209.85.212.176]:34385 "EHLO mail-wi0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752388AbbBKOkn (ORCPT ); Wed, 11 Feb 2015 09:40:43 -0500 Received: by mail-wi0-f176.google.com with SMTP id h11so4245758wiw.3 for ; Wed, 11 Feb 2015 06:40:42 -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:date:to:cc:subject:message-id:mime-version :content-type:content-disposition:user-agent; bh=ingU8BvXNCj4savRjb/Mnx51oFbgQc4MYl8xO1MGpxs=; b=BW5qN0j+NgNb8xb8rU+H3F9bQppfXhRDnyrn0VXtsHp4ksfjimuruSYp6q1BNaztdv PG2Iy7nijEdRFcaMqL2CSf+cQafrWzQ+BHke1nkgaEX8ooaFm/eXmSiuOU2iV5jNEgDa 6f3v4q7InRyC+TLNATgYWssvv2diu7dnV1PErqUNrsV/PBSTHex+lPOr0tRPGSSKWrOi 0ReHvGakbSF7tuX2iBgJAmeN9PRhj5UtRpAvzoIadTEbvPdiya9x8QuQ3mvwZHHEEnYO 2QVTu8MEHXLOYktz3jZ7pD00silwmDVRe0mwZzjDMdS91B7WLVMUrS63FQDJlJuXCYJm A1sA== X-Gm-Message-State: ALoCoQl0j3zwPitAKhok/o/d3pBxgnxebSNVqS+fSSQGlWson7ywfiiyyTpUYMYpvawhR4+l8UFy X-Received: by 10.180.87.65 with SMTP id v1mr57481153wiz.12.1423665642169; Wed, 11 Feb 2015 06:40:42 -0800 (PST) Received: from localhost (out.voltaire.com. [193.47.165.251]) by mx.google.com with ESMTPSA id ha1sm23525046wib.24.2015.02.11.06.40.41 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 11 Feb 2015 06:40:41 -0800 (PST) From: Eli Cohen X-Google-Original-From: Eli Cohen Date: Wed, 11 Feb 2015 16:40:38 +0200 To: davem@davemloft.net Cc: netdev@vger.kernel.org, clsoto@us.ibm.com, ogerlitz@mellanox.com Subject: [PATCH net] net/mlx5_core: Fix configuration of log_uar_page_sz Message-ID: <20150211144038.GA18543@mtldesk30> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The current code failed to configure the page size for architectures with page size different than 4K - PPC for example. Signed-off-by: Carol L Soto Signed-off-by: Eli Cohen --- Hi Dave, this patch fixes a problem in powerpc with 64K page size Eli drivers/net/ethernet/mellanox/mlx5/core/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c index 3a85904932e7..52d3afd6d548 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c @@ -290,6 +290,7 @@ static void copy_rw_fields(void *to, struct mlx5_caps *from) MLX5_SET(cmd_hca_cap, to, log_max_ra_req_dc, from->gen.log_max_ra_req_dc); MLX5_SET(cmd_hca_cap, to, log_max_ra_res_dc, from->gen.log_max_ra_res_dc); MLX5_SET(cmd_hca_cap, to, pkey_table_size, to_fw_pkey_sz(from->gen.pkey_table_size)); + MLX5_SET(cmd_hca_cap, to, log_uar_page_sz, PAGE_SHIFT - 12); v64 = from->gen.flags & MLX5_CAP_BITS_RW_MASK; *flags_off = cpu_to_be64(v64); }