Instead of having the global "unchecked_isa_dma" bit add a single
bit that tells the mid layer that the sense buffer needs to be ISA
DMA'able.
Right now when the bit is set we still force all commands to the ISA
DMA zone too, but that can change in the future.
Signed-off-by: Andi Kleen <ak@xxxxxxx>
Signed-off-by: Andi Kleen <andi@xxxxxxxxxxxxxx>
Signed-off-by: Andi Kleen <ak@xxxxxxxxxxxxxxx>
---
Documentation/scsi/scsi_mid_low_api.txt | 1 +
drivers/scsi/hosts.c | 1 +
drivers/scsi/scsi.c | 10 ++++++----
include/scsi/scsi_host.h | 8 ++++++++
4 files changed, 16 insertions(+), 4 deletions(-)
Index: linux/include/scsi/scsi_host.h
===================================================================
--- linux.orig/include/scsi/scsi_host.h 2008-11-15 22:37:11.000000000 +0100
+++ linux/include/scsi/scsi_host.h 2008-11-15 23:50:55.000000000 +0100
@@ -447,6 +447,11 @@
unsigned ordered_tag:1;
/*
+ * True if sense buffers need to be ISA-DMAable
+ */
+ unsigned sense_buffer_isa:1;
+
+ /*
* Countdown for host blocking with no commands outstanding.
*/
unsigned int max_host_blocked;
@@ -607,6 +612,9 @@
*/
unsigned ordered_tag:1;
+ /* Sense buffer needs to be ISA dma'able */
+ unsigned sense_buffer_isa:1;
+
/* Task mgmt function in progress */
unsigned tmf_in_progress:1;
Index: linux/Documentation/scsi/scsi_mid_low_api.txt
===================================================================
--- linux.orig/Documentation/scsi/scsi_mid_low_api.txt 2008-11-15 22:37:11.000000000 +0100
+++ linux/Documentation/scsi/scsi_mid_low_api.txt 2008-11-15 23:50:55.000000000 +0100
@@ -1268,6 +1268,7 @@
instances (currently ordered by ascending host_no)
my_devices - a double linked list of pointers to struct scsi_device
instances that belong to this host.
+ sense_buffer_isa - bit flag; true when the sense buffer needs to be ISA DMAable
hostdata[0] - area reserved for LLD at end of struct Scsi_Host. Size
is set by the second argument (named 'xtr_bytes') to
scsi_host_alloc() or scsi_register().
Index: linux/drivers/scsi/hosts.c
===================================================================
--- linux.orig/drivers/scsi/hosts.c 2008-11-15 22:37:11.000000000 +0100
+++ linux/drivers/scsi/hosts.c 2008-11-15 23:50:57.000000000 +0100
@@ -364,6 +364,7 @@
shost->active_mode = MODE_INITIATOR;
else
shost->active_mode = sht->supported_mode;
+ shost->sense_buffer_isa = sht->sense_buffer_isa;
if (sht->max_host_blocked)
shost->max_host_blocked = sht->max_host_blocked;
Index: linux/drivers/scsi/scsi.c
===================================================================
--- linux.orig/drivers/scsi/scsi.c 2008-11-15 22:37:12.000000000 +0100
+++ linux/drivers/scsi/scsi.c 2008-11-15 23:50:56.000000000 +0100
@@ -362,7 +362,7 @@
*/
mutex_lock(&host_cmd_pool_mutex);
pool = &scsi_cmd_pool;
- if (shost && shost->unchecked_isa_dma)
+ if (shost && (shost->unchecked_isa_dma || shost->sense_buffer_isa))
pool = &scsi_cmd_dma_pool;
if (!pool->users) {
pool->cmd_slab = kmem_cache_create(pool->cmd_name,
@@ -392,8 +392,8 @@
struct scsi_host_cmd_pool *pool;
mutex_lock(&host_cmd_pool_mutex);
- pool = (shost && shost->unchecked_isa_dma) ? &scsi_cmd_dma_pool :
- &scsi_cmd_pool;
+ pool = (shost && (shost->unchecked_isa_dma || shost->sense_buffer_isa)) ?
+ &scsi_cmd_dma_pool : &scsi_cmd_pool;
/*
* This may happen if a driver has a mismatched get and put
* of the command pool; the driver should be implicated in
@@ -488,7 +488,9 @@
int scsi_setup_command_freelist(struct Scsi_Host *shost)
{
struct scsi_cmnd *cmd;
- const gfp_t gfp_mask = shost->unchecked_isa_dma ? GFP_DMA : GFP_KERNEL;
+ gfp_t gfp_mask = GFP_KERNEL;
+ if (shost->unchecked_isa_dma || shost->sense_buffer_isa)
+ gfp_mask = GFP_DMA;
spin_lock_init(&shost->free_list_lock);
INIT_LIST_HEAD(&shost->free_list);
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
