From 62d6b80e6fa4c6d73af4595774baa0138ca0abdb Mon Sep 17 00:00:00 2001
From: Ralph Campbell <ralph.campbell@qlogic.com>
Date: Tue, 22 Jul 2008 14:18:33 -0700
Subject: [PATCH] --- yaml --- r: 105645 b: refs/heads/master c:
 64b784b583061ebfe1d484dd1fdc5a26c6d4293f h: refs/heads/master i:   105643:
 6328f5cd4d72a1e768deafe0460cd475239ef344 v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/infiniband/core/sa_query.c        | 3 ++-
 trunk/drivers/infiniband/hw/ehca/ehca_classes.h | 1 -
 trunk/drivers/infiniband/hw/ehca/ehca_hca.c     | 4 +---
 trunk/drivers/infiniband/hw/ehca/ehca_irq.c     | 4 ----
 trunk/drivers/infiniband/hw/ehca/ehca_qp.c      | 2 --
 trunk/drivers/infiniband/hw/ehca/ipz_pt_fn.c    | 1 -
 7 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index a2d8554434ad..8afe4af32a34 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a867c33bb65f2921351a9bdd98548bb96f0ff8c
+refs/heads/master: 64b784b583061ebfe1d484dd1fdc5a26c6d4293f
diff --git a/trunk/drivers/infiniband/core/sa_query.c b/trunk/drivers/infiniband/core/sa_query.c
index 1341de793e51..7863a50d56f2 100644
--- a/trunk/drivers/infiniband/core/sa_query.c
+++ b/trunk/drivers/infiniband/core/sa_query.c
@@ -1064,7 +1064,8 @@ static void ib_sa_remove_one(struct ib_device *device)
 
 	for (i = 0; i <= sa_dev->end_port - sa_dev->start_port; ++i) {
 		ib_unregister_mad_agent(sa_dev->port[i].agent);
-		kref_put(&sa_dev->port[i].sm_ah->ref, free_sm_ah);
+		if (sa_dev->port[i].sm_ah)
+			kref_put(&sa_dev->port[i].sm_ah->ref, free_sm_ah);
 	}
 
 	kfree(sa_dev);
diff --git a/trunk/drivers/infiniband/hw/ehca/ehca_classes.h b/trunk/drivers/infiniband/hw/ehca/ehca_classes.h
index 0b0618edd645..1e9e99a13933 100644
--- a/trunk/drivers/infiniband/hw/ehca/ehca_classes.h
+++ b/trunk/drivers/infiniband/hw/ehca/ehca_classes.h
@@ -194,7 +194,6 @@ struct ehca_qp {
 	u32 packet_count;
 	atomic_t nr_events; /* events seen */
 	wait_queue_head_t wait_completion;
-	int mig_armed;
 };
 
 #define IS_SRQ(qp) (qp->ext_type == EQPT_SRQ)
diff --git a/trunk/drivers/infiniband/hw/ehca/ehca_hca.c b/trunk/drivers/infiniband/hw/ehca/ehca_hca.c
index 46288220cfbb..bc3b37d2070f 100644
--- a/trunk/drivers/infiniband/hw/ehca/ehca_hca.c
+++ b/trunk/drivers/infiniband/hw/ehca/ehca_hca.c
@@ -114,9 +114,7 @@ int ehca_query_device(struct ib_device *ibdev, struct ib_device_attr *props)
 	}
 
 	props->max_pkeys           = 16;
-	/* Some FW versions say 0 here; insert sensible value in that case */
-	props->local_ca_ack_delay  = rblock->local_ca_ack_delay ?
-		min_t(u8, rblock->local_ca_ack_delay, 255) : 12;
+	props->local_ca_ack_delay  = min_t(u8, rblock->local_ca_ack_delay, 255);
 	props->max_raw_ipv6_qp     = limit_uint(rblock->max_raw_ipv6_qp);
 	props->max_raw_ethy_qp     = limit_uint(rblock->max_raw_ethy_qp);
 	props->max_mcast_grp       = limit_uint(rblock->max_mcast_grp);
diff --git a/trunk/drivers/infiniband/hw/ehca/ehca_irq.c b/trunk/drivers/infiniband/hw/ehca/ehca_irq.c
index 99642a6e17c4..0792d930c481 100644
--- a/trunk/drivers/infiniband/hw/ehca/ehca_irq.c
+++ b/trunk/drivers/infiniband/hw/ehca/ehca_irq.c
@@ -178,10 +178,6 @@ static void dispatch_qp_event(struct ehca_shca *shca, struct ehca_qp *qp,
 {
 	struct ib_event event;
 
-	/* PATH_MIG without the QP ever having been armed is false alarm */
-	if (event_type == IB_EVENT_PATH_MIG && !qp->mig_armed)
-		return;
-
 	event.device = &shca->ib_device;
 	event.event = event_type;
 
diff --git a/trunk/drivers/infiniband/hw/ehca/ehca_qp.c b/trunk/drivers/infiniband/hw/ehca/ehca_qp.c
index ea13efddf175..3f59587338ea 100644
--- a/trunk/drivers/infiniband/hw/ehca/ehca_qp.c
+++ b/trunk/drivers/infiniband/hw/ehca/ehca_qp.c
@@ -1460,8 +1460,6 @@ static int internal_modify_qp(struct ib_qp *ibqp,
 			goto modify_qp_exit2;
 		}
 		mqpcb->path_migration_state = attr->path_mig_state + 1;
-		if (attr->path_mig_state == IB_MIG_REARM)
-			my_qp->mig_armed = 1;
 		update_mask |=
 			EHCA_BMASK_SET(MQPCB_MASK_PATH_MIGRATION_STATE, 1);
 	}
diff --git a/trunk/drivers/infiniband/hw/ehca/ipz_pt_fn.c b/trunk/drivers/infiniband/hw/ehca/ipz_pt_fn.c
index c3a328465431..661f8db62706 100644
--- a/trunk/drivers/infiniband/hw/ehca/ipz_pt_fn.c
+++ b/trunk/drivers/infiniband/hw/ehca/ipz_pt_fn.c
@@ -163,7 +163,6 @@ static int alloc_small_queue_page(struct ipz_queue *queue, struct ehca_pd *pd)
 
 out:
 	ehca_err(pd->ib_pd.device, "failed to allocate small queue page");
-	mutex_unlock(&pd->lock);
 	return 0;
 }