From patchwork Tue Oct 27 23:55:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1389054 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=EwndfO+c; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CLTCP5RVGz9sV1 for ; Wed, 28 Oct 2020 10:57:21 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 66B5D8250C; Wed, 28 Oct 2020 00:56:17 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="EwndfO+c"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C6D10824D3; Wed, 28 Oct 2020 00:56:06 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qv1-xf42.google.com (mail-qv1-xf42.google.com [IPv6:2607:f8b0:4864:20::f42]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9323A8243D for ; Wed, 28 Oct 2020 00:56:03 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=seanga2@gmail.com Received: by mail-qv1-xf42.google.com with SMTP id w5so1579489qvn.12 for ; Tue, 27 Oct 2020 16:56:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jUtiK9n8QLLaK0bgkg9UkFrEUw96T2paf/AZ+mJN9i0=; b=EwndfO+czZwTcbNdYggA6Xy4WCKJ/mBax5vgioxtQbHKmWsJiLmMwa+lqdx2/0t32Y 4nH2hFHkqKtSJmAXuz2/4Dv4pJf6VqFT8SgTQZqlutGdp/qa/CcQ11Sj7X/Va9Ux0+L3 iSOftvGoI7EheabDXdXt9EpdyxeUannJF98CATV+SDT3Bog8pqd9Q81EtJJZ0RaQD8uz 0zizg+ifHtMTXRGiAxq/xkMRAmlZ6o4a1kcr8Xey6ERKoobUPClOXi+7VREo7kBEEycP TY/Nk6IKUn+AxtsAvA9rZU0qQJoyGicSzuuUJSAkAxi0vC3F8VIpr8QVKREqv1F+c0Ch 99aA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jUtiK9n8QLLaK0bgkg9UkFrEUw96T2paf/AZ+mJN9i0=; b=PijG8azHYqQZ7L+EMf69VsAuEWdYO0jYTjFnQfdyEjL1jdJypyMAFC0SE5BS4sEOJ0 rVN2Hk3YO3molYLus1YqEaMh9WXtZ9sIAYbccu4X2PSBJpy5HP0YQ9b0r1B0drvT7ubf BTnXd8ynWoUk0L6cDFMrX622WmBH4vbSUFTorkEBdQdzbAigQNrUrZUYMlFNe0snevHH l8WYEWs5H7wPwPTr/sZr4WHUQdrLCmHpw7ovwFwMjKNVdUs/FVmVaCTJN9xlRFfeJxyH s+/v8MudaKt53JaSZ33Oq8x/YRhscYaPN+/TvFQ9SaQVcXOoZtuIzcjr09M8CxCyGvxV WQDg== X-Gm-Message-State: AOAM531+I2635E1kKaqz+2E7lZDGY4tYspdxV+gPHeiJ0mucLhJNaCZA Yt2gYjWqjV7nCvNUFJMnZzLd2GV8tHHU/g== X-Google-Smtp-Source: ABdhPJycJW9Vw3HKvga20elijNrPLQynt/aqvHYuzlcLLpltOoGN4AycFtLxsO3W/IZODerMia3+xg== X-Received: by 2002:a0c:fbc3:: with SMTP id n3mr5008814qvp.59.1603842962324; Tue, 27 Oct 2020 16:56:02 -0700 (PDT) Received: from godwin.fios-router.home (pool-108-51-35-162.washdc.fios.verizon.net. [108.51.35.162]) by smtp.gmail.com with ESMTPSA id 69sm1907543qko.48.2020.10.27.16.56.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Oct 2020 16:56:01 -0700 (PDT) From: Sean Anderson To: u-boot@lists.denx.de Cc: Tom Rini , Heinrich Schuchardt , Simon Glass , Sean Anderson Subject: [PATCH v4 06/22] log: Add function to create a filter with flags Date: Tue, 27 Oct 2020 19:55:25 -0400 Message-Id: <20201027235541.706077-7-seanga2@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201027235541.706077-1-seanga2@gmail.com> References: <20201027235541.706077-1-seanga2@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean This function exposes a way to specify flags when creating a filter. Signed-off-by: Sean Anderson Reviewed-by: Simon Glass --- (no changes since v1) common/log.c | 6 ++++-- include/log.h | 29 +++++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/common/log.c b/common/log.c index 74ae7f0ea8..a14b227231 100644 --- a/common/log.c +++ b/common/log.c @@ -230,8 +230,9 @@ int _log(enum log_category_t cat, enum log_level_t level, const char *file, return 0; } -int log_add_filter(const char *drv_name, enum log_category_t cat_list[], - enum log_level_t max_level, const char *file_list) +int log_add_filter_flags(const char *drv_name, enum log_category_t cat_list[], + enum log_level_t max_level, const char *file_list, + int flags) { struct log_filter *filt; struct log_device *ldev; @@ -245,6 +246,7 @@ int log_add_filter(const char *drv_name, enum log_category_t cat_list[], if (!filt) return -ENOMEM; + filt->flags = flags; if (cat_list) { filt->flags |= LOGFF_HAS_CAT; for (i = 0; ; i++) { diff --git a/include/log.h b/include/log.h index 06eb0003fe..4e59a2cf74 100644 --- a/include/log.h +++ b/include/log.h @@ -474,6 +474,25 @@ enum log_fmt { /* Handle the 'log test' command */ int do_log_test(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); +/** + * log_add_filter_flags() - Add a new filter to a log device, specifying flags + * + * @drv_name: Driver name to add the filter to (since each driver only has a + * single device) + * @flags: Flags for this filter (LOGFF_...) + * @cat_list: List of categories to allow (terminated by %LOGC_END). If empty + * then all categories are permitted. Up to LOGF_MAX_CATEGORIES entries + * can be provided + * @max_level: Maximum log level to allow + * @file_list: List of files to allow, separated by comma. If NULL then all + * files are permitted + * @return the sequence number of the new filter (>=0) if the filter was added, + * or a -ve value on error + */ +int log_add_filter_flags(const char *drv_name, enum log_category_t cat_list[], + enum log_level_t max_level, const char *file_list, + int flags); + /** * log_add_filter() - Add a new filter to a log device * @@ -488,8 +507,14 @@ int do_log_test(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]); * @return the sequence number of the new filter (>=0) if the filter was added, * or a -ve value on error */ -int log_add_filter(const char *drv_name, enum log_category_t cat_list[], - enum log_level_t max_level, const char *file_list); +static inline int log_add_filter(const char *drv_name, + enum log_category_t cat_list[], + enum log_level_t max_level, + const char *file_list) +{ + return log_add_filter_flags(drv_name, cat_list, max_level, file_list, + 0); +} /** * log_remove_filter() - Remove a filter from a log device