From: Greg Kroah-Hartman Date: Tue, 23 Jul 2013 04:03:36 +0000 (-0700) Subject: 3.4-stable patches X-Git-Tag: v3.10.3~23 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ed85974173eec9e454f1c2bb025ce6706f83d84c;p=thirdparty%2Fkernel%2Fstable-queue.git 3.4-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 sunrpc-pipefs-mount-notification-optimization-for-dying-clients.patch --- diff --git a/queue-3.4/scsi-mpt2sas-fix-firmware-failure-with-wrong-task-attribute.patch b/queue-3.4/scsi-mpt2sas-fix-firmware-failure-with-wrong-task-attribute.patch new file mode 100644 index 00000000000..f28853320cb --- /dev/null +++ b/queue-3.4/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 +@@ -3963,11 +3963,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.4/scsi-zfcp-fix-adapter-re-open-recovery-while-link-to-san-is-down.patch b/queue-3.4/scsi-zfcp-fix-adapter-re-open-recovery-while-link-to-san-is-down.patch new file mode 100644 index 00000000000..7173b51e4c4 --- /dev/null +++ b/queue-3.4/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 +@@ -563,6 +563,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.4/series b/queue-3.4/series index c641f209278..5ab56662ced 100644 --- a/queue-3.4/series +++ b/queue-3.4/series @@ -5,3 +5,6 @@ asoc-sglt5000-fix-sgtl5000_pll_frac_div_mask.patch tick-prevent-uncontrolled-switch-to-oneshot-mode.patch rt2x00-read-5ghz-tx-power-values-from-the-correct-offset.patch ath9k-do-not-assign-noise-for-null-caldata.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 +sunrpc-pipefs-mount-notification-optimization-for-dying-clients.patch diff --git a/queue-3.4/sunrpc-pipefs-mount-notification-optimization-for-dying-clients.patch b/queue-3.4/sunrpc-pipefs-mount-notification-optimization-for-dying-clients.patch new file mode 100644 index 00000000000..6866851fd19 --- /dev/null +++ b/queue-3.4/sunrpc-pipefs-mount-notification-optimization-for-dying-clients.patch @@ -0,0 +1,33 @@ +From 4f6bb246f69443549fbbd0f2abaf863243cb35e9 Mon Sep 17 00:00:00 2001 +From: Stanislav Kinsbursky +Date: Mon, 24 Jun 2013 11:52:59 +0400 +Subject: SUNRPC: PipeFS MOUNT notification optimization for dying clients + +From: Stanislav Kinsbursky + +commit 4f6bb246f69443549fbbd0f2abaf863243cb35e9 upstream. + +Not need to create pipes for dying client. So just skip them. + +Note: we can safely dereference the client structure, because notification +caller is holding sn->pipefs_sb_lock. + +Signed-off-by: Stanislav Kinsbursky +Signed-off-by: Trond Myklebust +Signed-off-by: Greg Kroah-Hartman + +--- + net/sunrpc/clnt.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/net/sunrpc/clnt.c ++++ b/net/sunrpc/clnt.c +@@ -181,6 +181,8 @@ static inline int rpc_clnt_skip_event(st + if (((event == RPC_PIPEFS_MOUNT) && clnt->cl_dentry) || + ((event == RPC_PIPEFS_UMOUNT) && !clnt->cl_dentry)) + return 1; ++ if ((event == RPC_PIPEFS_MOUNT) && atomic_read(&clnt->cl_count) == 0) ++ return 1; + return 0; + } +