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

Commit 821b3996 authored Oct 24, 2008 by Lalit Chandivade Committed by James Bottomley Nov 05, 2008

[SCSI] qla2xxx: Correct Atmel flash-part handling.



Use correct block size (4K) for erase command 0x20 for Atmel
Flash. Use dword addresses for determining sector boundary.

Cc: Stable Tree <stable@kernel.org>
Signed-off-by: Lalit Chandivade <lalit.chandivade@qlogic.com>
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

parent 6b0eea21

drivers/scsi/qla2xxx/qla_def.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2547,7 +2547,6 @@ typedef struct scsi_qla_host {
	uint8_t fcode_revision[16];		uint8_t fcode_revision[16];
	uint32_t fw_revision[4];		uint32_t fw_revision[4];

	uint16_t fdt_odd_index;
	uint32_t fdt_wrt_disable;		uint32_t fdt_wrt_disable;
	uint32_t fdt_erase_cmd;		uint32_t fdt_erase_cmd;
	uint32_t fdt_block_size;		uint32_t fdt_block_size;

drivers/scsi/qla2xxx/qla_sup.c

+7 −12

Original line number	Original line	Diff line number	Diff line
	@@ -722,6 +722,7 @@ qla2xxx_get_flt_info(scsi_qla_host_t *ha, uint32_t flt_addr)
	static void		static void
	qla2xxx_get_fdt_info(scsi_qla_host_t *ha)		qla2xxx_get_fdt_info(scsi_qla_host_t *ha)
	{		{
			#define FLASH_BLK_SIZE_4K 0x1000
	#define FLASH_BLK_SIZE_32K 0x8000		#define FLASH_BLK_SIZE_32K 0x8000
	#define FLASH_BLK_SIZE_64K 0x10000		#define FLASH_BLK_SIZE_64K 0x10000
	const char loc, locations[] = { "MID", "FDT" };		const char loc, locations[] = { "MID", "FDT" };
	@@ -755,7 +756,6 @@ qla2xxx_get_fdt_info(scsi_qla_host_t *ha)
	loc = locations[1];		loc = locations[1];
	mid = le16_to_cpu(fdt->man_id);		mid = le16_to_cpu(fdt->man_id);
	fid = le16_to_cpu(fdt->id);		fid = le16_to_cpu(fdt->id);
	ha->fdt_odd_index = mid == 0x1f;
	ha->fdt_wrt_disable = fdt->wrt_disable_bits;		ha->fdt_wrt_disable = fdt->wrt_disable_bits;
	ha->fdt_erase_cmd = flash_conf_to_access_addr(0x0300 \| fdt->erase_cmd);		ha->fdt_erase_cmd = flash_conf_to_access_addr(0x0300 \| fdt->erase_cmd);
	ha->fdt_block_size = le32_to_cpu(fdt->block_size);		ha->fdt_block_size = le32_to_cpu(fdt->block_size);
	@@ -788,8 +788,7 @@ qla2xxx_get_fdt_info(scsi_qla_host_t *ha)
	ha->fdt_block_size = FLASH_BLK_SIZE_64K;		ha->fdt_block_size = FLASH_BLK_SIZE_64K;
	break;		break;
	case 0x1f: /* Atmel 26DF081A. */		case 0x1f: /* Atmel 26DF081A. */
	ha->fdt_odd_index = 1;		ha->fdt_block_size = FLASH_BLK_SIZE_4K;
	ha->fdt_block_size = FLASH_BLK_SIZE_64K;
	ha->fdt_erase_cmd = flash_conf_to_access_addr(0x0320);		ha->fdt_erase_cmd = flash_conf_to_access_addr(0x0320);
	ha->fdt_unprotect_sec_cmd = flash_conf_to_access_addr(0x0339);		ha->fdt_unprotect_sec_cmd = flash_conf_to_access_addr(0x0339);
	ha->fdt_protect_sec_cmd = flash_conf_to_access_addr(0x0336);		ha->fdt_protect_sec_cmd = flash_conf_to_access_addr(0x0336);
	@@ -801,9 +800,9 @@ qla2xxx_get_fdt_info(scsi_qla_host_t *ha)
	}		}
	done:		done:
	DEBUG2(qla_printk(KERN_DEBUG, ha, "FDT[%s]: (0x%x/0x%x) erase=0x%x "		DEBUG2(qla_printk(KERN_DEBUG, ha, "FDT[%s]: (0x%x/0x%x) erase=0x%x "
	"pro=%x upro=%x idx=%d wrtd=0x%x blk=0x%x.\n", loc, mid, fid,		"pro=%x upro=%x wrtd=0x%x blk=0x%x.\n", loc, mid, fid,
	ha->fdt_erase_cmd, ha->fdt_protect_sec_cmd,		ha->fdt_erase_cmd, ha->fdt_protect_sec_cmd,
	ha->fdt_unprotect_sec_cmd, ha->fdt_odd_index, ha->fdt_wrt_disable,		ha->fdt_unprotect_sec_cmd, ha->fdt_wrt_disable,
	ha->fdt_block_size));		ha->fdt_block_size));
	}		}

	@@ -987,13 +986,9 @@ qla24xx_write_flash_data(scsi_qla_host_t ha, uint32_t dwptr, uint32_t faddr,
	qla24xx_unprotect_flash(ha);		qla24xx_unprotect_flash(ha);

	for (liter = 0; liter < dwords; liter++, faddr++, dwptr++) {		for (liter = 0; liter < dwords; liter++, faddr++, dwptr++) {
	if (ha->fdt_odd_index) {
	findex = faddr << 2;
	fdata = findex & sec_mask;
	} else {
	findex = faddr;		findex = faddr;
	fdata = (findex & sec_mask) << 2;		fdata = (findex & sec_mask) << 2;
	}

	/* Are we at the beginning of a sector? */		/* Are we at the beginning of a sector? */
	if ((findex & rest_addr) == 0) {		if ((findex & rest_addr) == 0) {