tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
csiostor:Use firmware version from cxgb4/t4fw_version.h
This patch is to use firmware version macros from t4fw_version.h
and also enables 40g T5 adapter.
Signed-off-by: Praveen Madhavan <praveenm@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
authored by
Praveen Madhavan
and committed by
David S. Miller
541c571f
b5057dd7
+7
-8
+4
-2
drivers/scsi/csiostor/csio_hw.c
+4
-2
drivers/scsi/csiostor/csio_hw.c
···
1372
1372
}
1373
1373
1374
1374
/* Validate device capabilities */
1375
-
if (csio_hw_validate_caps(hw, mbp))
1375
+
rv = csio_hw_validate_caps(hw, mbp);
1376
+
if (rv != 0)
1376
1377
goto out;
1377
1378
1378
1379
/* Don't config device capabilities if already configured */
···
1777
1776
}
1778
1777
1779
1778
/* Validate device capabilities */
1780
-
if (csio_hw_validate_caps(hw, mbp))
1779
+
rv = csio_hw_validate_caps(hw, mbp);
1780
+
if (rv != 0)
1781
1781
goto bye;
1782
1782
/*
1783
1783
* Note that we're operating with parameters
+1
-5
drivers/scsi/csiostor/csio_hw_chip.h
+1
-5
drivers/scsi/csiostor/csio_hw_chip.h
···
45
45
#define FW_FNAME_T5 "cxgb4/t5fw.bin"
46
46
#define FW_CFG_NAME_T5 "cxgb4/t5-config.txt"
47
47
48
-
#define T5FW_VERSION_MAJOR 0x01
49
-
#define T5FW_VERSION_MINOR 0x0B
50
-
#define T5FW_VERSION_MICRO 0x1B
51
-
#define T5FW_VERSION_BUILD 0x00
52
-
53
48
#define CHELSIO_CHIP_CODE(version, revision) (((version) << 4) | (revision))
54
49
#define CHELSIO_CHIP_FPGA 0x100
55
50
#define CHELSIO_CHIP_VERSION(code) (((code) >> 12) & 0xf)
···
69
74
{ PCI_VENDOR_ID_CHELSIO, (devid), PCI_ANY_ID, PCI_ANY_ID, 0, 0, (idx) }
70
75
71
76
#include "t4fw_api.h"
77
+
#include "t4fw_version.h"
72
78
73
79
#define FW_VERSION(chip) ( \
74
80
FW_HDR_FW_VER_MAJOR_G(chip##FW_VERSION_MAJOR) | \
+2
-1
drivers/scsi/csiostor/csio_mb.c
+2
-1
drivers/scsi/csiostor/csio_mb.c