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

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2019-05-04 19:36:58 -07:00
parent e770b4bbc2 609bd271c4
commit 278fe65bf1
4 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
qla2x00t-32gbit/qla_fw.h
View File

@@ -772,13 +772,13 @@ struct els_entry_24xx {
#define ECF_CLR_PASSTHRU_PEND BIT_12
#define ECF_INCL_FRAME_HDR BIT_11
uint32_t rx_byte_count;
uint32_t tx_byte_count;
__le32 rx_byte_count;
__le32 tx_byte_count;
__le64 tx_address __packed; /* Data segment 0 address. */
uint32_t tx_len; /* Data segment 0 length. */
__le32 tx_len; /* Data segment 0 length. */
__le64 rx_address __packed; /* Data segment 1 address. */
uint32_t rx_len; /* Data segment 1 length. */
__le32 rx_len; /* Data segment 1 length. */
};
struct els_sts_entry_24xx {

10
qla2x00t-32gbit/qla_iocb.c
View File

@@ -2706,16 +2706,16 @@ qla24xx_els_logo_iocb(srb_t *sp, struct els_entry_24xx *els_iocb)
els_iocb->s_id[0] = vha->d_id.b.al_pa;
els_iocb->s_id[1] = vha->d_id.b.area;
els_iocb->s_id[2] = vha->d_id.b.domain;
els_iocb->control_flags = 0;
if (elsio->u.els_logo.els_cmd == ELS_DCMD_PLOGI) {
els_iocb->control_flags = 0;
els_iocb->tx_byte_count = els_iocb->tx_len =
sizeof(struct els_plogi_payload);
cpu_to_le32(sizeof(struct els_plogi_payload));
put_unaligned_le64(elsio->u.els_plogi.els_plogi_pyld_dma,
&els_iocb->tx_address);
els_iocb->rx_dsd_count = 1;
els_iocb->rx_byte_count = els_iocb->rx_len =
sizeof(struct els_plogi_payload);
cpu_to_le32(sizeof(struct els_plogi_payload));
put_unaligned_le64(elsio->u.els_plogi.els_resp_pyld_dma,
&els_iocb->rx_address);
@@ -2724,7 +2724,9 @@ qla24xx_els_logo_iocb(srb_t *sp, struct els_entry_24xx *els_iocb)
ql_dump_buffer(ql_log_info, vha, 0x0109,
(uint8_t *)els_iocb, 0x70);
} else {
els_iocb->tx_byte_count = sizeof(struct els_logo_payload);
els_iocb->control_flags = 1 << 13;
els_iocb->tx_byte_count =
cpu_to_le32(sizeof(struct els_logo_payload));
put_unaligned_le64(elsio->u.els_logo.els_logo_pyld_dma,
&els_iocb->tx_address);
els_iocb->tx_len = cpu_to_le32(sizeof(struct els_logo_payload));

2
qla2x00t-32gbit/qla_os.c
View File

@@ -87,7 +87,7 @@ module_param(ql2xloginretrycount, int, S_IRUGO);
MODULE_PARM_DESC(ql2xloginretrycount,
"Specify an alternate value for the NVRAM login retry count.");
int ql2xallocfwdump = 1;
int ql2xallocfwdump = 0;
module_param(ql2xallocfwdump, int, S_IRUGO);
MODULE_PARM_DESC(ql2xallocfwdump,
"Option to enable allocation of memory for a firmware dump "

18
qla2x00t-32gbit/qla_target.c
View File

@@ -6519,22 +6519,10 @@ void qlt_remove_target_resources(struct qla_hw_data *ha)
static void qlt_lport_dump(struct scsi_qla_host *vha, u64 wwpn,
unsigned char *b)
{
int i;
pr_debug("qla2xxx HW vha->node_name: ");
for (i = 0; i < WWN_SIZE; i++)
pr_debug("%02x ", vha->node_name[i]);
pr_debug("\n");
pr_debug("qla2xxx HW vha->port_name: ");
for (i = 0; i < WWN_SIZE; i++)
pr_debug("%02x ", vha->port_name[i]);
pr_debug("\n");
pr_debug("qla2xxx passed configfs WWPN: ");
pr_debug("qla2xxx HW vha->node_name: %8phC\n", vha->node_name);
pr_debug("qla2xxx HW vha->port_name: %8phC\n", vha->port_name);
put_unaligned_be64(wwpn, b);
for (i = 0; i < WWN_SIZE; i++)
pr_debug("%02x ", b[i]);
pr_debug("\n");
pr_debug("qla2xxx passed configfs WWPN: %8phC\n", b);
}
/**