mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
synced 2026-04-23 05:56:14 -04:00
[S390] qdio: rework debug feature logging
- make qdio_trace a per device view - remove s390dbf exceptions - remove CONFIG_QDIO_DEBUG, not needed anymore if we check for the level before calling sprintf - use snprintf for dbf entries - add start markers to see if the dbf view wrapped - add a global error view for all queues Signed-off-by: Jan Glauber <jang@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
committed by
Martin Schwidefsky
parent
9a1ce28aeb
commit
22f9934767
@@ -12,80 +12,72 @@
|
||||
#include <asm/qdio.h>
|
||||
#include "qdio.h"
|
||||
|
||||
#define QDIO_DBF_HEX(ex, name, level, addr, len) \
|
||||
do { \
|
||||
if (ex) \
|
||||
debug_exception(qdio_dbf_##name, level, (void *)(addr), len); \
|
||||
else \
|
||||
debug_event(qdio_dbf_##name, level, (void *)(addr), len); \
|
||||
} while (0)
|
||||
#define QDIO_DBF_TEXT(ex, name, level, text) \
|
||||
do { \
|
||||
if (ex) \
|
||||
debug_text_exception(qdio_dbf_##name, level, text); \
|
||||
else \
|
||||
debug_text_event(qdio_dbf_##name, level, text); \
|
||||
} while (0)
|
||||
|
||||
#define QDIO_DBF_HEX0(ex, name, addr, len) QDIO_DBF_HEX(ex, name, 0, addr, len)
|
||||
#define QDIO_DBF_HEX1(ex, name, addr, len) QDIO_DBF_HEX(ex, name, 1, addr, len)
|
||||
#define QDIO_DBF_HEX2(ex, name, addr, len) QDIO_DBF_HEX(ex, name, 2, addr, len)
|
||||
|
||||
#ifdef CONFIG_QDIO_DEBUG
|
||||
#define QDIO_DBF_HEX3(ex, name, addr, len) QDIO_DBF_HEX(ex, name, 3, addr, len)
|
||||
#define QDIO_DBF_HEX4(ex, name, addr, len) QDIO_DBF_HEX(ex, name, 4, addr, len)
|
||||
#define QDIO_DBF_HEX5(ex, name, addr, len) QDIO_DBF_HEX(ex, name, 5, addr, len)
|
||||
#define QDIO_DBF_HEX6(ex, name, addr, len) QDIO_DBF_HEX(ex, name, 6, addr, len)
|
||||
#else
|
||||
#define QDIO_DBF_HEX3(ex, name, addr, len) do {} while (0)
|
||||
#define QDIO_DBF_HEX4(ex, name, addr, len) do {} while (0)
|
||||
#define QDIO_DBF_HEX5(ex, name, addr, len) do {} while (0)
|
||||
#define QDIO_DBF_HEX6(ex, name, addr, len) do {} while (0)
|
||||
#endif /* CONFIG_QDIO_DEBUG */
|
||||
|
||||
#define QDIO_DBF_TEXT0(ex, name, text) QDIO_DBF_TEXT(ex, name, 0, text)
|
||||
#define QDIO_DBF_TEXT1(ex, name, text) QDIO_DBF_TEXT(ex, name, 1, text)
|
||||
#define QDIO_DBF_TEXT2(ex, name, text) QDIO_DBF_TEXT(ex, name, 2, text)
|
||||
|
||||
#ifdef CONFIG_QDIO_DEBUG
|
||||
#define QDIO_DBF_TEXT3(ex, name, text) QDIO_DBF_TEXT(ex, name, 3, text)
|
||||
#define QDIO_DBF_TEXT4(ex, name, text) QDIO_DBF_TEXT(ex, name, 4, text)
|
||||
#define QDIO_DBF_TEXT5(ex, name, text) QDIO_DBF_TEXT(ex, name, 5, text)
|
||||
#define QDIO_DBF_TEXT6(ex, name, text) QDIO_DBF_TEXT(ex, name, 6, text)
|
||||
#else
|
||||
#define QDIO_DBF_TEXT3(ex, name, text) do {} while (0)
|
||||
#define QDIO_DBF_TEXT4(ex, name, text) do {} while (0)
|
||||
#define QDIO_DBF_TEXT5(ex, name, text) do {} while (0)
|
||||
#define QDIO_DBF_TEXT6(ex, name, text) do {} while (0)
|
||||
#endif /* CONFIG_QDIO_DEBUG */
|
||||
|
||||
/* s390dbf views */
|
||||
#define QDIO_DBF_SETUP_LEN 8
|
||||
#define QDIO_DBF_SETUP_PAGES 8
|
||||
#define QDIO_DBF_SETUP_NR_AREAS 1
|
||||
|
||||
#define QDIO_DBF_TRACE_LEN 8
|
||||
#define QDIO_DBF_TRACE_NR_AREAS 2
|
||||
|
||||
#ifdef CONFIG_QDIO_DEBUG
|
||||
#define QDIO_DBF_TRACE_PAGES 32
|
||||
#define QDIO_DBF_SETUP_LEVEL 6
|
||||
#define QDIO_DBF_TRACE_LEVEL 4
|
||||
#else /* !CONFIG_QDIO_DEBUG */
|
||||
#define QDIO_DBF_TRACE_PAGES 8
|
||||
#define QDIO_DBF_SETUP_LEVEL 2
|
||||
#define QDIO_DBF_TRACE_LEVEL 2
|
||||
#endif /* CONFIG_QDIO_DEBUG */
|
||||
/* that gives us 15 characters in the text event views */
|
||||
#define QDIO_DBF_LEN 16
|
||||
|
||||
extern debug_info_t *qdio_dbf_setup;
|
||||
extern debug_info_t *qdio_dbf_trace;
|
||||
extern debug_info_t *qdio_dbf_error;
|
||||
|
||||
void qdio_allocate_do_dbf(struct qdio_initialize *init_data);
|
||||
void debug_print_bstat(struct qdio_q *q);
|
||||
/* sort out low debug levels early to avoid wasted sprints */
|
||||
static inline int qdio_dbf_passes(debug_info_t *dbf_grp, int level)
|
||||
{
|
||||
return (level <= dbf_grp->level);
|
||||
}
|
||||
|
||||
#define DBF_ERR 3 /* error conditions */
|
||||
#define DBF_WARN 4 /* warning conditions */
|
||||
#define DBF_INFO 6 /* informational */
|
||||
|
||||
#undef DBF_EVENT
|
||||
#undef DBF_ERROR
|
||||
#undef DBF_DEV_EVENT
|
||||
|
||||
#define DBF_EVENT(text...) \
|
||||
do { \
|
||||
char debug_buffer[QDIO_DBF_LEN]; \
|
||||
snprintf(debug_buffer, QDIO_DBF_LEN, text); \
|
||||
debug_text_event(qdio_dbf_setup, DBF_ERR, debug_buffer); \
|
||||
} while (0)
|
||||
|
||||
#define DBF_HEX(addr, len) \
|
||||
do { \
|
||||
debug_event(qdio_dbf_setup, DBF_ERR, (void*)(addr), len); \
|
||||
} while (0)
|
||||
|
||||
#define DBF_ERROR(text...) \
|
||||
do { \
|
||||
char debug_buffer[QDIO_DBF_LEN]; \
|
||||
snprintf(debug_buffer, QDIO_DBF_LEN, text); \
|
||||
debug_text_event(qdio_dbf_error, DBF_ERR, debug_buffer); \
|
||||
} while (0)
|
||||
|
||||
#define DBF_ERROR_HEX(addr, len) \
|
||||
do { \
|
||||
debug_event(qdio_dbf_error, DBF_ERR, (void*)(addr), len); \
|
||||
} while (0)
|
||||
|
||||
|
||||
#define DBF_DEV_EVENT(level, device, text...) \
|
||||
do { \
|
||||
char debug_buffer[QDIO_DBF_LEN]; \
|
||||
if (qdio_dbf_passes(device->debug_area, level)) { \
|
||||
snprintf(debug_buffer, QDIO_DBF_LEN, text); \
|
||||
debug_text_event(device->debug_area, level, debug_buffer); \
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
#define DBF_DEV_HEX(level, device, addr, len) \
|
||||
do { \
|
||||
debug_event(device->debug_area, level, (void*)(addr), len); \
|
||||
} while (0)
|
||||
|
||||
void qdio_allocate_dbf(struct qdio_initialize *init_data,
|
||||
struct qdio_irq *irq_ptr);
|
||||
void qdio_setup_debug_entries(struct qdio_irq *irq_ptr,
|
||||
struct ccw_device *cdev);
|
||||
void qdio_shutdown_debug_entries(struct qdio_irq *irq_ptr,
|
||||
struct ccw_device *cdev);
|
||||
int qdio_debug_init(void);
|
||||
void qdio_debug_exit(void);
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user