[hw] Don't try to write to event log when there is no driver object

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

diff --git a/hw/mlx4/kernel/bus/core/l2w_debug.c b/hw/mlx4/kernel/bus/core/l2w_debug.c
index 9973d81..3780b26 100644 (file)
--- a/hw/mlx4/kernel/bus/core/l2w_debug.c
+++ b/hw/mlx4/kernel/bus/core/l2w_debug.c
@@ -45,6 +45,11 @@ Return Value:
        int l_PktSize =sizeof(IO_ERROR_LOG_PACKET)+pi_nDataItems*sizeof(ULONG);
        int l_TotalSize =l_PktSize +l_Size;
 
+       if (pi_pIoObject == NULL) {
+               ASSERT(pi_pIoObject != NULL);
+               return;
+       }
+
        /* Init the variable argument list */   
        va_start(l_Argptr, pi_nDataItems);
 
@@ -132,6 +137,13 @@ mlx4_err(
        // print to Debugger
        va_start(list, format);
        buf[MAX_BUFFER_SIZE - 1] = '\0';
+
+       if (mdev == NULL) {
+               ASSERT(mdev != NULL);
+               return;
+       }
+
+       
        if (RtlStringCbVPrintfA( (char*)buf, sizeof(buf), format, list))
                return;
        cl_dbg_out( "%s\n", (char*)buf );
@@ -177,6 +189,11 @@ dev_err(
        UCHAR           buf[MAX_BUFFER_SIZE];
        WCHAR           wbuf[MAX_BUFFER_SIZE];
 
+       if (mdev == NULL) {
+               ASSERT(mdev != NULL);
+               return;
+       }
+
        // print to Debugger
        va_start(list, format);
        buf[MAX_BUFFER_SIZE - 1] = '\0';

diff --git a/hw/mlx4/kernel/hca/drv.h b/hw/mlx4/kernel/hca/drv.h
index 913e7fb..3138c03 100644 (file)
--- a/hw/mlx4/kernel/hca/drv.h
+++ b/hw/mlx4/kernel/hca/drv.h
@@ -243,6 +243,9 @@ static inline struct mlx4_dev *hca2mdev(mlnx_hca_t *p_hca)
 \r
 static inline boolean_t hca_is_livefish(PFDO_DEVICE_DATA p_fdo)\r
 {\r
+       if (p_fdo == NULL) {\r
+               return TRUE;\r
+       }\r
        return p_fdo->bus_ib_ifc.is_livefish;\r
 }\r
 \r

diff --git a/hw/mlx4/kernel/inc/l2w.h b/hw/mlx4/kernel/inc/l2w.h
index fee2eca..59a5132 100644 (file)
--- a/hw/mlx4/kernel/inc/l2w.h
+++ b/hw/mlx4/kernel/inc/l2w.h
@@ -326,6 +326,9 @@ struct mlx4_priv;
 
 static inline int mlx4_is_livefish(struct mlx4_dev *dev)
 {
+       if (dev == NULL) {
+               return TRUE;
+       }
        return !!(dev->flags & MLX4_FLAG_LIVEFISH);
 }
 

diff --git a/hw/mthca/kernel/hca_debug.h b/hw/mthca/kernel/hca_debug.h
index fb330b8..924b36d 100644 (file)
--- a/hw/mthca/kernel/hca_debug.h
+++ b/hw/mthca/kernel/hca_debug.h
@@ -63,7 +63,11 @@ static void _build_str( const char * format, ... )
        }\r
 \r
 #define HCA_PRINT_EV_MDEV(_level_,_flag_,_msg_)  \\r
-       HCA_PRINT_TO_EVENT_LOG(mdev->ext->cl_ext.p_self_do,_level_,_flag_,_msg_)\r
+{\\r
+       if(mdev) {\\r
+               HCA_PRINT_TO_EVENT_LOG(mdev->ext->cl_ext.p_self_do,_level_,_flag_,_msg_)\\r
+       }\\r
+}\\r
 \r
 \r
 #if defined(EVENT_TRACING)\r

diff --git a/hw/mthca/kernel/mthca_dev.h b/hw/mthca/kernel/mthca_dev.h
index 41fae6f..ad31d15 100644 (file)
--- a/hw/mthca/kernel/mthca_dev.h
+++ b/hw/mthca/kernel/mthca_dev.h
@@ -598,6 +598,9 @@ WriteEventLogEntryStr(
 
 static inline int mthca_is_livefish(struct mthca_dev *mdev)
 {
+       if(mdev == NULL) {
+               return TRUE;
+       }
        return mdev->mthca_flags & MTHCA_FLAG_LIVEFISH;
 }
 

diff --git a/hw/mthca/kernel/mthca_log.c b/hw/mthca/kernel/mthca_log.c
index 6725108..07bfb6c 100644 (file)
--- a/hw/mthca/kernel/mthca_log.c
+++ b/hw/mthca/kernel/mthca_log.c
@@ -73,6 +73,10 @@ Return Value:
        /* Init the variable argument list */   \r
        va_start(l_Argptr, pi_nDataItems);\r
 \r
+       if(pi_pIoObject == NULL) {\r
+               return;\r
+       }\r
+       \r
        /* Allocate an error log entry */ \r
     l_pErrorLogEntry = \r
        (PIO_ERROR_LOG_PACKET)IoAllocateErrorLogEntry(\r
@@ -165,6 +169,10 @@ Return Value:
        int l_PktSize =sizeof(IO_ERROR_LOG_PACKET)+pi_nDataItems*sizeof(ULONG);\r
        int l_TotalSize =l_PktSize +l_Size;\r
 \r
+       if(pi_pIoObject == NULL) {\r
+               return;\r
+       }\r
+       \r
        /* Init the variable argument list */   \r
        va_start(l_Argptr, pi_nDataItems);\r
 \r