diff options
Diffstat (limited to 'include/scsi/scsi_host.h')
-rw-r--r-- | include/scsi/scsi_host.h | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h index 47941fc5aba7..c50a97fc76f9 100644 --- a/include/scsi/scsi_host.h +++ b/include/scsi/scsi_host.h | |||
@@ -43,6 +43,12 @@ struct blk_queue_tags; | |||
43 | #define DISABLE_CLUSTERING 0 | 43 | #define DISABLE_CLUSTERING 0 |
44 | #define ENABLE_CLUSTERING 1 | 44 | #define ENABLE_CLUSTERING 1 |
45 | 45 | ||
46 | enum { | ||
47 | SCSI_QDEPTH_DEFAULT, /* default requested change, e.g. from sysfs */ | ||
48 | SCSI_QDEPTH_QFULL, /* scsi-ml requested due to queue full */ | ||
49 | SCSI_QDEPTH_RAMP_UP, /* scsi-ml requested due to threshhold event */ | ||
50 | }; | ||
51 | |||
46 | struct scsi_host_template { | 52 | struct scsi_host_template { |
47 | struct module *module; | 53 | struct module *module; |
48 | const char *name; | 54 | const char *name; |
@@ -294,7 +300,7 @@ struct scsi_host_template { | |||
294 | * | 300 | * |
295 | * Status: OPTIONAL | 301 | * Status: OPTIONAL |
296 | */ | 302 | */ |
297 | int (* change_queue_depth)(struct scsi_device *, int); | 303 | int (* change_queue_depth)(struct scsi_device *, int, int); |
298 | 304 | ||
299 | /* | 305 | /* |
300 | * Fill in this function to allow the changing of tag types | 306 | * Fill in this function to allow the changing of tag types |
@@ -677,6 +683,12 @@ struct Scsi_Host { | |||
677 | void *shost_data; | 683 | void *shost_data; |
678 | 684 | ||
679 | /* | 685 | /* |
686 | * Points to the physical bus device we'd use to do DMA | ||
687 | * Needed just in case we have virtual hosts. | ||
688 | */ | ||
689 | struct device *dma_dev; | ||
690 | |||
691 | /* | ||
680 | * We should ensure that this is aligned, both for better performance | 692 | * We should ensure that this is aligned, both for better performance |
681 | * and also because some compilers (m68k) don't automatically force | 693 | * and also because some compilers (m68k) don't automatically force |
682 | * alignment to a long boundary. | 694 | * alignment to a long boundary. |
@@ -720,7 +732,9 @@ extern int scsi_queue_work(struct Scsi_Host *, struct work_struct *); | |||
720 | extern void scsi_flush_work(struct Scsi_Host *); | 732 | extern void scsi_flush_work(struct Scsi_Host *); |
721 | 733 | ||
722 | extern struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *, int); | 734 | extern struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *, int); |
723 | extern int __must_check scsi_add_host(struct Scsi_Host *, struct device *); | 735 | extern int __must_check scsi_add_host_with_dma(struct Scsi_Host *, |
736 | struct device *, | ||
737 | struct device *); | ||
724 | extern void scsi_scan_host(struct Scsi_Host *); | 738 | extern void scsi_scan_host(struct Scsi_Host *); |
725 | extern void scsi_rescan_device(struct device *); | 739 | extern void scsi_rescan_device(struct device *); |
726 | extern void scsi_remove_host(struct Scsi_Host *); | 740 | extern void scsi_remove_host(struct Scsi_Host *); |
@@ -731,6 +745,12 @@ extern const char *scsi_host_state_name(enum scsi_host_state); | |||
731 | 745 | ||
732 | extern u64 scsi_calculate_bounce_limit(struct Scsi_Host *); | 746 | extern u64 scsi_calculate_bounce_limit(struct Scsi_Host *); |
733 | 747 | ||
748 | static inline int __must_check scsi_add_host(struct Scsi_Host *host, | ||
749 | struct device *dev) | ||
750 | { | ||
751 | return scsi_add_host_with_dma(host, dev, dev); | ||
752 | } | ||
753 | |||
734 | static inline struct device *scsi_get_device(struct Scsi_Host *shost) | 754 | static inline struct device *scsi_get_device(struct Scsi_Host *shost) |
735 | { | 755 | { |
736 | return shost->shost_gendev.parent; | 756 | return shost->shost_gendev.parent; |