From 0d7eb945b442f937bf7e6e1a63e395728c2a60ef Mon Sep 17 00:00:00 2001 From: Jiri Benc Date: Jan 22 2009 18:36:53 +0000 Subject: Merge branch 'master' of kerncvs.suse.de:/home/git/kernel-source --- diff --git a/kernel-source.changes b/kernel-source.changes index 2cc9f1c..4816576 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -7,6 +7,13 @@ Thu Jan 22 19:28:06 CET 2009 - jbenc@suse.cz driver. ------------------------------------------------------------------- +Thu Jan 22 19:13:20 CET 2009 - bphilips@suse.de + +- patches.drivers/disable-catas_reset-by-default-to-avoid-problems-with-eeh.patch: + disable catas_reset by default to avoid problems with EEH + (bnc#456389). + +------------------------------------------------------------------- Thu Jan 22 17:42:04 CET 2009 - rw@suse.de - patches.fixes/xpc-pass-physical: diff --git a/patches.drivers/disable-catas_reset-by-default-to-avoid-problems-with-eeh.patch b/patches.drivers/disable-catas_reset-by-default-to-avoid-problems-with-eeh.patch new file mode 100644 index 0000000..250db09 --- /dev/null +++ b/patches.drivers/disable-catas_reset-by-default-to-avoid-problems-with-eeh.patch @@ -0,0 +1,48 @@ +From: Xiuling Ma +Subject: [PATCH] disable catas_reset by default to avoid problems with EEH +References: bnc#456389 + +PPC machines with EEH and Mellanox ib/net cards with catastrophic error +recovery that encounter a PCI bus error can crash and become +unresponsive. + +Disable the card reset to avoid this. + +NOTE: an upstream fix will come later once IBM can review a couple of +approaches I suggested since this fix is brute force. This driver didn't have +this reset on error feature in SLES10 so it isn't a feature removal. + +Signed-off-by: Xiuling Ma +Acked-by: Brandon Philips + +--- + drivers/infiniband/hw/mthca/mthca_catas.c | 2 +- + drivers/net/mlx4/catas.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +Index: linux-2.6/drivers/infiniband/hw/mthca/mthca_catas.c +=================================================================== +--- linux-2.6.orig/drivers/infiniband/hw/mthca/mthca_catas.c ++++ linux-2.6/drivers/infiniband/hw/mthca/mthca_catas.c +@@ -51,7 +51,7 @@ static LIST_HEAD(catas_list); + static struct workqueue_struct *catas_wq; + static struct work_struct catas_work; + +-static int catas_reset_disable; ++static int catas_reset_disable = 1; + module_param_named(catas_reset_disable, catas_reset_disable, int, 0644); + MODULE_PARM_DESC(catas_reset_disable, "disable reset on catastrophic event if nonzero"); + +Index: linux-2.6/drivers/net/mlx4/catas.c +=================================================================== +--- linux-2.6.orig/drivers/net/mlx4/catas.c ++++ linux-2.6/drivers/net/mlx4/catas.c +@@ -45,7 +45,7 @@ static LIST_HEAD(catas_list); + static struct workqueue_struct *catas_wq; + static struct work_struct catas_work; + +-static int internal_err_reset = 1; ++static int internal_err_reset = 0; + module_param(internal_err_reset, int, 0644); + MODULE_PARM_DESC(internal_err_reset, + "Reset device on internal errors if non-zero (default 1)"); diff --git a/series.conf b/series.conf index a75b9e1..ba2c250 100644 --- a/series.conf +++ b/series.conf @@ -893,6 +893,8 @@ patches.drivers/ehca-fix-possible-nullpointer-access-v2.patch + patches.drivers/disable-catas_reset-by-default-to-avoid-problems-with-eeh.patch + ######################################################## # Storage ########################################################