zlogger: correct calculation of buffer map/offset

Fix calculation of buffer map & offset for the non-2KB buffer case.

Change-Id: Icb53076c5c23493ac8489d5393a53a9d7fe01c0a
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>

diff --git a/include/uapi/linux/zlogger.h b/include/uapi/linux/zlogger.h
index 8fb32ce22bf5da27d112362a12bb4c81a9e6a5ed..1cad482612305d6cb1481c84d76e6f7b51bec385 100644 (file)
--- a/include/uapi/linux/zlogger.h
+++ b/include/uapi/linux/zlogger.h
@@ -28,6 +28,7 @@
 #define ZLOGGER_MAP_SIZE (4 * ZLOGGER_MB)
 #define ZLOGGER_BUFFER_SIZE (ZLOGGER_DEVICE_COUNT * ZLOGGER_MAP_SIZE)
 #define ZLOGGER_BLOCK_SIZE (2 * ZLOGGER_KB)
+#define ZLOGGER_BLOCK_MAP_COUNT (ZLOGGER_MAP_SIZE / ZLOGGER_BLOCK_SIZE)
 #define ZLOGGER_BLOCK_COUNT (ZLOGGER_BUFFER_SIZE / ZLOGGER_BLOCK_SIZE)
 #define ZLOGGER_DATA_MAX (ZLOGGER_BLOCK_SIZE - sizeof(struct zlogger_header))
 

diff --git a/kernel/zlogger/zlogger.c b/kernel/zlogger/zlogger.c
index 003e032c40c3099ca7384f98560b1e2bbb8b726e..09ed37543c12758338fcab84ed02b1e84f376669 100644 (file)
--- a/kernel/zlogger/zlogger.c
+++ b/kernel/zlogger/zlogger.c
@@ -182,8 +182,8 @@ static inline char *get_shared_memory(int dev_index)
 static inline struct zlogger_block *get_block(uint16_t block_index)
 {
        uint16_t index = block_index - 1;
-       int offset = index & (ZLOGGER_BLOCK_SIZE - 1);
-       char *p = get_shared_memory(index / ZLOGGER_BLOCK_SIZE);
+       int offset = index & (ZLOGGER_BLOCK_MAP_COUNT - 1);
+       char *p = get_shared_memory(index / ZLOGGER_BLOCK_MAP_COUNT);
 
        if (!p)
                return NULL;