[MTHCA] mthca wpp debug use the same format .

fix race between KeCancelTimre to iounmap in mthca catastrophic error flow

git-svn-id: svn://openib.tc.cornell.edu/gen1@528 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/trunk/hw/mthca/kernel/hca_debug.h b/trunk/hw/mthca/kernel/hca_debug.h
index 8e737a53fa6011358e367671917aad4c7546ad9f..7ecfed43a5e96b7f47a5227f7b54e933b766ee42 100644 (file)
--- a/trunk/hw/mthca/kernel/hca_debug.h
+++ b/trunk/hw/mthca/kernel/hca_debug.h
@@ -96,9 +96,11 @@ static void _build_str( const char * format, ... )
 // begin_wpp config\r
 // HCA_ENTER(FLAG);\r
 // HCA_EXIT(FLAG);\r
-// USEPREFIX(HCA_PRINT, "%!STDPREFIX! %!FUNC!() :");\r
-// USESUFFIX(HCA_ENTER, " %!FUNC!()===>");\r
-// USESUFFIX(HCA_EXIT, " %!FUNC!()<===");\r
+// USEPREFIX(HCA_PRINT, "%!STDPREFIX! [MTHCA] :%!FUNC!() :");\r
+// USEPREFIX(HCA_PRINT_EXIT, "%!STDPREFIX! [MTHCA] :%!FUNC!() :");\r
+// USESUFFIX(HCA_PRINT_EXIT, "[MTHCA] :%!FUNC!():]");\r
+// USESUFFIX(HCA_ENTER, " [MTHCA] :%!FUNC!()[");\r
+// USESUFFIX(HCA_EXIT, " [MTHCA] :%!FUNC!()]");\r
 // end_wpp\r
 \r
 \r
@@ -158,10 +160,10 @@ static void _build_str( const char *      format, ... )
        }\r
 \r
 #define HCA_ENTER(flags)\\r
-       HCA_PRINT(TRACE_LEVEL_VERBOSE, flags,("===>\n"));\r
+       HCA_PRINT(TRACE_LEVEL_VERBOSE, flags,("[\n"));\r
 \r
 #define HCA_EXIT(flags)\\r
-       HCA_PRINT(TRACE_LEVEL_VERBOSE, flags, ("<===\n" ));\r
+       HCA_PRINT(TRACE_LEVEL_VERBOSE, flags, ("]\n" ));\r
 \r
 \r
 #define HCA_PRINT_EXIT(_level_,_flag_,_msg_)   \\r

diff --git a/trunk/hw/mthca/kernel/mthca_catas.c b/trunk/hw/mthca/kernel/mthca_catas.c
index fc7e90c9044f09bb0b118641b9372fca12572fb5..0c91518fb96fc119dffd79fe15a06dc3099e3dce 100644 (file)
--- a/trunk/hw/mthca/kernel/mthca_catas.c
+++ b/trunk/hw/mthca/kernel/mthca_catas.c
@@ -158,6 +158,7 @@ void mthca_stop_catas_poll(struct mthca_dev *dev)
        spin_unlock_irq(&lh);
 
        KeCancelTimer(&dev->catas_err.timer);
+       KeFlushQueuedDpcs();
 
        if (dev->catas_err.map) {
                iounmap(dev->catas_err.map, dev->catas_err.map_size);