diff options
author | schacko <schacko@qlogic.com> | 2010-06-16 22:56:40 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-06-17 11:57:55 -0400 |
commit | 8f891387aa73b85d2ea8d953e04dac224f687e52 (patch) | |
tree | cbf7101c7aa3721cb02298f3f454692bfbd18524 /drivers/net/qlcnic/qlcnic.h | |
parent | 7f9a0c34d26b1ce8a512555ca144e622dea4dc44 (diff) |
qlcnic: seperate interrupt for TX
Earlier all poll routine can process rx and tx, But now
one poll routine to process rx + tx and other for rx only.
Last msix vector will be used for separate tx interrupt.
o This is supported from fw version 4.4.2.
o Bump version 5.0.5
Signed-off-by: Sony Chacko <schacko@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/qlcnic/qlcnic.h')
-rw-r--r-- | drivers/net/qlcnic/qlcnic.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/net/qlcnic/qlcnic.h b/drivers/net/qlcnic/qlcnic.h index 7d31caaf2fa8..9970cff598d1 100644 --- a/drivers/net/qlcnic/qlcnic.h +++ b/drivers/net/qlcnic/qlcnic.h | |||
@@ -51,8 +51,8 @@ | |||
51 | 51 | ||
52 | #define _QLCNIC_LINUX_MAJOR 5 | 52 | #define _QLCNIC_LINUX_MAJOR 5 |
53 | #define _QLCNIC_LINUX_MINOR 0 | 53 | #define _QLCNIC_LINUX_MINOR 0 |
54 | #define _QLCNIC_LINUX_SUBVERSION 4 | 54 | #define _QLCNIC_LINUX_SUBVERSION 5 |
55 | #define QLCNIC_LINUX_VERSIONID "5.0.4" | 55 | #define QLCNIC_LINUX_VERSIONID "5.0.5" |
56 | #define QLCNIC_DRV_IDC_VER 0x01 | 56 | #define QLCNIC_DRV_IDC_VER 0x01 |
57 | 57 | ||
58 | #define QLCNIC_VERSION_CODE(a, b, c) (((a) << 24) + ((b) << 16) + (c)) | 58 | #define QLCNIC_VERSION_CODE(a, b, c) (((a) << 24) + ((b) << 16) + (c)) |
@@ -68,6 +68,7 @@ | |||
68 | #define QLCNIC_DECODE_VERSION(v) \ | 68 | #define QLCNIC_DECODE_VERSION(v) \ |
69 | QLCNIC_VERSION_CODE(((v) & 0xff), (((v) >> 8) & 0xff), ((v) >> 16)) | 69 | QLCNIC_VERSION_CODE(((v) & 0xff), (((v) >> 8) & 0xff), ((v) >> 16)) |
70 | 70 | ||
71 | #define QLCNIC_MIN_FW_VERSION QLCNIC_VERSION_CODE(4, 4, 2) | ||
71 | #define QLCNIC_NUM_FLASH_SECTORS (64) | 72 | #define QLCNIC_NUM_FLASH_SECTORS (64) |
72 | #define QLCNIC_FLASH_SECTOR_SIZE (64 * 1024) | 73 | #define QLCNIC_FLASH_SECTOR_SIZE (64 * 1024) |
73 | #define QLCNIC_FLASH_TOTAL_SIZE (QLCNIC_NUM_FLASH_SECTORS \ | 74 | #define QLCNIC_FLASH_TOTAL_SIZE (QLCNIC_NUM_FLASH_SECTORS \ |
@@ -567,6 +568,7 @@ struct qlcnic_recv_context { | |||
567 | #define QLCNIC_CAP0_LSO (1 << 6) | 568 | #define QLCNIC_CAP0_LSO (1 << 6) |
568 | #define QLCNIC_CAP0_JUMBO_CONTIGUOUS (1 << 7) | 569 | #define QLCNIC_CAP0_JUMBO_CONTIGUOUS (1 << 7) |
569 | #define QLCNIC_CAP0_LRO_CONTIGUOUS (1 << 8) | 570 | #define QLCNIC_CAP0_LRO_CONTIGUOUS (1 << 8) |
571 | #define QLCNIC_CAP0_VALIDOFF (1 << 11) | ||
570 | 572 | ||
571 | /* | 573 | /* |
572 | * Context state | 574 | * Context state |
@@ -602,9 +604,10 @@ struct qlcnic_hostrq_rx_ctx { | |||
602 | __le32 sds_ring_offset; /* Offset to SDS config */ | 604 | __le32 sds_ring_offset; /* Offset to SDS config */ |
603 | __le16 num_rds_rings; /* Count of RDS rings */ | 605 | __le16 num_rds_rings; /* Count of RDS rings */ |
604 | __le16 num_sds_rings; /* Count of SDS rings */ | 606 | __le16 num_sds_rings; /* Count of SDS rings */ |
605 | __le16 rsvd1; /* Padding */ | 607 | __le16 valid_field_offset; |
606 | __le16 rsvd2; /* Padding */ | 608 | u8 txrx_sds_binding; |
607 | u8 reserved[128]; /* reserve space for future expansion*/ | 609 | u8 msix_handler; |
610 | u8 reserved[128]; /* reserve space for future expansion*/ | ||
608 | /* MUST BE 64-bit aligned. | 611 | /* MUST BE 64-bit aligned. |
609 | The following is packed: | 612 | The following is packed: |
610 | - N hostrq_rds_rings | 613 | - N hostrq_rds_rings |
@@ -1109,6 +1112,7 @@ void qlcnic_request_firmware(struct qlcnic_adapter *adapter); | |||
1109 | void qlcnic_release_firmware(struct qlcnic_adapter *adapter); | 1112 | void qlcnic_release_firmware(struct qlcnic_adapter *adapter); |
1110 | int qlcnic_pinit_from_rom(struct qlcnic_adapter *adapter); | 1113 | int qlcnic_pinit_from_rom(struct qlcnic_adapter *adapter); |
1111 | int qlcnic_setup_idc_param(struct qlcnic_adapter *adapter); | 1114 | int qlcnic_setup_idc_param(struct qlcnic_adapter *adapter); |
1115 | int qlcnic_check_flash_fw_ver(struct qlcnic_adapter *adapter); | ||
1112 | 1116 | ||
1113 | int qlcnic_rom_fast_read(struct qlcnic_adapter *adapter, int addr, int *valp); | 1117 | int qlcnic_rom_fast_read(struct qlcnic_adapter *adapter, int addr, int *valp); |
1114 | int qlcnic_rom_fast_read_words(struct qlcnic_adapter *adapter, int addr, | 1118 | int qlcnic_rom_fast_read_words(struct qlcnic_adapter *adapter, int addr, |