From: Jesse Barnes <jbarnes@engr.sgi.com>
Reduce some overaggressive compensation for PCI write posting. In some
cases we don't actually want to read a value back, since the card could be
resetting.
Signed-off-by: Jesse Barnes <jbarnes@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/drivers/scsi/qla2xxx/qla_init.c | 7 -------
1 files changed, 7 deletions(-)
diff -puN drivers/scsi/qla2xxx/qla_init.c~qla2xxx-less-posting drivers/scsi/qla2xxx/qla_init.c
--- 25/drivers/scsi/qla2xxx/qla_init.c~qla2xxx-less-posting 2004-09-16 21:29:43.301572504 -0700
+++ 25-akpm/drivers/scsi/qla2xxx/qla_init.c 2004-09-16 21:29:43.308571440 -0700
@@ -463,13 +463,10 @@ qla2x00_reset_chip(scsi_qla_host_t *ha)
}
WRT_REG_WORD(®->hccr, HCCR_CLR_RISC_INT);
- RD_REG_WORD(®->hccr); /* PCI Posting. */
WRT_REG_WORD(®->hccr, HCCR_CLR_HOST_INT);
- RD_REG_WORD(®->hccr); /* PCI Posting. */
/* Reset ISP chip. */
WRT_REG_WORD(®->ctrl_status, CSR_ISP_SOFT_RESET);
- RD_REG_WORD(®->ctrl_status); /* PCI Posting. */
/* Wait for RISC to recover from reset. */
if (IS_QLA2100(ha) || IS_QLA2200(ha) || IS_QLA2300(ha)) {
@@ -490,7 +487,6 @@ qla2x00_reset_chip(scsi_qla_host_t *ha)
/* Reset RISC processor. */
WRT_REG_WORD(®->hccr, HCCR_RESET_RISC);
- RD_REG_WORD(®->hccr); /* PCI Posting. */
WRT_REG_WORD(®->semaphore, 0);
@@ -559,7 +555,6 @@ qla2x00_chip_diag(scsi_qla_host_t *ha)
/* Reset ISP chip. */
WRT_REG_WORD(®->ctrl_status, CSR_ISP_SOFT_RESET);
- RD_REG_WORD(®->ctrl_status); /* PCI Posting. */
/*
* We need to have a delay here since the card will not respond while
@@ -581,9 +576,7 @@ qla2x00_chip_diag(scsi_qla_host_t *ha)
/* Reset RISC processor. */
WRT_REG_WORD(®->hccr, HCCR_RESET_RISC);
- RD_REG_WORD(®->hccr); /* PCI Posting. */
WRT_REG_WORD(®->hccr, HCCR_RELEASE_RISC);
- RD_REG_WORD(®->hccr); /* PCI Posting. */
/* Workaround for QLA2312 PCI parity error */
if (IS_QLA2100(ha) || IS_QLA2200(ha) || IS_QLA2300(ha)) {
_