From b89b625836c417b32ff1fba0650f69ba6c39f7c3 Mon Sep 17 00:00:00 2001 From: sleybo Date: Thu, 19 Oct 2006 11:48:17 +0000 Subject: [PATCH] [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 --- trunk/hw/mthca/kernel/hca_debug.h | 12 +++++++----- trunk/hw/mthca/kernel/mthca_catas.c | 1 + 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/trunk/hw/mthca/kernel/hca_debug.h b/trunk/hw/mthca/kernel/hca_debug.h index 8e737a53..7ecfed43 100644 --- 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 // HCA_ENTER(FLAG); // HCA_EXIT(FLAG); -// USEPREFIX(HCA_PRINT, "%!STDPREFIX! %!FUNC!() :"); -// USESUFFIX(HCA_ENTER, " %!FUNC!()===>"); -// USESUFFIX(HCA_EXIT, " %!FUNC!()<==="); +// USEPREFIX(HCA_PRINT, "%!STDPREFIX! [MTHCA] :%!FUNC!() :"); +// USEPREFIX(HCA_PRINT_EXIT, "%!STDPREFIX! [MTHCA] :%!FUNC!() :"); +// USESUFFIX(HCA_PRINT_EXIT, "[MTHCA] :%!FUNC!():]"); +// USESUFFIX(HCA_ENTER, " [MTHCA] :%!FUNC!()["); +// USESUFFIX(HCA_EXIT, " [MTHCA] :%!FUNC!()]"); // end_wpp @@ -158,10 +160,10 @@ static void _build_str( const char * format, ... ) } #define HCA_ENTER(flags)\ - HCA_PRINT(TRACE_LEVEL_VERBOSE, flags,("===>\n")); + HCA_PRINT(TRACE_LEVEL_VERBOSE, flags,("[\n")); #define HCA_EXIT(flags)\ - HCA_PRINT(TRACE_LEVEL_VERBOSE, flags, ("<===\n" )); + HCA_PRINT(TRACE_LEVEL_VERBOSE, flags, ("]\n" )); #define HCA_PRINT_EXIT(_level_,_flag_,_msg_) \ diff --git a/trunk/hw/mthca/kernel/mthca_catas.c b/trunk/hw/mthca/kernel/mthca_catas.c index fc7e90c9..0c91518f 100644 --- 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); -- 2.41.0