Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40f3862b authored by Joe Carnuccio's avatar Joe Carnuccio Committed by Martin K. Petersen
Browse files

qla2xxx: Let DPORT be enabled purely by nvram. 



Signed-off-by: default avatarJoe Carnuccio <joe.carnuccio@qlogic.com>
Signed-off-by: default avatarHimanshu Madhani <himanshu.madhani@qlogic.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 8437dda0

drivers/scsi/qla2xxx/qla_dbg.c

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
 * ----------------------------------------------------------------------

 * |             Level            |   Last Value Used  |     Holes	|

 * ----------------------------------------------------------------------

 * | Module Init and Probe        |       0x018f       | 0x0146         |

 * | Module Init and Probe        |       0x0191       | 0x0146         |

 * |                              |                    | 0x015b-0x0160	|

 * |                              |                    | 0x016e		|

 * | Mailbox commands             |       0x1196       |		|

drivers/scsi/qla2xxx/qla_def.h

+1 −0
Original line number Diff line number Diff line
@@ -3029,6 +3029,7 @@ struct qla_hw_data { 
		uint32_t        mr_reset_hdlr_active:1;

		uint32_t        mr_intr_valid:1;



		uint32_t        dport_enabled:1;

		uint32_t	fawwpn_enabled:1;

		uint32_t	exlogins_enabled:1;

		uint32_t	exchoffld_enabled:1;

drivers/scsi/qla2xxx/qla_init.c

+6 −6
Original line number Diff line number Diff line
@@ -2288,13 +2288,13 @@ qla2x00_init_rings(scsi_qla_host_t *vha) 
		mid_init_cb->options = cpu_to_le16(BIT_1);

		mid_init_cb->init_cb.execution_throttle =

		    cpu_to_le16(ha->cur_fw_xcb_count);

		/* D-Port Status */

		if (IS_DPORT_CAPABLE(ha))

			mid_init_cb->init_cb.firmware_options_1 |=

			    cpu_to_le16(BIT_7);

		/* Enable FA-WWPN */

		ha->flags.dport_enabled =

		    (mid_init_cb->init_cb.firmware_options_1 & BIT_7) != 0;

		ql_dbg(ql_dbg_init, vha, 0x0191, "DPORT Support: %s.\n",

		    (ha->flags.dport_enabled) ? "enabled" : "disabled");

		/* FA-WWPN Status */

		ha->flags.fawwpn_enabled =

		    (mid_init_cb->init_cb.firmware_options_1 & BIT_6) ? 1 : 0;

		    (mid_init_cb->init_cb.firmware_options_1 & BIT_6) != 0;

		ql_dbg(ql_dbg_init, vha, 0x0141, "FA-WWPN Support: %s.\n",

		    (ha->flags.fawwpn_enabled) ? "enabled" : "disabled");

	}