lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SCSI] hpsa: take the adapter lock in hpsa_wait_for_mode_change_ack

Browse Source 
Need to take the lock while accessing the register to check to
see if config table changes have taken effect.

Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
This commit is contained in:
Stephen M. Cameron
2011-01-06 14:48:24 -06:00
committed by James Bottomley
parent 25c1e56a04
commit 6eaf46fdc7
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/scsi/hpsa.c
View File

@@ -3553,13 +3553,18 @@ static inline void hpsa_p600_dma_prefetch_quirk(struct ctlr_info *h)
static void __devinit hpsa_wait_for_mode_change_ack(struct ctlr_info *h) static void __devinit hpsa_wait_for_mode_change_ack(struct ctlr_info *h)
{ {
int i; int i;
u32 doorbell_value;
unsigned long flags;
/* under certain very rare conditions, this can take awhile. /* under certain very rare conditions, this can take awhile.
* (e.g.: hot replace a failed 144GB drive in a RAID 5 set right * (e.g.: hot replace a failed 144GB drive in a RAID 5 set right
* as we enter this code.) * as we enter this code.)
*/ */
for (i = 0; i < MAX_CONFIG_WAIT; i++) { for (i = 0; i < MAX_CONFIG_WAIT; i++) {
if (!(readl(h->vaddr + SA5_DOORBELL) & CFGTBL_ChangeReq)) spin_lock_irqsave(&h->lock, flags);
doorbell_value = readl(h->vaddr + SA5_DOORBELL);
spin_unlock_irqrestore(&h->lock, flags);
if (!doorbell_value & CFGTBL_ChangeReq)
break; break;
/* delay and try again */ /* delay and try again */
msleep(10); msleep(10);
@@ -3731,6 +3736,8 @@ static int __devinit hpsa_init_one(struct pci_dev *pdev,
h->busy_initializing = 1; h->busy_initializing = 1;
INIT_HLIST_HEAD(&h->cmpQ); INIT_HLIST_HEAD(&h->cmpQ);
INIT_HLIST_HEAD(&h->reqQ); INIT_HLIST_HEAD(&h->reqQ);
spin_lock_init(&h->lock);
spin_lock_init(&h->scan_lock);
rc = hpsa_pci_init(h); rc = hpsa_pci_init(h);
if (rc != 0) if (rc != 0)
goto clean1; goto clean1;
@@ -3790,8 +3797,6 @@ static int __devinit hpsa_init_one(struct pci_dev *pdev,
} }
if (hpsa_allocate_sg_chain_blocks(h)) if (hpsa_allocate_sg_chain_blocks(h))
goto clean4; goto clean4;
spin_lock_init(&h->lock);
spin_lock_init(&h->scan_lock);
init_waitqueue_head(&h->scan_wait_queue); init_waitqueue_head(&h->scan_wait_queue);
h->scan_finished = 1; /* no scan currently in progress */ h->scan_finished = 1; /* no scan currently in progress */