1 files changed, 17 insertions, 0 deletions

diff --git a/drivers/scsi/qla4xxx/ql4_nx.c b/drivers/scsi/qla4xxx/ql4_nx.c
index fdfe27b38698..f484ff438199 100644
--- a/drivers/scsi/qla4xxx/ql4_nx.c
+++ b/drivers/scsi/qla4xxx/ql4_nx.c
@@ -2015,11 +2015,19 @@ qla4_8xxx_get_flt_info(struct scsi_qla_host *ha, uint32_t flt_addr)
                         hw->flt_region_boot = start;
                         break;
                 case FLT_REG_FW_82:
+                case FLT_REG_FW_82_1:
                         hw->flt_region_fw = start;
                         break;
                 case FLT_REG_BOOTLOAD_82:
                         hw->flt_region_bootload = start;
                         break;
+                case FLT_REG_ISCSI_PARAM:
+                        hw->flt_iscsi_param =  start;
+                        break;
+                case FLT_REG_ISCSI_CHAP:
+                        hw->flt_region_chap =  start;
+                        hw->flt_chap_size =  le32_to_cpu(region->size);
+                        break;
                 }
         }
         goto done;
@@ -2032,6 +2040,9 @@ no_flash_data:
         hw->flt_region_boot     = FA_BOOT_CODE_ADDR_82;
         hw->flt_region_bootload = FA_BOOT_LOAD_ADDR_82;
         hw->flt_region_fw       = FA_RISC_CODE_ADDR_82;
+        hw->flt_region_chap     = FA_FLASH_ISCSI_CHAP;
+        hw->flt_chap_size       = FA_FLASH_CHAP_SIZE;
+
 done:
         DEBUG2(ql4_printk(KERN_INFO, ha, "FLT[%s]: flt=0x%x fdt=0x%x "
             "boot=0x%x bootload=0x%x fw=0x%x\n", loc, hw->flt_region_flt,
@@ -2258,10 +2269,16 @@ int qla4_8xxx_get_sys_info(struct scsi_qla_host *ha)
         }
 
         /* Save M.A.C. address & serial_number */
+        ha->port_num = sys_info->port_num;
         memcpy(ha->my_mac, &sys_info->mac_addr[0],
             min(sizeof(ha->my_mac), sizeof(sys_info->mac_addr)));
         memcpy(ha->serial_number, &sys_info->serial_number,
             min(sizeof(ha->serial_number), sizeof(sys_info->serial_number)));
+        memcpy(ha->model_name, &sys_info->board_id_str,
+               min(sizeof(ha->model_name), sizeof(sys_info->board_id_str)));
+        ha->phy_port_cnt = sys_info->phys_port_cnt;
+        ha->phy_port_num = sys_info->port_num;
+        ha->iscsi_pci_func_cnt = sys_info->iscsi_pci_func_cnt;
 
         DEBUG2(printk("scsi%ld: %s: "
             "mac %02x:%02x:%02x:%02x:%02x:%02x "