mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-14 09:11:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge r7459 from trunk

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.3.x@7712 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2018-11-04 04:35:40 +00:00
parent d80aab6368
commit 6cb43f45a6
7 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
qla2x00t/qla_attr.c
View File

@@ -482,10 +482,10 @@ out_id_list_failed:
if (size >= max_size)
goto out;
switch (atomic_read(&fcport->state)) {
case FCS_UNCONFIGURED : state = "Unconfigured"; break;
case FCS_DEVICE_DEAD : state = "Dead"; break;
case FCS_DEVICE_LOST : state = "Lost"; break;
case FCS_ONLINE : state = "Online"; break;
case FCS_UNCONFIGURED: state = "Unconfigured"; break;
case FCS_DEVICE_DEAD: state = "Dead"; break;
case FCS_DEVICE_LOST: state = "Lost"; break;
case FCS_ONLINE: state = "Online"; break;
default: state = "Unknown"; break;
}

6
qla2x00t/qla_bsg.c
View File

@@ -632,7 +632,7 @@ qla81xx_set_internal_loopback(scsi_qla_host_t *vha, uint16_t *config,
goto done_set_internal;
new_config[0] = config[0] | (ENABLE_INTERNAL_LOOPBACK << 1);
memcpy(&new_config[1], &config[1], sizeof(uint16_t) * 3) ;
memcpy(&new_config[1], &config[1], sizeof(uint16_t) * 3);
ha->notify_dcbx_comp = 1;
ret = qla81xx_set_port_config(vha, new_config);
@@ -673,11 +673,11 @@ qla81xx_reset_internal_loopback(scsi_qla_host_t *vha, uint16_t *config,
if (!IS_QLA81XX(ha) && !IS_QLA8031(ha))
goto done_reset_internal;
memset(new_config, 0 , sizeof(new_config));
memset(new_config, 0, sizeof(new_config));
if ((config[0] & INTERNAL_LOOPBACK_MASK) >> 1 ==
ENABLE_INTERNAL_LOOPBACK) {
new_config[0] = config[0] & ~INTERNAL_LOOPBACK_MASK;
memcpy(&new_config[1], &config[1], sizeof(uint16_t) * 3) ;
memcpy(&new_config[1], &config[1], sizeof(uint16_t) * 3);
ha->notify_dcbx_comp = wait;
ret = qla81xx_set_port_config(vha, new_config);

2
qla2x00t/qla_gbl.h
View File

@@ -329,7 +329,7 @@ extern int
qla2x00_disable_eft_trace(scsi_qla_host_t *);
extern int
qla2x00_enable_fce_trace(scsi_qla_host_t *, dma_addr_t, uint16_t , uint16_t *,
qla2x00_enable_fce_trace(scsi_qla_host_t *, dma_addr_t, uint16_t, uint16_t *,
uint32_t *);
extern int

2
qla2x00t/qla_gs.c
View File

@@ -1410,7 +1410,7 @@ qla2x00_fdmi_rhba(scsi_qla_host_t *vha)
eiter->len = cpu_to_be16(4 + alen);
size += 4 + alen;
ql_dbg(ql_dbg_disc, vha , 0x202c,
ql_dbg(ql_dbg_disc, vha, 0x202c,
"Optrom vers = %s.\n", eiter->a.orom_version);
/* Firmware version */

8
qla2x00t/qla_mbx.c
View File

@@ -4166,7 +4166,7 @@ qla2x00_loopback_test(scsi_qla_host_t *vha, struct msg_echo_lb *mreq, uint16_t *
ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10f7,
"Entered %s.\n", __func__);
memset(mcp->mb, 0 , sizeof(mcp->mb));
memset(mcp->mb, 0, sizeof(mcp->mb));
mcp->mb[0] = MBC_DIAGNOSTIC_LOOP_BACK;
mcp->mb[1] = mreq->options | BIT_6; // BIT_6 specifies 64 bit addressing
@@ -4228,7 +4228,7 @@ qla2x00_echo_test(scsi_qla_host_t *vha, struct msg_echo_lb *mreq, uint16_t *mres
ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10fa,
"Entered %s.\n", __func__);
memset(mcp->mb, 0 , sizeof(mcp->mb));
memset(mcp->mb, 0, sizeof(mcp->mb));
mcp->mb[0] = MBC_DIAGNOSTIC_ECHO;
mcp->mb[1] = mreq->options | BIT_6; /* BIT_6 specifies 64bit address */
if (IS_CNA_CAPABLE(ha)) {
@@ -4775,7 +4775,7 @@ qla82xx_md_get_template_size(scsi_qla_host_t *vha)
ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x111f,
"Entered %s.\n", __func__);
memset(mcp->mb, 0 , sizeof(mcp->mb));
memset(mcp->mb, 0, sizeof(mcp->mb));
mcp->mb[0] = LSW(MBC_DIAGNOSTIC_MINIDUMP_TEMPLATE);
mcp->mb[1] = MSW(MBC_DIAGNOSTIC_MINIDUMP_TEMPLATE);
mcp->mb[2] = LSW(RQST_TMPLT_SIZE);
@@ -4827,7 +4827,7 @@ qla82xx_md_get_template(scsi_qla_host_t *vha)
return rval;
}
memset(mcp->mb, 0 , sizeof(mcp->mb));
memset(mcp->mb, 0, sizeof(mcp->mb));
mcp->mb[0] = LSW(MBC_DIAGNOSTIC_MINIDUMP_TEMPLATE);
mcp->mb[1] = MSW(MBC_DIAGNOSTIC_MINIDUMP_TEMPLATE);
mcp->mb[2] = LSW(RQST_TMPLT);

10
qla2x00t/qla_nx.c
View File

@@ -889,7 +889,7 @@ static int
qla82xx_wait_rom_busy(struct qla_hw_data *ha)
{
long timeout = 0;
long done = 0 ;
long done = 0;
scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev);
while (done == 0) {
@@ -910,7 +910,7 @@ static int
qla82xx_wait_rom_done(struct qla_hw_data *ha)
{
long timeout = 0;
long done = 0 ;
long done = 0;
scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev);
while (done == 0) {
@@ -1001,7 +1001,7 @@ static int
qla82xx_flash_wait_write_finish(struct qla_hw_data *ha)
{
long timeout = 0;
uint32_t done = 1 ;
uint32_t done = 1;
uint32_t val;
int ret = 0;
scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev);
@@ -1130,7 +1130,7 @@ static int
qla82xx_pinit_from_rom(scsi_qla_host_t *vha)
{
int addr, val;
int i ;
int i;
struct crb_addr_pair *buf;
unsigned long off;
unsigned offset, n;
@@ -1529,7 +1529,7 @@ qla82xx_fw_load_from_flash(struct qla_hw_data *ha)
(qla82xx_rom_fast_read(ha, flashaddr + 4, (int *)&high))) {
return -1;
}
data = ((u64)high << 32) | low ;
data = ((u64)high << 32) | low;
qla82xx_pci_mem_write_2M(ha, memaddr, &data, 8);
flashaddr += 8;
memaddr += 8;

4
qla2x00t/qla_sup.c
View File

@@ -962,7 +962,7 @@ qla2xxx_get_idc_param(scsi_qla_host_t *vha)
wptr = (uint32_t *)req->ring;
ha->isp_ops->read_optrom(vha, (uint8_t *)req->ring,
QLA82XX_IDC_PARAM_ADDR , 8);
QLA82XX_IDC_PARAM_ADDR, 8);
if (*wptr == cpu_to_le32(0xffffffff)) {
ha->nx_dev_init_timeout = QLA82XX_ROM_DEV_INIT_TIMEOUT;
@@ -1682,7 +1682,7 @@ qla83xx_beacon_blink(struct scsi_qla_host *vha)
qla83xx_write_remote_reg(vha, led_select_value + 4, 0x40002000);
msleep(1000);
qla83xx_write_remote_reg(vha, led_select_value, 0x40004000);
qla83xx_write_remote_reg(vha, led_select_value + 4 , 0x40004000);
qla83xx_write_remote_reg(vha, led_select_value + 4, 0x40004000);
} else if ((IS_QLA8031(ha) || IS_QLA81XX(ha)) && ha->beacon_blink_led) {
int rval;