Print this page
NEX-8705 Drivers for ATTO Celerity FC-162E Gen 5 and Celerity FC-162P Gen 6 16GB FC cards support
Reviewed by: Dan Fields <dan.fields@nexenta.com>
Reviewed by: Rick McNeal <rick.mcneal@nexenta.com>
NEX-1878 update emlxs from source provided by Emulex
@@ -1252,11 +1252,12 @@
hba_attrs =
(fc_hba_adapter_attributes32_t *)fcio->fcio_obuf;
hba_attrs->version = FC_HBA_ADAPTER_ATTRIBUTES_VERSION;
- (void) strncpy(hba_attrs->Manufacturer, "Emulex",
+ (void) strncpy(hba_attrs->Manufacturer,
+ hba->model_info.manufacturer,
(sizeof (hba_attrs->Manufacturer)-1));
(void) strncpy(hba_attrs->SerialNumber, vpd->serial_num,
(sizeof (hba_attrs->SerialNumber)-1));
(void) strncpy(hba_attrs->Model, hba->model_info.model,
(sizeof (hba_attrs->Model)-1));
@@ -1298,11 +1299,12 @@
hba_attrs =
(fc_hba_adapter_attributes_t *)fcio->fcio_obuf;
hba_attrs->version = FC_HBA_ADAPTER_ATTRIBUTES_VERSION;
- (void) strncpy(hba_attrs->Manufacturer, "Emulex",
+ (void) strncpy(hba_attrs->Manufacturer,
+ hba->model_info.manufacturer,
(sizeof (hba_attrs->Manufacturer)-1));
(void) strncpy(hba_attrs->SerialNumber, vpd->serial_num,
(sizeof (hba_attrs->SerialNumber)-1));
(void) strncpy(hba_attrs->Model, hba->model_info.model,
(sizeof (hba_attrs->Model)-1));
@@ -1445,10 +1447,14 @@
break;
case LA_16GHZ_LINK:
port_attrs->PortSpeed =
HBA_PORTSPEED_16GBIT;
break;
+ case LA_32GHZ_LINK:
+ port_attrs->PortSpeed =
+ HBA_PORTSPEED_32GBIT;
+ break;
default:
port_attrs->PortSpeed =
HBA_PORTSPEED_UNKNOWN;
}
@@ -1591,10 +1597,14 @@
break;
case LA_16GHZ_LINK:
port_attrs->PortSpeed =
HBA_PORTSPEED_16GBIT;
break;
+ case LA_32GHZ_LINK:
+ port_attrs->PortSpeed =
+ HBA_PORTSPEED_32GBIT;
+ break;
default:
port_attrs->PortSpeed =
HBA_PORTSPEED_UNKNOWN;
}
@@ -2224,10 +2234,14 @@
break;
case LA_16GHZ_LINK:
port_attrs->PortSpeed =
HBA_PORTSPEED_16GBIT;
break;
+ case LA_32GHZ_LINK:
+ port_attrs->PortSpeed =
+ HBA_PORTSPEED_32GBIT;
+ break;
}
}
/* public loop */
else if (hba->topology == TOPOLOGY_LOOP) {
/* Check for common area and domain */
@@ -2264,10 +2278,14 @@
break;
case LA_16GHZ_LINK:
port_attrs->PortSpeed =
HBA_PORTSPEED_16GBIT;
break;
+ case LA_32GHZ_LINK:
+ port_attrs->PortSpeed =
+ HBA_PORTSPEED_32GBIT;
+ break;
}
}
}
}
@@ -2356,10 +2374,14 @@
break;
case LA_16GHZ_LINK:
port_attrs->PortSpeed =
HBA_PORTSPEED_16GBIT;
break;
+ case LA_32GHZ_LINK:
+ port_attrs->PortSpeed =
+ HBA_PORTSPEED_32GBIT;
+ break;
}
}
/* public loop */
else if (hba->topology == TOPOLOGY_LOOP) {
/* Check for common area and domain */
@@ -2396,10 +2418,14 @@
break;
case LA_16GHZ_LINK:
port_attrs->PortSpeed =
HBA_PORTSPEED_16GBIT;
break;
+ case LA_32GHZ_LINK:
+ port_attrs->PortSpeed =
+ HBA_PORTSPEED_32GBIT;
+ break;
}
}
}
}
@@ -2518,10 +2544,14 @@
break;
case LA_16GHZ_LINK:
port_attrs->PortSpeed =
HBA_PORTSPEED_16GBIT;
break;
+ case LA_32GHZ_LINK:
+ port_attrs->PortSpeed =
+ HBA_PORTSPEED_32GBIT;
+ break;
}
}
/* public loop */
else if (hba->topology == TOPOLOGY_LOOP) {
/* Check for common area and domain */
@@ -2558,10 +2588,14 @@
break;
case LA_16GHZ_LINK:
port_attrs->PortSpeed =
HBA_PORTSPEED_16GBIT;
break;
+ case LA_32GHZ_LINK:
+ port_attrs->PortSpeed =
+ HBA_PORTSPEED_32GBIT;
+ break;
}
}
}
}
@@ -2657,10 +2691,14 @@
break;
case LA_16GHZ_LINK:
port_attrs->PortSpeed =
HBA_PORTSPEED_16GBIT;
break;
+ case LA_32GHZ_LINK:
+ port_attrs->PortSpeed =
+ HBA_PORTSPEED_32GBIT;
+ break;
}
}
/* public loop */
else if (hba->topology == TOPOLOGY_LOOP) {
/* Check for common area and domain */
@@ -2697,10 +2735,14 @@
break;
case LA_16GHZ_LINK:
port_attrs->PortSpeed =
HBA_PORTSPEED_16GBIT;
break;
+ case LA_32GHZ_LINK:
+ port_attrs->PortSpeed =
+ HBA_PORTSPEED_32GBIT;
+ break;
}
}
}
}
@@ -3957,10 +3999,12 @@
hbainfo->port_speed = HBA_PORTSPEED_8GBIT;
} else if (hba->linkspeed == LA_10GHZ_LINK) {
hbainfo->port_speed = HBA_PORTSPEED_10GBIT;
} else if (hba->linkspeed == LA_16GHZ_LINK) {
hbainfo->port_speed = HBA_PORTSPEED_16GBIT;
+ } else if (hba->linkspeed == LA_32GHZ_LINK) {
+ hbainfo->port_speed = HBA_PORTSPEED_32GBIT;
} else {
hbainfo->port_speed = HBA_PORTSPEED_1GBIT;
}
hbainfo->node_count = port->node_count;
@@ -4193,10 +4237,12 @@
stats->link_speed = HBA_PORTSPEED_8GBIT;
} else if (hba->linkspeed == LA_10GHZ_LINK) {
stats->link_speed = HBA_PORTSPEED_10GBIT;
} else if (hba->linkspeed == LA_16GHZ_LINK) {
stats->link_speed = HBA_PORTSPEED_16GBIT;
+ } else if (hba->linkspeed == LA_32GHZ_LINK) {
+ stats->link_speed = HBA_PORTSPEED_32GBIT;
} else {
stats->link_speed = HBA_PORTSPEED_1GBIT;
}
}
@@ -6445,11 +6491,12 @@
/* Perform attention checks */
if (rsp->fru_data_valid == 0) {
EMLXS_MSGF(EMLXS_CONTEXT, &emlxs_adapter_error_msg,
"Invalid FRU data found on adapter. "
- "Return adapter to Emulex for repair.");
+ "Return adapter to %s for repair.",
+ hba->model_info.manufacturer);
}
switch (rsp->fw_type) {
case MENLO_FW_TYPE_GOLDEN:
EMLXS_MSGF(EMLXS_CONTEXT, &emlxs_adapter_warning_msg,