[SCSI] qla2xxx: Correct additional posting issues during NVRAM accesses.
On MMIO relaxed-order platforms, it is possible for the proper delay during NVRAM access to begin before the request passes through the PCI bus (via a MMIO write) to the ISP. Thus, causing a subsequent read to the NVRAM part to fail. Add a MMIO read, after the MMIO write to insure any posted writes are flushed. Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
parent
07ce5eba85
commit
dcb36ce9d9
|
@ -126,6 +126,7 @@ qla2x00_write_nvram_word(scsi_qla_host_t *ha, uint32_t addr, uint16_t data)
|
|||
|
||||
/* Wait for NVRAM to become ready */
|
||||
WRT_REG_WORD(®->nvram, NVR_SELECT);
|
||||
RD_REG_WORD(®->nvram); /* PCI Posting. */
|
||||
do {
|
||||
NVRAM_DELAY();
|
||||
word = RD_REG_WORD(®->nvram);
|
||||
|
@ -178,6 +179,7 @@ qla2x00_write_nvram_word_tmo(scsi_qla_host_t *ha, uint32_t addr, uint16_t data,
|
|||
|
||||
/* Wait for NVRAM to become ready */
|
||||
WRT_REG_WORD(®->nvram, NVR_SELECT);
|
||||
RD_REG_WORD(®->nvram); /* PCI Posting. */
|
||||
do {
|
||||
NVRAM_DELAY();
|
||||
word = RD_REG_WORD(®->nvram);
|
||||
|
@ -235,6 +237,7 @@ qla2x00_nvram_request(scsi_qla_host_t *ha, uint32_t nv_cmd)
|
|||
/* Read data from NVRAM. */
|
||||
for (cnt = 0; cnt < 16; cnt++) {
|
||||
WRT_REG_WORD(®->nvram, NVR_SELECT | NVR_CLOCK);
|
||||
RD_REG_WORD(®->nvram); /* PCI Posting. */
|
||||
NVRAM_DELAY();
|
||||
data <<= 1;
|
||||
reg_data = RD_REG_WORD(®->nvram);
|
||||
|
@ -337,6 +340,7 @@ qla2x00_clear_nvram_protection(scsi_qla_host_t *ha)
|
|||
|
||||
/* Wait for NVRAM to become ready. */
|
||||
WRT_REG_WORD(®->nvram, NVR_SELECT);
|
||||
RD_REG_WORD(®->nvram); /* PCI Posting. */
|
||||
do {
|
||||
NVRAM_DELAY();
|
||||
word = RD_REG_WORD(®->nvram);
|
||||
|
@ -388,6 +392,7 @@ qla2x00_set_nvram_protection(scsi_qla_host_t *ha, int stat)
|
|||
|
||||
/* Wait for NVRAM to become ready. */
|
||||
WRT_REG_WORD(®->nvram, NVR_SELECT);
|
||||
RD_REG_WORD(®->nvram); /* PCI Posting. */
|
||||
do {
|
||||
NVRAM_DELAY();
|
||||
word = RD_REG_WORD(®->nvram);
|
||||
|
|
Loading…
Reference in New Issue