diff options
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_logmsg.h')
| -rw-r--r-- | drivers/scsi/lpfc/lpfc_logmsg.h | 54 | 
1 files changed, 30 insertions, 24 deletions
diff --git a/drivers/scsi/lpfc/lpfc_logmsg.h b/drivers/scsi/lpfc/lpfc_logmsg.h index 1aa85709b01..954ba57970a 100644 --- a/drivers/scsi/lpfc/lpfc_logmsg.h +++ b/drivers/scsi/lpfc/lpfc_logmsg.h @@ -1,7 +1,7 @@  /*******************************************************************   * This file is part of the Emulex Linux Device Driver for         *   * Fibre Channel Host Bus Adapters.                                * - * Copyright (C) 2004-2008 Emulex.  All rights reserved.           * + * Copyright (C) 2004-2009 Emulex.  All rights reserved.           *   * EMULEX and SLI are trademarks of Emulex.                        *   * www.emulex.com                                                  *   *                                                                 * @@ -18,33 +18,39 @@   * included with this package.                                     *   *******************************************************************/ -#define LOG_ELS                       0x1	/* ELS events */ -#define LOG_DISCOVERY                 0x2	/* Link discovery events */ -#define LOG_MBOX                      0x4	/* Mailbox events */ -#define LOG_INIT                      0x8	/* Initialization events */ -#define LOG_LINK_EVENT                0x10	/* Link events */ -#define LOG_IP                        0x20	/* IP traffic history */ -#define LOG_FCP                       0x40	/* FCP traffic history */ -#define LOG_NODE                      0x80	/* Node table events */ -#define LOG_TEMP                      0x100	/* Temperature sensor events */ -#define LOG_BG			      0x200	/* BlockGuard events */ -#define LOG_MISC                      0x400	/* Miscellaneous events */ -#define LOG_SLI                       0x800	/* SLI events */ -#define LOG_FCP_ERROR                 0x1000	/* log errors, not underruns */ -#define LOG_LIBDFC                    0x2000	/* Libdfc events */ -#define LOG_VPORT                     0x4000	/* NPIV events */ -#define LOG_ALL_MSG                   0xffff	/* LOG all messages */ +#define LOG_ELS		0x00000001	/* ELS events */ +#define LOG_DISCOVERY	0x00000002	/* Link discovery events */ +#define LOG_MBOX	0x00000004	/* Mailbox events */ +#define LOG_INIT	0x00000008	/* Initialization events */ +#define LOG_LINK_EVENT	0x00000010	/* Link events */ +#define LOG_IP		0x00000020	/* IP traffic history */ +#define LOG_FCP		0x00000040	/* FCP traffic history */ +#define LOG_NODE	0x00000080	/* Node table events */ +#define LOG_TEMP	0x00000100	/* Temperature sensor events */ +#define LOG_BG		0x00000200	/* BlockGuard events */ +#define LOG_MISC	0x00000400	/* Miscellaneous events */ +#define LOG_SLI		0x00000800	/* SLI events */ +#define LOG_FCP_ERROR	0x00001000	/* log errors, not underruns */ +#define LOG_LIBDFC	0x00002000	/* Libdfc events */ +#define LOG_VPORT	0x00004000	/* NPIV events */ +#define LOF_SECURITY	0x00008000	/* Security events */ +#define LOG_EVENT	0x00010000	/* CT,TEMP,DUMP, logging */ +#define LOG_ALL_MSG	0xffffffff	/* LOG all messages */  #define lpfc_printf_vlog(vport, level, mask, fmt, arg...) \ -	do { \ -	{ if (((mask) &(vport)->cfg_log_verbose) || (level[1] <= '3')) \ +do { \ +	{ if (((mask) & (vport)->cfg_log_verbose) || (level[1] <= '3')) \  		dev_printk(level, &((vport)->phba->pcidev)->dev, "%d:(%d):" \  			   fmt, (vport)->phba->brd_no, vport->vpi, ##arg); } \ -	} while (0) +} while (0)  #define lpfc_printf_log(phba, level, mask, fmt, arg...) \ -	do { \ -	{ if (((mask) &(phba)->pport->cfg_log_verbose) || (level[1] <= '3')) \ +do { \ +	{ uint32_t log_verbose = (phba)->pport ? \ +				 (phba)->pport->cfg_log_verbose : \ +				 (phba)->cfg_log_verbose; \ +	  if (((mask) & log_verbose) || (level[1] <= '3')) \  		dev_printk(level, &((phba)->pcidev)->dev, "%d:" \ -			   fmt, phba->brd_no, ##arg); } \ -	} while (0) +			   fmt, phba->brd_no, ##arg); \ +	} \ +} while (0)  |