Attachment 308792 Details for Bug 450645 – 84xx flash,nvram fixes

[patch] 84xx flash,nvram fixes

qla2xxx_rhel4.7_84xx_nvram_flash_patch16.txt (text/plain), 1.98 KB, created by Marcus Barrow on 2008-06-10 10:22:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcus Barrow

Created: 2008-06-10 10:22:55 UTC

Size: 1.98 KB

patch

obsolete

>
>BZ 450645 [8/11] several fixes: ioctl module and slab corruption
>
>Include ISP85xx in some ioctl paths for nvram and flash handling.
>
>This patch changes some uses of the macro IS_QLA24XX to the more broad
>IS_QLA24XX_TYPE, which includes the 84xx.
>
>These changes are confined to the ioctl routine.
>
>Tested at QLogic.
>
>---
> drivers/scsi/qla2xxx/qim_inioct.c |    2 +-
> drivers/scsi/qla2xxx/qim_sup.c    |    4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/drivers/scsi/qla2xxx/qim_inioct.c b/drivers/scsi/qla2xxx/qim_inioct.c
>index ceb2673..a5f79a1 100644
>--- a/drivers/scsi/qla2xxx/qim_inioct.c
>+++ b/drivers/scsi/qla2xxx/qim_inioct.c
>@@ -831,7 +831,7 @@ qim_update_option_rom_ext(struct qla_hos
> 		DEBUG9_10(printk("%s: ERROR updating flash.\n", __func__);)
> 	} else {
> 		/* Update our db with the newly updated flash version values. */
>-		if (IS_QLA24XX(dr_ha) || IS_QLA54XX(dr_ha)) {
>+		if (IS_QLA24XX_TYPE(dr_ha) || IS_QLA25XX(dr_ha)) {
> 			DEBUG9(printk("%s(%ld): refresh flash versions.\n",
> 			    __func__, ha->host_no);)
> 
>diff --git a/drivers/scsi/qla2xxx/qim_sup.c b/drivers/scsi/qla2xxx/qim_sup.c
>index 93135f6..d976ca1 100644
>--- a/drivers/scsi/qla2xxx/qim_sup.c
>+++ b/drivers/scsi/qla2xxx/qim_sup.c
>@@ -675,7 +675,7 @@ qim_read_nvram_data(scsi_qla_host_t *ha,
> 	if (IS_QLA25XX(ha)) {
> 		qim2xxx_read_flash_data(ha, buf,
> 		    ((FA_VPD_NVRAM_ADDR << 2) | (naddr << 2)), bytes);
>-	} else if (IS_QLA24XX(ha) || IS_QLA54XX(ha)) {
>+	} else if (IS_QLA24XX_TYPE(ha)) {
> 		/* Dword reads to flash. */
> 		dwptr = (uint32_t *)buf;
> 		for (i = 0; i < bytes >> 2; i++, naddr++)
>@@ -709,7 +709,7 @@ qim_write_nvram_data(scsi_qla_host_t *ha
> 	if (IS_QLA25XX(ha)) {
> 		ret = qim24xx_write_flash_data(ha, (uint32_t *)buf,
> 		    FA_VPD_NVRAM_ADDR | naddr, bytes >> 2);
>-        } else if (IS_QLA24XX(ha) || IS_QLA54XX(ha)) {
>+        } else if (IS_QLA24XX_TYPE(ha)) {
> 		/* Enable flash write. */
> 		WRT_REG_DWORD(&reg->ctrl_status,
> 		    RD_REG_DWORD(&reg->ctrl_status) | CSRX_FLASH_ENABLE);
>-- 
>1.4.4.1
>

Actions: View | Diff

Attachments on bug 450645: 308785 | 308786 | 308787 | 308788 | 308789 | 308790 | 308791 | 308792 | 308793 | 308794 | 308795