From patchwork Wed Sep 7 02:26:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1675080 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=JVjqerve; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MMmR8503Jz1yj1 for ; Wed, 7 Sep 2022 12:29:08 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5D50F84A5C; Wed, 7 Sep 2022 04:28:25 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="JVjqerve"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3CB0A84A90; Wed, 7 Sep 2022 04:28:21 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ot1-x32f.google.com (mail-ot1-x32f.google.com [IPv6:2607:f8b0:4864:20::32f]) (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 635BA84AA7 for ; Wed, 7 Sep 2022 04:28:06 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-ot1-x32f.google.com with SMTP id t11-20020a05683014cb00b0063734a2a786so9330493otq.11 for ; Tue, 06 Sep 2022 19:28:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=XRr7rPuDn/WcIqp3PIYSHBclp41r5Lhr0J5eNREfIrg=; b=JVjqerve9KNSGC77tHPJcOwDw39ML/DWO/suqEdWizdQsUylbJKkvyHPfowJXGJyhK OVMnRPZGifTVY4Nh1O9J9iPJpNbFzV/Oe5nS+7dzif2Z8fWUtPOJCQjo+CW6IhN6DJE+ FZW0rHXvj2ojwTaCY1CUlIa8w52WDnbJ+yiMs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=XRr7rPuDn/WcIqp3PIYSHBclp41r5Lhr0J5eNREfIrg=; b=Wu+8ZkIQ25l84hBtthC14rWL0qGUoNDx82uKGtotGMguzLHn0WIdp6wBqtwJ0o9yCz +29vFfhjnWG+5PzrGq7PHpOW8LOkfvLNsipfkbNcYGB2TjpLSsStCh8VoUXD+zaG1o8i lmnk47HfL/T54VHgcBh9AMDuzH0OdyFVn4WZaU6tJTl+fUouMnlZckojDnr1MEwCK35f hioRlTfyua3dfWn5PY1BouS4qz8PiUwUls9Djg9RGsm3FtIuytl16TUId8L9KVHwUic1 1NWWYZVyeb4qPTsMTjyYAJIQis7Pq8fOi4PVDGy1jgyq04rw3zwtMrUBF3mLq1Ed0CET aIJA== X-Gm-Message-State: ACgBeo3Z4Wc+u6DrttGiLbvzhliBn1bogvxebzkAGzlGHRXHKB22UNfW vx1O7qtRfWC/8KH+yor9FUIaCVMV5fHY6g== X-Google-Smtp-Source: AA6agR5DvQUNaJ80+8w4DWOqrgXSfJhkGXSHvJWkVoX7V1g4LE3pCcKrHEDC54XmXb69p91lpOe5HQ== X-Received: by 2002:a9d:7050:0:b0:638:9c7b:40fe with SMTP id x16-20020a9d7050000000b006389c7b40femr587133otj.37.1662517684514; Tue, 06 Sep 2022 19:28:04 -0700 (PDT) Received: from sjg1.roam.corp.google.com (c-67-190-102-125.hsd1.co.comcast.net. [67.190.102.125]) by smtp.gmail.com with ESMTPSA id b10-20020a05687051ca00b0011e73536301sm7605046oaj.52.2022.09.06.19.28.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Sep 2022 19:28:04 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Kishon Vijay Abraham I , Michal Simek , =?utf-8?q?Marek_Beh=C3=BAn?= , Tom Rini , Simon Glass Subject: [PATCH v2 08/45] event: Allow multiple spy declarations for each event Date: Tue, 6 Sep 2022 20:26:56 -0600 Message-Id: <20220907022733.66423-9-sjg@chromium.org> X-Mailer: git-send-email 2.37.2.789.g6183377224-goog In-Reply-To: <20220907022733.66423-1-sjg@chromium.org> References: <20220907022733.66423-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.6 at phobos.denx.de X-Virus-Status: Clean At present only one spy is allowed per event. Update the naming to allow more than one, since some need this flexibility, e.g. the EVT_FT_FIXUP event. Signed-off-by: Simon Glass --- (no changes since v1) include/event.h | 4 ++-- scripts/event_dump.py | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/event.h b/include/event.h index e8f2f55c63d..ff883ca064e 100644 --- a/include/event.h +++ b/include/event.h @@ -143,8 +143,8 @@ static inline const char *event_spy_id(struct evspy_info *spy) * vbe_simple.c - so for now, make it global. */ #define EVENT_SPY(_type, _func) \ - __used ll_entry_declare(struct evspy_info, _type, evspy_info) = \ - _ESPY_REC(_type, _func) + __used ll_entry_declare(struct evspy_info, _type ## _3_ ## _func, \ + evspy_info) = _ESPY_REC(_type, _func) /** * event_register - register a new spy diff --git a/scripts/event_dump.py b/scripts/event_dump.py index 751f41b183a..6aadddf28da 100755 --- a/scripts/event_dump.py +++ b/scripts/event_dump.py @@ -17,8 +17,10 @@ sys.path.insert(1, os.path.join(our_path, '../tools')) from binman import elf from patman import tools +# A typical symbol looks like this: +# _u_boot_list_2_evspy_info_2_EVT_MISC_INIT_F_3_sandbox_misc_init_f PREFIX = '_u_boot_list_2_evspy_info_2_' -RE_EVTYPE = re.compile('%s(.*)' % PREFIX) +RE_EVTYPE = re.compile('%s(.*)_3_.*' % PREFIX) def show_sym(fname, data, endian, evtype, sym): """Show information about an evspy entry