openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[SCSI] qla2xxx: Corrections to log messages. 

Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
Saurav Kashyap 2012-05-15 14:34:22 -04:00 committed by James Bottomley
parent c0822b63cc
commit 00adc9a034
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/scsi/qla2xxx/qla_nx.c
View File

@ -1190,12 +1190,12 @@ qla82xx_pinit_from_rom(scsi_qla_host_t *vha)
} }
/* Offset in flash = lower 16 bits /* Offset in flash = lower 16 bits
* Number of enteries = upper 16 bits * Number of entries = upper 16 bits
*/ */
offset = n & 0xffffU; offset = n & 0xffffU;
n = (n >> 16) & 0xffffU; n = (n >> 16) & 0xffffU;
/* number of addr/value pair should not exceed 1024 enteries */ /* number of addr/value pair should not exceed 1024 entries */
if (n >= 1024) { if (n >= 1024) {
ql_log(ql_log_fatal, vha, 0x0071, ql_log(ql_log_fatal, vha, 0x0071,
"Card flash not initialized:n=0x%x.\n", n); "Card flash not initialized:n=0x%x.\n", n);
@ -2446,7 +2446,7 @@ qla82xx_load_fw(scsi_qla_host_t *vha)
if (qla82xx_fw_load_from_flash(ha) == QLA_SUCCESS) { if (qla82xx_fw_load_from_flash(ha) == QLA_SUCCESS) {
ql_log(ql_log_info, vha, 0x00a1, ql_log(ql_log_info, vha, 0x00a1,
"Firmware loaded successully from flash.\n"); "Firmware loaded successfully from flash.\n");
return QLA_SUCCESS; return QLA_SUCCESS;
} else { } else {
ql_log(ql_log_warn, vha, 0x0108, ql_log(ql_log_warn, vha, 0x0108,
@ -2461,7 +2461,7 @@ qla82xx_load_fw(scsi_qla_host_t *vha)
blob = ha->hablob = qla2x00_request_firmware(vha); blob = ha->hablob = qla2x00_request_firmware(vha);
if (!blob) { if (!blob) {
ql_log(ql_log_fatal, vha, 0x00a3, ql_log(ql_log_fatal, vha, 0x00a3,
"Firmware image not preset.\n"); "Firmware image not present.\n");
goto fw_load_failed; goto fw_load_failed;
} }
@ -2689,7 +2689,7 @@ qla82xx_write_flash_data(struct scsi_qla_host *vha, uint32_t *dwptr,
if (!optrom) { if (!optrom) {
ql_log(ql_log_warn, vha, 0xb01b, ql_log(ql_log_warn, vha, 0xb01b,
"Unable to allocate memory " "Unable to allocate memory "
"for optron burst write (%x KB).\n", "for optrom burst write (%x KB).\n",
OPTROM_BURST_SIZE / 1024); OPTROM_BURST_SIZE / 1024);
} }
} }

1
drivers/scsi/qla2xxx/qla_nx.h
View File

@ -562,7 +562,6 @@
#define QLA82XX_FW_VERSION_SUB (QLA82XX_CAM_RAM(0x158)) #define QLA82XX_FW_VERSION_SUB (QLA82XX_CAM_RAM(0x158))
#define QLA82XX_PCIE_REG(reg) (QLA82XX_CRB_PCIE + (reg)) #define QLA82XX_PCIE_REG(reg) (QLA82XX_CRB_PCIE + (reg))
#define PCIE_CHICKEN3 (0x120c8)
#define PCIE_SETUP_FUNCTION (0x12040) #define PCIE_SETUP_FUNCTION (0x12040)
#define PCIE_SETUP_FUNCTION2 (0x12048) #define PCIE_SETUP_FUNCTION2 (0x12048)