Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bbfb21da authored by Andrew Vasquez's avatar Andrew Vasquez Committed by James Bottomley
Browse files

[SCSI] qla2xxx: Correct locking during NVRAM manipulation. 



Commit 2c96d8d0 pushed the
acquisition of hardware_lock to too fine a level, which in turn
will cause problems with cond_resched()s added with
40a2e34a.

Signed-off-by: default avatarAndrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 024e8ac0

drivers/scsi/qla2xxx/qla_sup.c

+0 −3
Original line number Diff line number Diff line
@@ -869,11 +869,9 @@ qla24xx_write_nvram_data(scsi_qla_host_t *ha, uint8_t *buf, uint32_t naddr, 
	uint32_t i;

	uint32_t *dwptr;

	struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;

	unsigned long flags;



	ret = QLA_SUCCESS;



	spin_lock_irqsave(&ha->hardware_lock, flags);

	/* Enable flash write. */

	WRT_REG_DWORD(&reg->ctrl_status,

	    RD_REG_DWORD(&reg->ctrl_status) | CSRX_FLASH_ENABLE);
@@ -907,7 +905,6 @@ qla24xx_write_nvram_data(scsi_qla_host_t *ha, uint8_t *buf, uint32_t naddr, 
	WRT_REG_DWORD(&reg->ctrl_status,

	    RD_REG_DWORD(&reg->ctrl_status) & ~CSRX_FLASH_ENABLE);

	RD_REG_DWORD(&reg->ctrl_status);	/* PCI Posting. */

	spin_unlock_irqrestore(&ha->hardware_lock, flags);



	return ret;

}