On Mon, May 30, 2011 at 12:13:51PM +0800, [email protected] wrote: > > This is a note to let you know that I've just added the patch titled > > [SCSI] bnx2i: Fixed packet error created when the sq_size is > > to the 2.6.32-longterm tree which can be found at: > > http://www.kernel.org/git/?p=linux/kernel/git/longterm/longterm-queue-2.6.32.git;a=summary
And I've dropped it as it caused the following build errors: drivers/scsi/bnx2i/bnx2i_iscsi.c: In function ‘bnx2i_session_create’: drivers/scsi/bnx2i/bnx2i_iscsi.c:1236:6: error: ‘bnx2i_conn’ undeclared (first use in this function) drivers/scsi/bnx2i/bnx2i_iscsi.c:1236:6: note: each undeclared identifier is reported only once for each function it appears in drivers/scsi/bnx2i/bnx2i_iscsi.c:1237:3: warning: return makes pointer from integer without a cast If you want to fix this up, and have it in the .32-stable tree, please send [email protected] a backported patch. thanks, greg k-h > > The filename of the patch is: > bnx2i-fixed-packet-error-created-when-the-sq_size-is.patch > and it can be found in the queue-2.6.32 subdirectory. > > If you, or anyone else, feels it should not be added to the 2.6.32 longterm > tree, > please let <[email protected]> know about it. > > > >From 7287c63e986fe1a51a89f4bb1327320274a7a741 Mon Sep 17 00:00:00 2001 > From: Eddie Wai <[email protected]> > Date: Mon, 16 May 2011 11:13:18 -0700 > Subject: [SCSI] bnx2i: Fixed packet error created when the sq_size is > set to 16 > > From: Eddie Wai <[email protected]> > > commit 7287c63e986fe1a51a89f4bb1327320274a7a741 upstream. > > The number of chip's internal command cell, which is use to generate > SCSI cmd packets to the target, was not initialized correctly by > the driver when the sq_size is changed from the default 128. > This, in turn, will create a problem where the chip's transmit pipe > will erroneously reuse an old command cell that is no longer valid. > The fix is to correctly initialize the chip's command cell upon setup. > > Signed-off-by: Eddie Wai <[email protected]> > Reviewed-by: Mike Christie <[email protected]> > Signed-off-by: James Bottomley <[email protected]> > Signed-off-by: Greg Kroah-Hartman <[email protected]> > > --- > drivers/scsi/bnx2i/bnx2i_hwi.c | 1 + > drivers/scsi/bnx2i/bnx2i_iscsi.c | 3 +++ > 2 files changed, 4 insertions(+) > > --- a/drivers/scsi/bnx2i/bnx2i_hwi.c > +++ b/drivers/scsi/bnx2i/bnx2i_hwi.c > @@ -1172,6 +1172,7 @@ int bnx2i_send_fw_iscsi_init_msg(struct > iscsi_init.dummy_buffer_addr_hi = > (u32) ((u64) hba->dummy_buf_dma >> 32); > > + hba->num_ccell = hba->max_sqes >> 1; > hba->ctx_ccell_tasks = > ((hba->num_ccell & 0xFFFF) | (hba->max_sqes << 16)); > iscsi_init.num_ccells_per_conn = hba->num_ccell; > --- a/drivers/scsi/bnx2i/bnx2i_iscsi.c > +++ b/drivers/scsi/bnx2i/bnx2i_iscsi.c > @@ -1233,6 +1233,9 @@ bnx2i_session_create(struct iscsi_endpoi > if (bnx2i_adapter_ready(hba)) > return NULL; > > + if (bnx2i_conn->ep->num_active_cmds + 1 > hba->max_sqes) > + return -ENOMEM; > + > /* > * user can override hw limit as long as it is within > * the min/max. > > > Patches currently in longterm-queue-2.6.32 which might be from > [email protected] are > > _______________________________________________ > stable mailing list > [email protected] > http://linux.kernel.org/mailman/listinfo/stable _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
