qla4xxx: Added support for ISP82xx.

PATCH In review Ravi Anand 1 participant 1 message Apr 6, 2010

Subsystems (2)

SCSI QLogic QLA4XXX iSCSI driver

lore

Share & tools

lore

Ravi Anand

author

2010-04-06 10:16 UTC #0 lore raw

PATCH 10/12 qla4xxx: Added support for ISP82xx.

From: Vikas Chaudhary <[email protected]>

Signed-off-by Vikas Chaudhary <[email protected]>

Signed-off-by Ravi Anand <[email protected]>

---
 drivers/scsi/qla4xxx/Kconfig      |    4 +-
 drivers/scsi/qla4xxx/Makefile     |    2 +-
 drivers/scsi/qla4xxx/ql4_def.h    |  149 ++-
 drivers/scsi/qla4xxx/ql4_fw.h     |  144 +++-
 drivers/scsi/qla4xxx/ql4_glbl.h   |  115 ++-
 drivers/scsi/qla4xxx/ql4_init.c   |  169 ++-
 drivers/scsi/qla4xxx/ql4_inline.h |    2 +-
 drivers/scsi/qla4xxx/ql4_iocb.c   |   92 ++-
 drivers/scsi/qla4xxx/ql4_isr.c    |  400 +++++-
 drivers/scsi/qla4xxx/ql4_mbx.c    |  171 ++-
 drivers/scsi/qla4xxx/ql4_nvram.c  |    2 +-
 drivers/scsi/qla4xxx/ql4_nvram.h  |    6 +-
 drivers/scsi/qla4xxx/ql4_nx.c     | 2555 +++++++++++++++++++++++++++++++++++++
 drivers/scsi/qla4xxx/ql4_nx.h     |  703 ++++++++++
 drivers/scsi/qla4xxx/ql4_os.c     |  864 +++++++++----
 15 files changed, 4933 insertions(+), 445 deletions(-)
 create mode 100644 drivers/scsi/qla4xxx/ql4_nx.c
 create mode 100644 drivers/scsi/qla4xxx/ql4_nx.h

drivers/scsi/qla4xxx/Kconfig +2 -2

index 69cbff3..b309851 100644
@@ -3,5 +3,5 @@ config SCSI_QLA_ISCSI
        depends on PCI && SCSI && NET
        select SCSI_ISCSI_ATTRS
        ---help---
-       This driver supports the QLogic 40xx (ISP4XXX) iSCSI host
-       adapter family.
+       This driver supports QLogic 40xx (ISP4XXX) as well as
+       8022(ISP80XX) based adapter.

drivers/scsi/qla4xxx/Makefile +1 -1

index 86ea37b..0339ff0 100644
@@ -1,5 +1,5 @@
 qla4xxx-y := ql4_os.o ql4_init.o ql4_mbx.o ql4_iocb.o ql4_isr.o \
-               ql4_nvram.o ql4_dbg.o
+               ql4_nx.o ql4_nvram.o ql4_dbg.o
 
 obj-$(CONFIG_SCSI_QLA_ISCSI) += qla4xxx.o

drivers/scsi/qla4xxx/ql4_def.h +140 -9

260 lines not on this page · raw message

drivers/scsi/qla4xxx/ql4_fw.h +143 -1

190 lines not on this page · raw message

drivers/scsi/qla4xxx/ql4_glbl.h +86 ~~-29~~

146 lines not on this page · raw message

drivers/scsi/qla4xxx/ql4_init.c +119 ~~-50~~

346 lines not on this page · raw message

drivers/scsi/qla4xxx/ql4_inline.h +1 -1

index 6375eb0..9471ac7 100644
@@ -29,7 +29,7 @@ qla4xxx_lookup_ddb_by_fw_index(struct scsi_qla_host *ha, uint32_t fw_ddb_index)
                ddb_entry = ha->fw_ddb_index_map[fw_ddb_index];
        }
 
-       DEBUG3(printk("scsi%d: %s: index [%d], ddb_entry = %p\n",
+       DEBUG3(printk("scsi%d: %s: ddb [%d], ddb_entry = %p\n",
            ha->host_no, __func__, fw_ddb_index, ddb_entry));
 
        return ddb_entry;

drivers/scsi/qla4xxx/ql4_iocb.c +87 -5

128 lines not on this page · raw message

drivers/scsi/qla4xxx/ql4_isr.c +336 ~~-64~~

580 lines not on this page · raw message

drivers/scsi/qla4xxx/ql4_mbx.c +129 ~~-42~~

269 lines not on this page · raw message

drivers/scsi/qla4xxx/ql4_nvram.c +1 -1

index 7fe0482..f0d0fbf 100644
@@ -149,7 +149,7 @@ static int eeprom_readword(int eepromAddr, u16 * value,
 /* Hardware_lock must be set before calling */
 u16 rd_nvram_word(struct scsi_qla_host * ha, int offset)
 {
-       u16 val;
+       u16 val = 0;
 
        /* NOTE: NVRAM uses half-word addresses */
        eeprom_readword(offset, &val, ha);

drivers/scsi/qla4xxx/ql4_nvram.h +3 -3

index b47b4fc..ab7aaeb 100644
@@ -19,7 +19,7 @@
 
 #define         FM93C56A_START       0x1
 
-// Commands
+/* Commands */
 #define         FM93C56A_READ        0x2
 #define         FM93C56A_WEN         0x0
 #define         FM93C56A_WRITE       0x1

@@ -62,9 +62,9 @@
 #define         AUBURN_EEPROM_CLK_RISE     0x1
 #define         AUBURN_EEPROM_CLK_FALL     0x0
 
-/* */
+/**/
 /* EEPROM format */
-/* */
+/**/
 struct bios_params {
        uint16_t SpinUpDelay:1;
        uint16_t BIOSDisable:1;

drivers/scsi/qla4xxx/ql4_nx.c new file +2555 -0

1,033 lines not on this page · raw message

drivers/scsi/qla4xxx/ql4_nx.h new file +703 -0

703 lines not on this page · raw message

drivers/scsi/qla4xxx/ql4_os.c +627 ~~-237~~

864 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

--
1.6.0.2

----- End forwarded message -----

Part of the diff is not shown here. View the raw message.