| From aradford@gmail.com Tue Apr 11 11:25:12 2006 |
| Message-ID: <b1bc6a000604111125s74a95319m39e23598ed4755a5@mail.gmail.com> |
| Date: Tue, 11 Apr 2006 11:25:09 -0700 |
| From: "adam radford" <aradford@gmail.com> |
| To: "James Bottomley" <James.Bottomley@steeleye.com>, |
| "SCSI Mailing List" <linux-scsi@vger.kernel.org> |
| Subject: 3ware 9000 disable local irqs during kmap_atomic |
| |
| |
| The attached patch for 2.6.17-rc2 updates the 3ware 9000 driver: |
| |
| - Disable local interrupts during kmap/unmap_atomic(). |
| |
| Signed-off-by: Adam Radford <linuxraid@amcc.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/scsi/3w-9xxx.c | 8 ++++++-- |
| 1 file changed, 6 insertions(+), 2 deletions(-) |
| |
| --- linux-2.6.16.9.orig/drivers/scsi/3w-9xxx.c |
| +++ linux-2.6.16.9/drivers/scsi/3w-9xxx.c |
| @@ -85,7 +85,7 @@ |
| #include "3w-9xxx.h" |
| |
| /* Globals */ |
| -#define TW_DRIVER_VERSION "2.26.02.005" |
| +#define TW_DRIVER_VERSION "2.26.02.007" |
| static TW_Device_Extension *twa_device_extension_list[TW_MAX_SLOT]; |
| static unsigned int twa_device_extension_count; |
| static int twa_major = -1; |
| @@ -1944,9 +1944,13 @@ static void twa_scsiop_execute_scsi_comp |
| } |
| if (tw_dev->srb[request_id]->use_sg == 1) { |
| struct scatterlist *sg = (struct scatterlist *)tw_dev->srb[request_id]->request_buffer; |
| - char *buf = kmap_atomic(sg->page, KM_IRQ0) + sg->offset; |
| + char *buf; |
| + unsigned long flags = 0; |
| + local_irq_save(flags); |
| + buf = kmap_atomic(sg->page, KM_IRQ0) + sg->offset; |
| memcpy(buf, tw_dev->generic_buffer_virt[request_id], sg->length); |
| kunmap_atomic(buf - sg->offset, KM_IRQ0); |
| + local_irq_restore(flags); |
| } |
| } |
| } /* End twa_scsiop_execute_scsi_complete() */ |
