From bbdf36e4bb2fddc86116ad9f6085970dca625ec3 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 22 Jul 2013 21:03:25 -0700 Subject: [PATCH] 3.0-stable patches added patches: scsi-mpt2sas-fix-firmware-failure-with-wrong-task-attribute.patch scsi-zfcp-fix-adapter-re-open-recovery-while-link-to-san-is-down.patch --- ...re-failure-with-wrong-task-attribute.patch | 35 ++++++++++++++ ...n-recovery-while-link-to-san-is-down.patch | 46 +++++++++++++++++++ queue-3.0/series | 2 + 3 files changed, 83 insertions(+) create mode 100644 queue-3.0/scsi-mpt2sas-fix-firmware-failure-with-wrong-task-attribute.patch create mode 100644 queue-3.0/scsi-zfcp-fix-adapter-re-open-recovery-while-link-to-san-is-down.patch diff --git a/queue-3.0/scsi-mpt2sas-fix-firmware-failure-with-wrong-task-attribute.patch b/queue-3.0/scsi-mpt2sas-fix-firmware-failure-with-wrong-task-attribute.patch new file mode 100644 index 00000000000..d0f91f11831 --- /dev/null +++ b/queue-3.0/scsi-mpt2sas-fix-firmware-failure-with-wrong-task-attribute.patch @@ -0,0 +1,35 @@ +From 48ba2efc382f94fae16ca8ca011e5961a81ad1ea Mon Sep 17 00:00:00 2001 +From: Sreekanth Reddy +Date: Sat, 2 Feb 2013 00:58:20 +0530 +Subject: SCSI: mpt2sas: fix firmware failure with wrong task attribute + +From: Sreekanth Reddy + +commit 48ba2efc382f94fae16ca8ca011e5961a81ad1ea upstream. + +When SCSI command is received with task attribute not set, set it to SIMPLE. +Previously it is set to untagged. This causes the firmware to fail the commands. + +Signed-off-by: Sreekanth Reddy +Signed-off-by: James Bottomley +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/scsi/mpt2sas/mpt2sas_scsih.c | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c ++++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c +@@ -3740,11 +3740,7 @@ _scsih_qcmd_lck(struct scsi_cmnd *scmd, + else + mpi_control |= MPI2_SCSIIO_CONTROL_SIMPLEQ; + } else +-/* MPI Revision I (UNIT = 0xA) - removed MPI2_SCSIIO_CONTROL_UNTAGGED */ +-/* mpi_control |= MPI2_SCSIIO_CONTROL_UNTAGGED; +- */ +- mpi_control |= (0x500); +- ++ mpi_control |= MPI2_SCSIIO_CONTROL_SIMPLEQ; + } else + mpi_control |= MPI2_SCSIIO_CONTROL_SIMPLEQ; + /* Make sure Device is not raid volume. diff --git a/queue-3.0/scsi-zfcp-fix-adapter-re-open-recovery-while-link-to-san-is-down.patch b/queue-3.0/scsi-zfcp-fix-adapter-re-open-recovery-while-link-to-san-is-down.patch new file mode 100644 index 00000000000..e3b8eb97667 --- /dev/null +++ b/queue-3.0/scsi-zfcp-fix-adapter-re-open-recovery-while-link-to-san-is-down.patch @@ -0,0 +1,46 @@ +From f76ccaac4f82c463a037aa4a1e4ccb85c7011814 Mon Sep 17 00:00:00 2001 +From: Daniel Hansel +Date: Fri, 26 Apr 2013 17:32:14 +0200 +Subject: SCSI: zfcp: fix adapter (re)open recovery while link to SAN is down + +From: Daniel Hansel + +commit f76ccaac4f82c463a037aa4a1e4ccb85c7011814 upstream. + +FCP device remains in status ERP_FAILED when device is switched online +or adapter recovery is triggered while link to SAN is down. + +When Exchange Configuration Data command returns the FSF status +FSF_EXCHANGE_CONFIG_DATA_INCOMPLETE it aborts the exchange process. +The only retries are done during the common error recovery procedure +(i.e. max. 3 retries with 8sec sleep between) and remains in status +ERP_FAILED with QDIO down. + +This commit reverts the commit 0df138476c8306478d6e726f044868b4bccf411c +(zfcp: Fix adapter activation on link down). +When FSF status FSF_EXCHANGE_CONFIG_DATA_INCOMPLETE is received the +adapter recovery will be finished without any retries. QDIO will be +up now and status changes such as LINK UP will be received now. + +Signed-off-by: Daniel Hansel +Signed-off-by: Steffen Maier +Signed-off-by: James Bottomley +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/s390/scsi/zfcp_fsf.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/s390/scsi/zfcp_fsf.c ++++ b/drivers/s390/scsi/zfcp_fsf.c +@@ -534,6 +534,10 @@ static void zfcp_fsf_exchange_config_dat + fc_host_port_type(shost) = FC_PORTTYPE_UNKNOWN; + adapter->hydra_version = 0; + ++ /* avoids adapter shutdown to be able to recognize ++ * events such as LINK UP */ ++ atomic_set_mask(ZFCP_STATUS_ADAPTER_XCONFIG_OK, ++ &adapter->status); + zfcp_fsf_link_down_info_eval(req, + &qtcb->header.fsf_status_qual.link_down_info); + break; diff --git a/queue-3.0/series b/queue-3.0/series index 9782299cdd4..901f9c9b7f0 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -1,3 +1,5 @@ tick-prevent-uncontrolled-switch-to-oneshot-mode.patch asoc-sglt5000-fix-sgtl5000_pll_frac_div_mask.patch rt2x00-read-5ghz-tx-power-values-from-the-correct-offset.patch +scsi-zfcp-fix-adapter-re-open-recovery-while-link-to-san-is-down.patch +scsi-mpt2sas-fix-firmware-failure-with-wrong-task-attribute.patch -- 2.47.3