[ewg] [PATCH] IB/ehca: Change misleading error message
Joachim Fenkes
fenkes at de.ibm.com
Tue Nov 25 05:34:48 PST 2008
The error message printed when the eHCA driver prevents memory hotplug is
misleading -- the user might think that hot-removing the lhca, hotplugging
memory, then hot-adding the lhca again will work, but it doesn't.
Signed-off-by: Joachim Fenkes <fenkes at de.ibm.com>
---
Vlad, please apply this for GA -- thanks, Joachim.
.../ehca_00_revert_inhibit_dmem.patch | 19 +++++++++----------
.../ehca_00_revert_inhibit_dmem.patch | 19 +++++++++----------
.../2.6.18-EL5.1/ehca-00-revert_inhibit_dmem.patch | 19 +++++++++----------
.../2.6.18-EL5.2/ehca-00-revert_inhibit_dmem.patch | 19 +++++++++----------
.../2.6.24/ehca_00_revert_inhibit_dmem.patch | 19 +++++++++----------
.../2.6.25/ehca_00_revert_inhibit_dmem.patch | 19 +++++++++----------
.../2.6.26/ehca_00_revert_inhibit_dmem.patch | 19 +++++++++----------
kernel_patches/fixes/ehca_0110_inhibit_dmem.patch | 19 +++++++++----------
8 files changed, 72 insertions(+), 80 deletions(-)
diff --git a/kernel_patches/backport/2.6.16_sles10_sp1/ehca_00_revert_inhibit_dmem.patch b/kernel_patches/backport/2.6.16_sles10_sp1/ehca_00_revert_inhibit_dmem.patch
index 941eb50..3b153ec 100644
--- a/kernel_patches/backport/2.6.16_sles10_sp1/ehca_00_revert_inhibit_dmem.patch
+++ b/kernel_patches/backport/2.6.16_sles10_sp1/ehca_00_revert_inhibit_dmem.patch
@@ -1,4 +1,4 @@
-From 263c24a2bbbaca75805ed231e8346d86410af9d0 Mon Sep 17 00:00:00 2001
+From 8e110a2fff1f110a9211f240acc12b8310e5cbd3 Mon Sep 17 00:00:00 2001
From: Stefan Roscher <ossrosch at linux.vnet.ibm.com>
Date: Wed, 22 Oct 2008 15:54:38 -0700
Subject: [PATCH] IB/ehca: Reject dynamic memory add/remove when ehca adapter is present
@@ -18,11 +18,11 @@ operation, and then hot-adding the ehca adapter back.
Signed-off-by: Stefan Roscher <stefan.roscher at de.ibm.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
---
- drivers/infiniband/hw/ehca/ehca_main.c | 48 --------------------------------
- 1 files changed, 0 insertions(+), 48 deletions(-)
+ drivers/infiniband/hw/ehca/ehca_main.c | 47 --------------------------------
+ 1 files changed, 0 insertions(+), 47 deletions(-)
diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c
-index bb02a86..086959a 100644
+index bec7e02..086959a 100644
--- a/drivers/infiniband/hw/ehca/ehca_main.c
+++ b/drivers/infiniband/hw/ehca/ehca_main.c
@@ -44,8 +44,6 @@
@@ -34,7 +34,7 @@ index bb02a86..086959a 100644
#include "ehca_classes.h"
#include "ehca_iverbs.h"
#include "ehca_mrmw.h"
-@@ -971,41 +969,6 @@ void ehca_poll_eqs(unsigned long data)
+@@ -971,40 +969,6 @@ void ehca_poll_eqs(unsigned long data)
spin_unlock(&shca_list_lock);
}
@@ -61,8 +61,7 @@ index bb02a86..086959a 100644
- if (printk_timed_ratelimit(&ehca_dmem_warn_time,
- 30 * 1000))
- ehca_gen_err("DMEM operations are not allowed"
-- "as long as an ehca adapter is"
-- "attached to the LPAR");
+- "in conjunction with eHCA");
- return NOTIFY_BAD;
- }
- }
@@ -76,7 +75,7 @@ index bb02a86..086959a 100644
static int __init ehca_module_init(void)
{
int ret;
-@@ -1033,12 +996,6 @@ static int __init ehca_module_init(void)
+@@ -1032,12 +996,6 @@ static int __init ehca_module_init(void)
goto module_init2;
}
@@ -89,7 +88,7 @@ index bb02a86..086959a 100644
if (ehca_poll_all_eqs != 1) {
ehca_gen_err("WARNING!!!");
ehca_gen_err("It is possible to lose interrupts.");
-@@ -1051,9 +1008,6 @@ static int __init ehca_module_init(void)
+@@ -1050,9 +1008,6 @@ static int __init ehca_module_init(void)
return 0;
@@ -99,7 +98,7 @@ index bb02a86..086959a 100644
module_init2:
ehca_destroy_slab_caches();
-@@ -1069,8 +1023,6 @@ static void __exit ehca_module_exit(void)
+@@ -1068,8 +1023,6 @@ static void __exit ehca_module_exit(void)
ibmebus_unregister_driver(&ehca_driver);
diff --git a/kernel_patches/backport/2.6.16_sles10_sp2/ehca_00_revert_inhibit_dmem.patch b/kernel_patches/backport/2.6.16_sles10_sp2/ehca_00_revert_inhibit_dmem.patch
index 941eb50..3b153ec 100644
--- a/kernel_patches/backport/2.6.16_sles10_sp2/ehca_00_revert_inhibit_dmem.patch
+++ b/kernel_patches/backport/2.6.16_sles10_sp2/ehca_00_revert_inhibit_dmem.patch
@@ -1,4 +1,4 @@
-From 263c24a2bbbaca75805ed231e8346d86410af9d0 Mon Sep 17 00:00:00 2001
+From 8e110a2fff1f110a9211f240acc12b8310e5cbd3 Mon Sep 17 00:00:00 2001
From: Stefan Roscher <ossrosch at linux.vnet.ibm.com>
Date: Wed, 22 Oct 2008 15:54:38 -0700
Subject: [PATCH] IB/ehca: Reject dynamic memory add/remove when ehca adapter is present
@@ -18,11 +18,11 @@ operation, and then hot-adding the ehca adapter back.
Signed-off-by: Stefan Roscher <stefan.roscher at de.ibm.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
---
- drivers/infiniband/hw/ehca/ehca_main.c | 48 --------------------------------
- 1 files changed, 0 insertions(+), 48 deletions(-)
+ drivers/infiniband/hw/ehca/ehca_main.c | 47 --------------------------------
+ 1 files changed, 0 insertions(+), 47 deletions(-)
diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c
-index bb02a86..086959a 100644
+index bec7e02..086959a 100644
--- a/drivers/infiniband/hw/ehca/ehca_main.c
+++ b/drivers/infiniband/hw/ehca/ehca_main.c
@@ -44,8 +44,6 @@
@@ -34,7 +34,7 @@ index bb02a86..086959a 100644
#include "ehca_classes.h"
#include "ehca_iverbs.h"
#include "ehca_mrmw.h"
-@@ -971,41 +969,6 @@ void ehca_poll_eqs(unsigned long data)
+@@ -971,40 +969,6 @@ void ehca_poll_eqs(unsigned long data)
spin_unlock(&shca_list_lock);
}
@@ -61,8 +61,7 @@ index bb02a86..086959a 100644
- if (printk_timed_ratelimit(&ehca_dmem_warn_time,
- 30 * 1000))
- ehca_gen_err("DMEM operations are not allowed"
-- "as long as an ehca adapter is"
-- "attached to the LPAR");
+- "in conjunction with eHCA");
- return NOTIFY_BAD;
- }
- }
@@ -76,7 +75,7 @@ index bb02a86..086959a 100644
static int __init ehca_module_init(void)
{
int ret;
-@@ -1033,12 +996,6 @@ static int __init ehca_module_init(void)
+@@ -1032,12 +996,6 @@ static int __init ehca_module_init(void)
goto module_init2;
}
@@ -89,7 +88,7 @@ index bb02a86..086959a 100644
if (ehca_poll_all_eqs != 1) {
ehca_gen_err("WARNING!!!");
ehca_gen_err("It is possible to lose interrupts.");
-@@ -1051,9 +1008,6 @@ static int __init ehca_module_init(void)
+@@ -1050,9 +1008,6 @@ static int __init ehca_module_init(void)
return 0;
@@ -99,7 +98,7 @@ index bb02a86..086959a 100644
module_init2:
ehca_destroy_slab_caches();
-@@ -1069,8 +1023,6 @@ static void __exit ehca_module_exit(void)
+@@ -1068,8 +1023,6 @@ static void __exit ehca_module_exit(void)
ibmebus_unregister_driver(&ehca_driver);
diff --git a/kernel_patches/backport/2.6.18-EL5.1/ehca-00-revert_inhibit_dmem.patch b/kernel_patches/backport/2.6.18-EL5.1/ehca-00-revert_inhibit_dmem.patch
index 941eb50..3b153ec 100644
--- a/kernel_patches/backport/2.6.18-EL5.1/ehca-00-revert_inhibit_dmem.patch
+++ b/kernel_patches/backport/2.6.18-EL5.1/ehca-00-revert_inhibit_dmem.patch
@@ -1,4 +1,4 @@
-From 263c24a2bbbaca75805ed231e8346d86410af9d0 Mon Sep 17 00:00:00 2001
+From 8e110a2fff1f110a9211f240acc12b8310e5cbd3 Mon Sep 17 00:00:00 2001
From: Stefan Roscher <ossrosch at linux.vnet.ibm.com>
Date: Wed, 22 Oct 2008 15:54:38 -0700
Subject: [PATCH] IB/ehca: Reject dynamic memory add/remove when ehca adapter is present
@@ -18,11 +18,11 @@ operation, and then hot-adding the ehca adapter back.
Signed-off-by: Stefan Roscher <stefan.roscher at de.ibm.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
---
- drivers/infiniband/hw/ehca/ehca_main.c | 48 --------------------------------
- 1 files changed, 0 insertions(+), 48 deletions(-)
+ drivers/infiniband/hw/ehca/ehca_main.c | 47 --------------------------------
+ 1 files changed, 0 insertions(+), 47 deletions(-)
diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c
-index bb02a86..086959a 100644
+index bec7e02..086959a 100644
--- a/drivers/infiniband/hw/ehca/ehca_main.c
+++ b/drivers/infiniband/hw/ehca/ehca_main.c
@@ -44,8 +44,6 @@
@@ -34,7 +34,7 @@ index bb02a86..086959a 100644
#include "ehca_classes.h"
#include "ehca_iverbs.h"
#include "ehca_mrmw.h"
-@@ -971,41 +969,6 @@ void ehca_poll_eqs(unsigned long data)
+@@ -971,40 +969,6 @@ void ehca_poll_eqs(unsigned long data)
spin_unlock(&shca_list_lock);
}
@@ -61,8 +61,7 @@ index bb02a86..086959a 100644
- if (printk_timed_ratelimit(&ehca_dmem_warn_time,
- 30 * 1000))
- ehca_gen_err("DMEM operations are not allowed"
-- "as long as an ehca adapter is"
-- "attached to the LPAR");
+- "in conjunction with eHCA");
- return NOTIFY_BAD;
- }
- }
@@ -76,7 +75,7 @@ index bb02a86..086959a 100644
static int __init ehca_module_init(void)
{
int ret;
-@@ -1033,12 +996,6 @@ static int __init ehca_module_init(void)
+@@ -1032,12 +996,6 @@ static int __init ehca_module_init(void)
goto module_init2;
}
@@ -89,7 +88,7 @@ index bb02a86..086959a 100644
if (ehca_poll_all_eqs != 1) {
ehca_gen_err("WARNING!!!");
ehca_gen_err("It is possible to lose interrupts.");
-@@ -1051,9 +1008,6 @@ static int __init ehca_module_init(void)
+@@ -1050,9 +1008,6 @@ static int __init ehca_module_init(void)
return 0;
@@ -99,7 +98,7 @@ index bb02a86..086959a 100644
module_init2:
ehca_destroy_slab_caches();
-@@ -1069,8 +1023,6 @@ static void __exit ehca_module_exit(void)
+@@ -1068,8 +1023,6 @@ static void __exit ehca_module_exit(void)
ibmebus_unregister_driver(&ehca_driver);
diff --git a/kernel_patches/backport/2.6.18-EL5.2/ehca-00-revert_inhibit_dmem.patch b/kernel_patches/backport/2.6.18-EL5.2/ehca-00-revert_inhibit_dmem.patch
index 941eb50..3b153ec 100644
--- a/kernel_patches/backport/2.6.18-EL5.2/ehca-00-revert_inhibit_dmem.patch
+++ b/kernel_patches/backport/2.6.18-EL5.2/ehca-00-revert_inhibit_dmem.patch
@@ -1,4 +1,4 @@
-From 263c24a2bbbaca75805ed231e8346d86410af9d0 Mon Sep 17 00:00:00 2001
+From 8e110a2fff1f110a9211f240acc12b8310e5cbd3 Mon Sep 17 00:00:00 2001
From: Stefan Roscher <ossrosch at linux.vnet.ibm.com>
Date: Wed, 22 Oct 2008 15:54:38 -0700
Subject: [PATCH] IB/ehca: Reject dynamic memory add/remove when ehca adapter is present
@@ -18,11 +18,11 @@ operation, and then hot-adding the ehca adapter back.
Signed-off-by: Stefan Roscher <stefan.roscher at de.ibm.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
---
- drivers/infiniband/hw/ehca/ehca_main.c | 48 --------------------------------
- 1 files changed, 0 insertions(+), 48 deletions(-)
+ drivers/infiniband/hw/ehca/ehca_main.c | 47 --------------------------------
+ 1 files changed, 0 insertions(+), 47 deletions(-)
diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c
-index bb02a86..086959a 100644
+index bec7e02..086959a 100644
--- a/drivers/infiniband/hw/ehca/ehca_main.c
+++ b/drivers/infiniband/hw/ehca/ehca_main.c
@@ -44,8 +44,6 @@
@@ -34,7 +34,7 @@ index bb02a86..086959a 100644
#include "ehca_classes.h"
#include "ehca_iverbs.h"
#include "ehca_mrmw.h"
-@@ -971,41 +969,6 @@ void ehca_poll_eqs(unsigned long data)
+@@ -971,40 +969,6 @@ void ehca_poll_eqs(unsigned long data)
spin_unlock(&shca_list_lock);
}
@@ -61,8 +61,7 @@ index bb02a86..086959a 100644
- if (printk_timed_ratelimit(&ehca_dmem_warn_time,
- 30 * 1000))
- ehca_gen_err("DMEM operations are not allowed"
-- "as long as an ehca adapter is"
-- "attached to the LPAR");
+- "in conjunction with eHCA");
- return NOTIFY_BAD;
- }
- }
@@ -76,7 +75,7 @@ index bb02a86..086959a 100644
static int __init ehca_module_init(void)
{
int ret;
-@@ -1033,12 +996,6 @@ static int __init ehca_module_init(void)
+@@ -1032,12 +996,6 @@ static int __init ehca_module_init(void)
goto module_init2;
}
@@ -89,7 +88,7 @@ index bb02a86..086959a 100644
if (ehca_poll_all_eqs != 1) {
ehca_gen_err("WARNING!!!");
ehca_gen_err("It is possible to lose interrupts.");
-@@ -1051,9 +1008,6 @@ static int __init ehca_module_init(void)
+@@ -1050,9 +1008,6 @@ static int __init ehca_module_init(void)
return 0;
@@ -99,7 +98,7 @@ index bb02a86..086959a 100644
module_init2:
ehca_destroy_slab_caches();
-@@ -1069,8 +1023,6 @@ static void __exit ehca_module_exit(void)
+@@ -1068,8 +1023,6 @@ static void __exit ehca_module_exit(void)
ibmebus_unregister_driver(&ehca_driver);
diff --git a/kernel_patches/backport/2.6.24/ehca_00_revert_inhibit_dmem.patch b/kernel_patches/backport/2.6.24/ehca_00_revert_inhibit_dmem.patch
index 941eb50..3b153ec 100644
--- a/kernel_patches/backport/2.6.24/ehca_00_revert_inhibit_dmem.patch
+++ b/kernel_patches/backport/2.6.24/ehca_00_revert_inhibit_dmem.patch
@@ -1,4 +1,4 @@
-From 263c24a2bbbaca75805ed231e8346d86410af9d0 Mon Sep 17 00:00:00 2001
+From 8e110a2fff1f110a9211f240acc12b8310e5cbd3 Mon Sep 17 00:00:00 2001
From: Stefan Roscher <ossrosch at linux.vnet.ibm.com>
Date: Wed, 22 Oct 2008 15:54:38 -0700
Subject: [PATCH] IB/ehca: Reject dynamic memory add/remove when ehca adapter is present
@@ -18,11 +18,11 @@ operation, and then hot-adding the ehca adapter back.
Signed-off-by: Stefan Roscher <stefan.roscher at de.ibm.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
---
- drivers/infiniband/hw/ehca/ehca_main.c | 48 --------------------------------
- 1 files changed, 0 insertions(+), 48 deletions(-)
+ drivers/infiniband/hw/ehca/ehca_main.c | 47 --------------------------------
+ 1 files changed, 0 insertions(+), 47 deletions(-)
diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c
-index bb02a86..086959a 100644
+index bec7e02..086959a 100644
--- a/drivers/infiniband/hw/ehca/ehca_main.c
+++ b/drivers/infiniband/hw/ehca/ehca_main.c
@@ -44,8 +44,6 @@
@@ -34,7 +34,7 @@ index bb02a86..086959a 100644
#include "ehca_classes.h"
#include "ehca_iverbs.h"
#include "ehca_mrmw.h"
-@@ -971,41 +969,6 @@ void ehca_poll_eqs(unsigned long data)
+@@ -971,40 +969,6 @@ void ehca_poll_eqs(unsigned long data)
spin_unlock(&shca_list_lock);
}
@@ -61,8 +61,7 @@ index bb02a86..086959a 100644
- if (printk_timed_ratelimit(&ehca_dmem_warn_time,
- 30 * 1000))
- ehca_gen_err("DMEM operations are not allowed"
-- "as long as an ehca adapter is"
-- "attached to the LPAR");
+- "in conjunction with eHCA");
- return NOTIFY_BAD;
- }
- }
@@ -76,7 +75,7 @@ index bb02a86..086959a 100644
static int __init ehca_module_init(void)
{
int ret;
-@@ -1033,12 +996,6 @@ static int __init ehca_module_init(void)
+@@ -1032,12 +996,6 @@ static int __init ehca_module_init(void)
goto module_init2;
}
@@ -89,7 +88,7 @@ index bb02a86..086959a 100644
if (ehca_poll_all_eqs != 1) {
ehca_gen_err("WARNING!!!");
ehca_gen_err("It is possible to lose interrupts.");
-@@ -1051,9 +1008,6 @@ static int __init ehca_module_init(void)
+@@ -1050,9 +1008,6 @@ static int __init ehca_module_init(void)
return 0;
@@ -99,7 +98,7 @@ index bb02a86..086959a 100644
module_init2:
ehca_destroy_slab_caches();
-@@ -1069,8 +1023,6 @@ static void __exit ehca_module_exit(void)
+@@ -1068,8 +1023,6 @@ static void __exit ehca_module_exit(void)
ibmebus_unregister_driver(&ehca_driver);
diff --git a/kernel_patches/backport/2.6.25/ehca_00_revert_inhibit_dmem.patch b/kernel_patches/backport/2.6.25/ehca_00_revert_inhibit_dmem.patch
index 941eb50..3b153ec 100644
--- a/kernel_patches/backport/2.6.25/ehca_00_revert_inhibit_dmem.patch
+++ b/kernel_patches/backport/2.6.25/ehca_00_revert_inhibit_dmem.patch
@@ -1,4 +1,4 @@
-From 263c24a2bbbaca75805ed231e8346d86410af9d0 Mon Sep 17 00:00:00 2001
+From 8e110a2fff1f110a9211f240acc12b8310e5cbd3 Mon Sep 17 00:00:00 2001
From: Stefan Roscher <ossrosch at linux.vnet.ibm.com>
Date: Wed, 22 Oct 2008 15:54:38 -0700
Subject: [PATCH] IB/ehca: Reject dynamic memory add/remove when ehca adapter is present
@@ -18,11 +18,11 @@ operation, and then hot-adding the ehca adapter back.
Signed-off-by: Stefan Roscher <stefan.roscher at de.ibm.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
---
- drivers/infiniband/hw/ehca/ehca_main.c | 48 --------------------------------
- 1 files changed, 0 insertions(+), 48 deletions(-)
+ drivers/infiniband/hw/ehca/ehca_main.c | 47 --------------------------------
+ 1 files changed, 0 insertions(+), 47 deletions(-)
diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c
-index bb02a86..086959a 100644
+index bec7e02..086959a 100644
--- a/drivers/infiniband/hw/ehca/ehca_main.c
+++ b/drivers/infiniband/hw/ehca/ehca_main.c
@@ -44,8 +44,6 @@
@@ -34,7 +34,7 @@ index bb02a86..086959a 100644
#include "ehca_classes.h"
#include "ehca_iverbs.h"
#include "ehca_mrmw.h"
-@@ -971,41 +969,6 @@ void ehca_poll_eqs(unsigned long data)
+@@ -971,40 +969,6 @@ void ehca_poll_eqs(unsigned long data)
spin_unlock(&shca_list_lock);
}
@@ -61,8 +61,7 @@ index bb02a86..086959a 100644
- if (printk_timed_ratelimit(&ehca_dmem_warn_time,
- 30 * 1000))
- ehca_gen_err("DMEM operations are not allowed"
-- "as long as an ehca adapter is"
-- "attached to the LPAR");
+- "in conjunction with eHCA");
- return NOTIFY_BAD;
- }
- }
@@ -76,7 +75,7 @@ index bb02a86..086959a 100644
static int __init ehca_module_init(void)
{
int ret;
-@@ -1033,12 +996,6 @@ static int __init ehca_module_init(void)
+@@ -1032,12 +996,6 @@ static int __init ehca_module_init(void)
goto module_init2;
}
@@ -89,7 +88,7 @@ index bb02a86..086959a 100644
if (ehca_poll_all_eqs != 1) {
ehca_gen_err("WARNING!!!");
ehca_gen_err("It is possible to lose interrupts.");
-@@ -1051,9 +1008,6 @@ static int __init ehca_module_init(void)
+@@ -1050,9 +1008,6 @@ static int __init ehca_module_init(void)
return 0;
@@ -99,7 +98,7 @@ index bb02a86..086959a 100644
module_init2:
ehca_destroy_slab_caches();
-@@ -1069,8 +1023,6 @@ static void __exit ehca_module_exit(void)
+@@ -1068,8 +1023,6 @@ static void __exit ehca_module_exit(void)
ibmebus_unregister_driver(&ehca_driver);
diff --git a/kernel_patches/backport/2.6.26/ehca_00_revert_inhibit_dmem.patch b/kernel_patches/backport/2.6.26/ehca_00_revert_inhibit_dmem.patch
index 941eb50..3b153ec 100644
--- a/kernel_patches/backport/2.6.26/ehca_00_revert_inhibit_dmem.patch
+++ b/kernel_patches/backport/2.6.26/ehca_00_revert_inhibit_dmem.patch
@@ -1,4 +1,4 @@
-From 263c24a2bbbaca75805ed231e8346d86410af9d0 Mon Sep 17 00:00:00 2001
+From 8e110a2fff1f110a9211f240acc12b8310e5cbd3 Mon Sep 17 00:00:00 2001
From: Stefan Roscher <ossrosch at linux.vnet.ibm.com>
Date: Wed, 22 Oct 2008 15:54:38 -0700
Subject: [PATCH] IB/ehca: Reject dynamic memory add/remove when ehca adapter is present
@@ -18,11 +18,11 @@ operation, and then hot-adding the ehca adapter back.
Signed-off-by: Stefan Roscher <stefan.roscher at de.ibm.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
---
- drivers/infiniband/hw/ehca/ehca_main.c | 48 --------------------------------
- 1 files changed, 0 insertions(+), 48 deletions(-)
+ drivers/infiniband/hw/ehca/ehca_main.c | 47 --------------------------------
+ 1 files changed, 0 insertions(+), 47 deletions(-)
diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c
-index bb02a86..086959a 100644
+index bec7e02..086959a 100644
--- a/drivers/infiniband/hw/ehca/ehca_main.c
+++ b/drivers/infiniband/hw/ehca/ehca_main.c
@@ -44,8 +44,6 @@
@@ -34,7 +34,7 @@ index bb02a86..086959a 100644
#include "ehca_classes.h"
#include "ehca_iverbs.h"
#include "ehca_mrmw.h"
-@@ -971,41 +969,6 @@ void ehca_poll_eqs(unsigned long data)
+@@ -971,40 +969,6 @@ void ehca_poll_eqs(unsigned long data)
spin_unlock(&shca_list_lock);
}
@@ -61,8 +61,7 @@ index bb02a86..086959a 100644
- if (printk_timed_ratelimit(&ehca_dmem_warn_time,
- 30 * 1000))
- ehca_gen_err("DMEM operations are not allowed"
-- "as long as an ehca adapter is"
-- "attached to the LPAR");
+- "in conjunction with eHCA");
- return NOTIFY_BAD;
- }
- }
@@ -76,7 +75,7 @@ index bb02a86..086959a 100644
static int __init ehca_module_init(void)
{
int ret;
-@@ -1033,12 +996,6 @@ static int __init ehca_module_init(void)
+@@ -1032,12 +996,6 @@ static int __init ehca_module_init(void)
goto module_init2;
}
@@ -89,7 +88,7 @@ index bb02a86..086959a 100644
if (ehca_poll_all_eqs != 1) {
ehca_gen_err("WARNING!!!");
ehca_gen_err("It is possible to lose interrupts.");
-@@ -1051,9 +1008,6 @@ static int __init ehca_module_init(void)
+@@ -1050,9 +1008,6 @@ static int __init ehca_module_init(void)
return 0;
@@ -99,7 +98,7 @@ index bb02a86..086959a 100644
module_init2:
ehca_destroy_slab_caches();
-@@ -1069,8 +1023,6 @@ static void __exit ehca_module_exit(void)
+@@ -1068,8 +1023,6 @@ static void __exit ehca_module_exit(void)
ibmebus_unregister_driver(&ehca_driver);
diff --git a/kernel_patches/fixes/ehca_0110_inhibit_dmem.patch b/kernel_patches/fixes/ehca_0110_inhibit_dmem.patch
index 5ccab2e..90fd5e0 100644
--- a/kernel_patches/fixes/ehca_0110_inhibit_dmem.patch
+++ b/kernel_patches/fixes/ehca_0110_inhibit_dmem.patch
@@ -1,4 +1,4 @@
-From 263c24a2bbbaca75805ed231e8346d86410af9d0 Mon Sep 17 00:00:00 2001
+From d02d05f6df61d70cb3b7cb4837883d773f0b89d1 Mon Sep 17 00:00:00 2001
From: Stefan Roscher <ossrosch at linux.vnet.ibm.com>
Date: Wed, 22 Oct 2008 15:54:38 -0700
Subject: [PATCH] IB/ehca: Reject dynamic memory add/remove when ehca adapter is present
@@ -18,11 +18,11 @@ operation, and then hot-adding the ehca adapter back.
Signed-off-by: Stefan Roscher <stefan.roscher at de.ibm.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
---
- drivers/infiniband/hw/ehca/ehca_main.c | 48 ++++++++++++++++++++++++++++++++
- 1 files changed, 48 insertions(+), 0 deletions(-)
+ drivers/infiniband/hw/ehca/ehca_main.c | 47 ++++++++++++++++++++++++++++++++
+ 1 files changed, 47 insertions(+), 0 deletions(-)
diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c
-index 086959a..bb02a86 100644
+index 086959a..bec7e02 100644
--- a/drivers/infiniband/hw/ehca/ehca_main.c
+++ b/drivers/infiniband/hw/ehca/ehca_main.c
@@ -44,6 +44,8 @@
@@ -34,7 +34,7 @@ index 086959a..bb02a86 100644
#include "ehca_classes.h"
#include "ehca_iverbs.h"
#include "ehca_mrmw.h"
-@@ -969,6 +971,41 @@ void ehca_poll_eqs(unsigned long data)
+@@ -969,6 +971,40 @@ void ehca_poll_eqs(unsigned long data)
spin_unlock(&shca_list_lock);
}
@@ -61,8 +61,7 @@ index 086959a..bb02a86 100644
+ if (printk_timed_ratelimit(&ehca_dmem_warn_time,
+ 30 * 1000))
+ ehca_gen_err("DMEM operations are not allowed"
-+ "as long as an ehca adapter is"
-+ "attached to the LPAR");
++ "in conjunction with eHCA");
+ return NOTIFY_BAD;
+ }
+ }
@@ -76,7 +75,7 @@ index 086959a..bb02a86 100644
static int __init ehca_module_init(void)
{
int ret;
-@@ -996,6 +1033,12 @@ static int __init ehca_module_init(void)
+@@ -996,6 +1032,12 @@ static int __init ehca_module_init(void)
goto module_init2;
}
@@ -89,7 +88,7 @@ index 086959a..bb02a86 100644
if (ehca_poll_all_eqs != 1) {
ehca_gen_err("WARNING!!!");
ehca_gen_err("It is possible to lose interrupts.");
-@@ -1008,6 +1051,9 @@ static int __init ehca_module_init(void)
+@@ -1008,6 +1050,9 @@ static int __init ehca_module_init(void)
return 0;
@@ -99,7 +98,7 @@ index 086959a..bb02a86 100644
module_init2:
ehca_destroy_slab_caches();
-@@ -1023,6 +1069,8 @@ static void __exit ehca_module_exit(void)
+@@ -1023,6 +1068,8 @@ static void __exit ehca_module_exit(void)
ibmebus_unregister_driver(&ehca_driver);
--
1.5.5
More information about the ewg
mailing list