Skip to contentSkip to conversation

patch scsi-qla2xxx-correct-atmel-flash-part-handling.patch added to 2.6.27-stable tree

DISCUSSION Stefan Lippers-Hollmann 3 participants 3 messages Nov 18, 2008 – Nov 21, 2008 2 messages not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

Hi

Quoted 8 lines · On Montag, 17. November 2008, [email protected] wrote:

This is a note to let you know that we have just queued up the patch titled

Subject: SCSI: qla2xxx: Correct Atmel flash-part handling.

to the 2.6.27-stable tree. Its filename is

scsi-qla2xxx-correct-atmel-flash-part-handling.patch

This unfortunately breaks the build.

drivers/scsi/qla2xxx/qla_sup.c: In function 'qla2xxx_get_flash_info':
drivers/scsi/qla2xxx/qla_sup.c:628: error: 'scsi_qla_host_t' has no member named 'fdt_odd_index' make[6]: *** [drivers/scsi/qla2xxx/qla_sup.o] Error 1
make[5]: *** [drivers/scsi/qla2xxx] Error 2
make[4]: *** [drivers/scsi] Error 2

Quoted 29 lines

A git repo of this tree can be found at
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

From 821b3996001508e872582dcafc7575021f122728 Mon Sep 17 00:00:00 2001
From: Lalit Chandivade <[email protected]>
Date: Fri, 24 Oct 2008 15:13:44 -0700
Subject: SCSI: qla2xxx: Correct Atmel flash-part handling.

From: Lalit Chandivade <[email protected]>

commit 821b3996001508e872582dcafc7575021f122728 upstream.

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

---
 drivers/scsi/qla2xxx/qla_def.h |    1 -
 drivers/scsi/qla2xxx/qla_sup.c |   19 +++++++------------
 2 files changed, 7 insertions(+), 13 deletions(-)

drivers/scsi/qla2xxx/qla_def.h typedef struct scsi_qla_host { · line 2551

Quoted 7 lines
drivers/scsi/qla2xxx/qla_def.h +0 -1
@@ -2546,7 +2546,6 @@ typedef struct scsi_qla_host {
 	uint8_t		fcode_revision[16];
 	uint32_t	fw_revision[4];
 
-	uint16_t	fdt_odd_index;
 	uint32_t	fdt_wrt_disable;
 	uint32_t	fdt_erase_cmd;
 	uint32_t	fdt_block_size;

2.6.27.7-rc2:

$ grep -nR -A 3 -B 3 fdt_odd_index drivers/scsi/qla2xxx/
drivers/scsi/qla2xxx/qla_sup.c-628-     DEBUG2(qla_printk(KERN_DEBUG, ha, "Flash[MID]: (0x%x/0x%x) erase=0x%x "
drivers/scsi/qla2xxx/qla_sup.c-629-         "pro=%x upro=%x idx=%d wrtd=0x%x blk=0x%x.\n", man_id, flash_id,
drivers/scsi/qla2xxx/qla_sup.c-630-         ha->fdt_erase_cmd, ha->fdt_protect_sec_cmd,
drivers/scsi/qla2xxx/qla_sup.c:631:         ha->fdt_unprotect_sec_cmd, ha->fdt_odd_index, ha->fdt_wrt_disable,
drivers/scsi/qla2xxx/qla_sup.c-632-         ha->fdt_block_size));
drivers/scsi/qla2xxx/qla_sup.c-633-}
drivers/scsi/qla2xxx/qla_sup.c-634-

Regards
Stefan Lippers-Hollmann

#2 lore raw
Quoted 12 lines · Stefan Lippers-Hollmann

Hi

Quoted 8 lines · On Montag, 17. November 2008, [email protected] wrote:

This is a note to let you know that we have just queued up the patch titled

Subject: SCSI: qla2xxx: Correct Atmel flash-part handling.

to the 2.6.27-stable tree. Its filename is

scsi-qla2xxx-correct-atmel-flash-part-handling.patch

Quoted 7 lines

This unfortunately breaks the build.

drivers/scsi/qla2xxx/qla_sup.c: In function 'qla2xxx_get_flash_info':
drivers/scsi/qla2xxx/qla_sup.c:628: error: 'scsi_qla_host_t' has no member named 'fdt_odd_index' make[6]: *** [drivers/scsi/qla2xxx/qla_sup.o] Error 1
make[5]: *** [drivers/scsi/qla2xxx] Error 2
make[4]: *** [drivers/scsi] Error 2

Crap :(

Lalit, can you fix this up? I'm at a conference for the next two days and probably will not have email access, nor time to try to resolve this...

thanks,

greg k-h

A message that is not in the archive (sent off-list or not yet received): [email protected]

#4 lore raw

Re: [stable] patchscsi-qla2xxx-correct-atmel-flash-part-handling.patch added to2.6.27-stable tree

Quoted 3 lines · Lalit Chandivade

Greg,

This change is missing, attached is the full patch, also pasted below.

Thanks for the fix, I used it in the 2.6.27.7 release.

greg k-h