Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761339AbYA3KiV (ORCPT ); Wed, 30 Jan 2008 05:38:21 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757860AbYA3KiK (ORCPT ); Wed, 30 Jan 2008 05:38:10 -0500 Received: from brick.kernel.dk ([87.55.233.238]:3864 "EHLO kernel.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750758AbYA3KiH (ORCPT ); Wed, 30 Jan 2008 05:38:07 -0500 Date: Wed, 30 Jan 2008 11:38:04 +0100 From: Jens Axboe To: Geert Uytterhoeven Cc: James Bottomley , Matthew Dharm , Oliver Neukum , Boaz Harrosh , Greg KH , linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, linux-scsi@vger.kernel.org Subject: Re: [BUG] 2.6.24-git usb reset problems Message-ID: <20080130103803.GN15220@kernel.dk> References: <479F32E9.10609@panasas.com> <20080129141108.GV15220@kernel.dk> <200801291531.39825.oliver@neukum.org> <20080129143109.GW15220@kernel.dk> <20080129183910.GI15220@kernel.dk> <20080129191024.GO14375@one-eyed-alien.net> <1201635195.3069.36.camel@localhost.localdomain> <20080129193520.GQ15220@kernel.dk> <20080129194543.GR15220@kernel.dk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2993 Lines: 74 On Wed, Jan 30 2008, Geert Uytterhoeven wrote: > On Tue, 29 Jan 2008, Jens Axboe wrote: > > On Tue, Jan 29 2008, Jens Axboe wrote: > > > On Tue, Jan 29 2008, James Bottomley wrote: > > > > On Tue, 2008-01-29 at 11:10 -0800, Matthew Dharm wrote: > > > > > For some reason, usb_sg_init is boned during auto-sense. > > > > > > > > OK, that's implicating the scsi_eh_prep_cmnd() in the auto sense > > > > code ... that was also an update in 2.6.24 > > > > > > yeah, already found the bug - it's assuming ->request_buffer holds the > > > sglist, oops. Preparing a fix. > > > > ok here goes, this saves and restores the sg table correctly. it also > > fixes the usb bug for me. > > I can confirm this patch fixes the errors I was seeing with current > linux-2.6.git for the USB memory card readers in a Dell TFT connected > to a PS3. James, we need a fix for this pushed asap. So either we should merge the below now, or push the bidi patchset that also fixes this. It all depends on when you want to merge the bidi patches... > > diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c > > index 547e85a..12770ef 100644 > > --- a/drivers/scsi/scsi_error.c > > +++ b/drivers/scsi/scsi_error.c > > @@ -622,13 +622,15 @@ void scsi_eh_prep_cmnd(struct scsi_cmnd *scmd, struct scsi_eh_save *ses, > > ses->use_sg = scmd->use_sg; > > ses->resid = scmd->resid; > > ses->result = scmd->result; > > + memcpy(&ses->sense_sgl, &scmd->sg_table, sizeof(ses->sense_sgl)); > > > > if (sense_bytes) { > > scmd->request_bufflen = min_t(unsigned, > > SCSI_SENSE_BUFFERSIZE, sense_bytes); > > sg_init_one(&ses->sense_sgl, scmd->sense_buffer, > > scmd->request_bufflen); > > - scmd->request_buffer = &ses->sense_sgl; > > + scmd->sg_table.sgl = &ses->sense_sgl; > > + scmd->sg_table.nents = scmd->sg_table.orig_nents = 1; > > scmd->sc_data_direction = DMA_FROM_DEVICE; > > scmd->use_sg = 1; > > memset(scmd->cmnd, 0, sizeof(scmd->cmnd)); > > @@ -679,6 +681,7 @@ void scsi_eh_restore_cmnd(struct scsi_cmnd* scmd, struct scsi_eh_save *ses) > > scmd->request_bufflen = ses->bufflen; > > scmd->request_buffer = ses->buffer; > > scmd->use_sg = ses->use_sg; > > + memcpy(&scmd->sg_table, &ses->sg_table, sizeof(scmd->sg_table)); > > scmd->resid = ses->resid; > > scmd->result = ses->result; > > } > > diff --git a/include/scsi/scsi_eh.h b/include/scsi/scsi_eh.h > > index d21b891..d43dc83 100644 > > --- a/include/scsi/scsi_eh.h > > +++ b/include/scsi/scsi_eh.h > > @@ -75,6 +75,7 @@ struct scsi_eh_save { > > > > void *buffer; > > unsigned bufflen; > > + struct sg_table sg_table; > > unsigned short use_sg; > > int resid; > > -- Jens Axboe -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/