Re: [PATCH] [SCSI] qla4xxx: fix for timing issue for nvram accesses.

[David C Somayajulu]

This patch fixes a timing issue related to nvram accesses in qla4xxx driver for 
some cpu/slot speed combination.

Signed-off-by: David Somayajulu <[EMAIL PROTECTED]>

---
 drivers/scsi/qla4xxx/ql4_nvram.c |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/drivers/scsi/qla4xxx/ql4_nvram.c b/drivers/scsi/qla4xxx/ql4_nvram.c
index fc50203..a84ed3e 100644
--- a/drivers/scsi/qla4xxx/ql4_nvram.c
+++ b/drivers/scsi/qla4xxx/ql4_nvram.c
@@ -29,7 +29,9 @@ static int fm93c56a_select(struct scsi_q
 
        ha->eeprom_cmd_data = AUBURN_EEPROM_CS_1 | 0x000f0000;
        writel(ha->eeprom_cmd_data, isp_nvram(ha));
+       udelay(1);
        readl(isp_nvram(ha));
+       udelay(1);
        return 1;
 }
 
@@ -42,11 +44,15 @@ static int fm93c56a_cmd(struct scsi_qla_
 
        /* Clock in a zero, then do the start bit. */
        writel(ha->eeprom_cmd_data | AUBURN_EEPROM_DO_1, isp_nvram(ha));
+       udelay(1);
        writel(ha->eeprom_cmd_data | AUBURN_EEPROM_DO_1 |
               AUBURN_EEPROM_CLK_RISE, isp_nvram(ha));
+       udelay(1);
        writel(ha->eeprom_cmd_data | AUBURN_EEPROM_DO_1 |
               AUBURN_EEPROM_CLK_FALL, isp_nvram(ha));
+       udelay(1);
        readl(isp_nvram(ha));
+       udelay(1);
        mask = 1 << (FM93C56A_CMD_BITS - 1);
 
        /* Force the previous data bit to be different. */
@@ -61,13 +67,17 @@ static int fm93c56a_cmd(struct scsi_qla_
                         * match.
                         */
                        writel(ha->eeprom_cmd_data | dataBit, isp_nvram(ha));
+                       udelay(1);
                        previousBit = dataBit;
                }
                writel(ha->eeprom_cmd_data | dataBit |
                       AUBURN_EEPROM_CLK_RISE, isp_nvram(ha));
+               udelay(1);
                writel(ha->eeprom_cmd_data | dataBit |
                       AUBURN_EEPROM_CLK_FALL, isp_nvram(ha));
+               udelay(1);
                readl(isp_nvram(ha));
+               udelay(1);
                cmd = cmd << 1;
        }
        mask = 1 << (eeprom_no_addr_bits(ha) - 1);
@@ -83,13 +93,17 @@ static int fm93c56a_cmd(struct scsi_qla_
                         * match.
                         */
                        writel(ha->eeprom_cmd_data | dataBit, isp_nvram(ha));
+                       udelay(1);
                        previousBit = dataBit;
                }
                writel(ha->eeprom_cmd_data | dataBit |
                       AUBURN_EEPROM_CLK_RISE, isp_nvram(ha));
+               udelay(1);
                writel(ha->eeprom_cmd_data | dataBit |
                       AUBURN_EEPROM_CLK_FALL, isp_nvram(ha));
+               udelay(1);
                readl(isp_nvram(ha));
+               udelay(1);
                addr = addr << 1;
        }
        return 1;
@@ -99,7 +113,9 @@ static int fm93c56a_deselect(struct scsi
 {
        ha->eeprom_cmd_data = AUBURN_EEPROM_CS_0 | 0x000f0000;
        writel(ha->eeprom_cmd_data, isp_nvram(ha));
+       udelay(1);
        readl(isp_nvram(ha));
+       udelay(1);
        return 1;
 }
 
@@ -114,10 +130,13 @@ static int fm93c56a_datain(struct scsi_q
        for (i = 0; i < eeprom_no_data_bits(ha); i++) {
                writel(ha->eeprom_cmd_data |
                       AUBURN_EEPROM_CLK_RISE, isp_nvram(ha));
+               udelay(1);
                writel(ha->eeprom_cmd_data |
                       AUBURN_EEPROM_CLK_FALL, isp_nvram(ha));
+               udelay(1);
                dataBit =
                        (readw(isp_nvram(ha)) & AUBURN_EEPROM_DI_1) ? 1 : 0;
+               udelay(1);
                data = (data << 1) | dataBit;
        }
 
-- 
1.4.2.3


-
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html