From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C7703C38147 for ; Wed, 18 Jan 2023 18:20:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:From:References:Cc:To:Subject: MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=oKLyVj3Q4O5IsOktm5iPPp/7vQ1OvO8FTVOZkNMlQFM=; b=SYTkjZIfgjrvjP o+nVRdHK9fsqVCEzSqyPp9PQHCIgtt9Q6TQHd4Pddcifv4a0acI5zOw0W4nHmNxJ6hVnkgTSt5OD+ TOta/mcNNU1EiP9vCB6IjOB/C4DqEM8EJuWH95hAIOLOClBaOQdT0GR0xq+0nBg+tRBLvOBFVf0dB +5IUEuddizUrrebriJcp65S/88Vq5pl56Qh3xxgns6gZCCWopxkMiH+tDw8XUyAdd/Fw3RCXMkmEp geXMH380FfFt+mHOqDXWX0yc8OfU9Cw0enrObocNlt5QhgcT7Gf7P2t9y7Uygll2YXKoP4y7Q9aQm B1AWSgjvoE/+pp8zbrlw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pID1f-002GbT-Lr; Wed, 18 Jan 2023 18:19:08 +0000 Received: from mout.kundenserver.de ([212.227.126.133]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pICtt-002DgI-8M; Wed, 18 Jan 2023 18:11:08 +0000 Received: from [192.168.1.139] ([37.4.248.41]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1M6H7o-1pKOks0aQy-006i5j; Wed, 18 Jan 2023 19:10:58 +0100 Message-ID: <07d1b3e2-9072-d12f-98e3-48d0f9d712d2@i2se.com> Date: Wed, 18 Jan 2023 19:10:57 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Subject: Re: [RFC PATCH 4/4] staging: vc04_services: Drop remnants of custom logging Content-Language: en-US To: Umang Jain , Phil Elwell Cc: Greg Kroah-Hartman , Florian Fainelli , Adrien Thierry , Dan Carpenter , Dave Stevenson , linux-staging@lists.linux.dev, Kieran Bingham , linux-kernel@vger.kernel.org, Laurent Pinchart , linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org References: <20230118115810.21979-1-umang.jain@ideasonboard.com> <20230118115810.21979-5-umang.jain@ideasonboard.com> From: Stefan Wahren In-Reply-To: <20230118115810.21979-5-umang.jain@ideasonboard.com> X-Provags-ID: V03:K1:k7ngXy/iSumtDiFB+K8JBW2wWj1T7x3yIwjvbBUbCWCqrEqvZWt tywPaZuP/k8XUvN8Tfuh56mXZ04KANOrctghw7RZXoR+w18/K4zOmgZwl7//q1vcdBjIRui hU/SYZg+JBdF08zC3g2GYDikFZUGm3xSblMMPyJivrfxawvMRjUe2HMPO/wRsLrVYJ2xdFS spBtDGyTvQWFnGbUeeXEg== UI-OutboundReport: notjunk:1;M01:P0:cVK7N9Dh1wE=;2mb+vgyA+kOLzoavtsm0dzadBc/ WcheQbSg8YOMtu1HTkbx0UtwjbxYqD6gxocTuyDsfkHit2I5saTy7ekpPSalZDDLROU9s9Zz2 9Ok/C/eFx+1Sbhtx4aAZJLilboJha8hcQUaj175Ypw2Sk07SqaE6ATma37vu3ySF687ZsRPxA FvettuoWhcqO7W0y4NZdBKKyju9EOSa925kGL+EfwGh+GxpFxlFhIGRH2SpY2bVlJYYPax1d0 MsRT4tSHEY6s2vVhtW7HVM1WQ3OhrjxhybzQFlKWvCdq9gEsRUgI5Y3XffhaQAK4pNx/wUhTZ zoWT78a22yp38wi9aF/5HftpdSRqhJMdtq9LsLFUWacVghKJYWXdF/uTpfT3tLNLuJ/9S1D5C yzTf1jCbyz8cxea6qyVyCMZyqB6nvRq2Rue7ufUEWuqzf1tG0Ks9BQEj3giV8VPCqUqK7LXbv 7JrbQm4XxsENjla72PhI9YAgZYpNNSWkqIuhCWu8NNJSuXClfN85mTk4IV+dL9mnkMRKx7yhI SaROFG1nCikWpF0ezh7pAwVNcZPca3PuDZLBthMTtDfHpw/od69rK5wofP6bVWk6fqSA4MY0o 7fy50o3HeCQzbT2tZ4xSJc8tly7bd8dR7znzvJ7lWMxCcjiBRUGbquTHUBNgikPbbIGZwBiW5 +Bxpe5RYr4e4fKjU5mS1jnltySHmrnzMqwSI+aBHEQ== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230118_101105_668092_7461FDFC X-CRM114-Status: GOOD ( 20.99 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Umang, [add Phil] Am 18.01.23 um 12:58 schrieb Umang Jain: > Drop remnants of custom logging such as header definitions and such. > Also migrate the vchiq_debugfs to use the log levels coming from > include/linux/kern_levels.h instead. since we switch to default kernel logging, i would prefer to drop all of these logging specific debugfs entries too. Or just leave one entry to specify a logging mask as suggested before. > > Signed-off-by: Umang Jain > --- > .../interface/vchiq_arm/vchiq_arm.c | 4 -- > .../interface/vchiq_arm/vchiq_core.c | 39 +++++++------------ > .../interface/vchiq_arm/vchiq_core.h | 39 ------------------- > .../interface/vchiq_arm/vchiq_debugfs.c | 26 ++++++++----- > 4 files changed, 31 insertions(+), 77 deletions(-) > > diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c > index ed3773b996a3..45e28ca368ee 100644 > --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c > +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c > @@ -60,10 +60,6 @@ > #define KEEPALIVE_VER 1 > #define KEEPALIVE_VER_MIN KEEPALIVE_VER > > -/* Run time control of log level, based on KERN_XXX level. */ > -int vchiq_arm_log_level = VCHIQ_LOG_DEFAULT; > -int vchiq_susp_log_level = VCHIQ_LOG_ERROR; > - > DEFINE_SPINLOCK(msg_queue_spinlock); > struct vchiq_state g_state; > > diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c > index 7b3c57326d28..4cf710a3ca28 100644 > --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c > +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c > @@ -9,6 +9,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -103,10 +104,8 @@ static_assert((unsigned int)VCHIQ_PORT_MAX < > > #define BULK_INDEX(x) ((x) & (VCHIQ_NUM_SERVICE_BULKS - 1)) > > -#define SRVTRACE_LEVEL(srv) \ > - (((srv) && (srv)->trace) ? VCHIQ_LOG_TRACE : vchiq_core_msg_log_level) > #define SRVTRACE_ENABLED(srv, lev) \ > - (((srv) && (srv)->trace) || (vchiq_core_msg_log_level >= (lev))) > + (((srv) && (srv)->trace) || (LOGLEVEL_DEFAULT >= (lev))) > > #define NO_CLOSE_RECVD 0 > #define CLOSE_RECVD 1 > @@ -154,11 +153,6 @@ static inline void check_sizes(void) > BUILD_BUG_ON_NOT_POWER_OF_2(VCHIQ_MAX_SERVICES); > } > > -/* Run time control of log level, based on KERN_XXX level. */ > -int vchiq_core_log_level = VCHIQ_LOG_DEFAULT; > -int vchiq_core_msg_log_level = VCHIQ_LOG_DEFAULT; > -int vchiq_sync_log_level = VCHIQ_LOG_DEFAULT; > - > DEFINE_SPINLOCK(bulk_waiter_spinlock); > static DEFINE_SPINLOCK(quota_spinlock); > > @@ -1035,8 +1029,7 @@ queue_message(struct vchiq_state *state, struct vchiq_service *service, > return -EINVAL; > } > > - if (SRVTRACE_ENABLED(service, > - VCHIQ_LOG_INFO)) > + if (SRVTRACE_ENABLED(service, LOGLEVEL_INFO)) > vchiq_log_dump_mem("Sent", 0, > header->data, > min_t(size_t, 16, callback_result)); > @@ -1144,6 +1137,7 @@ queue_message_sync(struct vchiq_state *state, struct vchiq_service *service, > struct vchiq_shared_state *local; > struct vchiq_header *header; > ssize_t callback_result; > + int svc_fourcc; > > local = state->local; > > @@ -1184,8 +1178,7 @@ queue_message_sync(struct vchiq_state *state, struct vchiq_service *service, > } > > if (service) { > - if (SRVTRACE_ENABLED(service, > - VCHIQ_LOG_INFO)) > + if (SRVTRACE_ENABLED(service, LOGLEVEL_INFO)) > vchiq_log_dump_mem("Sent", 0, > header->data, > min_t(size_t, 16, callback_result)); > @@ -1199,19 +1192,15 @@ queue_message_sync(struct vchiq_state *state, struct vchiq_service *service, > header->size = size; > header->msgid = msgid; > > - if (vchiq_sync_log_level >= VCHIQ_LOG_TRACE) { > - int svc_fourcc; > > - svc_fourcc = service > - ? service->base.fourcc > - : VCHIQ_MAKE_FOURCC('?', '?', '?', '?'); > + svc_fourcc = service ? service->base.fourcc > + : VCHIQ_MAKE_FOURCC('?', '?', '?', '?'); > > - dev_dbg(state->dev, > - "Sent Sync Msg %s(%u) to %c%c%c%c s:%u d:%d len:%d", > - msg_type_str(VCHIQ_MSG_TYPE(msgid)), VCHIQ_MSG_TYPE(msgid), > - VCHIQ_FOURCC_AS_4CHARS(svc_fourcc), VCHIQ_MSG_SRCPORT(msgid), > - VCHIQ_MSG_DSTPORT(msgid), size); > - } > + dev_dbg(state->dev, > + "Sent Sync Msg %s(%u) to %c%c%c%c s:%u d:%d len:%d", > + msg_type_str(VCHIQ_MSG_TYPE(msgid)), VCHIQ_MSG_TYPE(msgid), > + VCHIQ_FOURCC_AS_4CHARS(svc_fourcc), VCHIQ_MSG_SRCPORT(msgid), > + VCHIQ_MSG_DSTPORT(msgid), size); > > remote_event_signal(&state->remote->sync_trigger); > > @@ -1624,7 +1613,7 @@ parse_message(struct vchiq_state *state, struct vchiq_header *header) > break; > } > > - if (SRVTRACE_ENABLED(service, VCHIQ_LOG_INFO)) { > + if (SRVTRACE_ENABLED(service, LOGLEVEL_INFO)) { > int svc_fourcc; > > svc_fourcc = service > @@ -2031,7 +2020,7 @@ sync_func(void *v) > continue; > } > > - if (vchiq_sync_log_level >= VCHIQ_LOG_TRACE) { > + if (vchiq_sync_log_level >= LOGLEVEL_DEBUG) { > int svc_fourcc; > > svc_fourcc = service > diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h > index ec3505424718..960bf4efeab5 100644 > --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h > +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h > @@ -30,39 +30,6 @@ > #define VCHIQ_SLOT_SIZE 4096 > #define VCHIQ_MAX_MSG_SIZE (VCHIQ_SLOT_SIZE - sizeof(struct vchiq_header)) > > -/* Run time control of log level, based on KERN_XXX level. */ > -#define VCHIQ_LOG_DEFAULT 4 > -#define VCHIQ_LOG_ERROR 3 > -#define VCHIQ_LOG_WARNING 4 > -#define VCHIQ_LOG_INFO 6 > -#define VCHIQ_LOG_TRACE 7 > - > -#define VCHIQ_LOG_PREFIX KERN_INFO "vchiq: " > - > -#ifndef vchiq_log_error > -#define vchiq_log_error(cat, fmt, ...) \ > - do { if (cat >= VCHIQ_LOG_ERROR) \ > - printk(VCHIQ_LOG_PREFIX fmt "\n", ##__VA_ARGS__); } while (0) > -#endif > -#ifndef vchiq_log_warning > -#define vchiq_log_warning(cat, fmt, ...) \ > - do { if (cat >= VCHIQ_LOG_WARNING) \ > - printk(VCHIQ_LOG_PREFIX fmt "\n", ##__VA_ARGS__); } while (0) > -#endif > -#ifndef vchiq_log_info > -#define vchiq_log_info(cat, fmt, ...) \ > - do { if (cat >= VCHIQ_LOG_INFO) \ > - printk(VCHIQ_LOG_PREFIX fmt "\n", ##__VA_ARGS__); } while (0) > -#endif > -#ifndef vchiq_log_trace > -#define vchiq_log_trace(cat, fmt, ...) \ > - do { if (cat >= VCHIQ_LOG_TRACE) \ > - printk(VCHIQ_LOG_PREFIX fmt "\n", ##__VA_ARGS__); } while (0) > -#endif > - > -#define vchiq_loud_error(...) \ > - vchiq_log_error(vchiq_core_log_level, "===== " __VA_ARGS__) > - > #define VCHIQ_SLOT_MASK (VCHIQ_SLOT_SIZE - 1) > #define VCHIQ_SLOT_QUEUE_MASK (VCHIQ_MAX_SLOTS_PER_SIDE - 1) > #define VCHIQ_SLOT_ZERO_SLOTS DIV_ROUND_UP(sizeof(struct vchiq_slot_zero), \ > @@ -496,12 +463,6 @@ vchiq_dump_state(void *dump_context, struct vchiq_state *state); > extern int > vchiq_dump_service_state(void *dump_context, struct vchiq_service *service); > > -extern void > -vchiq_loud_error_header(void); > - > -extern void > -vchiq_loud_error_footer(void); > - > extern void > request_poll(struct vchiq_state *state, struct vchiq_service *service, > int poll_type); > diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c > index dc667afd1f8c..1d142752351d 100644 > --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c > +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c > @@ -5,6 +5,8 @@ > */ > > #include > +#include > + > #include "vchiq_core.h" > #include "vchiq_arm.h" > #include "vchiq_debugfs.h" > @@ -22,6 +24,12 @@ > static struct dentry *vchiq_dbg_dir; > static struct dentry *vchiq_dbg_clients; > > +int vchiq_arm_log_level = LOGLEVEL_DEFAULT; > +int vchiq_susp_log_level = LOGLEVEL_ERR; > +int vchiq_core_log_level = LOGLEVEL_DEFAULT; > +int vchiq_core_msg_log_level = LOGLEVEL_DEFAULT; > +int vchiq_sync_log_level = LOGLEVEL_DEFAULT; > + > /* Log category debugfs entries */ > struct vchiq_debugfs_log_entry { > const char *name; > @@ -42,16 +50,16 @@ static int debugfs_log_show(struct seq_file *f, void *offset) > char *log_value = NULL; > > switch (*levp) { > - case VCHIQ_LOG_ERROR: > + case LOGLEVEL_ERR: > log_value = VCHIQ_LOG_ERROR_STR; > break; > - case VCHIQ_LOG_WARNING: > + case LOGLEVEL_WARNING: > log_value = VCHIQ_LOG_WARNING_STR; > break; > - case VCHIQ_LOG_INFO: > + case LOGLEVEL_INFO: > log_value = VCHIQ_LOG_INFO_STR; > break; > - case VCHIQ_LOG_TRACE: > + case LOGLEVEL_DEBUG: > log_value = VCHIQ_LOG_TRACE_STR; > break; > default: > @@ -85,15 +93,15 @@ static ssize_t debugfs_log_write(struct file *file, > kbuf[count - 1] = 0; > > if (strncmp("error", kbuf, strlen("error")) == 0) > - *levp = VCHIQ_LOG_ERROR; > + *levp = LOGLEVEL_ERR; > else if (strncmp("warning", kbuf, strlen("warning")) == 0) > - *levp = VCHIQ_LOG_WARNING; > + *levp = LOGLEVEL_WARNING; > else if (strncmp("info", kbuf, strlen("info")) == 0) > - *levp = VCHIQ_LOG_INFO; > + *levp = LOGLEVEL_INFO; > else if (strncmp("trace", kbuf, strlen("trace")) == 0) > - *levp = VCHIQ_LOG_TRACE; > + *levp = LOGLEVEL_DEBUG; > else > - *levp = VCHIQ_LOG_DEFAULT; > + *levp = LOGLEVEL_DEFAULT; > > *ppos += count; > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel