diff options
| author | Dan Williams <[email protected]> | 2012-01-31 05:40:45 +0000 |
|---|---|---|
| committer | James Bottomley <[email protected]> | 2012-02-29 21:42:51 +0000 |
| commit | 26a2e68f816ebd736a0484ca293457b280af4ef1 (patch) | |
| tree | 5fbae208c3bcda21dd1f9f918e811e07c2ce80e8 /drivers/scsi/libsas/sas_init.c | |
| parent | [SCSI] libsas: fixup target_port_protocols for expanders that don't report sata (diff) | |
| download | kernel-26a2e68f816ebd736a0484ca293457b280af4ef1.tar.gz kernel-26a2e68f816ebd736a0484ca293457b280af4ef1.zip | |
[SCSI] libsas: don't recover end devices attached to disabled phys
If userspace has decided to disable a phy the kernel should honor that
and not inadvertantly re-enable the phy via error recovery. This is
more straightforward in the sata case where link recovery (via
libata-eh) is separate from sas_task cancelling in libsas-eh. Teach
libsas to accept -ENODEV as a successful response from I_T_nexus_reset
('successful' in terms of not escalating further).
This is a more comprehensive fix then "libsas: don't recover 'gone'
devices in sas_ata_hard_reset()", as it is no longer sata-specific.
aic94xx does check the return value from sas_phy_reset() so if the phy
is disabled we proceed with clearing the I_T_nexus.
Signed-off-by: Dan Williams <[email protected]>
Signed-off-by: James Bottomley <[email protected]>
Diffstat (limited to 'drivers/scsi/libsas/sas_init.c')
| -rw-r--r-- | drivers/scsi/libsas/sas_init.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/scsi/libsas/sas_init.c b/drivers/scsi/libsas/sas_init.c index 09c14ca3fbd5..120bff64be30 100644 --- a/drivers/scsi/libsas/sas_init.c +++ b/drivers/scsi/libsas/sas_init.c @@ -298,6 +298,9 @@ int sas_phy_reset(struct sas_phy *phy, int hard_reset) int ret; enum phy_func reset_type; + if (!phy->enabled) + return -ENODEV; + if (hard_reset) reset_type = PHY_FUNC_HARD_RESET; else |