Commit 35bf9f1f authored by David S. Miller's avatar David S. Miller

Merge branch 'mlx4-fixes'

Tariq Toukan says:

====================
mlx4 fixes for 4.20-rc

This patchset includes small fixes for mlx4_core driver.

First patch by Jack zeros a field in a FW communication
command, to match the FW spec.
Please queue it to -stable >= v3.17.

In the second patch I zero-initialize a variable to silence
a compliation warning.
Please queue it to -stable >= v3.19.

Third patch by Aya replaces int fields with unsigned int,
to fix a UBSAN warning.
Please queue it to -stable >= v3.13.

Series generated against net commit:
db8ddde7 Merge branch 'qed-Miscellaneous-bug-fixes'
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 08e14fe4 a463146e
...@@ -337,7 +337,7 @@ void mlx4_zone_allocator_destroy(struct mlx4_zone_allocator *zone_alloc) ...@@ -337,7 +337,7 @@ void mlx4_zone_allocator_destroy(struct mlx4_zone_allocator *zone_alloc)
static u32 __mlx4_alloc_from_zone(struct mlx4_zone_entry *zone, int count, static u32 __mlx4_alloc_from_zone(struct mlx4_zone_entry *zone, int count,
int align, u32 skip_mask, u32 *puid) int align, u32 skip_mask, u32 *puid)
{ {
u32 uid; u32 uid = 0;
u32 res; u32 res;
struct mlx4_zone_allocator *zone_alloc = zone->allocator; struct mlx4_zone_allocator *zone_alloc = zone->allocator;
struct mlx4_zone_entry *curr_node; struct mlx4_zone_entry *curr_node;
......
...@@ -540,8 +540,8 @@ struct slave_list { ...@@ -540,8 +540,8 @@ struct slave_list {
struct resource_allocator { struct resource_allocator {
spinlock_t alloc_lock; /* protect quotas */ spinlock_t alloc_lock; /* protect quotas */
union { union {
int res_reserved; unsigned int res_reserved;
int res_port_rsvd[MLX4_MAX_PORTS]; unsigned int res_port_rsvd[MLX4_MAX_PORTS];
}; };
union { union {
int res_free; int res_free;
......
...@@ -363,6 +363,7 @@ int mlx4_mr_hw_write_mpt(struct mlx4_dev *dev, struct mlx4_mr *mmr, ...@@ -363,6 +363,7 @@ int mlx4_mr_hw_write_mpt(struct mlx4_dev *dev, struct mlx4_mr *mmr,
container_of((void *)mpt_entry, struct mlx4_cmd_mailbox, container_of((void *)mpt_entry, struct mlx4_cmd_mailbox,
buf); buf);
(*mpt_entry)->lkey = 0;
err = mlx4_SW2HW_MPT(dev, mailbox, key); err = mlx4_SW2HW_MPT(dev, mailbox, key);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment