Commit 32e33aaf authored by Oliver Neukum's avatar Oliver Neukum Committed by Paul Mackerras

usb hpusbscsi driver fixes:

	- special case for REQUEST_SENSE
	- reset handling won't work properly -> disabled
	- error reporting corrected
parent 09d3c1df
...@@ -283,7 +283,12 @@ static int hpusbscsi_scsi_queuecommand (Scsi_Cmnd *srb, scsi_callback callback) ...@@ -283,7 +283,12 @@ static int hpusbscsi_scsi_queuecommand (Scsi_Cmnd *srb, scsi_callback callback)
/* Now we need to decide which callback to give to the urb we send the command with */ /* Now we need to decide which callback to give to the urb we send the command with */
if (!srb->bufflen) { if (!srb->bufflen) {
usb_callback = simple_command_callback; if (srb->cmnd[0] == REQUEST_SENSE){
hpusbscsi->current_data_pipe = usb_rcvbulkpipe(hpusbscsi->dev, hpusbscsi->ep_in);
usb_callback = request_sense_callback;
} else {
usb_callback = simple_command_callback;
}
} else { } else {
if (likely(srb->use_sg)) { if (likely(srb->use_sg)) {
usb_callback = scatter_gather_callback; usb_callback = scatter_gather_callback;
...@@ -341,8 +346,8 @@ static int hpusbscsi_scsi_host_reset (Scsi_Cmnd *srb) ...@@ -341,8 +346,8 @@ static int hpusbscsi_scsi_host_reset (Scsi_Cmnd *srb)
struct hpusbscsi* hpusbscsi = (struct hpusbscsi*)(srb->host->hostdata[0]); struct hpusbscsi* hpusbscsi = (struct hpusbscsi*)(srb->host->hostdata[0]);
printk(KERN_DEBUG"SCSI reset requested.\n"); printk(KERN_DEBUG"SCSI reset requested.\n");
usb_reset_device(hpusbscsi->dev); //usb_reset_device(hpusbscsi->dev);
printk(KERN_DEBUG"SCSI reset completed.\n"); //printk(KERN_DEBUG"SCSI reset completed.\n");
hpusbscsi->state = HP_STATE_FREE; hpusbscsi->state = HP_STATE_FREE;
return 0; return 0;
...@@ -382,7 +387,7 @@ DEBUG("Getting status byte %d \n",hpusbscsi->scsi_state_byte); ...@@ -382,7 +387,7 @@ DEBUG("Getting status byte %d \n",hpusbscsi->scsi_state_byte);
return; return;
} }
hpusbscsi->srb->result &= SCSI_ERR_MASK; hpusbscsi->srb->result &= SCSI_ERR_MASK;
hpusbscsi->srb->result |= hpusbscsi->scsi_state_byte<<1; hpusbscsi->srb->result |= hpusbscsi->scsi_state_byte;
if (hpusbscsi->scallback != NULL && hpusbscsi->state == HP_STATE_WAIT) if (hpusbscsi->scallback != NULL && hpusbscsi->state == HP_STATE_WAIT)
/* we do a callback to the scsi layer if and only if all data has been transfered */ /* we do a callback to the scsi layer if and only if all data has been transfered */
...@@ -427,6 +432,32 @@ static void simple_command_callback(struct urb *u) ...@@ -427,6 +432,32 @@ static void simple_command_callback(struct urb *u)
} }
} }
static void request_sense_callback (struct urb *u)
{
struct hpusbscsi * hpusbscsi = (struct hpusbscsi *)u->context;
if (unlikely(u->status<0)) {
handle_usb_error(hpusbscsi);
return;
}
FILL_BULK_URB(
u,
hpusbscsi->dev,
hpusbscsi->current_data_pipe,
hpusbscsi->srb->sense_buffer,
SCSI_SENSE_BUFFERSIZE,
simple_done,
hpusbscsi
);
if (unlikely(0 > usb_submit_urb(u, GFP_ATOMIC))) {
handle_usb_error(hpusbscsi);
return;
}
hpusbscsi->state = HP_STATE_WORKING;
}
static void scatter_gather_callback(struct urb *u) static void scatter_gather_callback(struct urb *u)
{ {
struct hpusbscsi * hpusbscsi = (struct hpusbscsi *)u->context; struct hpusbscsi * hpusbscsi = (struct hpusbscsi *)u->context;
......
...@@ -51,7 +51,8 @@ static int hpusbscsi_scsi_detect (struct SHT * sht); ...@@ -51,7 +51,8 @@ static int hpusbscsi_scsi_detect (struct SHT * sht);
static void simple_command_callback(struct urb *u); static void simple_command_callback(struct urb *u);
static void scatter_gather_callback(struct urb *u); static void scatter_gather_callback(struct urb *u);
static void simple_payload_callback (struct urb *u); static void simple_payload_callback (struct urb *u);
static void control_interrupt_callback (struct urb *u); static void request_sense_callback (struct urb *u);
static void control_interrupt_callback (struct urb *u);
static void simple_done (struct urb *u); static void simple_done (struct urb *u);
static int hpusbscsi_scsi_queuecommand (Scsi_Cmnd *srb, scsi_callback callback); static int hpusbscsi_scsi_queuecommand (Scsi_Cmnd *srb, scsi_callback callback);
static int hpusbscsi_scsi_host_reset (Scsi_Cmnd *srb); static int hpusbscsi_scsi_host_reset (Scsi_Cmnd *srb);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment