~hc/RK356X_SDK_RELEASE.git

..	..	@@ -1,8 +1,7 @@
	1	+// SPDX-License-Identifier: GPL-2.0-only
1	2	/*
2	3	* QLogic Fibre Channel HBA Driver
3	4	* Copyright (c) 2003-2014 QLogic Corporation
4		- *
5		- * See LICENSE.qla2xxx for copyright and licensing details.
6	5	*/
7	6	#include "qla_def.h"
8	7	#include "qla_target.h"
..	..	@@ -22,10 +21,156 @@
22	21	static void qla2x00_status_cont_entry(struct rsp_que , sts_cont_entry_t );
23	22	static int qla2x00_error_entry(scsi_qla_host_t , struct rsp_que ,
24	23	sts_entry_t *);
	24	+static void qla27xx_process_purex_fpin(struct scsi_qla_host *vha,
	25	+ struct purex_item *item);
	26	+static struct purex_item qla24xx_alloc_purex_item(scsi_qla_host_t vha,
	27	+ uint16_t size);
	28	+static struct purex_item qla24xx_copy_std_pkt(struct scsi_qla_host vha,
	29	+ void *pkt);
	30	+static struct purex_item qla27xx_copy_fpin_pkt(struct scsi_qla_host vha,
	31	+ void pkt, struct rsp_que rsp);
	32	+
	33	+static void
	34	+qla27xx_process_purex_fpin(struct scsi_qla_host vha, struct purex_item item)
	35	+{
	36	+ void *pkt = &item->iocb;
	37	+ uint16_t pkt_size = item->size;
	38	+
	39	+ ql_dbg(ql_dbg_init + ql_dbg_verbose, vha, 0x508d,
	40	+ "%s: Enter\n", __func__);
	41	+
	42	+ ql_dbg(ql_dbg_init + ql_dbg_verbose, vha, 0x508e,
	43	+ "-------- ELS REQ -------\n");
	44	+ ql_dump_buffer(ql_dbg_init + ql_dbg_verbose, vha, 0x508f,
	45	+ pkt, pkt_size);
	46	+
	47	+ fc_host_fpin_rcv(vha->host, pkt_size, (char *)pkt);
	48	+}
	49	+
	50	+const char *const port_state_str[] = {
	51	+ "Unknown",
	52	+ "UNCONFIGURED",
	53	+ "DEAD",
	54	+ "LOST",
	55	+ "ONLINE"
	56	+};
	57	+
	58	+static void
	59	+qla24xx_process_abts(struct scsi_qla_host vha, struct purex_item pkt)
	60	+{
	61	+ struct abts_entry_24xx *abts =
	62	+ (struct abts_entry_24xx *)&pkt->iocb;
	63	+ struct qla_hw_data *ha = vha->hw;
	64	+ struct els_entry_24xx *rsp_els;
	65	+ struct abts_entry_24xx *abts_rsp;
	66	+ dma_addr_t dma;
	67	+ uint32_t fctl;
	68	+ int rval;
	69	+
	70	+ ql_dbg(ql_dbg_init, vha, 0x0286, "%s: entered.\n", __func__);
	71	+
	72	+ ql_log(ql_log_warn, vha, 0x0287,
	73	+ "Processing ABTS xchg=%#x oxid=%#x rxid=%#x seqid=%#x seqcnt=%#x\n",
	74	+ abts->rx_xch_addr_to_abort, abts->ox_id, abts->rx_id,
	75	+ abts->seq_id, abts->seq_cnt);
	76	+ ql_dbg(ql_dbg_init + ql_dbg_verbose, vha, 0x0287,
	77	+ "-------- ABTS RCV -------\n");
	78	+ ql_dump_buffer(ql_dbg_init + ql_dbg_verbose, vha, 0x0287,
	79	+ (uint8_t )abts, sizeof(abts));
	80	+
	81	+ rsp_els = dma_alloc_coherent(&ha->pdev->dev, sizeof(*rsp_els), &dma,
	82	+ GFP_KERNEL);
	83	+ if (!rsp_els) {
	84	+ ql_log(ql_log_warn, vha, 0x0287,
	85	+ "Failed allocate dma buffer ABTS/ELS RSP.\n");
	86	+ return;
	87	+ }
	88	+
	89	+ /* terminate exchange */
	90	+ rsp_els->entry_type = ELS_IOCB_TYPE;
	91	+ rsp_els->entry_count = 1;
	92	+ rsp_els->nport_handle = cpu_to_le16(~0);
	93	+ rsp_els->rx_xchg_address = abts->rx_xch_addr_to_abort;
	94	+ rsp_els->control_flags = cpu_to_le16(EPD_RX_XCHG);
	95	+ ql_dbg(ql_dbg_init, vha, 0x0283,
	96	+ "Sending ELS Response to terminate exchange %#x...\n",
	97	+ abts->rx_xch_addr_to_abort);
	98	+ ql_dbg(ql_dbg_init + ql_dbg_verbose, vha, 0x0283,
	99	+ "-------- ELS RSP -------\n");
	100	+ ql_dump_buffer(ql_dbg_init + ql_dbg_verbose, vha, 0x0283,
	101	+ (uint8_t )rsp_els, sizeof(rsp_els));
	102	+ rval = qla2x00_issue_iocb(vha, rsp_els, dma, 0);
	103	+ if (rval) {
	104	+ ql_log(ql_log_warn, vha, 0x0288,
	105	+ "%s: iocb failed to execute -> %x\n", __func__, rval);
	106	+ } else if (rsp_els->comp_status) {
	107	+ ql_log(ql_log_warn, vha, 0x0289,
	108	+ "%s: iocb failed to complete -> completion=%#x subcode=(%#x,%#x)\n",
	109	+ __func__, rsp_els->comp_status,
	110	+ rsp_els->error_subcode_1, rsp_els->error_subcode_2);
	111	+ } else {
	112	+ ql_dbg(ql_dbg_init, vha, 0x028a,
	113	+ "%s: abort exchange done.\n", __func__);
	114	+ }
	115	+
	116	+ /* send ABTS response */
	117	+ abts_rsp = (void *)rsp_els;
	118	+ memset(abts_rsp, 0, sizeof(*abts_rsp));
	119	+ abts_rsp->entry_type = ABTS_RSP_TYPE;
	120	+ abts_rsp->entry_count = 1;
	121	+ abts_rsp->nport_handle = abts->nport_handle;
	122	+ abts_rsp->vp_idx = abts->vp_idx;
	123	+ abts_rsp->sof_type = abts->sof_type & 0xf0;
	124	+ abts_rsp->rx_xch_addr = abts->rx_xch_addr;
	125	+ abts_rsp->d_id[0] = abts->s_id[0];
	126	+ abts_rsp->d_id[1] = abts->s_id[1];
	127	+ abts_rsp->d_id[2] = abts->s_id[2];
	128	+ abts_rsp->r_ctl = FC_ROUTING_BLD \| FC_R_CTL_BLD_BA_ACC;
	129	+ abts_rsp->s_id[0] = abts->d_id[0];
	130	+ abts_rsp->s_id[1] = abts->d_id[1];
	131	+ abts_rsp->s_id[2] = abts->d_id[2];
	132	+ abts_rsp->cs_ctl = abts->cs_ctl;
	133	+ /* include flipping bit23 in fctl */
	134	+ fctl = ~(abts->f_ctl[2] \| 0x7F) << 16 \|
	135	+ FC_F_CTL_LAST_SEQ \| FC_F_CTL_END_SEQ \| FC_F_CTL_SEQ_INIT;
	136	+ abts_rsp->f_ctl[0] = fctl >> 0 & 0xff;
	137	+ abts_rsp->f_ctl[1] = fctl >> 8 & 0xff;
	138	+ abts_rsp->f_ctl[2] = fctl >> 16 & 0xff;
	139	+ abts_rsp->type = FC_TYPE_BLD;
	140	+ abts_rsp->rx_id = abts->rx_id;
	141	+ abts_rsp->ox_id = abts->ox_id;
	142	+ abts_rsp->payload.ba_acc.aborted_rx_id = abts->rx_id;
	143	+ abts_rsp->payload.ba_acc.aborted_ox_id = abts->ox_id;
	144	+ abts_rsp->payload.ba_acc.high_seq_cnt = cpu_to_le16(~0);
	145	+ abts_rsp->rx_xch_addr_to_abort = abts->rx_xch_addr_to_abort;
	146	+ ql_dbg(ql_dbg_init, vha, 0x028b,
	147	+ "Sending BA ACC response to ABTS %#x...\n",
	148	+ abts->rx_xch_addr_to_abort);
	149	+ ql_dbg(ql_dbg_init + ql_dbg_verbose, vha, 0x028b,
	150	+ "-------- ELS RSP -------\n");
	151	+ ql_dump_buffer(ql_dbg_init + ql_dbg_verbose, vha, 0x028b,
	152	+ (uint8_t )abts_rsp, sizeof(abts_rsp));
	153	+ rval = qla2x00_issue_iocb(vha, abts_rsp, dma, 0);
	154	+ if (rval) {
	155	+ ql_log(ql_log_warn, vha, 0x028c,
	156	+ "%s: iocb failed to execute -> %x\n", __func__, rval);
	157	+ } else if (abts_rsp->comp_status) {
	158	+ ql_log(ql_log_warn, vha, 0x028d,
	159	+ "%s: iocb failed to complete -> completion=%#x subcode=(%#x,%#x)\n",
	160	+ __func__, abts_rsp->comp_status,
	161	+ abts_rsp->payload.error.subcode1,
	162	+ abts_rsp->payload.error.subcode2);
	163	+ } else {
	164	+ ql_dbg(ql_dbg_init, vha, 0x028ea,
	165	+ "%s: done.\n", __func__);
	166	+ }
	167	+
	168	+ dma_free_coherent(&ha->pdev->dev, sizeof(*rsp_els), rsp_els, dma);
	169	+}
25	170
26	171	/**
27	172	* qla2100_intr_handler() - Process interrupts for the ISP2100 and ISP2200.
28		- * @irq:
	173	+ * @irq: interrupt number
29	174	* @dev_id: SCSI driver HA context
30	175	*
31	176	* Called by system whenever the host adapter generates an interrupt.
..	..	@@ -41,7 +186,7 @@
41	186	int status;
42	187	unsigned long iter;
43	188	uint16_t hccr;
44		- uint16_t mb[4];
	189	+ uint16_t mb[8];
45	190	struct rsp_que *rsp;
46	191	unsigned long flags;
47	192
..	..	@@ -59,7 +204,7 @@
59	204	spin_lock_irqsave(&ha->hardware_lock, flags);
60	205	vha = pci_get_drvdata(ha->pdev);
61	206	for (iter = 50; iter--; ) {
62		- hccr = RD_REG_WORD(&reg->hccr);
	207	+ hccr = rd_reg_word(&reg->hccr);
63	208	if (qla2x00_check_reg16_for_disconnect(vha, hccr))
64	209	break;
65	210	if (hccr & HCCR_RISC_PAUSE) {
..	..	@@ -71,18 +216,18 @@
71	216	* bit to be cleared. Schedule a big hammer to get
72	217	* out of the RISC PAUSED state.
73	218	*/
74		- WRT_REG_WORD(&reg->hccr, HCCR_RESET_RISC);
75		- RD_REG_WORD(&reg->hccr);
	219	+ wrt_reg_word(&reg->hccr, HCCR_RESET_RISC);
	220	+ rd_reg_word(&reg->hccr);
76	221
77		- ha->isp_ops->fw_dump(vha, 1);
	222	+ ha->isp_ops->fw_dump(vha);
78	223	set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
79	224	break;
80		- } else if ((RD_REG_WORD(&reg->istatus) & ISR_RISC_INT) == 0)
	225	+ } else if ((rd_reg_word(&reg->istatus) & ISR_RISC_INT) == 0)
81	226	break;
82	227
83		- if (RD_REG_WORD(&reg->semaphore) & BIT_0) {
84		- WRT_REG_WORD(&reg->hccr, HCCR_CLR_RISC_INT);
85		- RD_REG_WORD(&reg->hccr);
	228	+ if (rd_reg_word(&reg->semaphore) & BIT_0) {
	229	+ wrt_reg_word(&reg->hccr, HCCR_CLR_RISC_INT);
	230	+ rd_reg_word(&reg->hccr);
86	231
87	232	/* Get mailbox data. */
88	233	mb[0] = RD_MAILBOX_REG(ha, reg, 0);
..	..	@@ -101,13 +246,13 @@
101	246	mb[0]);
102	247	}
103	248	/* Release mailbox registers. */
104		- WRT_REG_WORD(&reg->semaphore, 0);
105		- RD_REG_WORD(&reg->semaphore);
	249	+ wrt_reg_word(&reg->semaphore, 0);
	250	+ rd_reg_word(&reg->semaphore);
106	251	} else {
107	252	qla2x00_process_response_queue(rsp);
108	253
109		- WRT_REG_WORD(&reg->hccr, HCCR_CLR_RISC_INT);
110		- RD_REG_WORD(&reg->hccr);
	254	+ wrt_reg_word(&reg->hccr, HCCR_CLR_RISC_INT);
	255	+ rd_reg_word(&reg->hccr);
111	256	}
112	257	}
113	258	qla2x00_handle_mbx_completion(ha, status);
..	..	@@ -144,7 +289,7 @@
144	289
145	290	/**
146	291	* qla2300_intr_handler() - Process interrupts for the ISP23xx and ISP63xx.
147		- * @irq:
	292	+ * @irq: interrupt number
148	293	* @dev_id: SCSI driver HA context
149	294	*
150	295	* Called by system whenever the host adapter generates an interrupt.
..	..	@@ -160,7 +305,7 @@
160	305	unsigned long iter;
161	306	uint32_t stat;
162	307	uint16_t hccr;
163		- uint16_t mb[4];
	308	+ uint16_t mb[8];
164	309	struct rsp_que *rsp;
165	310	struct qla_hw_data *ha;
166	311	unsigned long flags;
..	..	@@ -179,14 +324,14 @@
179	324	spin_lock_irqsave(&ha->hardware_lock, flags);
180	325	vha = pci_get_drvdata(ha->pdev);
181	326	for (iter = 50; iter--; ) {
182		- stat = RD_REG_DWORD(&reg->u.isp2300.host_status);
	327	+ stat = rd_reg_dword(&reg->u.isp2300.host_status);
183	328	if (qla2x00_check_reg32_for_disconnect(vha, stat))
184	329	break;
185	330	if (stat & HSR_RISC_PAUSED) {
186	331	if (unlikely(pci_channel_offline(ha->pdev)))
187	332	break;
188	333
189		- hccr = RD_REG_WORD(&reg->hccr);
	334	+ hccr = rd_reg_word(&reg->hccr);
190	335
191	336	if (hccr & (BIT_15 \| BIT_13 \| BIT_11 \| BIT_8))
192	337	ql_log(ql_log_warn, vha, 0x5026,
..	..	@@ -202,10 +347,10 @@
202	347	* interrupt bit to be cleared. Schedule a big
203	348	* hammer to get out of the RISC PAUSED state.
204	349	*/
205		- WRT_REG_WORD(&reg->hccr, HCCR_RESET_RISC);
206		- RD_REG_WORD(&reg->hccr);
	350	+ wrt_reg_word(&reg->hccr, HCCR_RESET_RISC);
	351	+ rd_reg_word(&reg->hccr);
207	352
208		- ha->isp_ops->fw_dump(vha, 1);
	353	+ ha->isp_ops->fw_dump(vha);
209	354	set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
210	355	break;
211	356	} else if ((stat & HSR_RISC_INT) == 0)
..	..	@@ -220,7 +365,7 @@
220	365	status \|= MBX_INTERRUPT;
221	366
222	367	/* Release mailbox registers. */
223		- WRT_REG_WORD(&reg->semaphore, 0);
	368	+ wrt_reg_word(&reg->semaphore, 0);
224	369	break;
225	370	case 0x12:
226	371	mb[0] = MSW(stat);
..	..	@@ -248,8 +393,8 @@
248	393	"Unrecognized interrupt type (%d).\n", stat & 0xff);
249	394	break;
250	395	}
251		- WRT_REG_WORD(&reg->hccr, HCCR_CLR_RISC_INT);
252		- RD_REG_WORD_RELAXED(&reg->hccr);
	396	+ wrt_reg_word(&reg->hccr, HCCR_CLR_RISC_INT);
	397	+ rd_reg_word_relaxed(&reg->hccr);
253	398	}
254	399	qla2x00_handle_mbx_completion(ha, status);
255	400	spin_unlock_irqrestore(&ha->hardware_lock, flags);
..	..	@@ -267,7 +412,7 @@
267	412	{
268	413	uint16_t cnt;
269	414	uint32_t mboxes;
270		- uint16_t __iomem *wptr;
	415	+ __le16 __iomem *wptr;
271	416	struct qla_hw_data *ha = vha->hw;
272	417	struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;
273	418
..	..	@@ -283,15 +428,15 @@
283	428	ha->flags.mbox_int = 1;
284	429	ha->mailbox_out[0] = mb0;
285	430	mboxes >>= 1;
286		- wptr = (uint16_t __iomem *)MAILBOX_REG(ha, reg, 1);
	431	+ wptr = MAILBOX_REG(ha, reg, 1);
287	432
288	433	for (cnt = 1; cnt < ha->mbx_count; cnt++) {
289	434	if (IS_QLA2200(ha) && cnt == 8)
290		- wptr = (uint16_t __iomem *)MAILBOX_REG(ha, reg, 8);
	435	+ wptr = MAILBOX_REG(ha, reg, 8);
291	436	if ((cnt == 4 \|\| cnt == 5) && (mboxes & BIT_0))
292	437	ha->mailbox_out[cnt] = qla2x00_debounce_register(wptr);
293	438	else if (mboxes & BIT_0)
294		- ha->mailbox_out[cnt] = RD_REG_WORD(wptr);
	439	+ ha->mailbox_out[cnt] = rd_reg_word(wptr);
295	440
296	441	wptr++;
297	442	mboxes >>= 1;
..	..	@@ -306,19 +451,19 @@
306	451	int rval;
307	452	struct device_reg_24xx __iomem *reg24 = &vha->hw->iobase->isp24;
308	453	struct device_reg_82xx __iomem *reg82 = &vha->hw->iobase->isp82;
309		- uint16_t __iomem *wptr;
	454	+ __le16 __iomem *wptr;
310	455	uint16_t cnt, timeout, mb[QLA_IDC_ACK_REGS];
311	456
312	457	/* Seed data -- mailbox1 -> mailbox7. */
313	458	if (IS_QLA81XX(vha->hw) \|\| IS_QLA83XX(vha->hw))
314		- wptr = (uint16_t __iomem *)&reg24->mailbox1;
	459	+ wptr = &reg24->mailbox1;
315	460	else if (IS_QLA8044(vha->hw))
316		- wptr = (uint16_t __iomem *)&reg82->mailbox_out[1];
	461	+ wptr = &reg82->mailbox_out[1];
317	462	else
318	463	return;
319	464
320	465	for (cnt = 0; cnt < QLA_IDC_ACK_REGS; cnt++, wptr++)
321		- mb[cnt] = RD_REG_WORD(wptr);
	466	+ mb[cnt] = rd_reg_word(wptr);
322	467
323	468	ql_dbg(ql_dbg_async, vha, 0x5021,
324	469	"Inter-Driver Communication %s -- "
..	..	@@ -366,7 +511,7 @@
366	511	static const char *const link_speeds[] = {
367	512	"1", "2", "?", "4", "8", "16", "32", "10"
368	513	};
369		-#define QLA_LAST_SPEED 7
	514	+#define QLA_LAST_SPEED (ARRAY_SIZE(link_speeds) - 1)
370	515
371	516	if (IS_QLA2100(ha) \|\| IS_QLA2200(ha))
372	517	return link_speeds[0];
..	..	@@ -611,6 +756,212 @@
611	756	return NULL;
612	757	}
613	758
	759	+/* Shall be called only on supported adapters. */
	760	+static void
	761	+qla27xx_handle_8200_aen(scsi_qla_host_t vha, uint16_t mb)
	762	+{
	763	+ struct qla_hw_data *ha = vha->hw;
	764	+ bool reset_isp_needed = 0;
	765	+
	766	+ ql_log(ql_log_warn, vha, 0x02f0,
	767	+ "MPI Heartbeat stop. MPI reset is%s needed. "
	768	+ "MB0[%xh] MB1[%xh] MB2[%xh] MB3[%xh]\n",
	769	+ mb[1] & BIT_8 ? "" : " not",
	770	+ mb[0], mb[1], mb[2], mb[3]);
	771	+
	772	+ if ((mb[1] & BIT_8) == 0)
	773	+ return;
	774	+
	775	+ ql_log(ql_log_warn, vha, 0x02f1,
	776	+ "MPI Heartbeat stop. FW dump needed\n");
	777	+
	778	+ if (ql2xfulldump_on_mpifail) {
	779	+ ha->isp_ops->fw_dump(vha);
	780	+ reset_isp_needed = 1;
	781	+ }
	782	+
	783	+ ha->isp_ops->mpi_fw_dump(vha, 1);
	784	+
	785	+ if (reset_isp_needed) {
	786	+ vha->hw->flags.fw_init_done = 0;
	787	+ set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
	788	+ qla2xxx_wake_dpc(vha);
	789	+ }
	790	+}
	791	+
	792	+static struct purex_item *
	793	+qla24xx_alloc_purex_item(scsi_qla_host_t *vha, uint16_t size)
	794	+{
	795	+ struct purex_item *item = NULL;
	796	+ uint8_t item_hdr_size = sizeof(*item);
	797	+
	798	+ if (size > QLA_DEFAULT_PAYLOAD_SIZE) {
	799	+ item = kzalloc(item_hdr_size +
	800	+ (size - QLA_DEFAULT_PAYLOAD_SIZE), GFP_ATOMIC);
	801	+ } else {
	802	+ if (atomic_inc_return(&vha->default_item.in_use) == 1) {
	803	+ item = &vha->default_item;
	804	+ goto initialize_purex_header;
	805	+ } else {
	806	+ item = kzalloc(item_hdr_size, GFP_ATOMIC);
	807	+ }
	808	+ }
	809	+ if (!item) {
	810	+ ql_log(ql_log_warn, vha, 0x5092,
	811	+ ">> Failed allocate purex list item.\n");
	812	+
	813	+ return NULL;
	814	+ }
	815	+
	816	+initialize_purex_header:
	817	+ item->vha = vha;
	818	+ item->size = size;
	819	+ return item;
	820	+}
	821	+
	822	+static void
	823	+qla24xx_queue_purex_item(scsi_qla_host_t vha, struct purex_item pkt,
	824	+ void (process_item)(struct scsi_qla_host vha,
	825	+ struct purex_item *pkt))
	826	+{
	827	+ struct purex_list *list = &vha->purex_list;
	828	+ ulong flags;
	829	+
	830	+ pkt->process_item = process_item;
	831	+
	832	+ spin_lock_irqsave(&list->lock, flags);
	833	+ list_add_tail(&pkt->list, &list->head);
	834	+ spin_unlock_irqrestore(&list->lock, flags);
	835	+
	836	+ set_bit(PROCESS_PUREX_IOCB, &vha->dpc_flags);
	837	+}
	838	+
	839	+/**
	840	+ * qla24xx_copy_std_pkt() - Copy over purex ELS which is
	841	+ * contained in a single IOCB.
	842	+ * purex packet.
	843	+ * @vha: SCSI driver HA context
	844	+ * @pkt: ELS packet
	845	+ */
	846	+static struct purex_item
	847	+qla24xx_copy_std_pkt(struct scsi_qla_host vha, void *pkt)
	848	+{
	849	+ struct purex_item *item;
	850	+
	851	+ item = qla24xx_alloc_purex_item(vha,
	852	+ QLA_DEFAULT_PAYLOAD_SIZE);
	853	+ if (!item)
	854	+ return item;
	855	+
	856	+ memcpy(&item->iocb, pkt, sizeof(item->iocb));
	857	+ return item;
	858	+}
	859	+
	860	+/**
	861	+ * qla27xx_copy_fpin_pkt() - Copy over fpin packets that can
	862	+ * span over multiple IOCBs.
	863	+ * @vha: SCSI driver HA context
	864	+ * @pkt: ELS packet
	865	+ * @rsp: Response queue
	866	+ */
	867	+static struct purex_item *
	868	+qla27xx_copy_fpin_pkt(struct scsi_qla_host vha, void *pkt,
	869	+ struct rsp_que **rsp)
	870	+{
	871	+ struct purex_entry_24xx purex = pkt;
	872	+ struct rsp_que rsp_q = rsp;
	873	+ sts_cont_entry_t *new_pkt;
	874	+ uint16_t no_bytes = 0, total_bytes = 0, pending_bytes = 0;
	875	+ uint16_t buffer_copy_offset = 0;
	876	+ uint16_t entry_count, entry_count_remaining;
	877	+ struct purex_item *item;
	878	+ void *fpin_pkt = NULL;
	879	+
	880	+ total_bytes = (le16_to_cpu(purex->frame_size) & 0x0FFF)
	881	+ - PURX_ELS_HEADER_SIZE;
	882	+ pending_bytes = total_bytes;
	883	+ entry_count = entry_count_remaining = purex->entry_count;
	884	+ no_bytes = (pending_bytes > sizeof(purex->els_frame_payload)) ?
	885	+ sizeof(purex->els_frame_payload) : pending_bytes;
	886	+ ql_log(ql_log_info, vha, 0x509a,
	887	+ "FPIN ELS, frame_size 0x%x, entry count %d\n",
	888	+ total_bytes, entry_count);
	889	+
	890	+ item = qla24xx_alloc_purex_item(vha, total_bytes);
	891	+ if (!item)
	892	+ return item;
	893	+
	894	+ fpin_pkt = &item->iocb;
	895	+
	896	+ memcpy(fpin_pkt, &purex->els_frame_payload[0], no_bytes);
	897	+ buffer_copy_offset += no_bytes;
	898	+ pending_bytes -= no_bytes;
	899	+ --entry_count_remaining;
	900	+
	901	+ ((response_t *)purex)->signature = RESPONSE_PROCESSED;
	902	+ wmb();
	903	+
	904	+ do {
	905	+ while ((total_bytes > 0) && (entry_count_remaining > 0)) {
	906	+ if (rsp_q->ring_ptr->signature == RESPONSE_PROCESSED) {
	907	+ ql_dbg(ql_dbg_async, vha, 0x5084,
	908	+ "Ran out of IOCBs, partial data 0x%x\n",
	909	+ buffer_copy_offset);
	910	+ cpu_relax();
	911	+ continue;
	912	+ }
	913	+
	914	+ new_pkt = (sts_cont_entry_t *)rsp_q->ring_ptr;
	915	+ *pkt = new_pkt;
	916	+
	917	+ if (new_pkt->entry_type != STATUS_CONT_TYPE) {
	918	+ ql_log(ql_log_warn, vha, 0x507a,
	919	+ "Unexpected IOCB type, partial data 0x%x\n",
	920	+ buffer_copy_offset);
	921	+ break;
	922	+ }
	923	+
	924	+ rsp_q->ring_index++;
	925	+ if (rsp_q->ring_index == rsp_q->length) {
	926	+ rsp_q->ring_index = 0;
	927	+ rsp_q->ring_ptr = rsp_q->ring;
	928	+ } else {
	929	+ rsp_q->ring_ptr++;
	930	+ }
	931	+ no_bytes = (pending_bytes > sizeof(new_pkt->data)) ?
	932	+ sizeof(new_pkt->data) : pending_bytes;
	933	+ if ((buffer_copy_offset + no_bytes) <= total_bytes) {
	934	+ memcpy(((uint8_t *)fpin_pkt +
	935	+ buffer_copy_offset), new_pkt->data,
	936	+ no_bytes);
	937	+ buffer_copy_offset += no_bytes;
	938	+ pending_bytes -= no_bytes;
	939	+ --entry_count_remaining;
	940	+ } else {
	941	+ ql_log(ql_log_warn, vha, 0x5044,
	942	+ "Attempt to copy more that we got, optimizing..%x\n",
	943	+ buffer_copy_offset);
	944	+ memcpy(((uint8_t *)fpin_pkt +
	945	+ buffer_copy_offset), new_pkt->data,
	946	+ total_bytes - buffer_copy_offset);
	947	+ }
	948	+
	949	+ ((response_t *)new_pkt)->signature = RESPONSE_PROCESSED;
	950	+ wmb();
	951	+ }
	952	+
	953	+ if (pending_bytes != 0 \|\| entry_count_remaining != 0) {
	954	+ ql_log(ql_log_fatal, vha, 0x508b,
	955	+ "Dropping partial FPIN, underrun bytes = 0x%x, entry cnts 0x%x\n",
	956	+ total_bytes, entry_count_remaining);
	957	+ qla24xx_free_purex_item(item);
	958	+ return NULL;
	959	+ }
	960	+ } while (entry_count_remaining > 0);
	961	+ host_to_fcp_swap((uint8_t *)&item->iocb, total_bytes);
	962	+ return item;
	963	+}
	964	+
614	965	/**
615	966	* qla2x00_async_event() - Process aynchronous events.
616	967	* @vha: SCSI driver HA context
..	..	@@ -640,7 +991,7 @@
640	991	goto skip_rio;
641	992	switch (mb[0]) {
642	993	case MBA_SCSI_COMPLETION:
643		- handles[0] = le32_to_cpu((uint32_t)((mb[2] << 16) \| mb[1]));
	994	+ handles[0] = make_handle(mb[2], mb[1]);
644	995	handle_cnt = 1;
645	996	break;
646	997	case MBA_CMPLT_1_16BIT:
..	..	@@ -679,10 +1030,9 @@
679	1030	mb[0] = MBA_SCSI_COMPLETION;
680	1031	break;
681	1032	case MBA_CMPLT_2_32BIT:
682		- handles[0] = le32_to_cpu((uint32_t)((mb[2] << 16) \| mb[1]));
683		- handles[1] = le32_to_cpu(
684		- ((uint32_t)(RD_MAILBOX_REG(ha, reg, 7) << 16)) \|
685		- RD_MAILBOX_REG(ha, reg, 6));
	1033	+ handles[0] = make_handle(mb[2], mb[1]);
	1034	+ handles[1] = make_handle(RD_MAILBOX_REG(ha, reg, 7),
	1035	+ RD_MAILBOX_REG(ha, reg, 6));
686	1036	handle_cnt = 2;
687	1037	mb[0] = MBA_SCSI_COMPLETION;
688	1038	break;
..	..	@@ -708,13 +1058,28 @@
708	1058	break;
709	1059
710	1060	case MBA_SYSTEM_ERR: /* System Error */
711		- mbx = (IS_QLA81XX(ha) \|\| IS_QLA83XX(ha) \|\| IS_QLA27XX(ha)) ?
712		- RD_REG_WORD(&reg24->mailbox7) : 0;
713		- ql_log(ql_log_warn, vha, 0x5003,
714		- "ISP System Error - mbx1=%xh mbx2=%xh mbx3=%xh "
715		- "mbx7=%xh.\n", mb[1], mb[2], mb[3], mbx);
	1061	+ mbx = 0;
	1062	+ if (IS_QLA81XX(ha) \|\| IS_QLA83XX(ha) \|\|
	1063	+ IS_QLA27XX(ha) \|\| IS_QLA28XX(ha)) {
	1064	+ u16 m[4];
716	1065
717		- ha->isp_ops->fw_dump(vha, 1);
	1066	+ m[0] = rd_reg_word(&reg24->mailbox4);
	1067	+ m[1] = rd_reg_word(&reg24->mailbox5);
	1068	+ m[2] = rd_reg_word(&reg24->mailbox6);
	1069	+ mbx = m[3] = rd_reg_word(&reg24->mailbox7);
	1070	+
	1071	+ ql_log(ql_log_warn, vha, 0x5003,
	1072	+ "ISP System Error - mbx1=%xh mbx2=%xh mbx3=%xh mbx4=%xh mbx5=%xh mbx6=%xh mbx7=%xh.\n",
	1073	+ mb[1], mb[2], mb[3], m[0], m[1], m[2], m[3]);
	1074	+ } else
	1075	+ ql_log(ql_log_warn, vha, 0x5003,
	1076	+ "ISP System Error - mbx1=%xh mbx2=%xh mbx3=%xh.\n ",
	1077	+ mb[1], mb[2], mb[3]);
	1078	+
	1079	+ if ((IS_QLA27XX(ha) \|\| IS_QLA28XX(ha)) &&
	1080	+ rd_reg_word(&reg24->mailbox7) & BIT_8)
	1081	+ ha->isp_ops->mpi_fw_dump(vha, 1);
	1082	+ ha->isp_ops->fw_dump(vha);
718	1083	ha->flags.fw_init_done = 0;
719	1084	QLA_FW_STOPPED(ha);
720	1085
..	..	@@ -765,7 +1130,6 @@
765	1130	case MBA_LOOP_INIT_ERR:
766	1131	ql_log(ql_log_warn, vha, 0x5090,
767	1132	"LOOP INIT ERROR (%x).\n", mb[1]);
768		- ha->isp_ops->fw_dump(vha, 1);
769	1133	set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
770	1134	break;
771	1135
..	..	@@ -778,7 +1142,7 @@
778	1142	if (atomic_read(&vha->loop_state) != LOOP_DOWN) {
779	1143	atomic_set(&vha->loop_state, LOOP_DOWN);
780	1144	atomic_set(&vha->loop_down_timer, LOOP_DOWN_TIME);
781		- qla2x00_mark_all_devices_lost(vha, 1);
	1145	+ qla2x00_mark_all_devices_lost(vha);
782	1146	}
783	1147
784	1148	if (vha->vp_idx) {
..	..	@@ -803,13 +1167,15 @@
803	1167	"LOOP UP detected (%s Gbps).\n",
804	1168	qla2x00_get_link_speed_str(ha, ha->link_data_rate));
805	1169
	1170	+ if (IS_QLA83XX(ha) \|\| IS_QLA27XX(ha) \|\| IS_QLA28XX(ha)) {
	1171	+ if (mb[2] & BIT_0)
	1172	+ ql_log(ql_log_info, vha, 0x11a0,
	1173	+ "FEC=enabled (link up).\n");
	1174	+ }
	1175	+
806	1176	vha->flags.management_server_logged_in = 0;
807	1177	qla2x00_post_aen_work(vha, FCH_EVT_LINKUP, ha->link_data_rate);
808	1178
809		- if (AUTO_DETECT_SFP_SUPPORT(vha)) {
810		- set_bit(DETECT_SFP_CHANGE, &vha->dpc_flags);
811		- qla2xxx_wake_dpc(vha);
812		- }
813	1179	break;
814	1180
815	1181	case MBA_LOOP_DOWN: /* Loop Down Event */
..	..	@@ -818,8 +1184,8 @@
818	1184	ha->current_topology = 0;
819	1185
820	1186	mbx = (IS_QLA81XX(ha) \|\| IS_QLA8031(ha))
821		- ? RD_REG_WORD(&reg24->mailbox4) : 0;
822		- mbx = (IS_P3P_TYPE(ha)) ? RD_REG_WORD(&reg82->mailbox_out[4])
	1187	+ ? rd_reg_word(&reg24->mailbox4) : 0;
	1188	+ mbx = (IS_P3P_TYPE(ha)) ? rd_reg_word(&reg82->mailbox_out[4])
823	1189	: mbx;
824	1190	ql_log(ql_log_info, vha, 0x500b,
825	1191	"LOOP DOWN detected (%x %x %x %x).\n",
..	..	@@ -834,9 +1200,9 @@
834	1200	* Restore for Physical Port only
835	1201	*/
836	1202	if (!vha->vp_idx) {
837		- if (ha->flags.fawwpn_enabled) {
838		- void *wwpn = ha->init_cb->port_name;
839		- memcpy(vha->port_name, wwpn, WWN_SIZE);
	1203	+ if (ha->flags.fawwpn_enabled &&
	1204	+ (ha->current_topology == ISP_CFG_F)) {
	1205	+ memcpy(vha->port_name, ha->port_name, WWN_SIZE);
840	1206	fc_host_port_name(vha->host) =
841	1207	wwn_to_u64(vha->port_name);
842	1208	ql_dbg(ql_dbg_init + ql_dbg_verbose,
..	..	@@ -849,7 +1215,7 @@
849	1215	}
850	1216
851	1217	vha->device_flags \|= DFLG_NO_CABLE;
852		- qla2x00_mark_all_devices_lost(vha, 1);
	1218	+ qla2x00_mark_all_devices_lost(vha);
853	1219	}
854	1220
855	1221	if (vha->vp_idx) {
..	..	@@ -869,7 +1235,7 @@
869	1235	if (atomic_read(&vha->loop_state) != LOOP_DOWN) {
870	1236	atomic_set(&vha->loop_state, LOOP_DOWN);
871	1237	atomic_set(&vha->loop_down_timer, LOOP_DOWN_TIME);
872		- qla2x00_mark_all_devices_lost(vha, 1);
	1238	+ qla2x00_mark_all_devices_lost(vha);
873	1239	}
874	1240
875	1241	if (vha->vp_idx) {
..	..	@@ -912,7 +1278,7 @@
912	1278	atomic_set(&vha->loop_down_timer,
913	1279	LOOP_DOWN_TIME);
914	1280	if (!N2N_TOPO(ha))
915		- qla2x00_mark_all_devices_lost(vha, 1);
	1281	+ qla2x00_mark_all_devices_lost(vha);
916	1282	}
917	1283
918	1284	if (vha->vp_idx) {
..	..	@@ -941,7 +1307,7 @@
941	1307	if (!atomic_read(&vha->loop_down_timer))
942	1308	atomic_set(&vha->loop_down_timer,
943	1309	LOOP_DOWN_TIME);
944		- qla2x00_mark_all_devices_lost(vha, 1);
	1310	+ qla2x00_mark_all_devices_lost(vha);
945	1311	}
946	1312
947	1313	if (vha->vp_idx) {
..	..	@@ -1010,7 +1376,6 @@
1010	1376	"Marking port lost loopid=%04x portid=%06x.\n",
1011	1377	fcport->loop_id, fcport->d_id.b24);
1012	1378	if (qla_ini_mode_enabled(vha)) {
1013		- qla2x00_mark_device_lost(fcport->vha, fcport, 1, 1);
1014	1379	fcport->logout_on_delete = 0;
1015	1380	qlt_schedule_sess_for_deletion(fcport);
1016	1381	}
..	..	@@ -1022,14 +1387,14 @@
1022	1387	atomic_set(&vha->loop_down_timer,
1023	1388	LOOP_DOWN_TIME);
1024	1389	vha->device_flags \|= DFLG_NO_CABLE;
1025		- qla2x00_mark_all_devices_lost(vha, 1);
	1390	+ qla2x00_mark_all_devices_lost(vha);
1026	1391	}
1027	1392
1028	1393	if (vha->vp_idx) {
1029	1394	atomic_set(&vha->vp_state, VP_FAILED);
1030	1395	fc_vport_set_state(vha->fc_vport,
1031	1396	FC_VPORT_FAILED);
1032		- qla2x00_mark_all_devices_lost(vha, 1);
	1397	+ qla2x00_mark_all_devices_lost(vha);
1033	1398	}
1034	1399
1035	1400	vha->flags.management_server_logged_in = 0;
..	..	@@ -1102,11 +1467,23 @@
1102	1467	struct event_arg ea;
1103	1468
1104	1469	memset(&ea, 0, sizeof(ea));
1105		- ea.event = FCME_RSCN;
1106	1470	ea.id.b24 = rscn_entry;
1107	1471	ea.id.b.rsvd_1 = rscn_entry >> 24;
1108		- qla2x00_fcport_event_handler(vha, &ea);
	1472	+ qla2x00_handle_rscn(vha, &ea);
1109	1473	qla2x00_post_aen_work(vha, FCH_EVT_RSCN, rscn_entry);
	1474	+ }
	1475	+ break;
	1476	+ case MBA_CONGN_NOTI_RECV:
	1477	+ if (!ha->flags.scm_enabled \|\|
	1478	+ mb[1] != QLA_CON_PRIMITIVE_RECEIVED)
	1479	+ break;
	1480	+
	1481	+ if (mb[2] == QLA_CONGESTION_ARB_WARNING) {
	1482	+ ql_dbg(ql_dbg_async, vha, 0x509b,
	1483	+ "Congestion Warning %04x %04x.\n", mb[1], mb[2]);
	1484	+ } else if (mb[2] == QLA_CONGESTION_ARB_ALARM) {
	1485	+ ql_log(ql_log_warn, vha, 0x509b,
	1486	+ "Congestion Alarm %04x %04x.\n", mb[1], mb[2]);
1110	1487	}
1111	1488	break;
1112	1489	/* case MBA_RIO_RESPONSE: */
..	..	@@ -1186,7 +1563,7 @@
1186	1563	break;
1187	1564	case MBA_IDC_NOTIFY:
1188	1565	if (IS_QLA8031(vha->hw) \|\| IS_QLA8044(ha)) {
1189		- mb[4] = RD_REG_WORD(&reg24->mailbox4);
	1566	+ mb[4] = rd_reg_word(&reg24->mailbox4);
1190	1567	if (((mb[2] & 0x7fff) == MBC_PORT_RESET \|\|
1191	1568	(mb[2] & 0x7fff) == MBC_SET_PORT_CONFIG) &&
1192	1569	(mb[4] & INTERNAL_LOOPBACK_MASK) != 0) {
..	..	@@ -1200,11 +1577,11 @@
1200	1577	qla2xxx_wake_dpc(vha);
1201	1578	}
1202	1579	}
1203		- /* fall through */
	1580	+ fallthrough;
1204	1581	case MBA_IDC_COMPLETE:
1205	1582	if (ha->notify_lb_portup_comp && !vha->vp_idx)
1206	1583	complete(&ha->lb_portup_comp);
1207		- /* Fallthru */
	1584	+ fallthrough;
1208	1585	case MBA_IDC_TIME_EXT:
1209	1586	if (IS_QLA81XX(vha->hw) \|\| IS_QLA8031(vha->hw) \|\|
1210	1587	IS_QLA8044(ha))
..	..	@@ -1212,20 +1589,51 @@
1212	1589	break;
1213	1590
1214	1591	case MBA_IDC_AEN:
1215		- mb[4] = RD_REG_WORD(&reg24->mailbox4);
1216		- mb[5] = RD_REG_WORD(&reg24->mailbox5);
1217		- mb[6] = RD_REG_WORD(&reg24->mailbox6);
1218		- mb[7] = RD_REG_WORD(&reg24->mailbox7);
1219		- qla83xx_handle_8200_aen(vha, mb);
	1592	+ if (IS_QLA27XX(ha) \|\| IS_QLA28XX(ha)) {
	1593	+ qla27xx_handle_8200_aen(vha, mb);
	1594	+ } else if (IS_QLA83XX(ha)) {
	1595	+ mb[4] = rd_reg_word(&reg24->mailbox4);
	1596	+ mb[5] = rd_reg_word(&reg24->mailbox5);
	1597	+ mb[6] = rd_reg_word(&reg24->mailbox6);
	1598	+ mb[7] = rd_reg_word(&reg24->mailbox7);
	1599	+ qla83xx_handle_8200_aen(vha, mb);
	1600	+ } else {
	1601	+ ql_dbg(ql_dbg_async, vha, 0x5052,
	1602	+ "skip Heartbeat processing mb0-3=[0x%04x] [0x%04x] [0x%04x] [0x%04x]\n",
	1603	+ mb[0], mb[1], mb[2], mb[3]);
	1604	+ }
1220	1605	break;
1221	1606
1222	1607	case MBA_DPORT_DIAGNOSTICS:
1223	1608	ql_dbg(ql_dbg_async, vha, 0x5052,
1224		- "D-Port Diagnostics: %04x result=%s\n",
1225		- mb[0],
1226		- mb[1] == 0 ? "start" :
1227		- mb[1] == 1 ? "done (pass)" :
1228		- mb[1] == 2 ? "done (error)" : "other");
	1609	+ "D-Port Diagnostics: %04x %04x %04x %04x\n",
	1610	+ mb[0], mb[1], mb[2], mb[3]);
	1611	+ memcpy(vha->dport_data, mb, sizeof(vha->dport_data));
	1612	+ if (IS_QLA83XX(ha) \|\| IS_QLA27XX(ha) \|\| IS_QLA28XX(ha)) {
	1613	+ static char *results[] = {
	1614	+ "start", "done(pass)", "done(error)", "undefined" };
	1615	+ static char *types[] = {
	1616	+ "none", "dynamic", "static", "other" };
	1617	+ uint result = mb[1] >> 0 & 0x3;
	1618	+ uint type = mb[1] >> 6 & 0x3;
	1619	+ uint sw = mb[1] >> 15 & 0x1;
	1620	+ ql_dbg(ql_dbg_async, vha, 0x5052,
	1621	+ "D-Port Diagnostics: result=%s type=%s [sw=%u]\n",
	1622	+ results[result], types[type], sw);
	1623	+ if (result == 2) {
	1624	+ static char *reasons[] = {
	1625	+ "reserved", "unexpected reject",
	1626	+ "unexpected phase", "retry exceeded",
	1627	+ "timed out", "not supported",
	1628	+ "user stopped" };
	1629	+ uint reason = mb[2] >> 0 & 0xf;
	1630	+ uint phase = mb[2] >> 12 & 0xf;
	1631	+ ql_dbg(ql_dbg_async, vha, 0x5052,
	1632	+ "D-Port Diagnostics: reason=%s phase=%u \n",
	1633	+ reason < 7 ? reasons[reason] : "other",
	1634	+ phase >> 1);
	1635	+ }
	1636	+ }
1229	1637	break;
1230	1638
1231	1639	case MBA_TEMPERATURE_ALERT:
..	..	@@ -1238,6 +1646,11 @@
1238	1646	case MBA_TRANS_INSERT:
1239	1647	ql_dbg(ql_dbg_async, vha, 0x5091,
1240	1648	"Transceiver Insertion: %04x\n", mb[1]);
	1649	+ set_bit(DETECT_SFP_CHANGE, &vha->dpc_flags);
	1650	+ break;
	1651	+
	1652	+ case MBA_TRANS_REMOVE:
	1653	+ ql_dbg(ql_dbg_async, vha, 0x5091, "Transceiver Removal\n");
1241	1654	break;
1242	1655
1243	1656	default:
..	..	@@ -1300,35 +1713,35 @@
1300	1713	{
1301	1714	struct qla_hw_data *ha = vha->hw;
1302	1715	sts_entry_t *pkt = iocb;
1303		- srb_t *sp = NULL;
	1716	+ srb_t *sp;
1304	1717	uint16_t index;
1305	1718
1306	1719	index = LSW(pkt->handle);
1307	1720	if (index >= req->num_outstanding_cmds) {
1308	1721	ql_log(ql_log_warn, vha, 0x5031,
1309		- "Invalid command index (%x) type %8ph.\n",
1310		- index, iocb);
	1722	+ "%s: Invalid command index (%x) type %8ph.\n",
	1723	+ func, index, iocb);
1311	1724	if (IS_P3P_TYPE(ha))
1312	1725	set_bit(FCOE_CTX_RESET_NEEDED, &vha->dpc_flags);
1313	1726	else
1314	1727	set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
1315		- goto done;
	1728	+ return NULL;
1316	1729	}
1317	1730	sp = req->outstanding_cmds[index];
1318	1731	if (!sp) {
1319	1732	ql_log(ql_log_warn, vha, 0x5032,
1320		- "Invalid completion handle (%x) -- timed-out.\n", index);
1321		- return sp;
	1733	+ "%s: Invalid completion handle (%x) -- timed-out.\n",
	1734	+ func, index);
	1735	+ return NULL;
1322	1736	}
1323	1737	if (sp->handle != index) {
1324	1738	ql_log(ql_log_warn, vha, 0x5033,
1325		- "SRB handle (%x) mismatch %x.\n", sp->handle, index);
	1739	+ "%s: SRB handle (%x) mismatch %x.\n", func,
	1740	+ sp->handle, index);
1326	1741	return NULL;
1327	1742	}
1328	1743
1329	1744	req->outstanding_cmds[index] = NULL;
1330		-
1331		-done:
1332	1745	return sp;
1333	1746	}
1334	1747
..	..	@@ -1367,7 +1780,7 @@
1367	1780	le16_to_cpu(mbx->status_flags));
1368	1781
1369	1782	ql_dump_buffer(ql_dbg_async + ql_dbg_buffer, vha, 0x5029,
1370		- (uint8_t )mbx, sizeof(mbx));
	1783	+ mbx, sizeof(*mbx));
1371	1784
1372	1785	goto logio_done;
1373	1786	}
..	..	@@ -1423,6 +1836,7 @@
1423	1836	struct mbx_24xx_entry *pkt)
1424	1837	{
1425	1838	const char func[] = "MBX-IOCB2";
	1839	+ struct qla_hw_data *ha = vha->hw;
1426	1840	srb_t *sp;
1427	1841	struct srb_iocb *si;
1428	1842	u16 sz, i;
..	..	@@ -1432,11 +1846,23 @@
1432	1846	if (!sp)
1433	1847	return;
1434	1848
	1849	+ if (sp->type == SRB_SCSI_CMD \|\|
	1850	+ sp->type == SRB_NVME_CMD \|\|
	1851	+ sp->type == SRB_TM_CMD) {
	1852	+ ql_log(ql_log_warn, vha, 0x509d,
	1853	+ "Inconsistent event entry type %d\n", sp->type);
	1854	+ if (IS_P3P_TYPE(ha))
	1855	+ set_bit(FCOE_CTX_RESET_NEEDED, &vha->dpc_flags);
	1856	+ else
	1857	+ set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
	1858	+ return;
	1859	+ }
	1860	+
1435	1861	si = &sp->u.iocb_cmd;
1436	1862	sz = min(ARRAY_SIZE(pkt->mb), ARRAY_SIZE(sp->u.iocb_cmd.u.mbx.in_mb));
1437	1863
1438	1864	for (i = 0; i < sz; i++)
1439		- si->u.mbx.in_mb[i] = le16_to_cpu(pkt->mb[i]);
	1865	+ si->u.mbx.in_mb[i] = pkt->mb[i];
1440	1866
1441	1867	res = (si->u.mbx.in_mb[0] & MBS_MASK);
1442	1868
..	..	@@ -1497,7 +1923,7 @@
1497	1923	if (comp_status == CS_DATA_UNDERRUN) {
1498	1924	res = DID_OK << 16;
1499	1925	bsg_reply->reply_payload_rcv_len =
1500		- le16_to_cpu(((sts_entry_t *)pkt)->rsp_info_len);
	1926	+ le16_to_cpu(pkt->rsp_info_len);
1501	1927
1502	1928	ql_log(ql_log_warn, vha, 0x5048,
1503	1929	"CT pass-through-%s error comp_status=0x%x total_byte=0x%x.\n",
..	..	@@ -1511,7 +1937,7 @@
1511	1937	bsg_reply->reply_payload_rcv_len = 0;
1512	1938	}
1513	1939	ql_dump_buffer(ql_dbg_async + ql_dbg_buffer, vha, 0x5035,
1514		- (uint8_t )pkt, sizeof(pkt));
	1940	+ pkt, sizeof(*pkt));
1515	1941	} else {
1516	1942	res = DID_OK << 16;
1517	1943	bsg_reply->reply_payload_rcv_len =
..	..	@@ -1537,6 +1963,7 @@
1537	1963	qla24xx_els_ct_entry(scsi_qla_host_t vha, struct req_que req,
1538	1964	struct sts_entry_24xx *pkt, int iocb_type)
1539	1965	{
	1966	+ struct els_sts_entry_24xx ese = (struct els_sts_entry_24xx )pkt;
1540	1967	const char func[] = "ELS_CT_IOCB";
1541	1968	const char *type;
1542	1969	srb_t *sp;
..	..	@@ -1586,33 +2013,31 @@
1586	2013	}
1587	2014
1588	2015	comp_status = fw_status[0] = le16_to_cpu(pkt->comp_status);
1589		- fw_status[1] = le16_to_cpu(((struct els_sts_entry_24xx*)pkt)->error_subcode_1);
1590		- fw_status[2] = le16_to_cpu(((struct els_sts_entry_24xx*)pkt)->error_subcode_2);
	2016	+ fw_status[1] = le32_to_cpu(ese->error_subcode_1);
	2017	+ fw_status[2] = le32_to_cpu(ese->error_subcode_2);
1591	2018
1592	2019	if (iocb_type == ELS_IOCB_TYPE) {
1593	2020	els = &sp->u.iocb_cmd;
1594		- els->u.els_plogi.fw_status[0] = fw_status[0];
1595		- els->u.els_plogi.fw_status[1] = fw_status[1];
1596		- els->u.els_plogi.fw_status[2] = fw_status[2];
1597		- els->u.els_plogi.comp_status = fw_status[0];
	2021	+ els->u.els_plogi.fw_status[0] = cpu_to_le32(fw_status[0]);
	2022	+ els->u.els_plogi.fw_status[1] = cpu_to_le32(fw_status[1]);
	2023	+ els->u.els_plogi.fw_status[2] = cpu_to_le32(fw_status[2]);
	2024	+ els->u.els_plogi.comp_status = cpu_to_le16(fw_status[0]);
1598	2025	if (comp_status == CS_COMPLETE) {
1599	2026	res = DID_OK << 16;
1600	2027	} else {
1601	2028	if (comp_status == CS_DATA_UNDERRUN) {
1602	2029	res = DID_OK << 16;
1603		- els->u.els_plogi.len =
1604		- le16_to_cpu(((struct els_sts_entry_24xx *)
1605		- pkt)->total_byte_count);
	2030	+ els->u.els_plogi.len = cpu_to_le16(le32_to_cpu(
	2031	+ ese->total_byte_count));
1606	2032	} else {
1607	2033	els->u.els_plogi.len = 0;
1608	2034	res = DID_ERROR << 16;
1609	2035	}
1610	2036	}
1611		- ql_log(ql_log_info, vha, 0x503f,
1612		- "ELS IOCB Done -%s error hdl=%x comp_status=0x%x error subcode 1=0x%x error subcode 2=0x%x total_byte=0x%x\n",
	2037	+ ql_dbg(ql_dbg_disc, vha, 0x503f,
	2038	+ "ELS IOCB Done -%s hdl=%x comp_status=0x%x error subcode 1=0x%x error subcode 2=0x%x total_byte=0x%x\n",
1613	2039	type, sp->handle, comp_status, fw_status[1], fw_status[2],
1614		- le16_to_cpu(((struct els_sts_entry_24xx *)
1615		- pkt)->total_byte_count));
	2040	+ le32_to_cpu(ese->total_byte_count));
1616	2041	goto els_ct_done;
1617	2042	}
1618	2043
..	..	@@ -1628,30 +2053,27 @@
1628	2053	if (comp_status == CS_DATA_UNDERRUN) {
1629	2054	res = DID_OK << 16;
1630	2055	bsg_reply->reply_payload_rcv_len =
1631		- le16_to_cpu(((struct els_sts_entry_24xx *)pkt)->total_byte_count);
	2056	+ le32_to_cpu(ese->total_byte_count);
1632	2057
1633	2058	ql_dbg(ql_dbg_user, vha, 0x503f,
1634	2059	"ELS-CT pass-through-%s error hdl=%x comp_status-status=0x%x "
1635	2060	"error subcode 1=0x%x error subcode 2=0x%x total_byte = 0x%x.\n",
1636	2061	type, sp->handle, comp_status, fw_status[1], fw_status[2],
1637		- le16_to_cpu(((struct els_sts_entry_24xx *)
1638		- pkt)->total_byte_count));
	2062	+ le32_to_cpu(ese->total_byte_count));
1639	2063	} else {
1640	2064	ql_dbg(ql_dbg_user, vha, 0x5040,
1641	2065	"ELS-CT pass-through-%s error hdl=%x comp_status-status=0x%x "
1642	2066	"error subcode 1=0x%x error subcode 2=0x%x.\n",
1643	2067	type, sp->handle, comp_status,
1644		- le16_to_cpu(((struct els_sts_entry_24xx *)
1645		- pkt)->error_subcode_1),
1646		- le16_to_cpu(((struct els_sts_entry_24xx *)
1647		- pkt)->error_subcode_2));
	2068	+ le32_to_cpu(ese->error_subcode_1),
	2069	+ le32_to_cpu(ese->error_subcode_2));
1648	2070	res = DID_ERROR << 16;
1649	2071	bsg_reply->reply_payload_rcv_len = 0;
1650	2072	}
1651	2073	memcpy(bsg_job->reply + sizeof(struct fc_bsg_reply),
1652	2074	fw_status, sizeof(fw_status));
1653	2075	ql_dump_buffer(ql_dbg_user + ql_dbg_buffer, vha, 0x5056,
1654		- (uint8_t )pkt, sizeof(pkt));
	2076	+ pkt, sizeof(*pkt));
1655	2077	}
1656	2078	else {
1657	2079	res = DID_OK << 16;
..	..	@@ -1695,21 +2117,28 @@
1695	2117	fcport->d_id.b.area, fcport->d_id.b.al_pa,
1696	2118	logio->entry_status);
1697	2119	ql_dump_buffer(ql_dbg_async + ql_dbg_buffer, vha, 0x504d,
1698		- (uint8_t )logio, sizeof(logio));
	2120	+ logio, sizeof(*logio));
1699	2121
1700	2122	goto logio_done;
1701	2123	}
1702	2124
1703	2125	if (le16_to_cpu(logio->comp_status) == CS_COMPLETE) {
1704		- ql_dbg(ql_dbg_async, fcport->vha, 0x5036,
1705		- "Async-%s complete - %8phC hdl=%x portid=%02x%02x%02x "
1706		- "iop0=%x.\n", type, fcport->port_name, sp->handle,
1707		- fcport->d_id.b.domain,
1708		- fcport->d_id.b.area, fcport->d_id.b.al_pa,
	2126	+ ql_dbg(ql_dbg_async, sp->vha, 0x5036,
	2127	+ "Async-%s complete: handle=%x pid=%06x wwpn=%8phC iop0=%x\n",
	2128	+ type, sp->handle, fcport->d_id.b24, fcport->port_name,
1709	2129	le32_to_cpu(logio->io_parameter[0]));
1710	2130
1711	2131	vha->hw->exch_starvation = 0;
1712	2132	data[0] = MBS_COMMAND_COMPLETE;
	2133	+
	2134	+ if (sp->type == SRB_PRLI_CMD) {
	2135	+ lio->u.logio.iop[0] =
	2136	+ le32_to_cpu(logio->io_parameter[0]);
	2137	+ lio->u.logio.iop[1] =
	2138	+ le32_to_cpu(logio->io_parameter[1]);
	2139	+ goto logio_done;
	2140	+ }
	2141	+
1713	2142	if (sp->type != SRB_LOGIN_CMD)
1714	2143	goto logio_done;
1715	2144
..	..	@@ -1769,17 +2198,15 @@
1769	2198	set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
1770	2199	qla2xxx_wake_dpc(vha);
1771	2200	}
1772		- /* fall through */
	2201	+ fallthrough;
1773	2202	default:
1774	2203	data[0] = MBS_COMMAND_ERROR;
1775	2204	break;
1776	2205	}
1777	2206
1778		- ql_dbg(ql_dbg_async, fcport->vha, 0x5037,
1779		- "Async-%s failed - %8phC hdl=%x portid=%02x%02x%02x comp=%x "
1780		- "iop0=%x iop1=%x.\n", type, fcport->port_name,
1781		- sp->handle, fcport->d_id.b.domain,
1782		- fcport->d_id.b.area, fcport->d_id.b.al_pa,
	2207	+ ql_dbg(ql_dbg_async, sp->vha, 0x5037,
	2208	+ "Async-%s failed: handle=%x pid=%06x wwpn=%8phC comp_status=%x iop0=%x iop1=%x\n",
	2209	+ type, sp->handle, fcport->d_id.b24, fcport->port_name,
1783	2210	le16_to_cpu(logio->comp_status),
1784	2211	le32_to_cpu(logio->io_parameter[0]),
1785	2212	le32_to_cpu(logio->io_parameter[1]));
..	..	@@ -1819,6 +2246,7 @@
1819	2246	iocb->u.tmf.data = QLA_FUNCTION_FAILED;
1820	2247	} else if ((le16_to_cpu(sts->scsi_status) &
1821	2248	SS_RESPONSE_INFO_LEN_VALID)) {
	2249	+ host_to_fcp_swap(sts->data, sizeof(sts->data));
1822	2250	if (le32_to_cpu(sts->rsp_data_len) < 4) {
1823	2251	ql_log(ql_log_warn, fcport->vha, 0x503b,
1824	2252	"Async-%s error - hdl=%x not enough response(%d).\n",
..	..	@@ -1832,8 +2260,8 @@
1832	2260	}
1833	2261
1834	2262	if (iocb->u.tmf.data != QLA_SUCCESS)
1835		- ql_dump_buffer(ql_dbg_async + ql_dbg_buffer, vha, 0x5055,
1836		- (uint8_t )sts, sizeof(sts));
	2263	+ ql_dump_buffer(ql_dbg_async + ql_dbg_buffer, sp->vha, 0x5055,
	2264	+ sts, sizeof(*sts));
1837	2265
1838	2266	sp->done(sp, 0);
1839	2267	}
..	..	@@ -1846,16 +2274,24 @@
1846	2274	struct sts_entry_24xx sts = (struct sts_entry_24xx )tsk;
1847	2275	uint16_t state_flags;
1848	2276	struct nvmefc_fcp_req *fd;
1849		- uint16_t ret = 0;
	2277	+ uint16_t ret = QLA_SUCCESS;
	2278	+ __le16 comp_status = sts->comp_status;
	2279	+ int logit = 0;
1850	2280
1851	2281	iocb = &sp->u.iocb_cmd;
1852	2282	fcport = sp->fcport;
1853		- iocb->u.nvme.comp_status = le16_to_cpu(sts->comp_status);
	2283	+ iocb->u.nvme.comp_status = comp_status;
1854	2284	state_flags = le16_to_cpu(sts->state_flags);
1855	2285	fd = iocb->u.nvme.desc;
1856	2286
1857	2287	if (unlikely(iocb->u.nvme.aen_op))
1858	2288	atomic_dec(&sp->vha->hw->nvme_active_aen_cnt);
	2289	+
	2290	+ if (unlikely(comp_status != CS_COMPLETE))
	2291	+ logit = 1;
	2292	+
	2293	+ fd->transferred_length = fd->payload_length -
	2294	+ le32_to_cpu(sts->residual_len);
1859	2295
1860	2296	/*
1861	2297	* State flags: Bit 6 and 0.
..	..	@@ -1867,16 +2303,28 @@
1867	2303	*/
1868	2304	if (!(state_flags & (SF_FCP_RSP_DMA \| SF_NVME_ERSP))) {
1869	2305	iocb->u.nvme.rsp_pyld_len = 0;
	2306	+ } else if ((state_flags & (SF_FCP_RSP_DMA \| SF_NVME_ERSP)) ==
	2307	+ (SF_FCP_RSP_DMA \| SF_NVME_ERSP)) {
	2308	+ /* Response already DMA'd to fd->rspaddr. */
	2309	+ iocb->u.nvme.rsp_pyld_len = sts->nvme_rsp_pyld_len;
1870	2310	} else if ((state_flags & SF_FCP_RSP_DMA)) {
1871		- iocb->u.nvme.rsp_pyld_len = le16_to_cpu(sts->nvme_rsp_pyld_len);
	2311	+ /*
	2312	+ * Non-zero value in first 12 bytes of NVMe_RSP IU, treat this
	2313	+ * as an error.
	2314	+ */
	2315	+ iocb->u.nvme.rsp_pyld_len = 0;
	2316	+ fd->transferred_length = 0;
	2317	+ ql_dbg(ql_dbg_io, fcport->vha, 0x307a,
	2318	+ "Unexpected values in NVMe_RSP IU.\n");
	2319	+ logit = 1;
1872	2320	} else if (state_flags & SF_NVME_ERSP) {
1873	2321	uint32_t inbuf, outbuf;
1874	2322	uint16_t iter;
1875	2323
1876	2324	inbuf = (uint32_t *)&sts->nvme_ersp_data;
1877	2325	outbuf = (uint32_t *)fd->rspaddr;
1878		- iocb->u.nvme.rsp_pyld_len = le16_to_cpu(sts->nvme_rsp_pyld_len);
1879		- if (unlikely(iocb->u.nvme.rsp_pyld_len >
	2326	+ iocb->u.nvme.rsp_pyld_len = sts->nvme_rsp_pyld_len;
	2327	+ if (unlikely(le16_to_cpu(iocb->u.nvme.rsp_pyld_len) >
1880	2328	sizeof(struct nvme_fc_ersp_iu))) {
1881	2329	if (ql_mask_match(ql_dbg_io)) {
1882	2330	WARN_ONCE(1, "Unexpected response payload length %u.\n",
..	..	@@ -1886,42 +2334,61 @@
1886	2334	iocb->u.nvme.rsp_pyld_len);
1887	2335	}
1888	2336	iocb->u.nvme.rsp_pyld_len =
1889		- sizeof(struct nvme_fc_ersp_iu);
	2337	+ cpu_to_le16(sizeof(struct nvme_fc_ersp_iu));
1890	2338	}
1891		- iter = iocb->u.nvme.rsp_pyld_len >> 2;
	2339	+ iter = le16_to_cpu(iocb->u.nvme.rsp_pyld_len) >> 2;
1892	2340	for (; iter; iter--)
1893	2341	outbuf++ = swab32(inbuf++);
1894		- } else { /* unhandled case */
1895		- ql_log(ql_log_warn, fcport->vha, 0x503a,
1896		- "NVME-%s error. Unhandled state_flags of %x\n",
1897		- sp->name, state_flags);
1898	2342	}
1899	2343
1900		- fd->transferred_length = fd->payload_length -
1901		- le32_to_cpu(sts->residual_len);
	2344	+ if (state_flags & SF_NVME_ERSP) {
	2345	+ struct nvme_fc_ersp_iu *rsp_iu = fd->rspaddr;
	2346	+ u32 tgt_xfer_len;
1902	2347
1903		- switch (le16_to_cpu(sts->comp_status)) {
	2348	+ tgt_xfer_len = be32_to_cpu(rsp_iu->xfrd_len);
	2349	+ if (fd->transferred_length != tgt_xfer_len) {
	2350	+ ql_dbg(ql_dbg_io, fcport->vha, 0x3079,
	2351	+ "Dropped frame(s) detected (sent/rcvd=%u/%u).\n",
	2352	+ tgt_xfer_len, fd->transferred_length);
	2353	+ logit = 1;
	2354	+ } else if (le16_to_cpu(comp_status) == CS_DATA_UNDERRUN) {
	2355	+ /*
	2356	+ * Do not log if this is just an underflow and there
	2357	+ * is no data loss.
	2358	+ */
	2359	+ logit = 0;
	2360	+ }
	2361	+ }
	2362	+
	2363	+ if (unlikely(logit))
	2364	+ ql_log(ql_log_warn, fcport->vha, 0x5060,
	2365	+ "NVME-%s ERR Handling - hdl=%x status(%x) tr_len:%x resid=%x ox_id=%x\n",
	2366	+ sp->name, sp->handle, comp_status,
	2367	+ fd->transferred_length, le32_to_cpu(sts->residual_len),
	2368	+ sts->ox_id);
	2369	+
	2370	+ /*
	2371	+ * If transport error then Failure (HBA rejects request)
	2372	+ * otherwise transport will handle.
	2373	+ */
	2374	+ switch (le16_to_cpu(comp_status)) {
1904	2375	case CS_COMPLETE:
1905		- ret = QLA_SUCCESS;
1906	2376	break;
1907		- case CS_ABORTED:
	2377	+
1908	2378	case CS_RESET:
1909	2379	case CS_PORT_UNAVAILABLE:
1910	2380	case CS_PORT_LOGGED_OUT:
	2381	+ fcport->nvme_flag \|= NVME_FLAG_RESETTING;
	2382	+ fallthrough;
	2383	+ case CS_ABORTED:
1911	2384	case CS_PORT_BUSY:
1912		- ql_log(ql_log_warn, fcport->vha, 0x5060,
1913		- "NVME-%s ERR Handling - hdl=%x completion status(%x) resid=%x ox_id=%x\n",
1914		- sp->name, sp->handle, sts->comp_status,
1915		- le32_to_cpu(sts->residual_len), sts->ox_id);
1916	2385	fd->transferred_length = 0;
1917	2386	iocb->u.nvme.rsp_pyld_len = 0;
1918	2387	ret = QLA_ABORTED;
1919	2388	break;
	2389	+ case CS_DATA_UNDERRUN:
	2390	+ break;
1920	2391	default:
1921		- ql_log(ql_log_warn, fcport->vha, 0x5060,
1922		- "NVME-%s error - hdl=%x completion status(%x) resid=%x ox_id=%x\n",
1923		- sp->name, sp->handle, sts->comp_status,
1924		- le32_to_cpu(sts->residual_len), sts->ox_id);
1925	2392	ret = QLA_FUNCTION_FAILED;
1926	2393	break;
1927	2394	}
..	..	@@ -1959,6 +2426,52 @@
1959	2426	sp->done(sp, rval);
1960	2427	}
1961	2428
	2429	+/* Process a single response queue entry. */
	2430	+static void qla2x00_process_response_entry(struct scsi_qla_host *vha,
	2431	+ struct rsp_que *rsp,
	2432	+ sts_entry_t *pkt)
	2433	+{
	2434	+ sts21_entry_t *sts21_entry;
	2435	+ sts22_entry_t *sts22_entry;
	2436	+ uint16_t handle_cnt;
	2437	+ uint16_t cnt;
	2438	+
	2439	+ switch (pkt->entry_type) {
	2440	+ case STATUS_TYPE:
	2441	+ qla2x00_status_entry(vha, rsp, pkt);
	2442	+ break;
	2443	+ case STATUS_TYPE_21:
	2444	+ sts21_entry = (sts21_entry_t *)pkt;
	2445	+ handle_cnt = sts21_entry->handle_count;
	2446	+ for (cnt = 0; cnt < handle_cnt; cnt++)
	2447	+ qla2x00_process_completed_request(vha, rsp->req,
	2448	+ sts21_entry->handle[cnt]);
	2449	+ break;
	2450	+ case STATUS_TYPE_22:
	2451	+ sts22_entry = (sts22_entry_t *)pkt;
	2452	+ handle_cnt = sts22_entry->handle_count;
	2453	+ for (cnt = 0; cnt < handle_cnt; cnt++)
	2454	+ qla2x00_process_completed_request(vha, rsp->req,
	2455	+ sts22_entry->handle[cnt]);
	2456	+ break;
	2457	+ case STATUS_CONT_TYPE:
	2458	+ qla2x00_status_cont_entry(rsp, (sts_cont_entry_t *)pkt);
	2459	+ break;
	2460	+ case MBX_IOCB_TYPE:
	2461	+ qla2x00_mbx_iocb_entry(vha, rsp->req, (struct mbx_entry *)pkt);
	2462	+ break;
	2463	+ case CT_IOCB_TYPE:
	2464	+ qla2x00_ct_entry(vha, rsp->req, pkt, CT_IOCB_TYPE);
	2465	+ break;
	2466	+ default:
	2467	+ /* Type Not Supported. */
	2468	+ ql_log(ql_log_warn, vha, 0x504a,
	2469	+ "Received unknown response pkt type %x entry status=%x.\n",
	2470	+ pkt->entry_type, pkt->entry_status);
	2471	+ break;
	2472	+ }
	2473	+}
	2474	+
1962	2475	/**
1963	2476	* qla2x00_process_response_queue() - Process response queue entries.
1964	2477	* @rsp: response queue
..	..	@@ -1970,8 +2483,6 @@
1970	2483	struct qla_hw_data *ha = rsp->hw;
1971	2484	struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;
1972	2485	sts_entry_t *pkt;
1973		- uint16_t handle_cnt;
1974		- uint16_t cnt;
1975	2486
1976	2487	vha = pci_get_drvdata(ha->pdev);
1977	2488
..	..	@@ -1996,48 +2507,13 @@
1996	2507	continue;
1997	2508	}
1998	2509
1999		- switch (pkt->entry_type) {
2000		- case STATUS_TYPE:
2001		- qla2x00_status_entry(vha, rsp, pkt);
2002		- break;
2003		- case STATUS_TYPE_21:
2004		- handle_cnt = ((sts21_entry_t *)pkt)->handle_count;
2005		- for (cnt = 0; cnt < handle_cnt; cnt++) {
2006		- qla2x00_process_completed_request(vha, rsp->req,
2007		- ((sts21_entry_t *)pkt)->handle[cnt]);
2008		- }
2009		- break;
2010		- case STATUS_TYPE_22:
2011		- handle_cnt = ((sts22_entry_t *)pkt)->handle_count;
2012		- for (cnt = 0; cnt < handle_cnt; cnt++) {
2013		- qla2x00_process_completed_request(vha, rsp->req,
2014		- ((sts22_entry_t *)pkt)->handle[cnt]);
2015		- }
2016		- break;
2017		- case STATUS_CONT_TYPE:
2018		- qla2x00_status_cont_entry(rsp, (sts_cont_entry_t *)pkt);
2019		- break;
2020		- case MBX_IOCB_TYPE:
2021		- qla2x00_mbx_iocb_entry(vha, rsp->req,
2022		- (struct mbx_entry *)pkt);
2023		- break;
2024		- case CT_IOCB_TYPE:
2025		- qla2x00_ct_entry(vha, rsp->req, pkt, CT_IOCB_TYPE);
2026		- break;
2027		- default:
2028		- /* Type Not Supported. */
2029		- ql_log(ql_log_warn, vha, 0x504a,
2030		- "Received unknown response pkt type %x "
2031		- "entry status=%x.\n",
2032		- pkt->entry_type, pkt->entry_status);
2033		- break;
2034		- }
	2510	+ qla2x00_process_response_entry(vha, rsp, pkt);
2035	2511	((response_t *)pkt)->signature = RESPONSE_PROCESSED;
2036	2512	wmb();
2037	2513	}
2038	2514
2039	2515	/* Adjust ring index */
2040		- WRT_REG_WORD(ISP_RSP_Q_OUT(ha, reg), rsp->ring_index);
	2516	+ wrt_reg_word(ISP_RSP_Q_OUT(ha, reg), rsp->ring_index);
2041	2517	}
2042	2518
2043	2519	static inline void
..	..	@@ -2106,12 +2582,12 @@
2106	2582	* swab32 of the "data" field in the beginning of qla2x00_status_entry()
2107	2583	* would make guard field appear at offset 2
2108	2584	*/
2109		- a_guard = le16_to_cpu((uint16_t )(ap + 2));
2110		- a_app_tag = le16_to_cpu((uint16_t )(ap + 0));
2111		- a_ref_tag = le32_to_cpu((uint32_t )(ap + 4));
2112		- e_guard = le16_to_cpu((uint16_t )(ep + 2));
2113		- e_app_tag = le16_to_cpu((uint16_t )(ep + 0));
2114		- e_ref_tag = le32_to_cpu((uint32_t )(ep + 4));
	2585	+ a_guard = get_unaligned_le16(ap + 2);
	2586	+ a_app_tag = get_unaligned_le16(ap + 0);
	2587	+ a_ref_tag = get_unaligned_le32(ap + 4);
	2588	+ e_guard = get_unaligned_le16(ep + 2);
	2589	+ e_app_tag = get_unaligned_le16(ep + 0);
	2590	+ e_ref_tag = get_unaligned_le32(ep + 4);
2115	2591
2116	2592	ql_dbg(ql_dbg_io, vha, 0x3023,
2117	2593	"iocb(s) %p Returned STATUS.\n", sts24);
..	..	@@ -2128,9 +2604,9 @@
2128	2604	* For type 3: ref & app tag is all 'f's
2129	2605	* For type 0,1,2: app tag is all 'f's
2130	2606	*/
2131		- if ((a_app_tag == T10_PI_APP_ESCAPE) &&
2132		- ((scsi_get_prot_type(cmd) != SCSI_PROT_DIF_TYPE3) \|\|
2133		- (a_ref_tag == T10_PI_REF_ESCAPE))) {
	2607	+ if (a_app_tag == be16_to_cpu(T10_PI_APP_ESCAPE) &&
	2608	+ (scsi_get_prot_type(cmd) != SCSI_PROT_DIF_TYPE3 \|\|
	2609	+ a_ref_tag == be32_to_cpu(T10_PI_REF_ESCAPE))) {
2134	2610	uint32_t blocks_done, resid;
2135	2611	sector_t lba_s = scsi_get_lba(cmd);
2136	2612
..	..	@@ -2226,10 +2702,8 @@
2226	2702	struct bsg_job *bsg_job = NULL;
2227	2703	struct fc_bsg_request *bsg_request;
2228	2704	struct fc_bsg_reply *bsg_reply;
2229		- sts_entry_t *sts;
2230		- struct sts_entry_24xx *sts24;
2231		- sts = (sts_entry_t *) pkt;
2232		- sts24 = (struct sts_entry_24xx *) pkt;
	2705	+ sts_entry_t *sts = pkt;
	2706	+ struct sts_entry_24xx *sts24 = pkt;
2233	2707
2234	2708	/* Validate handle. */
2235	2709	if (index >= req->num_outstanding_cmds) {
..	..	@@ -2375,8 +2849,8 @@
2375	2849	srb_t *sp;
2376	2850	fc_port_t *fcport;
2377	2851	struct scsi_cmnd *cp;
2378		- sts_entry_t *sts;
2379		- struct sts_entry_24xx *sts24;
	2852	+ sts_entry_t *sts = pkt;
	2853	+ struct sts_entry_24xx *sts24 = pkt;
2380	2854	uint16_t comp_status;
2381	2855	uint16_t scsi_status;
2382	2856	uint16_t ox_id;
..	..	@@ -2392,10 +2866,8 @@
2392	2866	int logit = 1;
2393	2867	int res = 0;
2394	2868	uint16_t state_flags = 0;
2395		- uint16_t retry_delay = 0;
	2869	+ uint16_t sts_qual = 0;
2396	2870
2397		- sts = (sts_entry_t *) pkt;
2398		- sts24 = (struct sts_entry_24xx *) pkt;
2399	2871	if (IS_FWI2_CAPABLE(ha)) {
2400	2872	comp_status = le16_to_cpu(sts24->comp_status);
2401	2873	scsi_status = le16_to_cpu(sts24->scsi_status) & SS_MASK;
..	..	@@ -2440,6 +2912,7 @@
2440	2912	}
2441	2913	return;
2442	2914	}
	2915	+ qla_put_iocbs(sp->qpair, &sp->iores);
2443	2916
2444	2917	if (sp->cmd_type != TYPE_SRB) {
2445	2918	req->outstanding_cmds[handle] = NULL;
..	..	@@ -2505,13 +2978,7 @@
2505	2978	host_to_fcp_swap(sts24->data, sizeof(sts24->data));
2506	2979	ox_id = le16_to_cpu(sts24->ox_id);
2507	2980	par_sense_len = sizeof(sts24->data);
2508		- /* Valid values of the retry delay timer are 0x1-0xffef */
2509		- if (sts24->retry_delay > 0 && sts24->retry_delay < 0xfff1) {
2510		- retry_delay = sts24->retry_delay & 0x3fff;
2511		- ql_dbg(ql_dbg_io, sp->vha, 0x3033,
2512		- "%s: scope=%#x retry_delay=%#x\n", __func__,
2513		- sts24->retry_delay >> 14, retry_delay);
2514		- }
	2981	+ sts_qual = le16_to_cpu(sts24->status_qualifier);
2515	2982	} else {
2516	2983	if (scsi_status & SS_SENSE_LEN_VALID)
2517	2984	sense_len = le16_to_cpu(sts->req_sense_length);
..	..	@@ -2549,9 +3016,9 @@
2549	3016	* Check retry_delay_timer value if we receive a busy or
2550	3017	* queue full.
2551	3018	*/
2552		- if (lscsi_status == SAM_STAT_TASK_SET_FULL \|\|
2553		- lscsi_status == SAM_STAT_BUSY)
2554		- qla2x00_set_retry_delay_timestamp(fcport, retry_delay);
	3019	+ if (unlikely(lscsi_status == SAM_STAT_TASK_SET_FULL \|\|
	3020	+ lscsi_status == SAM_STAT_BUSY))
	3021	+ qla2x00_set_retry_delay_timestamp(fcport, sts_qual);
2555	3022
2556	3023	/*
2557	3024	* Based on Host and scsi status generate status code for Linux
..	..	@@ -2695,10 +3162,9 @@
2695	3162	"Port to be marked lost on fcport=%02x%02x%02x, current "
2696	3163	"port state= %s comp_status %x.\n", fcport->d_id.b.domain,
2697	3164	fcport->d_id.b.area, fcport->d_id.b.al_pa,
2698		- port_state_str[atomic_read(&fcport->state)],
	3165	+ port_state_str[FCS_ONLINE],
2699	3166	comp_status);
2700	3167
2701		- qla2x00_mark_device_lost(fcport->vha, fcport, 1, 1);
2702	3168	qlt_schedule_sess_for_deletion(fcport);
2703	3169	}
2704	3170
..	..	@@ -2725,6 +3191,17 @@
2725	3191	cp->device->vendor);
2726	3192	break;
2727	3193
	3194	+ case CS_DMA:
	3195	+ ql_log(ql_log_info, fcport->vha, 0x3022,
	3196	+ "CS_DMA error: 0x%x-0x%x (0x%x) nexus=%ld:%d:%llu portid=%06x oxid=0x%x cdb=%10phN len=0x%x rsp_info=0x%x resid=0x%x fw_resid=0x%x sp=%p cp=%p.\n",
	3197	+ comp_status, scsi_status, res, vha->host_no,
	3198	+ cp->device->id, cp->device->lun, fcport->d_id.b24,
	3199	+ ox_id, cp->cmnd, scsi_bufflen(cp), rsp_info_len,
	3200	+ resid_len, fw_resid_len, sp, cp);
	3201	+ ql_dump_buffer(ql_dbg_tgt + ql_dbg_verbose, vha, 0xe0ee,
	3202	+ pkt, sizeof(*sts24));
	3203	+ res = DID_ERROR << 16;
	3204	+ break;
2728	3205	default:
2729	3206	res = DID_ERROR << 16;
2730	3207	break;
..	..	@@ -2848,6 +3325,7 @@
2848	3325	default:
2849	3326	sp = qla2x00_get_sp_from_handle(vha, func, req, pkt);
2850	3327	if (sp) {
	3328	+ qla_put_iocbs(sp->qpair, &sp->iores);
2851	3329	sp->done(sp, res);
2852	3330	return 0;
2853	3331	}
..	..	@@ -2874,7 +3352,7 @@
2874	3352	{
2875	3353	uint16_t cnt;
2876	3354	uint32_t mboxes;
2877		- uint16_t __iomem *wptr;
	3355	+ __le16 __iomem *wptr;
2878	3356	struct qla_hw_data *ha = vha->hw;
2879	3357	struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;
2880	3358
..	..	@@ -2890,11 +3368,11 @@
2890	3368	ha->flags.mbox_int = 1;
2891	3369	ha->mailbox_out[0] = mb0;
2892	3370	mboxes >>= 1;
2893		- wptr = (uint16_t __iomem *)&reg->mailbox1;
	3371	+ wptr = &reg->mailbox1;
2894	3372
2895	3373	for (cnt = 1; cnt < ha->mbx_count; cnt++) {
2896	3374	if (mboxes & BIT_0)
2897		- ha->mailbox_out[cnt] = RD_REG_WORD(wptr);
	3375	+ ha->mailbox_out[cnt] = rd_reg_word(wptr);
2898	3376
2899	3377	mboxes >>= 1;
2900	3378	wptr++;
..	..	@@ -2914,7 +3392,7 @@
2914	3392	return;
2915	3393
2916	3394	abt = &sp->u.iocb_cmd;
2917		- abt->u.abt.comp_status = le16_to_cpu(pkt->nport_handle);
	3395	+ abt->u.abt.comp_status = pkt->nport_handle;
2918	3396	sp->done(sp, 0);
2919	3397	}
2920	3398
..	..	@@ -2943,12 +3421,16 @@
2943	3421	{
2944	3422	struct sts_entry_24xx *pkt;
2945	3423	struct qla_hw_data *ha = vha->hw;
	3424	+ struct purex_entry_24xx *purex_entry;
	3425	+ struct purex_item *pure_item;
2946	3426
2947	3427	if (!ha->flags.fw_started)
2948	3428	return;
2949	3429
2950		- if (rsp->qpair->cpuid != smp_processor_id())
	3430	+ if (rsp->qpair->cpuid != smp_processor_id() \|\| !rsp->qpair->rcv_intr) {
	3431	+ rsp->qpair->rcv_intr = 1;
2951	3432	qla_cpu_update(rsp->qpair, smp_processor_id());
	3433	+ }
2952	3434
2953	3435	while (rsp->ring_ptr->signature != RESPONSE_PROCESSED) {
2954	3436	pkt = (struct sts_entry_24xx *)rsp->ring_ptr;
..	..	@@ -2993,7 +3475,16 @@
2993	3475	qla24xx_els_ct_entry(vha, rsp->req, pkt, ELS_IOCB_TYPE);
2994	3476	break;
2995	3477	case ABTS_RECV_24XX:
2996		- if (IS_QLA83XX(ha) \|\| IS_QLA27XX(ha)) {
	3478	+ if (qla_ini_mode_enabled(vha)) {
	3479	+ pure_item = qla24xx_copy_std_pkt(vha, pkt);
	3480	+ if (!pure_item)
	3481	+ break;
	3482	+ qla24xx_queue_purex_item(vha, pure_item,
	3483	+ qla24xx_process_abts);
	3484	+ break;
	3485	+ }
	3486	+ if (IS_QLA83XX(ha) \|\| IS_QLA27XX(ha) \|\|
	3487	+ IS_QLA28XX(ha)) {
2997	3488	/* ensure that the ATIO queue is empty */
2998	3489	qlt_handle_abts_recv(vha, rsp,
2999	3490	(response_t *)pkt);
..	..	@@ -3001,7 +3492,7 @@
3001	3492	} else {
3002	3493	qlt_24xx_process_atio_queue(vha, 1);
3003	3494	}
3004		- /* fall through */
	3495	+ fallthrough;
3005	3496	case ABTS_RESP_24XX:
3006	3497	case CTIO_TYPE7:
3007	3498	case CTIO_CRC2:
..	..	@@ -3036,12 +3527,41 @@
3036	3527	qla_ctrlvp_completed(vha, rsp->req,
3037	3528	(struct vp_ctrl_entry_24xx *)pkt);
3038	3529	break;
	3530	+ case PUREX_IOCB_TYPE:
	3531	+ purex_entry = (void *)pkt;
	3532	+ switch (purex_entry->els_frame_payload[3]) {
	3533	+ case ELS_RDP:
	3534	+ pure_item = qla24xx_copy_std_pkt(vha, pkt);
	3535	+ if (!pure_item)
	3536	+ break;
	3537	+ qla24xx_queue_purex_item(vha, pure_item,
	3538	+ qla24xx_process_purex_rdp);
	3539	+ break;
	3540	+ case ELS_FPIN:
	3541	+ if (!vha->hw->flags.scm_enabled) {
	3542	+ ql_log(ql_log_warn, vha, 0x5094,
	3543	+ "SCM not active for this port\n");
	3544	+ break;
	3545	+ }
	3546	+ pure_item = qla27xx_copy_fpin_pkt(vha,
	3547	+ (void **)&pkt, &rsp);
	3548	+ if (!pure_item)
	3549	+ break;
	3550	+ qla24xx_queue_purex_item(vha, pure_item,
	3551	+ qla27xx_process_purex_fpin);
	3552	+ break;
	3553	+
	3554	+ default:
	3555	+ ql_log(ql_log_warn, vha, 0x509c,
	3556	+ "Discarding ELS Request opcode 0x%x\n",
	3557	+ purex_entry->els_frame_payload[3]);
	3558	+ }
	3559	+ break;
3039	3560	default:
3040	3561	/* Type Not Supported. */
3041	3562	ql_dbg(ql_dbg_async, vha, 0x5042,
3042		- "Received unknown response pkt type %x "
3043		- "entry status=%x.\n",
3044		- pkt->entry_type, pkt->entry_status);
	3563	+ "Received unknown response pkt type 0x%x entry status=%x.\n",
	3564	+ pkt->entry_type, pkt->entry_status);
3045	3565	break;
3046	3566	}
3047	3567	((response_t *)pkt)->signature = RESPONSE_PROCESSED;
..	..	@@ -3051,9 +3571,10 @@
3051	3571	/* Adjust ring index */
3052	3572	if (IS_P3P_TYPE(ha)) {
3053	3573	struct device_reg_82xx __iomem *reg = &ha->iobase->isp82;
3054		- WRT_REG_DWORD(&reg->rsp_q_out[0], rsp->ring_index);
	3574	+
	3575	+ wrt_reg_dword(&reg->rsp_q_out[0], rsp->ring_index);
3055	3576	} else {
3056		- WRT_REG_DWORD(rsp->rsp_q_out, rsp->ring_index);
	3577	+ wrt_reg_dword(rsp->rsp_q_out, rsp->ring_index);
3057	3578	}
3058	3579	}
3059	3580
..	..	@@ -3066,17 +3587,17 @@
3066	3587	struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;
3067	3588
3068	3589	if (!IS_QLA25XX(ha) && !IS_QLA81XX(ha) && !IS_QLA83XX(ha) &&
3069		- !IS_QLA27XX(ha))
	3590	+ !IS_QLA27XX(ha) && !IS_QLA28XX(ha))
3070	3591	return;
3071	3592
3072	3593	rval = QLA_SUCCESS;
3073		- WRT_REG_DWORD(&reg->iobase_addr, 0x7C00);
3074		- RD_REG_DWORD(&reg->iobase_addr);
3075		- WRT_REG_DWORD(&reg->iobase_window, 0x0001);
3076		- for (cnt = 10000; (RD_REG_DWORD(&reg->iobase_window) & BIT_0) == 0 &&
	3594	+ wrt_reg_dword(&reg->iobase_addr, 0x7C00);
	3595	+ rd_reg_dword(&reg->iobase_addr);
	3596	+ wrt_reg_dword(&reg->iobase_window, 0x0001);
	3597	+ for (cnt = 10000; (rd_reg_dword(&reg->iobase_window) & BIT_0) == 0 &&
3077	3598	rval == QLA_SUCCESS; cnt--) {
3078	3599	if (cnt) {
3079		- WRT_REG_DWORD(&reg->iobase_window, 0x0001);
	3600	+ wrt_reg_dword(&reg->iobase_window, 0x0001);
3080	3601	udelay(10);
3081	3602	} else
3082	3603	rval = QLA_FUNCTION_TIMEOUT;
..	..	@@ -3085,11 +3606,11 @@
3085	3606	goto next_test;
3086	3607
3087	3608	rval = QLA_SUCCESS;
3088		- WRT_REG_DWORD(&reg->iobase_window, 0x0003);
3089		- for (cnt = 100; (RD_REG_DWORD(&reg->iobase_window) & BIT_0) == 0 &&
	3609	+ wrt_reg_dword(&reg->iobase_window, 0x0003);
	3610	+ for (cnt = 100; (rd_reg_dword(&reg->iobase_window) & BIT_0) == 0 &&
3090	3611	rval == QLA_SUCCESS; cnt--) {
3091	3612	if (cnt) {
3092		- WRT_REG_DWORD(&reg->iobase_window, 0x0003);
	3613	+ wrt_reg_dword(&reg->iobase_window, 0x0003);
3093	3614	udelay(10);
3094	3615	} else
3095	3616	rval = QLA_FUNCTION_TIMEOUT;
..	..	@@ -3098,18 +3619,18 @@
3098	3619	goto done;
3099	3620
3100	3621	next_test:
3101		- if (RD_REG_DWORD(&reg->iobase_c8) & BIT_3)
	3622	+ if (rd_reg_dword(&reg->iobase_c8) & BIT_3)
3102	3623	ql_log(ql_log_info, vha, 0x504c,
3103	3624	"Additional code -- 0x55AA.\n");
3104	3625
3105	3626	done:
3106		- WRT_REG_DWORD(&reg->iobase_window, 0x0000);
3107		- RD_REG_DWORD(&reg->iobase_window);
	3627	+ wrt_reg_dword(&reg->iobase_window, 0x0000);
	3628	+ rd_reg_dword(&reg->iobase_window);
3108	3629	}
3109	3630
3110	3631	/**
3111	3632	* qla24xx_intr_handler() - Process interrupts for the ISP23xx and ISP24xx.
3112		- * @irq:
	3633	+ * @irq: interrupt number
3113	3634	* @dev_id: SCSI driver HA context
3114	3635	*
3115	3636	* Called by system whenever the host adapter generates an interrupt.
..	..	@@ -3148,14 +3669,14 @@
3148	3669	spin_lock_irqsave(&ha->hardware_lock, flags);
3149	3670	vha = pci_get_drvdata(ha->pdev);
3150	3671	for (iter = 50; iter--; ) {
3151		- stat = RD_REG_DWORD(&reg->host_status);
	3672	+ stat = rd_reg_dword(&reg->host_status);
3152	3673	if (qla2x00_check_reg32_for_disconnect(vha, stat))
3153	3674	break;
3154	3675	if (stat & HSRX_RISC_PAUSED) {
3155	3676	if (unlikely(pci_channel_offline(ha->pdev)))
3156	3677	break;
3157	3678
3158		- hccr = RD_REG_DWORD(&reg->hccr);
	3679	+ hccr = rd_reg_dword(&reg->hccr);
3159	3680
3160	3681	ql_log(ql_log_warn, vha, 0x504b,
3161	3682	"RISC paused -- HCCR=%x, Dumping firmware.\n",
..	..	@@ -3163,7 +3684,7 @@
3163	3684
3164	3685	qla2xxx_check_risc_status(vha);
3165	3686
3166		- ha->isp_ops->fw_dump(vha, 1);
	3687	+ ha->isp_ops->fw_dump(vha);
3167	3688	set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
3168	3689	break;
3169	3690	} else if ((stat & HSRX_RISC_INT) == 0)
..	..	@@ -3180,9 +3701,9 @@
3180	3701	break;
3181	3702	case INTR_ASYNC_EVENT:
3182	3703	mb[0] = MSW(stat);
3183		- mb[1] = RD_REG_WORD(&reg->mailbox1);
3184		- mb[2] = RD_REG_WORD(&reg->mailbox2);
3185		- mb[3] = RD_REG_WORD(&reg->mailbox3);
	3704	+ mb[1] = rd_reg_word(&reg->mailbox1);
	3705	+ mb[2] = rd_reg_word(&reg->mailbox2);
	3706	+ mb[3] = rd_reg_word(&reg->mailbox3);
3186	3707	qla2x00_async_event(vha, rsp, mb);
3187	3708	break;
3188	3709	case INTR_RSP_QUE_UPDATE:
..	..	@@ -3202,8 +3723,8 @@
3202	3723	"Unrecognized interrupt type (%d).\n", stat * 0xff);
3203	3724	break;
3204	3725	}
3205		- WRT_REG_DWORD(&reg->hccr, HCCRX_CLR_RISC_INT);
3206		- RD_REG_DWORD_RELAXED(&reg->hccr);
	3726	+ wrt_reg_dword(&reg->hccr, HCCRX_CLR_RISC_INT);
	3727	+ rd_reg_dword_relaxed(&reg->hccr);
3207	3728	if (unlikely(IS_QLA83XX(ha) && (ha->pdev->revision == 1)))
3208	3729	ndelay(3500);
3209	3730	}
..	..	@@ -3242,8 +3763,8 @@
3242	3763	vha = pci_get_drvdata(ha->pdev);
3243	3764	qla24xx_process_response_queue(vha, rsp);
3244	3765	if (!ha->flags.disable_msix_handshake) {
3245		- WRT_REG_DWORD(&reg->hccr, HCCRX_CLR_RISC_INT);
3246		- RD_REG_DWORD_RELAXED(&reg->hccr);
	3766	+ wrt_reg_dword(&reg->hccr, HCCRX_CLR_RISC_INT);
	3767	+ rd_reg_dword_relaxed(&reg->hccr);
3247	3768	}
3248	3769	spin_unlock_irqrestore(&ha->hardware_lock, flags);
3249	3770
..	..	@@ -3277,14 +3798,14 @@
3277	3798	spin_lock_irqsave(&ha->hardware_lock, flags);
3278	3799	vha = pci_get_drvdata(ha->pdev);
3279	3800	do {
3280		- stat = RD_REG_DWORD(&reg->host_status);
	3801	+ stat = rd_reg_dword(&reg->host_status);
3281	3802	if (qla2x00_check_reg32_for_disconnect(vha, stat))
3282	3803	break;
3283	3804	if (stat & HSRX_RISC_PAUSED) {
3284	3805	if (unlikely(pci_channel_offline(ha->pdev)))
3285	3806	break;
3286	3807
3287		- hccr = RD_REG_DWORD(&reg->hccr);
	3808	+ hccr = rd_reg_dword(&reg->hccr);
3288	3809
3289	3810	ql_log(ql_log_info, vha, 0x5050,
3290	3811	"RISC paused -- HCCR=%x, Dumping firmware.\n",
..	..	@@ -3292,7 +3813,7 @@
3292	3813
3293	3814	qla2xxx_check_risc_status(vha);
3294	3815
3295		- ha->isp_ops->fw_dump(vha, 1);
	3816	+ ha->isp_ops->fw_dump(vha);
3296	3817	set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
3297	3818	break;
3298	3819	} else if ((stat & HSRX_RISC_INT) == 0)
..	..	@@ -3309,9 +3830,9 @@
3309	3830	break;
3310	3831	case INTR_ASYNC_EVENT:
3311	3832	mb[0] = MSW(stat);
3312		- mb[1] = RD_REG_WORD(&reg->mailbox1);
3313		- mb[2] = RD_REG_WORD(&reg->mailbox2);
3314		- mb[3] = RD_REG_WORD(&reg->mailbox3);
	3833	+ mb[1] = rd_reg_word(&reg->mailbox1);
	3834	+ mb[2] = rd_reg_word(&reg->mailbox2);
	3835	+ mb[3] = rd_reg_word(&reg->mailbox3);
3315	3836	qla2x00_async_event(vha, rsp, mb);
3316	3837	break;
3317	3838	case INTR_RSP_QUE_UPDATE:
..	..	@@ -3331,7 +3852,7 @@
3331	3852	"Unrecognized interrupt type (%d).\n", stat & 0xff);
3332	3853	break;
3333	3854	}
3334		- WRT_REG_DWORD(&reg->hccr, HCCRX_CLR_RISC_INT);
	3855	+ wrt_reg_dword(&reg->hccr, HCCRX_CLR_RISC_INT);
3335	3856	} while (0);
3336	3857	qla2x00_handle_mbx_completion(ha, status);
3337	3858	spin_unlock_irqrestore(&ha->hardware_lock, flags);
..	..	@@ -3350,6 +3871,25 @@
3350	3871	{
3351	3872	struct qla_hw_data *ha;
3352	3873	struct qla_qpair *qpair;
	3874	+
	3875	+ qpair = dev_id;
	3876	+ if (!qpair) {
	3877	+ ql_log(ql_log_info, NULL, 0x505b,
	3878	+ "%s: NULL response queue pointer.\n", __func__);
	3879	+ return IRQ_NONE;
	3880	+ }
	3881	+ ha = qpair->hw;
	3882	+
	3883	+ queue_work_on(smp_processor_id(), ha->wq, &qpair->q_work);
	3884	+
	3885	+ return IRQ_HANDLED;
	3886	+}
	3887	+
	3888	+irqreturn_t
	3889	+qla2xxx_msix_rsp_q_hs(int irq, void *dev_id)
	3890	+{
	3891	+ struct qla_hw_data *ha;
	3892	+ struct qla_qpair *qpair;
3353	3893	struct device_reg_24xx __iomem *reg;
3354	3894	unsigned long flags;
3355	3895
..	..	@@ -3361,15 +3901,12 @@
3361	3901	}
3362	3902	ha = qpair->hw;
3363	3903
3364		- /* Clear the interrupt, if enabled, for this response queue */
3365		- if (unlikely(!ha->flags.disable_msix_handshake)) {
3366		- reg = &ha->iobase->isp24;
3367		- spin_lock_irqsave(&ha->hardware_lock, flags);
3368		- WRT_REG_DWORD(&reg->hccr, HCCRX_CLR_RISC_INT);
3369		- spin_unlock_irqrestore(&ha->hardware_lock, flags);
3370		- }
	3904	+ reg = &ha->iobase->isp24;
	3905	+ spin_lock_irqsave(&ha->hardware_lock, flags);
	3906	+ wrt_reg_dword(&reg->hccr, HCCRX_CLR_RISC_INT);
	3907	+ spin_unlock_irqrestore(&ha->hardware_lock, flags);
3371	3908
3372		- queue_work(ha->wq, &qpair->q_work);
	3909	+ queue_work_on(smp_processor_id(), ha->wq, &qpair->q_work);
3373	3910
3374	3911	return IRQ_HANDLED;
3375	3912	}
..	..	@@ -3386,6 +3923,7 @@
3386	3923	{ "rsp_q", qla24xx_msix_rsp_q },
3387	3924	{ "atio_q", qla83xx_msix_atio_q },
3388	3925	{ "qpair_multiq", qla2xxx_msix_rsp_q },
	3926	+ { "qpair_multiq_hs", qla2xxx_msix_rsp_q_hs },
3389	3927	};
3390	3928
3391	3929	static const struct qla_init_msix_entry qla82xx_msix_entries[] = {
..	..	@@ -3410,7 +3948,7 @@
3410	3948	min_vecs++;
3411	3949	}
3412	3950
3413		- if (USER_CTRL_IRQ(ha)) {
	3951	+ if (USER_CTRL_IRQ(ha) \|\| !ha->mqiobase) {
3414	3952	/* user wants to control IRQ setting for target mode */
3415	3953	ret = pci_alloc_irq_vectors(ha->pdev, min_vecs,
3416	3954	ha->msix_count, PCI_IRQ_MSIX);
..	..	@@ -3444,6 +3982,7 @@
3444	3982	"Adjusted Max no of queues pairs: %d.\n", ha->max_qpairs);
3445	3983	}
3446	3984	}
	3985	+ vha->irq_offset = desc.pre_vectors;
3447	3986	ha->msix_entries = kcalloc(ha->msix_count,
3448	3987	sizeof(struct qla_msix_entry),
3449	3988	GFP_KERNEL);
..	..	@@ -3515,16 +4054,12 @@
3515	4054	}
3516	4055
3517	4056	/* Enable MSI-X vector for response queue update for queue 0 */
3518		- if (IS_QLA83XX(ha) \|\| IS_QLA27XX(ha)) {
3519		- if (ha->msixbase && ha->mqiobase &&
3520		- (ha->max_rsp_queues > 1 \|\| ha->max_req_queues > 1 \|\|
3521		- ql2xmqsupport))
3522		- ha->mqenable = 1;
3523		- } else
3524		- if (ha->mqiobase &&
3525		- (ha->max_rsp_queues > 1 \|\| ha->max_req_queues > 1 \|\|
3526		- ql2xmqsupport))
3527		- ha->mqenable = 1;
	4057	+ if (IS_MQUE_CAPABLE(ha) &&
	4058	+ (ha->msixbase && ha->mqiobase && ha->max_qpairs))
	4059	+ ha->mqenable = 1;
	4060	+ else
	4061	+ ha->mqenable = 0;
	4062	+
3528	4063	ql_dbg(ql_dbg_multiq, vha, 0xc005,
3529	4064	"mqiobase=%p, max_rsp_queues=%d, max_req_queues=%d.\n",
3530	4065	ha->mqiobase, ha->max_rsp_queues, ha->max_req_queues);
..	..	@@ -3550,7 +4085,7 @@
3550	4085	/* If possible, enable MSI-X. */
3551	4086	if (ql2xenablemsix == 0 \|\| (!IS_QLA2432(ha) && !IS_QLA2532(ha) &&
3552	4087	!IS_QLA8432(ha) && !IS_CNA_CAPABLE(ha) && !IS_QLA2031(ha) &&
3553		- !IS_QLAFX00(ha) && !IS_QLA27XX(ha)))
	4088	+ !IS_QLAFX00(ha) && !IS_QLA27XX(ha) && !IS_QLA28XX(ha)))
3554	4089	goto skip_msi;
3555	4090
3556	4091	if (ql2xenablemsix == 2)
..	..	@@ -3589,7 +4124,7 @@
3589	4124
3590	4125	if (!IS_QLA24XX(ha) && !IS_QLA2532(ha) && !IS_QLA8432(ha) &&
3591	4126	!IS_QLA8001(ha) && !IS_P3P_TYPE(ha) && !IS_QLAFX00(ha) &&
3592		- !IS_QLA27XX(ha))
	4127	+ !IS_QLA27XX(ha) && !IS_QLA28XX(ha))
3593	4128	goto skip_msi;
3594	4129
3595	4130	ret = pci_alloc_irq_vectors(ha->pdev, 1, 1, PCI_IRQ_MSI);
..	..	@@ -3618,6 +4153,8 @@
3618	4153	ql_dbg(ql_dbg_init, vha, 0x0125,
3619	4154	"INTa mode: Enabled.\n");
3620	4155	ha->flags.mr_intr_valid = 1;
	4156	+ /* Set max_qpair to 0, as MSI-X and MSI in not enabled */
	4157	+ ha->max_qpairs = 0;
3621	4158	}
3622	4159
3623	4160	clear_risc_ints:
..	..	@@ -3625,7 +4162,7 @@
3625	4162	goto fail;
3626	4163
3627	4164	spin_lock_irq(&ha->hardware_lock);
3628		- WRT_REG_WORD(&reg->isp.semaphore, 0);
	4165	+ wrt_reg_word(&reg->isp.semaphore, 0);
3629	4166	spin_unlock_irq(&ha->hardware_lock);
3630	4167
3631	4168	fail: