aboutsummaryrefslogtreecommitdiff
path: root/drivers/scsi/isci/port.c
diff options
context:
space:
mode:
authorGravatar Marcin Tomczak <marcin.tomczak@intel.com> 2012-01-04 01:33:15 -0800
committerGravatar James Bottomley <JBottomley@Parallels.com> 2012-01-16 11:45:19 +0400
commitd4ec1cf61fb081a9dde0c0e0b2d0201f4005f937 (patch)
treeb93baa50731ef128b13a01b0319f9b0bc7e76112 /drivers/scsi/isci/port.c
parent[SCSI] isci: update version to 1.1 (diff)
downloadlinux-d4ec1cf61fb081a9dde0c0e0b2d0201f4005f937.tar.gz
linux-d4ec1cf61fb081a9dde0c0e0b2d0201f4005f937.tar.bz2
linux-d4ec1cf61fb081a9dde0c0e0b2d0201f4005f937.zip
[SCSI] isci: Fix IO fails when pull cable from phy in x4 wideport in MPC mode.
Failure seen pulling a cable from a x4 port configured in manual port configuration (MPC) mode (MPC mode is set by the the OEM paramaters provided by the platform or isci_firmware.bin). While IO running to devices behind and expander, plugging out the cable from phy is causing IO failures and IO drops on disks and never recover. It happens because during link up/down the phy were being taken out of the port. Fix: during link down the phy is kept in the same logical port. Signed-off-by: Marcin Tomczak <marcin.tomczak@intel.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/isci/port.c')
-rw-r--r--drivers/scsi/isci/port.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/scsi/isci/port.c b/drivers/scsi/isci/port.c
index ac7f27749f97..4cb071d825bb 100644
--- a/drivers/scsi/isci/port.c
+++ b/drivers/scsi/isci/port.c
@@ -674,9 +674,13 @@ void sci_port_deactivate_phy(struct isci_port *iport, struct isci_phy *iphy,
iphy->max_negotiated_speed = SAS_LINK_RATE_UNKNOWN;
- /* Re-assign the phy back to the LP as if it were a narrow port */
- writel(iphy->phy_index,
- &iport->port_pe_configuration_register[iphy->phy_index]);
+ /* Re-assign the phy back to the LP as if it were a narrow port for APC
+ * mode. For MPC mode, the phy will remain in the port.
+ */
+ if (iport->owning_controller->oem_parameters.controller.mode_type ==
+ SCIC_PORT_AUTOMATIC_CONFIGURATION_MODE)
+ writel(iphy->phy_index,
+ &iport->port_pe_configuration_register[iphy->phy_index]);
if (do_notify_user == true)
isci_port_link_down(ihost, iphy, iport);