diff options
Diffstat (limited to 'drivers/ata/ahci.h')
-rw-r--r-- | drivers/ata/ahci.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h index a4faa438889c..167ba7e3b92e 100644 --- a/drivers/ata/ahci.h +++ b/drivers/ata/ahci.h | |||
@@ -240,8 +240,7 @@ enum { | |||
240 | error-handling stage) */ | 240 | error-handling stage) */ |
241 | AHCI_HFLAG_NO_DEVSLP = (1 << 17), /* no device sleep */ | 241 | AHCI_HFLAG_NO_DEVSLP = (1 << 17), /* no device sleep */ |
242 | AHCI_HFLAG_NO_FBS = (1 << 18), /* no FBS */ | 242 | AHCI_HFLAG_NO_FBS = (1 << 18), /* no FBS */ |
243 | AHCI_HFLAG_EDGE_IRQ = (1 << 19), /* HOST_IRQ_STAT behaves as | 243 | |
244 | Edge Triggered */ | ||
245 | #ifdef CONFIG_PCI_MSI | 244 | #ifdef CONFIG_PCI_MSI |
246 | AHCI_HFLAG_MULTI_MSI = (1 << 20), /* multiple PCI MSIs */ | 245 | AHCI_HFLAG_MULTI_MSI = (1 << 20), /* multiple PCI MSIs */ |
247 | AHCI_HFLAG_MULTI_MSIX = (1 << 21), /* per-port MSI-X */ | 246 | AHCI_HFLAG_MULTI_MSIX = (1 << 21), /* per-port MSI-X */ |
@@ -250,6 +249,7 @@ enum { | |||
250 | AHCI_HFLAG_MULTI_MSI = 0, | 249 | AHCI_HFLAG_MULTI_MSI = 0, |
251 | AHCI_HFLAG_MULTI_MSIX = 0, | 250 | AHCI_HFLAG_MULTI_MSIX = 0, |
252 | #endif | 251 | #endif |
252 | AHCI_HFLAG_WAKE_BEFORE_STOP = (1 << 22), /* wake before DMA stop */ | ||
253 | 253 | ||
254 | /* ap->flags bits */ | 254 | /* ap->flags bits */ |
255 | 255 | ||
@@ -360,6 +360,7 @@ struct ahci_host_priv { | |||
360 | * be overridden anytime before the host is activated. | 360 | * be overridden anytime before the host is activated. |
361 | */ | 361 | */ |
362 | void (*start_engine)(struct ata_port *ap); | 362 | void (*start_engine)(struct ata_port *ap); |
363 | irqreturn_t (*irq_handler)(int irq, void *dev_instance); | ||
363 | }; | 364 | }; |
364 | 365 | ||
365 | #ifdef CONFIG_PCI_MSI | 366 | #ifdef CONFIG_PCI_MSI |
@@ -423,6 +424,7 @@ int ahci_reset_em(struct ata_host *host); | |||
423 | void ahci_print_info(struct ata_host *host, const char *scc_s); | 424 | void ahci_print_info(struct ata_host *host, const char *scc_s); |
424 | int ahci_host_activate(struct ata_host *host, struct scsi_host_template *sht); | 425 | int ahci_host_activate(struct ata_host *host, struct scsi_host_template *sht); |
425 | void ahci_error_handler(struct ata_port *ap); | 426 | void ahci_error_handler(struct ata_port *ap); |
427 | u32 ahci_handle_port_intr(struct ata_host *host, u32 irq_masked); | ||
426 | 428 | ||
427 | static inline void __iomem *__ahci_port_base(struct ata_host *host, | 429 | static inline void __iomem *__ahci_port_base(struct ata_host *host, |
428 | unsigned int port_no) | 430 | unsigned int port_no) |