Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2015-12-01 17:21:37 +0100
committerJiri Kosina <jkosina@suse.cz>2015-12-01 17:21:37 +0100
commited01a9f29e3870a7af90f5af7d5b668bfecba4e7 (patch)
tree6df1371688a0a379bfa56c4cf63be456c3e69eeb
parentb52251da0b37509c00365ef21446f4d9d25b7059 (diff)
parent2e842af6385b66d5c6653bcec6d7309499749cf2 (diff)
Merge remote-tracking branch 'origin/users/hare/SLE11-SP4/for-next' into SLE11-SP4rpm-3.0.101-68
-rw-r--r--patches.drivers/lpfc-Fix-cq_id-masking-problem.patch37
-rw-r--r--series.conf1
2 files changed, 38 insertions, 0 deletions
diff --git a/patches.drivers/lpfc-Fix-cq_id-masking-problem.patch b/patches.drivers/lpfc-Fix-cq_id-masking-problem.patch
new file mode 100644
index 0000000000..c2c8dcebdc
--- /dev/null
+++ b/patches.drivers/lpfc-Fix-cq_id-masking-problem.patch
@@ -0,0 +1,37 @@
+From: James Smart <james.smart@avagotech.com>
+Date: Fri, 22 May 2015 10:42:40 -0400
+Subject: lpfc: Fix cq_id masking problem.
+References: bsc#944677
+Git-commit: 16f3b48d26ac069abc020826f0c429c4ddcfb20c)
+Patch-Mainline: v4.2
+
+The driver inadvertainly constrained the id space to 8 bits, when its
+a full 16 bits from hw. This resulted in bad id's being written to the
+hardware. Resulted in symptoms such as incomplete initialization, no
+detection of link events, etc.
+
+Signed-off-by: Dick Kennedy <dick.kennedy@avagotech.com>
+Signed-off-by: James Smart <james.smart@avagotech.com>
+Reviewed-by: Hannes Reinecke <hare@suse.de>
+Signed-off-by: James Bottomley <JBottomley@Odin.com>
+Acked-by: Hannes Reinecke <hare@suse.de>
+---
+ drivers/scsi/lpfc/lpfc_hw4.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/scsi/lpfc/lpfc_hw4.h b/drivers/scsi/lpfc/lpfc_hw4.h
+index 59ad8dc..36c6559 100644
+--- a/drivers/scsi/lpfc/lpfc_hw4.h
++++ b/drivers/scsi/lpfc/lpfc_hw4.h
+@@ -291,7 +291,7 @@ struct sli4_bls_rsp {
+ struct lpfc_eqe {
+ uint32_t word0;
+ #define lpfc_eqe_resource_id_SHIFT 16
+-#define lpfc_eqe_resource_id_MASK 0x000000FF
++#define lpfc_eqe_resource_id_MASK 0x0000FFFF
+ #define lpfc_eqe_resource_id_WORD word0
+ #define lpfc_eqe_minor_code_SHIFT 4
+ #define lpfc_eqe_minor_code_MASK 0x00000FFF
+--
+1.8.5.6
+
diff --git a/series.conf b/series.conf
index 0e1748042d..02adc520cc 100644
--- a/series.conf
+++ b/series.conf
@@ -6279,6 +6279,7 @@
patches.drivers/lpfc-fix-for-handling-unmapped-ndlp-in-target-reset-.patch
patches.drivers/lpfc-update-lpfc-version-to-driver-version-10.4.8000.patch
patches.drivers/lpfc-Fix-race-on-command-completion.patch
+ patches.drivers/lpfc-Fix-cq_id-masking-problem.patch
patches.drivers/qla2xxx-0001-fix-comment-typo-hammmer.patch
patches.drivers/qla2xxx-0002-Basic-infrastructure-for-dynamic-logging.patch