Message ID | 1438790732-29819-1-git-send-email-clsoto@linux.vnet.ibm.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
On 8/5/2015 7:05 PM, clsoto@linux.vnet.ibm.com wrote: > From: Carol L Soto <clsoto@linux.vnet.ibm.com> > > failed to configure the page size for architectures with page size > different than 4K. > > Signed-off-by: Carol L Soto <clsoto@linux.vnet.ibm.com> > --- Please pull this patch into kernel 4.2 Fixes: 938fe83 ("net/mlx5_core: New device capabilities handling") Acked-by: Amir Vadai <amirv@mellanox.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Amir Vadai <amirv@mellanox.com> Date: Thu, 6 Aug 2015 14:01:11 +0300 > On 8/5/2015 7:05 PM, clsoto@linux.vnet.ibm.com wrote: >> From: Carol L Soto <clsoto@linux.vnet.ibm.com> >> >> failed to configure the page size for architectures with page size >> different than 4K. >> >> Signed-off-by: Carol L Soto <clsoto@linux.vnet.ibm.com> >> --- > > Please pull this patch into kernel 4.2 > > Fixes: 938fe83 ("net/mlx5_core: New device capabilities handling") > Acked-by: Amir Vadai <amirv@mellanox.com> Applied to 'net', thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c index 603a8b0..03aabdd 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c @@ -391,6 +391,8 @@ static int handle_hca_cap(struct mlx5_core_dev *dev) /* disable cmdif checksum */ MLX5_SET(cmd_hca_cap, set_hca_cap, cmdif_checksum, 0); + MLX5_SET(cmd_hca_cap, set_hca_cap, log_uar_page_sz, PAGE_SHIFT - 12); + err = set_caps(dev, set_ctx, set_sz); query_ex: