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

Commit a083e8bc authored by Vikas Chaudhary's avatar Vikas Chaudhary Committed by James Bottomley
Browse files

[SCSI] qla4xxx: Print WARN_ONCE() if iSCSI function presence bit removed 



Signed-off-by: default avatarVikas Chaudhary <vikas.chaudhary@qlogic.com>
Reviewed-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 37418cc6

drivers/scsi/qla4xxx/ql4_83xx.c

+20 −0
Original line number Diff line number Diff line
@@ -1664,3 +1664,23 @@ void qla4_83xx_disable_pause(struct scsi_qla_host *ha) 
	__qla4_83xx_disable_pause(ha);

	ha->isp_ops->idc_unlock(ha);

}



/**

 * qla4_83xx_is_detached - Check if we are marked invisible.

 * @ha: Pointer to host adapter structure.

 **/

int qla4_83xx_is_detached(struct scsi_qla_host *ha)

{

	uint32_t drv_active;



	drv_active = qla4_8xxx_rd_direct(ha, QLA8XXX_CRB_DRV_ACTIVE);



	if (test_bit(AF_INIT_DONE, &ha->flags) &&

	    !(drv_active & (1 << ha->func_num))) {

		DEBUG2(ql4_printk(KERN_INFO, ha, "%s: drv_active = 0x%X\n",

				  __func__, drv_active));

		return QLA_SUCCESS;

	}



	return QLA_ERROR;

}

drivers/scsi/qla4xxx/ql4_glbl.h

+1 −0
Original line number Diff line number Diff line
@@ -280,6 +280,7 @@ uint8_t qla4xxx_set_ipaddr_state(uint8_t fw_ipaddr_state); 
int qla4_83xx_get_port_config(struct scsi_qla_host *ha, uint32_t *config);

int qla4_83xx_set_port_config(struct scsi_qla_host *ha, uint32_t *config);

int qla4_8xxx_check_init_adapter_retry(struct scsi_qla_host *ha);

int qla4_83xx_is_detached(struct scsi_qla_host *ha);



extern int ql4xextended_error_logging;

extern int ql4xdontresethba;

drivers/scsi/qla4xxx/ql4_os.c

+5 −0
Original line number Diff line number Diff line
@@ -4372,6 +4372,11 @@ void qla4_8xxx_watchdog(struct scsi_qla_host *ha) 
	uint32_t dev_state;

	uint32_t idc_ctrl;



	if (is_qla8032(ha) &&

	    (qla4_83xx_is_detached(ha) == QLA_SUCCESS))

		WARN_ONCE(1, "%s: iSCSI function %d marked invisible\n",

			  __func__, ha->func_num);



	/* don't poll if reset is going on */

	if (!(test_bit(DPC_RESET_ACTIVE, &ha->dpc_flags) ||

	    test_bit(DPC_RESET_HA, &ha->dpc_flags) ||