From 04f67ad54c243fdc12ac1f9b7d8d51e57f304a10 Mon Sep 17 00:00:00 2001 From: Eli Cohen Date: Wed, 10 Nov 2010 12:52:37 +0000 Subject: [PATCH] --- yaml --- r: 222797 b: refs/heads/master c: 58d74bb1d9f79bb56b2ea51d2ca06a28fa0fce02 h: refs/heads/master i: 222795: e2b65290fdf9a66cad8ed591b461162b130fb361 v: v3 --- [refs] | 2 +- trunk/drivers/net/mlx4/fw.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4bee7bc54f88..aef58361e006 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e27535b9c6e071d461be33b75a33047c9bb4c0ce +refs/heads/master: 58d74bb1d9f79bb56b2ea51d2ca06a28fa0fce02 diff --git a/trunk/drivers/net/mlx4/fw.c b/trunk/drivers/net/mlx4/fw.c index b68eee2414c2..7a7e18ba278a 100644 --- a/trunk/drivers/net/mlx4/fw.c +++ b/trunk/drivers/net/mlx4/fw.c @@ -289,6 +289,10 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap) MLX4_GET(field, outbox, QUERY_DEV_CAP_LOG_BF_REG_SZ_OFFSET); dev_cap->bf_reg_size = 1 << (field & 0x1f); MLX4_GET(field, outbox, QUERY_DEV_CAP_LOG_MAX_BF_REGS_PER_PAGE_OFFSET); + if ((1 << (field & 0x3f)) > (PAGE_SIZE / dev_cap->bf_reg_size)) { + mlx4_warn(dev, "firmware bug: log2 # of blue flame regs is invalid (%d), forcing 3\n", field & 0x1f); + field = 3; + } dev_cap->bf_regs_per_page = 1 << (field & 0x3f); mlx4_dbg(dev, "BlueFlame available (reg size %d, regs/page %d)\n", dev_cap->bf_reg_size, dev_cap->bf_regs_per_page);