From patchwork Fri Apr 12 16:08:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 788286 Delivered-To: patch@linaro.org Received: by 2002:adf:e6ca:0:b0:346:15ad:a2a with SMTP id y10csp793087wrm; Fri, 12 Apr 2024 09:08:44 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUXtAhDrPcT5GAtl3EAsdCSg6QKxpQvW22z9Zvvo5Ec3P49cbbw67KzOWtg+FWeMqN9g9wkfbFlOhkrV6izajql X-Google-Smtp-Source: AGHT+IFrr9wvwQPcvKt71ezR0gxu7Ca8UXgVM4KpPMUiuty5+bPmSBVFVLqt/5WFoUQPhNAIj6fg X-Received: by 2002:a05:6102:cd2:b0:47a:25d0:fe35 with SMTP id g18-20020a0561020cd200b0047a25d0fe35mr3250868vst.18.1712938123978; Fri, 12 Apr 2024 09:08:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712938123; cv=none; d=google.com; s=arc-20160816; b=El/sCrXtU1mI200sFej7ziZ4/9CGOwqwz0Tg3PcJe0CgBNBdzZMb5xKenMdCYvFTIl Bm3GcILBacofld/9yvwDbUeVGTg8YwdCV5wYKWjot7+mPZ8IhlXY0YryFOBaR+9meKQS uqkFr1pjM0Y0Vy4nStJbtGnmW7Rtql0OigNILbu7gvFMZopA/HFJJe1YcZvNAztry1AV f1ww1AJ/xKsJAskYRhXQyLsKprMQL72+Fjy2ixybNrup5ePKloj8AlUR88raPIT1gKaU Ey+hQQtslMzcbX1gbkgyE9MERgxJsoeAIYvxLoww1rh2gvHkZGYb2WWFTK1FAOY0P6e4 G14w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=TBhQKR/lHD6IZXFjTo1ySz6Tl3QB1lxlueYAwJ+2R5E=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=G9boQtO0v1eF9/LKijpUs4SVYOFBnWkuqRi011X4Urrce1lBNOydK4N6W0KOpHPVi0 6gBFXzdxJBOFYMJwqfORQrC8ePS2vWLg5JafOqAq6dO13P5aNidTjtDEwSLSWjiuIqa1 KqFc33u6POYI++52aJedjURIPT/kqKLDM6FZ5CC/q3/NnY04+iPzRnG66rux35x9oa63 dqoITt/eMRILehE/dEBbu8fQNgcjV8d0i3jUMaA21ZQUyR8xI7t4UYC+qBdK/bmcImhL DWBhnK2W+OqGnWU5UzHgZufjA3Dfm1Y9UTFHKOW51ao6fEE+Y3XN0BsJMkUo6PVfDYFw hDZA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sW3Sxksz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k6-20020a056102004600b0047a263d117csi695840vsp.24.2024.04.12.09.08.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 12 Apr 2024 09:08:43 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sW3Sxksz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rvJRp-0001sV-Od; Fri, 12 Apr 2024 12:08:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rvJRo-0001sF-GA for qemu-devel@nongnu.org; Fri, 12 Apr 2024 12:08:16 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rvJRm-0004ZN-9f for qemu-devel@nongnu.org; Fri, 12 Apr 2024 12:08:16 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-346b96f1483so587965f8f.1 for ; Fri, 12 Apr 2024 09:08:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712938092; x=1713542892; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=TBhQKR/lHD6IZXFjTo1ySz6Tl3QB1lxlueYAwJ+2R5E=; b=sW3SxkszNZ7NXzFNKjmWv4y90BaKf7qJanRK4YSDo9lYBkDNk6pAERtXT4DWXSmz3c G4Umt7rnDvOEe8xR90gFwhaWKdA/CfD7HviiKYC+sZOdAiBThOWmtpq/MSl1q+W5MBVP GcIuJkNvrbNQmjmLU9JWIzZ9v9D44dQAPrAdeQ8wELyyW8xx0OVfTcllgMMWlh9/yV+K KU9agTANjgmNJ1esPIEnXkEradExI1tDyLKi3MQcXB1VJ2CI/c9CLpfnAjapLKl1QWxB IyYJ3agMqeFcL4nT3IgaY15FIXWl5qRnGJrfeW+M2sIUVN7hqFij/qg+0u62eDsZuqD1 rDkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712938092; x=1713542892; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TBhQKR/lHD6IZXFjTo1ySz6Tl3QB1lxlueYAwJ+2R5E=; b=Rv9w4ZIWM7aoMcI8qqNRojJ8entzIQjD8dJR0IsviY3UGqkns/ptTf7KD64Lffrt61 SpVpCezAbS269uZFD4wDwzyxU4MHKGbrld0G1JuuK0JInOdmX7FOpM+gpTrJgKwWPFKC bcvmjoWPDO9P3N5/Iq4zzOjI2oabiWTA7MnwNt3rnr4UIncWWuMcDhVim1Vm65gGZyb8 V9ItGfeIV/1r1cECCKld+fNOOrWXUHLdIAtxWHqn2bA8g+MXjfKW9SGnzLUJo0s84MAV gKySAXk/jczx/z8ko6hQsZP543O3/0JoT5LD3reLTayaQmOKrvfbD6uoS/KgaxggacbC IL/g== X-Gm-Message-State: AOJu0YxwcNNlOhd7942eY+ZSMJsd8YFPZpO8OoxOO5OVbD5ZojN3Fc0O JUVRwDV6RTnhDvRreLcftgY+lunkx6x1p2xFlGGLvyeSxlXR1u7OiElCjZrU0Q2Eabio0Nm20t3 n X-Received: by 2002:adf:a386:0:b0:33e:c0f0:c159 with SMTP id l6-20020adfa386000000b0033ec0f0c159mr5482474wrb.10.1712938092633; Fri, 12 Apr 2024 09:08:12 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id cr12-20020a05600004ec00b00341ce80ea66sm4582371wrb.82.2024.04.12.09.08.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Apr 2024 09:08:12 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH 3/6] scripts/coccinelle: New script to add ResetType to hold and exit phases Date: Fri, 12 Apr 2024 17:08:06 +0100 Message-Id: <20240412160809.1260625-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240412160809.1260625-1-peter.maydell@linaro.org> References: <20240412160809.1260625-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x434.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org We pass a ResetType argument to the Resettable class enter phase method, but we don't pass it to hold and exit, even though the callsites have it readily available. This means that if a device cared about the ResetType it would need to record it in the enter phase method to use later on. We should pass the type to all three of the phase methods to avoid having to do that. This coccinelle script adds the ResetType argument to the hold and exit phases of the Resettable interface. The first part of the script (rules holdfn_assigned, holdfn_defined, exitfn_assigned, exitfn_defined) update implementations of the interface within device models, both to change the signature of their method implementations and to pass on the reset type when they invoke reset on some other device. The second part of the script is various special cases: * method callsites in resettable_phase_hold(), resettable_phase_exit() and device_phases_reset() * updating the typedefs for the methods * isl_pmbus_vr.c has some code where one device's reset method directly calls the implementation of a different device's method Signed-off-by: Peter Maydell Reviewed-by: Luc Michel --- The structure here is a bit of an experiment: usually I would make the coccinelle script cover the main mechanical change and do the special cases by hand-editing. But I thought it might be clearer to have the entire next commit be made by coccinelle, so reviewers don't have to go hunting through a 99% automated commit for the 1% hand written part. Let me know whether you like this or not... --- scripts/coccinelle/reset-type.cocci | 133 ++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) create mode 100644 scripts/coccinelle/reset-type.cocci diff --git a/scripts/coccinelle/reset-type.cocci b/scripts/coccinelle/reset-type.cocci new file mode 100644 index 00000000000..14abdd7bd0c --- /dev/null +++ b/scripts/coccinelle/reset-type.cocci @@ -0,0 +1,133 @@ +// Convert device code using three-phase reset to add a ResetType +// argument to implementations of ResettableHoldPhase and +// ResettableEnterPhase methods. +// +// Copyright Linaro Ltd 2024 +// SPDX-License-Identifier: GPL-2.0-or-later +// +// for dir in include hw target; do \ +// spatch --macro-file scripts/cocci-macro-file.h \ +// --sp-file scripts/coccinelle/reset-type.cocci \ +// --keep-comments --smpl-spacing --in-place --include-headers \ +// --dir $dir; done +// +// This coccinelle script aims to produce a complete change that needs +// no human interaction, so as well as the generic "update device +// implementations of the hold and exit phase methods" it includes +// the special-case transformations needed for the core code and for +// one device model that does something a bit nonstandard. Those +// special cases are at the end of the file. + +// Look for where we use a function as a ResettableHoldPhase method, +// either by directly assigning it to phases.hold or by calling +// resettable_class_set_parent_phases, and remember the function name. +@ holdfn_assigned @ +identifier enterfn, holdfn, exitfn; +identifier rc; +expression e; +@@ +ResettableClass *rc; +... +( + rc->phases.hold = holdfn; +| + resettable_class_set_parent_phases(rc, enterfn, holdfn, exitfn, e); +) + +// Look for the definition of the function we found in holdfn_assigned, +// and add the new argument. If the function calls a hold function +// itself (probably chaining to the parent class reset) then add the +// new argument there too. +@ holdfn_defined @ +identifier holdfn_assigned.holdfn; +typedef Object; +identifier obj; +expression parent; +@@ +-holdfn(Object *obj) ++holdfn(Object *obj, ResetType type) +{ + <... +- parent.hold(obj) ++ parent.hold(obj, type) + ...> +} + +// Similarly for ResettableExitPhase. +@ exitfn_assigned @ +identifier enterfn, holdfn, exitfn; +identifier rc; +expression e; +@@ +ResettableClass *rc; +... +( + rc->phases.exit = exitfn; +| + resettable_class_set_parent_phases(rc, enterfn, holdfn, exitfn, e); +) +@ exitfn_defined @ +identifier exitfn_assigned.exitfn; +typedef Object; +identifier obj; +expression parent; +@@ +-exitfn(Object *obj) ++exitfn(Object *obj, ResetType type) +{ + <... +- parent.exit(obj) ++ parent.exit(obj, type) + ...> +} + +// SPECIAL CASES ONLY BELOW HERE +// We use a python scripted constraint on the position of the match +// to ensure that they only match in a particular function. See +// https://public-inbox.org/git/alpine.DEB.2.21.1808240652370.2344@hadrien/ +// which recommends this as the way to do "match only in this function". + +// Special case: isl_pmbus_vr.c has some reset methods calling others directly +@ isl_pmbus_vr @ +identifier obj; +@@ +- isl_pmbus_vr_exit_reset(obj); ++ isl_pmbus_vr_exit_reset(obj, type); + +// Special case: device_phases_reset() needs to pass RESET_TYPE_COLD +@ device_phases_reset_hold @ +expression obj; +identifier rc; +identifier phase; +position p : script:python() { p[0].current_element == "device_phases_reset" }; +@@ +- rc->phases.phase(obj)@p ++ rc->phases.phase(obj, RESET_TYPE_COLD) + +// Special case: in resettable_phase_hold() and resettable_phase_exit() +// we need to pass through the ResetType argument to the method being called +@ resettable_phase_hold @ +expression obj; +identifier rc; +position p : script:python() { p[0].current_element == "resettable_phase_hold" }; +@@ +- rc->phases.hold(obj)@p ++ rc->phases.hold(obj, type) +@ resettable_phase_exit @ +expression obj; +identifier rc; +position p : script:python() { p[0].current_element == "resettable_phase_exit" }; +@@ +- rc->phases.exit(obj)@p ++ rc->phases.exit(obj, type) +// Special case: the typedefs for the methods need to declare the new argument +@ phase_typedef_hold @ +identifier obj; +@@ +- typedef void (*ResettableHoldPhase)(Object *obj); ++ typedef void (*ResettableHoldPhase)(Object *obj, ResetType type); +@ phase_typedef_exit @ +identifier obj; +@@ +- typedef void (*ResettableExitPhase)(Object *obj); ++ typedef void (*ResettableExitPhase)(Object *obj, ResetType type);