[SCSI] qla2xxx: Integrate generic card temperature with mezz card temperature.

Give priority to I2C thermal.

Signed-off-by: Joe Carnuccio <joe.carnuccio@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 992e24081e65..c081882c566d 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -864,6 +864,7 @@ typedef struct {
 #define MBX_0           BIT_0
 
 #define RNID_TYPE_SET_VERSION   0x9
+#define RNID_TYPE_ASIC_TEMP     0xC
 
 /*
  * Firmware state codes from get firmware state mailbox command
@@ -2628,7 +2629,6 @@ struct qla_hw_data {
                 uint32_t        nic_core_hung:1;
 
                 uint32_t        quiesce_owner:1;
-                uint32_t        thermal_supported:1;
                 uint32_t        nic_core_reset_hdlr_active:1;
                 uint32_t        nic_core_reset_owner:1;
                 uint32_t        isp82xx_no_md_cap:1;
@@ -3076,6 +3076,9 @@ struct qla_hw_data {
         int             cfg_lun_q_depth;
 
         struct qlt_hw_data tgt;
+        uint16_t        thermal_support;
+#define THERMAL_SUPPORT_I2C BIT_0
+#define THERMAL_SUPPORT_ISP BIT_1
 };
 
 /*