diff options
Diffstat (limited to 'drivers/scsi/aacraid/aacraid.h')
-rw-r--r-- | drivers/scsi/aacraid/aacraid.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h index d0eecd4bec83..eb3ed91bac79 100644 --- a/drivers/scsi/aacraid/aacraid.h +++ b/drivers/scsi/aacraid/aacraid.h | |||
@@ -494,6 +494,7 @@ struct adapter_ops | |||
494 | int (*adapter_sync_cmd)(struct aac_dev *dev, u32 command, u32 p1, u32 p2, u32 p3, u32 p4, u32 p5, u32 p6, u32 *status, u32 *r1, u32 *r2, u32 *r3, u32 *r4); | 494 | int (*adapter_sync_cmd)(struct aac_dev *dev, u32 command, u32 p1, u32 p2, u32 p3, u32 p4, u32 p5, u32 p6, u32 *status, u32 *r1, u32 *r2, u32 *r3, u32 *r4); |
495 | int (*adapter_check_health)(struct aac_dev *dev); | 495 | int (*adapter_check_health)(struct aac_dev *dev); |
496 | int (*adapter_send)(struct fib * fib); | 496 | int (*adapter_send)(struct fib * fib); |
497 | int (*adapter_ioremap)(struct aac_dev * dev, u32 size); | ||
497 | }; | 498 | }; |
498 | 499 | ||
499 | /* | 500 | /* |
@@ -682,14 +683,6 @@ struct rx_inbound { | |||
682 | __le32 Mailbox[8]; | 683 | __le32 Mailbox[8]; |
683 | }; | 684 | }; |
684 | 685 | ||
685 | #define InboundMailbox0 IndexRegs.Mailbox[0] | ||
686 | #define InboundMailbox1 IndexRegs.Mailbox[1] | ||
687 | #define InboundMailbox2 IndexRegs.Mailbox[2] | ||
688 | #define InboundMailbox3 IndexRegs.Mailbox[3] | ||
689 | #define InboundMailbox4 IndexRegs.Mailbox[4] | ||
690 | #define InboundMailbox5 IndexRegs.Mailbox[5] | ||
691 | #define InboundMailbox6 IndexRegs.Mailbox[6] | ||
692 | |||
693 | #define INBOUNDDOORBELL_0 0x00000001 | 686 | #define INBOUNDDOORBELL_0 0x00000001 |
694 | #define INBOUNDDOORBELL_1 0x00000002 | 687 | #define INBOUNDDOORBELL_1 0x00000002 |
695 | #define INBOUNDDOORBELL_2 0x00000004 | 688 | #define INBOUNDDOORBELL_2 0x00000004 |
@@ -1010,6 +1003,8 @@ struct aac_dev | |||
1010 | struct rx_registers __iomem *rx; | 1003 | struct rx_registers __iomem *rx; |
1011 | struct rkt_registers __iomem *rkt; | 1004 | struct rkt_registers __iomem *rkt; |
1012 | } regs; | 1005 | } regs; |
1006 | volatile void __iomem *base; | ||
1007 | volatile struct rx_inbound __iomem *IndexRegs; | ||
1013 | u32 OIMR; /* Mask Register Cache */ | 1008 | u32 OIMR; /* Mask Register Cache */ |
1014 | /* | 1009 | /* |
1015 | * AIF thread states | 1010 | * AIF thread states |
@@ -1029,6 +1024,7 @@ struct aac_dev | |||
1029 | init->InitStructRevision==cpu_to_le32(ADAPTER_INIT_STRUCT_REVISION_4) | 1024 | init->InitStructRevision==cpu_to_le32(ADAPTER_INIT_STRUCT_REVISION_4) |
1030 | u8 raw_io_64; | 1025 | u8 raw_io_64; |
1031 | u8 printf_enabled; | 1026 | u8 printf_enabled; |
1027 | u8 in_reset; | ||
1032 | }; | 1028 | }; |
1033 | 1029 | ||
1034 | #define aac_adapter_interrupt(dev) \ | 1030 | #define aac_adapter_interrupt(dev) \ |
@@ -1049,6 +1045,9 @@ struct aac_dev | |||
1049 | #define aac_adapter_send(fib) \ | 1045 | #define aac_adapter_send(fib) \ |
1050 | ((fib)->dev)->a_ops.adapter_send(fib) | 1046 | ((fib)->dev)->a_ops.adapter_send(fib) |
1051 | 1047 | ||
1048 | #define aac_adapter_ioremap(dev, size) \ | ||
1049 | (dev)->a_ops.adapter_ioremap(dev, size) | ||
1050 | |||
1052 | #define FIB_CONTEXT_FLAG_TIMED_OUT (0x00000001) | 1051 | #define FIB_CONTEXT_FLAG_TIMED_OUT (0x00000001) |
1053 | 1052 | ||
1054 | /* | 1053 | /* |
@@ -1524,7 +1523,6 @@ struct aac_get_name { | |||
1524 | __le32 count; /* sizeof(((struct aac_get_name_resp *)NULL)->data) */ | 1523 | __le32 count; /* sizeof(((struct aac_get_name_resp *)NULL)->data) */ |
1525 | }; | 1524 | }; |
1526 | 1525 | ||
1527 | #define CT_OK 218 | ||
1528 | struct aac_get_name_resp { | 1526 | struct aac_get_name_resp { |
1529 | __le32 dummy0; | 1527 | __le32 dummy0; |
1530 | __le32 dummy1; | 1528 | __le32 dummy1; |
@@ -1670,6 +1668,7 @@ extern struct aac_common aac_config; | |||
1670 | #define RCV_TEMP_READINGS 0x00000025 | 1668 | #define RCV_TEMP_READINGS 0x00000025 |
1671 | #define GET_COMM_PREFERRED_SETTINGS 0x00000026 | 1669 | #define GET_COMM_PREFERRED_SETTINGS 0x00000026 |
1672 | #define IOP_RESET 0x00001000 | 1670 | #define IOP_RESET 0x00001000 |
1671 | #define IOP_RESET_ALWAYS 0x00001001 | ||
1673 | #define RE_INIT_ADAPTER 0x000000ee | 1672 | #define RE_INIT_ADAPTER 0x000000ee |
1674 | 1673 | ||
1675 | /* | 1674 | /* |
@@ -1788,7 +1787,7 @@ void aac_consumer_free(struct aac_dev * dev, struct aac_queue * q, u32 qnum); | |||
1788 | int aac_fib_complete(struct fib * context); | 1787 | int aac_fib_complete(struct fib * context); |
1789 | #define fib_data(fibctx) ((void *)(fibctx)->hw_fib->data) | 1788 | #define fib_data(fibctx) ((void *)(fibctx)->hw_fib->data) |
1790 | struct aac_dev *aac_init_adapter(struct aac_dev *dev); | 1789 | struct aac_dev *aac_init_adapter(struct aac_dev *dev); |
1791 | int aac_get_config_status(struct aac_dev *dev); | 1790 | int aac_get_config_status(struct aac_dev *dev, int commit_flag); |
1792 | int aac_get_containers(struct aac_dev *dev); | 1791 | int aac_get_containers(struct aac_dev *dev); |
1793 | int aac_scsi_cmd(struct scsi_cmnd *cmd); | 1792 | int aac_scsi_cmd(struct scsi_cmnd *cmd); |
1794 | int aac_dev_ioctl(struct aac_dev *dev, int cmd, void __user *arg); | 1793 | int aac_dev_ioctl(struct aac_dev *dev, int cmd, void __user *arg); |
@@ -1799,6 +1798,7 @@ int aac_sa_init(struct aac_dev *dev); | |||
1799 | unsigned int aac_response_normal(struct aac_queue * q); | 1798 | unsigned int aac_response_normal(struct aac_queue * q); |
1800 | unsigned int aac_command_normal(struct aac_queue * q); | 1799 | unsigned int aac_command_normal(struct aac_queue * q); |
1801 | unsigned int aac_intr_normal(struct aac_dev * dev, u32 Index); | 1800 | unsigned int aac_intr_normal(struct aac_dev * dev, u32 Index); |
1801 | int aac_check_health(struct aac_dev * dev); | ||
1802 | int aac_command_thread(void *data); | 1802 | int aac_command_thread(void *data); |
1803 | int aac_close_fib_context(struct aac_dev * dev, struct aac_fib_context *fibctx); | 1803 | int aac_close_fib_context(struct aac_dev * dev, struct aac_fib_context *fibctx); |
1804 | int aac_fib_adapter_complete(struct fib * fibptr, unsigned short size); | 1804 | int aac_fib_adapter_complete(struct fib * fibptr, unsigned short size); |