diff options
Diffstat (limited to 'drivers/scsi/bfa/bfad_drv.h')
-rw-r--r-- | drivers/scsi/bfa/bfad_drv.h | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/drivers/scsi/bfa/bfad_drv.h b/drivers/scsi/bfa/bfad_drv.h index 7f9ea90254cd..48661a2726d7 100644 --- a/drivers/scsi/bfa/bfad_drv.h +++ b/drivers/scsi/bfa/bfad_drv.h | |||
@@ -43,6 +43,7 @@ | |||
43 | #include <scsi/scsi_tcq.h> | 43 | #include <scsi/scsi_tcq.h> |
44 | #include <scsi/scsi_transport_fc.h> | 44 | #include <scsi/scsi_transport_fc.h> |
45 | #include <scsi/scsi_transport.h> | 45 | #include <scsi/scsi_transport.h> |
46 | #include <scsi/scsi_bsg_fc.h> | ||
46 | 47 | ||
47 | #include "bfa_modules.h" | 48 | #include "bfa_modules.h" |
48 | #include "bfa_fcs.h" | 49 | #include "bfa_fcs.h" |
@@ -55,7 +56,7 @@ | |||
55 | #ifdef BFA_DRIVER_VERSION | 56 | #ifdef BFA_DRIVER_VERSION |
56 | #define BFAD_DRIVER_VERSION BFA_DRIVER_VERSION | 57 | #define BFAD_DRIVER_VERSION BFA_DRIVER_VERSION |
57 | #else | 58 | #else |
58 | #define BFAD_DRIVER_VERSION "2.3.2.3" | 59 | #define BFAD_DRIVER_VERSION "3.0.2.1" |
59 | #endif | 60 | #endif |
60 | 61 | ||
61 | #define BFAD_PROTO_NAME FCPI_NAME | 62 | #define BFAD_PROTO_NAME FCPI_NAME |
@@ -79,7 +80,7 @@ | |||
79 | #define BFAD_HAL_INIT_FAIL 0x00000100 | 80 | #define BFAD_HAL_INIT_FAIL 0x00000100 |
80 | #define BFAD_FC4_PROBE_DONE 0x00000200 | 81 | #define BFAD_FC4_PROBE_DONE 0x00000200 |
81 | #define BFAD_PORT_DELETE 0x00000001 | 82 | #define BFAD_PORT_DELETE 0x00000001 |
82 | 83 | #define BFAD_INTX_ON 0x00000400 | |
83 | /* | 84 | /* |
84 | * BFAD related definition | 85 | * BFAD related definition |
85 | */ | 86 | */ |
@@ -92,6 +93,8 @@ | |||
92 | */ | 93 | */ |
93 | #define BFAD_LUN_QUEUE_DEPTH 32 | 94 | #define BFAD_LUN_QUEUE_DEPTH 32 |
94 | #define BFAD_IO_MAX_SGE SG_ALL | 95 | #define BFAD_IO_MAX_SGE SG_ALL |
96 | #define BFAD_MIN_SECTORS 128 /* 64k */ | ||
97 | #define BFAD_MAX_SECTORS 0xFFFF /* 32 MB */ | ||
95 | 98 | ||
96 | #define bfad_isr_t irq_handler_t | 99 | #define bfad_isr_t irq_handler_t |
97 | 100 | ||
@@ -110,6 +113,7 @@ struct bfad_msix_s { | |||
110 | enum { | 113 | enum { |
111 | BFA_TRC_LDRV_BFAD = 1, | 114 | BFA_TRC_LDRV_BFAD = 1, |
112 | BFA_TRC_LDRV_IM = 2, | 115 | BFA_TRC_LDRV_IM = 2, |
116 | BFA_TRC_LDRV_BSG = 3, | ||
113 | }; | 117 | }; |
114 | 118 | ||
115 | enum bfad_port_pvb_type { | 119 | enum bfad_port_pvb_type { |
@@ -189,8 +193,10 @@ struct bfad_s { | |||
189 | struct bfa_pcidev_s hal_pcidev; | 193 | struct bfa_pcidev_s hal_pcidev; |
190 | struct bfa_ioc_pci_attr_s pci_attr; | 194 | struct bfa_ioc_pci_attr_s pci_attr; |
191 | void __iomem *pci_bar0_kva; | 195 | void __iomem *pci_bar0_kva; |
196 | void __iomem *pci_bar2_kva; | ||
192 | struct completion comp; | 197 | struct completion comp; |
193 | struct completion suspend; | 198 | struct completion suspend; |
199 | struct completion enable_comp; | ||
194 | struct completion disable_comp; | 200 | struct completion disable_comp; |
195 | bfa_boolean_t disable_active; | 201 | bfa_boolean_t disable_active; |
196 | struct bfad_port_s pport; /* physical port of the BFAD */ | 202 | struct bfad_port_s pport; /* physical port of the BFAD */ |
@@ -273,21 +279,6 @@ struct bfad_hal_comp { | |||
273 | struct completion comp; | 279 | struct completion comp; |
274 | }; | 280 | }; |
275 | 281 | ||
276 | /* | ||
277 | * Macro to obtain the immediate lower power | ||
278 | * of two for the integer. | ||
279 | */ | ||
280 | #define nextLowerInt(x) \ | ||
281 | do { \ | ||
282 | int __i; \ | ||
283 | (*x)--; \ | ||
284 | for (__i = 1; __i < (sizeof(int)*8); __i <<= 1) \ | ||
285 | (*x) = (*x) | (*x) >> __i; \ | ||
286 | (*x)++; \ | ||
287 | (*x) = (*x) >> 1; \ | ||
288 | } while (0) | ||
289 | |||
290 | |||
291 | #define BFA_LOG(level, bfad, mask, fmt, arg...) \ | 282 | #define BFA_LOG(level, bfad, mask, fmt, arg...) \ |
292 | do { \ | 283 | do { \ |
293 | if (((mask) == 4) || (level[1] <= '4')) \ | 284 | if (((mask) == 4) || (level[1] <= '4')) \ |
@@ -354,6 +345,7 @@ extern int msix_disable_ct; | |||
354 | extern int fdmi_enable; | 345 | extern int fdmi_enable; |
355 | extern int supported_fc4s; | 346 | extern int supported_fc4s; |
356 | extern int pcie_max_read_reqsz; | 347 | extern int pcie_max_read_reqsz; |
348 | extern int max_xfer_size; | ||
357 | extern int bfa_debugfs_enable; | 349 | extern int bfa_debugfs_enable; |
358 | extern struct mutex bfad_mutex; | 350 | extern struct mutex bfad_mutex; |
359 | 351 | ||