From 05f4f1754d56154d3ac1f24264ada965dc968b98 Mon Sep 17 00:00:00 2001 From: Dave Olson Date: Thu, 9 Aug 2007 15:18:48 -0700 Subject: [PATCH] --- yaml --- r: 67151 b: refs/heads/master c: 9ef8617af77136e743e5dd4b081a61797888a977 h: refs/heads/master i: 67149: 14e30efe66fe7add0cead970ea896daf48ef93ae 67147: 3532d2e2fd9ce57481b5d8c5d269a11fb8eacf5f 67143: 620c135a928cf687f3ca35e2e72ad73c0de3b681 67135: e536e70cc79f3f0eaa59ec907bd9c4150b109f03 v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/ipath/ipath_iba6120.c | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 2f0e60c10078..223f0c3adba2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1793b4771d258c93ed86a6356c95cac418781fdd +refs/heads/master: 9ef8617af77136e743e5dd4b081a61797888a977 diff --git a/trunk/drivers/infiniband/hw/ipath/ipath_iba6120.c b/trunk/drivers/infiniband/hw/ipath/ipath_iba6120.c index a324c6f7aeba..d43f0b3a43fe 100644 --- a/trunk/drivers/infiniband/hw/ipath/ipath_iba6120.c +++ b/trunk/drivers/infiniband/hw/ipath/ipath_iba6120.c @@ -1143,11 +1143,14 @@ static void ipath_pe_put_tid(struct ipath_devdata *dd, u64 __iomem *tidptr, pa |= 2 << 29; } - /* workaround chip bug 9437 by writing each TID twice - * and holding a spinlock around the writes, so they don't - * intermix with other TID (eager or expected) writes - * Unfortunately, this call can be done from interrupt level - * for the port 0 eager TIDs, so we have to use irqsave + /* + * Workaround chip bug 9437 by writing the scratch register + * before and after the TID, and with an io write barrier. + * We use a spinlock around the writes, so they can't intermix + * with other TID (eager or expected) writes (the chip bug + * is triggered by back to back TID writes). Unfortunately, this + * call can be done from interrupt level for the port 0 eager TIDs, + * so we have to use irqsave locks. */ spin_lock_irqsave(&dd->ipath_tid_lock, flags); ipath_write_kreg(dd, dd->ipath_kregs->kr_scratch, 0xfeeddeaf);