|
@@ -3123,25 +3123,6 @@ _scsih_io_done(struct MPT2SAS_ADAPTER *ioc, u16 smid, u8 VF_ID, u32 reply)
|
|
|
scmd->scsi_done(scmd);
|
|
|
}
|
|
|
|
|
|
-/**
|
|
|
- * _scsih_link_change - process phy link changes
|
|
|
- * @ioc: per adapter object
|
|
|
- * @handle: phy handle
|
|
|
- * @attached_handle: valid for devices attached to link
|
|
|
- * @phy_number: phy number
|
|
|
- * @link_rate: new link rate
|
|
|
- * Context: user.
|
|
|
- *
|
|
|
- * Return nothing.
|
|
|
- */
|
|
|
-static void
|
|
|
-_scsih_link_change(struct MPT2SAS_ADAPTER *ioc, u16 handle, u16 attached_handle,
|
|
|
- u8 phy_number, u8 link_rate)
|
|
|
-{
|
|
|
- mpt2sas_transport_update_phy_link_change(ioc, handle, attached_handle,
|
|
|
- phy_number, link_rate);
|
|
|
-}
|
|
|
-
|
|
|
/**
|
|
|
* _scsih_sas_host_refresh - refreshing sas host object contents
|
|
|
* @ioc: per adapter object
|
|
@@ -3186,7 +3167,8 @@ _scsih_sas_host_refresh(struct MPT2SAS_ADAPTER *ioc, u8 update)
|
|
|
le16_to_cpu(sas_iounit_pg0->PhyData[i].
|
|
|
ControllerDevHandle);
|
|
|
if (update)
|
|
|
- _scsih_link_change(ioc,
|
|
|
+ mpt2sas_transport_update_links(
|
|
|
+ ioc,
|
|
|
ioc->sas_hba.phy[i].handle,
|
|
|
le16_to_cpu(sas_iounit_pg0->PhyData[i].
|
|
|
AttachedDevHandle), i,
|
|
@@ -3868,9 +3850,10 @@ _scsih_sas_topology_change_event(struct MPT2SAS_ADAPTER *ioc, u8 VF_ID,
|
|
|
case MPI2_EVENT_SAS_TOPO_RC_TARG_ADDED:
|
|
|
if (!parent_handle) {
|
|
|
if (phy_number < ioc->sas_hba.num_phys)
|
|
|
- _scsih_link_change(ioc,
|
|
|
- ioc->sas_hba.phy[phy_number].handle,
|
|
|
- handle, phy_number, link_rate_);
|
|
|
+ mpt2sas_transport_update_links(
|
|
|
+ ioc,
|
|
|
+ ioc->sas_hba.phy[phy_number].handle,
|
|
|
+ handle, phy_number, link_rate_);
|
|
|
} else {
|
|
|
spin_lock_irqsave(&ioc->sas_node_lock, flags);
|
|
|
sas_expander =
|
|
@@ -3880,11 +3863,12 @@ _scsih_sas_topology_change_event(struct MPT2SAS_ADAPTER *ioc, u8 VF_ID,
|
|
|
flags);
|
|
|
if (sas_expander) {
|
|
|
if (phy_number < sas_expander->num_phys)
|
|
|
- _scsih_link_change(ioc,
|
|
|
- sas_expander->
|
|
|
- phy[phy_number].handle,
|
|
|
- handle, phy_number,
|
|
|
- link_rate_);
|
|
|
+ mpt2sas_transport_update_links(
|
|
|
+ ioc,
|
|
|
+ sas_expander->
|
|
|
+ phy[phy_number].handle,
|
|
|
+ handle, phy_number,
|
|
|
+ link_rate_);
|
|
|
}
|
|
|
}
|
|
|
if (reason_code == MPI2_EVENT_SAS_TOPO_RC_PHY_CHANGED) {
|
|
@@ -4400,7 +4384,7 @@ _scsih_sas_pd_add(struct MPT2SAS_ADAPTER *ioc,
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- _scsih_link_change(ioc,
|
|
|
+ mpt2sas_transport_update_links(ioc,
|
|
|
le16_to_cpu(sas_device_pg0.ParentDevHandle),
|
|
|
handle, sas_device_pg0.PhyNum, MPI2_SAS_NEG_LINK_RATE_1_5);
|
|
|
|
|
@@ -4689,7 +4673,7 @@ _scsih_sas_ir_physical_disk_event(struct MPT2SAS_ADAPTER *ioc, u8 VF_ID,
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- _scsih_link_change(ioc,
|
|
|
+ mpt2sas_transport_update_links(ioc,
|
|
|
le16_to_cpu(sas_device_pg0.ParentDevHandle),
|
|
|
handle, sas_device_pg0.PhyNum, MPI2_SAS_NEG_LINK_RATE_1_5);
|
|
|
|