samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

msm: camera: utils: Add CAM_IO_ACCESS log category

Browse Source 
Currently, CAM_UTIL debug logs when enabled, flood the logcat
with io read/write access logs, which are not necessary when
debugging clocks, interrupts and other parameters. Add separate
entry for IO access in debug util.

CRs-Fixed: 2743063
Change-Id: Id13393211bcc6fdc620aaffe8f8ab27a6b7c6986
Signed-off-by: Mukund Madhusudan Atre <matre@codeaurora.org>
This commit is contained in:
Mukund Madhusudan Atre
2020-07-28 18:37:28 -07:00
committed by Gerrit - the friendly Code Review server
parent e3c7dd3683
commit 397fcc6f55
3 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/cam_utils/cam_debug_util.c
View File

@@ -206,6 +206,9 @@ const char *cam_get_module_name(unsigned int module_id)
case CAM_RES: case CAM_RES:
name = "CAM-RES"; name = "CAM-RES";
break; break;
case CAM_IO_ACCESS:
name = "CAM-IO-ACCESS";
break;
default: default:
name = "CAM"; name = "CAM";
break; break;

3
drivers/cam_utils/cam_debug_util.h
View File

@@ -44,6 +44,9 @@
#define CAM_OPE (1 << 28) #define CAM_OPE (1 << 28)
#define CAM_PRESIL (1 << 27) #define CAM_PRESIL (1 << 27)
/* CAM_IO_ACCESS: Tracks IO read/write */
#define CAM_IO_ACCESS (1 << 29)
#define STR_BUFFER_MAX_LENGTH 1024 #define STR_BUFFER_MAX_LENGTH 1024
/** /**

42
drivers/cam_utils/cam_io_util.c
View File

@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/* /*
* Copyright (c) 2011-2014, 2017-2018, The Linux Foundation. * Copyright (c) 2011-2014, 2017-2018, 2020, The Linux Foundation.
* All rights reserved. * All rights reserved.
*/ */
@@ -15,7 +15,7 @@ int cam_io_w(uint32_t data, void __iomem *addr)
if (!addr) if (!addr)
return -EINVAL; return -EINVAL;
CAM_DBG(CAM_UTIL, "0x%pK %08x", addr, data); CAM_DBG(CAM_IO_ACCESS, "0x%pK %08x", addr, data);
writel_relaxed_no_log(data, addr); writel_relaxed_no_log(data, addr);
return 0; return 0;
@@ -26,7 +26,7 @@ int cam_io_w_mb(uint32_t data, void __iomem *addr)
if (!addr) if (!addr)
return -EINVAL; return -EINVAL;
CAM_DBG(CAM_UTIL, "0x%pK %08x", addr, data); CAM_DBG(CAM_IO_ACCESS, "0x%pK %08x", addr, data);
/* Ensure previous writes are done */ /* Ensure previous writes are done */
wmb(); wmb();
writel_relaxed_no_log(data, addr); writel_relaxed_no_log(data, addr);
@@ -41,12 +41,12 @@ uint32_t cam_io_r(void __iomem *addr)
uint32_t data; uint32_t data;
if (!addr) { if (!addr) {
CAM_ERR(CAM_UTIL, "Invalid args"); CAM_ERR(CAM_IO_ACCESS, "Invalid args");
return 0; return 0;
} }
data = readl_relaxed(addr); data = readl_relaxed(addr);
CAM_DBG(CAM_UTIL, "0x%pK %08x", addr, data); CAM_DBG(CAM_IO_ACCESS, "0x%pK %08x", addr, data);
return data; return data;
} }
@@ -56,14 +56,14 @@ uint32_t cam_io_r_mb(void __iomem *addr)
uint32_t data; uint32_t data;
if (!addr) { if (!addr) {
CAM_ERR(CAM_UTIL, "Invalid args"); CAM_ERR(CAM_IO_ACCESS, "Invalid args");
return 0; return 0;
} }
/* Ensure previous read is done */ /* Ensure previous read is done */
rmb(); rmb();
data = readl_relaxed(addr); data = readl_relaxed(addr);
CAM_DBG(CAM_UTIL, "0x%pK %08x", addr, data); CAM_DBG(CAM_IO_ACCESS, "0x%pK %08x", addr, data);
/* Ensure previous read is done */ /* Ensure previous read is done */
rmb(); rmb();
@@ -80,10 +80,10 @@ int cam_io_memcpy(void __iomem *dest_addr,
if (!dest_addr || !src_addr) if (!dest_addr || !src_addr)
return -EINVAL; return -EINVAL;
CAM_DBG(CAM_UTIL, "%pK %pK %d", dest_addr, src_addr, len); CAM_DBG(CAM_IO_ACCESS, "%pK %pK %d", dest_addr, src_addr, len);
for (i = 0; i < len/4; i++) { for (i = 0; i < len/4; i++) {
CAM_DBG(CAM_UTIL, "0x%pK %08x", d, *s); CAM_DBG(CAM_IO_ACCESS, "0x%pK %08x", d, *s);
writel_relaxed(*s++, d++); writel_relaxed(*s++, d++);
} }
@@ -100,7 +100,7 @@ int cam_io_memcpy_mb(void __iomem *dest_addr,
if (!dest_addr || !src_addr) if (!dest_addr || !src_addr)
return -EINVAL; return -EINVAL;
CAM_DBG(CAM_UTIL, "%pK %pK %d", dest_addr, src_addr, len); CAM_DBG(CAM_IO_ACCESS, "%pK %pK %d", dest_addr, src_addr, len);
/* /*
* Do not use cam_io_w_mb to avoid double wmb() after a write * Do not use cam_io_w_mb to avoid double wmb() after a write
@@ -108,7 +108,7 @@ int cam_io_memcpy_mb(void __iomem *dest_addr,
*/ */
wmb(); wmb();
for (i = 0; i < (len / 4); i++) { for (i = 0; i < (len / 4); i++) {
CAM_DBG(CAM_UTIL, "0x%pK %08x", d, *s); CAM_DBG(CAM_IO_ACCESS, "0x%pK %08x", d, *s);
writel_relaxed(*s++, d++); writel_relaxed(*s++, d++);
} }
/* Ensure previous writes are done */ /* Ensure previous writes are done */
@@ -134,7 +134,7 @@ int cam_io_poll_value(void __iomem *addr, uint32_t wait_data, uint32_t retry,
} }
if (cnt > retry) { if (cnt > retry) {
CAM_DBG(CAM_UTIL, "Poll failed by value"); CAM_DBG(CAM_IO_ACCESS, "Poll failed by value");
rc = -EINVAL; rc = -EINVAL;
} }
@@ -159,7 +159,7 @@ int cam_io_poll_value_wmask(void __iomem *addr, uint32_t wait_data,
} }
if (cnt > retry) { if (cnt > retry) {
CAM_DBG(CAM_UTIL, "Poll failed with mask"); CAM_DBG(CAM_IO_ACCESS, "Poll failed with mask");
rc = -EINVAL; rc = -EINVAL;
} }
@@ -175,7 +175,7 @@ int cam_io_w_same_offset_block(const uint32_t *data, void __iomem *addr,
return -EINVAL; return -EINVAL;
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
CAM_DBG(CAM_UTIL, "i= %d len =%d val=%x addr =%pK", CAM_DBG(CAM_IO_ACCESS, "i= %d len =%d val=%x addr =%pK",
i, len, data[i], addr); i, len, data[i], addr);
writel_relaxed(data[i], addr); writel_relaxed(data[i], addr);
} }
@@ -192,7 +192,7 @@ int cam_io_w_mb_same_offset_block(const uint32_t *data, void __iomem *addr,
return -EINVAL; return -EINVAL;
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
CAM_DBG(CAM_UTIL, "i= %d len =%d val=%x addr =%pK", CAM_DBG(CAM_IO_ACCESS, "i= %d len =%d val=%x addr =%pK",
i, len, data[i], addr); i, len, data[i], addr);
/* Ensure previous writes are done */ /* Ensure previous writes are done */
wmb(); wmb();
@@ -213,7 +213,8 @@ int cam_io_w_offset_val_block(const uint32_t data[][2],
return -EINVAL; return -EINVAL;
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
CAM_DBG(CAM_UTIL, "i= %d len =%d val=%x addr_base =%pK reg=%x", CAM_DBG(CAM_IO_ACCESS,
"i= %d len =%d val=%x addr_base =%pK reg=%x",
i, len, __VAL(i), addr_base, __OFFSET(i)); i, len, __VAL(i), addr_base, __OFFSET(i));
writel_relaxed(__VAL(i), addr_base + __OFFSET(i)); writel_relaxed(__VAL(i), addr_base + __OFFSET(i));
} }
@@ -232,7 +233,8 @@ int cam_io_w_mb_offset_val_block(const uint32_t data[][2],
/* Ensure write is done */ /* Ensure write is done */
wmb(); wmb();
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
CAM_DBG(CAM_UTIL, "i= %d len =%d val=%x addr_base =%pK reg=%x", CAM_DBG(CAM_IO_ACCESS,
"i= %d len =%d val=%x addr_base =%pK reg=%x",
i, len, __VAL(i), addr_base, __OFFSET(i)); i, len, __VAL(i), addr_base, __OFFSET(i));
writel_relaxed(__VAL(i), addr_base + __OFFSET(i)); writel_relaxed(__VAL(i), addr_base + __OFFSET(i));
} }
@@ -250,7 +252,7 @@ int cam_io_dump(void __iomem *base_addr, uint32_t start_offset, int size)
int i; int i;
uint32_t data; uint32_t data;
CAM_DBG(CAM_UTIL, "addr=%pK offset=0x%x size=%d", CAM_DBG(CAM_IO_ACCESS, "addr=%pK offset=0x%x size=%d",
base_addr, start_offset, size); base_addr, start_offset, size);
if (!base_addr || (size <= 0)) if (!base_addr || (size <= 0))
@@ -268,13 +270,13 @@ int cam_io_dump(void __iomem *base_addr, uint32_t start_offset, int size)
snprintf(p_str, 10, "%08x ", data); snprintf(p_str, 10, "%08x ", data);
p_str += 9; p_str += 9;
if ((i + 1) % NUM_REGISTER_PER_LINE == 0) { if ((i + 1) % NUM_REGISTER_PER_LINE == 0) {
CAM_ERR(CAM_UTIL, "%s", line_str); CAM_ERR(CAM_IO_ACCESS, "%s", line_str);
line_str[0] = '\0'; line_str[0] = '\0';
p_str = line_str; p_str = line_str;
} }
} }
if (line_str[0] != '\0') if (line_str[0] != '\0')
CAM_ERR(CAM_UTIL, "%s", line_str); CAM_ERR(CAM_IO_ACCESS, "%s", line_str);
return 0; return 0;
} }