diff options
author | John Gregor <john.gregor@qlogic.com> | 2007-09-05 04:57:14 -0400 |
---|---|---|
committer | Roland Dreier <rolandd@cisco.com> | 2008-01-25 17:15:27 -0500 |
commit | e342c119172f87f2d812bccfd0283f62e1bc1c2a (patch) | |
tree | 52eb0e75f5f894ab7f0f3c755f0876f18637e5a9 /drivers/infiniband/hw/ipath/ipath_file_ops.c | |
parent | 9ab4295d1d9ab10a249aea002060685f935a528c (diff) |
IB/ipath: Fix sendctrl locking
Code review pointed out that the locking around uses of ipath_sendctrl
and kr_sendctrl were, in several places, incorrect and/or inconsistent.
Signed-off-by: John Gregor <john.gregor@qlogic.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband/hw/ipath/ipath_file_ops.c')
-rw-r--r-- | drivers/infiniband/hw/ipath/ipath_file_ops.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_file_ops.c b/drivers/infiniband/hw/ipath/ipath_file_ops.c index 5de3243a47c..92dae6f5b39 100644 --- a/drivers/infiniband/hw/ipath/ipath_file_ops.c +++ b/drivers/infiniband/hw/ipath/ipath_file_ops.c | |||
@@ -2149,11 +2149,15 @@ static int ipath_get_slave_info(struct ipath_portdata *pd, | |||
2149 | 2149 | ||
2150 | static int ipath_force_pio_avail_update(struct ipath_devdata *dd) | 2150 | static int ipath_force_pio_avail_update(struct ipath_devdata *dd) |
2151 | { | 2151 | { |
2152 | u64 reg = dd->ipath_sendctrl; | 2152 | unsigned long flags; |
2153 | 2153 | ||
2154 | clear_bit(IPATH_S_PIOBUFAVAILUPD, ®); | 2154 | spin_lock_irqsave(&dd->ipath_sendctrl_lock, flags); |
2155 | ipath_write_kreg(dd, dd->ipath_kregs->kr_sendctrl, reg); | 2155 | ipath_write_kreg(dd, dd->ipath_kregs->kr_sendctrl, |
2156 | dd->ipath_sendctrl & ~INFINIPATH_S_PIOBUFAVAILUPD); | ||
2157 | ipath_read_kreg64(dd, dd->ipath_kregs->kr_scratch); | ||
2156 | ipath_write_kreg(dd, dd->ipath_kregs->kr_sendctrl, dd->ipath_sendctrl); | 2158 | ipath_write_kreg(dd, dd->ipath_kregs->kr_sendctrl, dd->ipath_sendctrl); |
2159 | ipath_read_kreg64(dd, dd->ipath_kregs->kr_scratch); | ||
2160 | spin_unlock_irqrestore(&dd->ipath_sendctrl_lock, flags); | ||
2157 | 2161 | ||
2158 | return 0; | 2162 | return 0; |
2159 | } | 2163 | } |