ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ioat: Use log library instead of ioat_printf

Browse Source 
Change-Id: I10a71b5c83f60d3ef1bbf83b464813405edd1938
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Ben Walker 2016-08-12 09:13:33 -07:00
parent b0e349a804
commit 29004b6738
6 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/ioat/perf/Makefile
View File

@ -42,7 +42,8 @@ CFLAGS += -I. $(DPDK_INC)
SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/ioat/libspdk_ioat.a \ SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/ioat/libspdk_ioat.a \
$(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \ $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
$(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a \
$(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) $(DPDK_LIB) LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) $(DPDK_LIB)

3
examples/ioat/verify/Makefile
View File

@ -42,7 +42,8 @@ CFLAGS += -I. $(DPDK_INC)
SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/ioat/libspdk_ioat.a \ SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/ioat/libspdk_ioat.a \
$(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \ $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
$(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a \
$(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) $(DPDK_LIB) LIBS += $(SPDK_LIBS) $(PCIACCESS_LIB) $(DPDK_LIB)

30
lib/ioat/ioat.c
View File

@ -34,6 +34,8 @@
#include "ioat_internal.h" #include "ioat_internal.h"
#include "ioat_pci.h" #include "ioat_pci.h"
#include "spdk/log.h"
#include <pthread.h> #include <pthread.h>
struct ioat_driver { struct ioat_driver {
@ -94,8 +96,8 @@ ioat_map_pci_bar(struct spdk_ioat_chan *ioat)
regs_bar = 0; regs_bar = 0;
rc = ioat_pcicfg_map_bar(ioat->device, regs_bar, 0, &addr); rc = ioat_pcicfg_map_bar(ioat->device, regs_bar, 0, &addr);
if (rc != 0 || addr == NULL) { if (rc != 0 || addr == NULL) {
ioat_printf(ioat, "%s: pci_device_map_range failed with error code %d\n", SPDK_ERRLOG("pci_device_map_range failed with error code %d\n",
__func__, rc); rc);
return -1; return -1;
} }
@ -272,7 +274,7 @@ static int ioat_reset_hw(struct spdk_ioat_chan *ioat)
ioat_delay_us(1000); ioat_delay_us(1000);
timeout--; timeout--;
if (timeout == 0) { if (timeout == 0) {
ioat_printf(ioat, "%s: timed out waiting for suspend\n", __func__); SPDK_ERRLOG("timed out waiting for suspend\n");
return -1; return -1;
} }
status = ioat_get_chansts(ioat); status = ioat_get_chansts(ioat);
@ -292,7 +294,7 @@ static int ioat_reset_hw(struct spdk_ioat_chan *ioat)
ioat_delay_us(1000); ioat_delay_us(1000);
timeout--; timeout--;
if (timeout == 0) { if (timeout == 0) {
ioat_printf(ioat, "%s: timed out waiting for reset\n", __func__); SPDK_ERRLOG("timed out waiting for reset\n");
return -1; return -1;
} }
} }
@ -315,7 +317,7 @@ ioat_process_channel_events(struct spdk_ioat_chan *ioat)
completed_descriptor = status & SPDK_IOAT_CHANSTS_COMPLETED_DESCRIPTOR_MASK; completed_descriptor = status & SPDK_IOAT_CHANSTS_COMPLETED_DESCRIPTOR_MASK;
if (is_ioat_halted(status)) { if (is_ioat_halted(status)) {
ioat_printf(ioat, "%s: Channel halted (%x)\n", __func__, ioat->regs->chanerr); SPDK_ERRLOG("Channel halted (%x)\n", ioat->regs->chanerr);
return -1; return -1;
} }
@ -369,14 +371,14 @@ ioat_channel_start(struct spdk_ioat_chan *ioat)
uint64_t comp_update_bus_addr; uint64_t comp_update_bus_addr;
if (ioat_map_pci_bar(ioat) != 0) { if (ioat_map_pci_bar(ioat) != 0) {
ioat_printf(ioat, "%s: ioat_map_pci_bar() failed\n", __func__); SPDK_ERRLOG("ioat_map_pci_bar() failed\n");
return -1; return -1;
} }
version = ioat->regs->cbver; version = ioat->regs->cbver;
if (version < SPDK_IOAT_VER_3_0) { if (version < SPDK_IOAT_VER_3_0) {
ioat_printf(ioat, "%s: unsupported IOAT version %u.%u\n", SPDK_ERRLOG(" unsupported IOAT version %u.%u\n",
__func__, version >> 4, version & 0xF); version >> 4, version & 0xF);
return -1; return -1;
} }
@ -393,7 +395,7 @@ ioat_channel_start(struct spdk_ioat_chan *ioat)
ioat->max_xfer_size = 1ULL << 32; ioat->max_xfer_size = 1ULL << 32;
} else if (xfercap < 12) { } else if (xfercap < 12) {
/* XFCERCAP must be at least 12 (4 KB) according to the spec. */ /* XFCERCAP must be at least 12 (4 KB) according to the spec. */
ioat_printf(ioat, "%s: invalid XFERCAP value %u\n", __func__, xfercap); SPDK_ERRLOG("invalid XFERCAP value %u\n", xfercap);
return -1; return -1;
} else { } else {
ioat->max_xfer_size = 1U << xfercap; ioat->max_xfer_size = 1U << xfercap;
@ -448,8 +450,8 @@ ioat_channel_start(struct spdk_ioat_chan *ioat)
if (is_ioat_idle(status)) { if (is_ioat_idle(status)) {
ioat_process_channel_events(ioat); ioat_process_channel_events(ioat);
} else { } else {
ioat_printf(ioat, "%s: could not start channel: status = %p\n error = %#x\n", SPDK_ERRLOG("could not start channel: status = %p\n error = %#x\n",
__func__, (void *)status, ioat->regs->chanerr); (void *)status, ioat->regs->chanerr);
return -1; return -1;
} }
@ -516,7 +518,7 @@ ioat_enum_cb(void *ctx, struct spdk_pci_device *pci_dev)
*/ */
ioat = ioat_attach(pci_dev); ioat = ioat_attach(pci_dev);
if (ioat == NULL) { if (ioat == NULL) {
ioat_printf(NULL, "ioat_attach() failed\n"); SPDK_ERRLOG("ioat_attach() failed\n");
return -1; return -1;
} }
@ -660,7 +662,7 @@ spdk_ioat_submit_fill(struct spdk_ioat_chan *ioat, void *cb_arg, spdk_ioat_req_c
} }
if (!(ioat->dma_capabilities & SPDK_IOAT_ENGINE_FILL_SUPPORTED)) { if (!(ioat->dma_capabilities & SPDK_IOAT_ENGINE_FILL_SUPPORTED)) {
ioat_printf(ioat, "Channel does not support memory fill\n"); SPDK_ERRLOG("Channel does not support memory fill\n");
return -1; return -1;
} }
@ -716,3 +718,5 @@ spdk_ioat_process_events(struct spdk_ioat_chan *ioat)
{ {
return ioat_process_channel_events(ioat); return ioat_process_channel_events(ioat);
} }
SPDK_LOG_REGISTER_TRACE_FLAG("ioat", SPDK_TRACE_IOAT)

5
lib/ioat/ioat_impl.h
View File

@ -64,11 +64,6 @@ ioat_zmalloc(const char *tag, size_t size, unsigned align, uint64_t *phys_addr)
*/ */
#define ioat_delay_us(us) rte_delay_us(us) #define ioat_delay_us(us) rte_delay_us(us)
/**
* Log or print a message from the driver.
*/
#define ioat_printf(chan, fmt, args...) printf(fmt, ##args)
/** /**
* *
*/ */

2
mk/ioat.unittest.mk
View File

@ -39,7 +39,7 @@ C_SRCS = $(TEST_FILE) $(OTHER_FILES)
CFLAGS += -I$(SPDK_ROOT_DIR)/lib -include $(SPDK_ROOT_DIR)/test/lib/ioat/unit/ioat_impl.h CFLAGS += -I$(SPDK_ROOT_DIR)/lib -include $(SPDK_ROOT_DIR)/test/lib/ioat/unit/ioat_impl.h
LIBS += -lcunit LIBS += -lcunit $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a
APP = $(TEST_FILE:.c=) APP = $(TEST_FILE:.c=)

1
test/lib/ioat/unit/ioat_impl.h
View File

@ -24,7 +24,6 @@ ioat_zmalloc(const char *tag, size_t size, unsigned align, uint64_t *phys_addr)
#define ioat_free(buf) free(buf) #define ioat_free(buf) free(buf)
#define ioat_vtophys(buf) (uint64_t)(buf) #define ioat_vtophys(buf) (uint64_t)(buf)
#define ioat_delay_us(us) ioat_noop() #define ioat_delay_us(us) ioat_noop()
#define ioat_printf(chan, fmt, args...) printf(fmt, ##args)
static inline int static inline int
ioat_pci_enumerate(int (*enum_cb)(void *enum_ctx, struct spdk_pci_device *pci_dev), void *enum_ctx) ioat_pci_enumerate(int (*enum_cb)(void *enum_ctx, struct spdk_pci_device *pci_dev), void *enum_ctx)