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

Commit 1ae47cf3 authored by Joe Carnuccio's avatar Joe Carnuccio Committed by James Bottomley
Browse files

[SCSI] qla2xxx: Reconfigure thermal temperature. 



For supported ISPS, Read asic temperature by calling the
GET PARAMS (type C) mailbox command.

Signed-off-by: default avatarJoe Carnuccio <joe.carnuccio@qlogic.com>
Signed-off-by: default avatarSaurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent c46e65c7

drivers/scsi/qla2xxx/qla_attr.c

+0 −6
Original line number Diff line number Diff line
@@ -1300,12 +1300,6 @@ qla2x00_thermal_temp_show(struct device *dev, 
	scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));

	uint16_t temp = 0;



	if (!vha->hw->thermal_support) {

		ql_log(ql_log_warn, vha, 0x70db,

		    "Thermal not supported by this card.\n");

		goto done;

	}



	if (qla2x00_reset_active(vha)) {

		ql_log(ql_log_warn, vha, 0x70dc, "ISP reset active.\n");

		goto done;

drivers/scsi/qla2xxx/qla_dbg.c

+3 −1
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
 * | Module Init and Probe        |       0x0151       | 0x4b,0xba,0xfa |

 * | Mailbox commands             |       0x1181       | 0x111a-0x111b  |

 * |                              |                    | 0x1155-0x1158  |

 * |                              |                    | 0x1018-0x1019  |

 * |                              |                    | 0x10ca		|

 * | Device Discovery             |       0x2095       | 0x2020-0x2022, |

 * |                              |                    | 0x2011-0x2012, |

 * |                              |                    | 0x2016         |
@@ -37,7 +39,7 @@ 
 * |                              |                    | 0x70a5,0x70a6, |

 * |                              |                    | 0x70a8,0x70ab, |

 * |                              |                    | 0x70ad-0x70ae, |

 * |                              |                    | 0x70d1-0x70da, |

 * |                              |                    | 0x70d1-0x70db, |

 * |                              |                    | 0x7047,0x703b	|

 * | Task Management              |       0x803d       | 0x8025-0x8026  |

 * |                              |                    | 0x800b,0x8039  |

drivers/scsi/qla2xxx/qla_def.h

+0 −3
Original line number Diff line number Diff line
@@ -3304,9 +3304,6 @@ struct qla_hw_data { 
	struct mr_data_fx00 mr;



	struct qlt_hw_data tgt;

	uint16_t	thermal_support;

#define THERMAL_SUPPORT_I2C BIT_0

#define THERMAL_SUPPORT_ISP BIT_1

};



/*

drivers/scsi/qla2xxx/qla_gbl.h

+2 −0
Original line number Diff line number Diff line
@@ -685,6 +685,8 @@ extern int qla81xx_get_led_config(scsi_qla_host_t *, uint16_t *); 
extern int qla82xx_mbx_beacon_ctl(scsi_qla_host_t *, int);

extern char *qdev_state(uint32_t);

extern void qla82xx_clear_pending_mbx(scsi_qla_host_t *);

extern int qla82xx_read_temperature(scsi_qla_host_t *);

extern int qla8044_read_temperature(scsi_qla_host_t *);



/* BSG related functions */

extern int qla24xx_bsg_request(struct fc_bsg_job *);

drivers/scsi/qla2xxx/qla_init.c

+0 −1
Original line number Diff line number Diff line
@@ -524,7 +524,6 @@ qla2x00_initialize_adapter(scsi_qla_host_t *vha) 
	vha->flags.reset_active = 0;

	ha->flags.pci_channel_io_perm_failure = 0;

	ha->flags.eeh_busy = 0;

	ha->thermal_support = THERMAL_SUPPORT_I2C|THERMAL_SUPPORT_ISP;

	atomic_set(&vha->loop_down_timer, LOOP_DOWN_TIME);

	atomic_set(&vha->loop_state, LOOP_DOWN);

	vha->device_flags = DFLG_NO_CABLE;