From patchwork Tue Jan 16 15:12:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 763045 Delivered-To: patch@linaro.org Received: by 2002:a5d:5903:0:b0:337:62d3:c6d5 with SMTP id v3csp1665789wrd; Tue, 16 Jan 2024 07:14:42 -0800 (PST) X-Google-Smtp-Source: AGHT+IFJUUPCn7B5vtkjS0VKaOomIkjD8qzyLtbIDayRvwG3l8K1/oN8Q2jES2bF4HUkGcFUUOPV X-Received: by 2002:a05:6214:4008:b0:681:5673:fb2f with SMTP id kd8-20020a056214400800b006815673fb2fmr7695112qvb.46.1705418081924; Tue, 16 Jan 2024 07:14:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705418081; cv=none; d=google.com; s=arc-20160816; b=xOKClrPPSYz1mOtj/2j7bFObGbtj23drbGGkOTi8oOThMy1NPLNXfdkNqWRSjvq2NJ Vi4+9xDGmqozyjnYr9sX+1Fcgv026+sgeXTkxQTI7sJ1fo1kQyLZ4/YKcvPN+TxkjW73 49k9HxKF+1PzeCZLpZgNWMSHi33BJej+aj0B/Ykunpm20iFM8LdLmfIocVYSGhp90Qbp orU6BIJA8aa9powM4YFieP8h4Q9CU+4Ph5D1wUxqsnjr16GWCuc7rU/ygrRbdYN3x94B gW+fK+CntPZwHkDdLnXn3+QkQgm1ZUaxMDn/PHQef5PYUcrv5CvFujmSzeyH9quSlMFZ Cmgw== 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=klstX9rwm3US7BwgKsjrY2dDzwCKawA+SeWa7QsXZAk=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=da4K4KYImU1iLg+qEfupMnE2Wg7cjoGt79UsA7xyVPJZbcQJCvF2usZ6y+nm+i2aUs eQRw6DeC4jX/rSux5c92qA9B0PQ39Bk2sFOUvrwHKMW2uNIhAzN4FYo2yzj6Nfwbo5Xa mmwPDCF8O7xOsJWDAwR8Vmx7+hFy4adYKP4zpQ8vqOO5RH/TkwZX5/8wu8TWylP9pDeT Xo3Xf96/+poI/N1SxosfOrxiWJWhgiaU3g1Jq2O23papYLZxcBF7dGQzx107Un0HOQlt 5BoPCFbkjODEf8VIKbqN6L8aSKUWcCCieNgyJljA+77510VE6dYNkjvRhHBPJFu3LRn4 GkTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cahlQxQF; 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 i15-20020a0cf10f000000b0067f8a6faa71si10270563qvl.224.2024.01.16.07.14.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Jan 2024 07:14:41 -0800 (PST) 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=cahlQxQF; 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 1rPl7M-0006ha-P8; Tue, 16 Jan 2024 10:12:44 -0500 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 1rPl7K-0006g1-7d for qemu-devel@nongnu.org; Tue, 16 Jan 2024 10:12:42 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rPl7G-0005rv-TS for qemu-devel@nongnu.org; Tue, 16 Jan 2024 10:12:41 -0500 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-40e86a9fbd9so3524555e9.1 for ; Tue, 16 Jan 2024 07:12:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1705417957; x=1706022757; 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=klstX9rwm3US7BwgKsjrY2dDzwCKawA+SeWa7QsXZAk=; b=cahlQxQFxC1k6+elzFEia58H+e91jBEjWwhwwq/qScCK3LOTGnxWFjDKLSwj1U+0Wk /+23TFo0MN0/fb14WO+TP+LvIcMrgHjt50qCuEQRTZaOA7yvkW/XjvtCGHWWJzia3a8u JRb9WJJaj7SDrGq6xa1fF+rL1NwwyxMDk0tz+Ufu7q+r2MkaJ7QnrPO8Z0/QzycFwXo8 JdQbnjDFcqcE7qriQc0RmVovswcHoJksMybN6Iw9LGkXKMmKzynCf3bsMIoUwb22lLr9 3ex+LGvM6sYVrLZ/Pnz7uJPiJfKP1ixtJYSS+0+kg4taxDzQXAUq1IA3Hfg/4AFnLZ9j ApKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705417957; x=1706022757; 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=klstX9rwm3US7BwgKsjrY2dDzwCKawA+SeWa7QsXZAk=; b=UFNziL7IU83L3DACgTHQg/8PKlxyyZX4SUlQgTVPvDWMIwbT/hqnaByAbUJC0LGSqM VKdmgRPs1b1q1SlC8t0OKYhgMM6Wfsp3GWVog8BmbW2z/w9Z+9WmJRazLKQ7fIpXqsOq GgaXCosl4W3HYsYqcH4THlszvFVt1tFW327zL281WyjmPAxwLeWsrByz6dTP1duUQNsr aVaSp+99r6eeA0Vj8FmuLcC45yUiDNJHHbt/0IVwcJbfhZ/i1rwrjJt1lRUkmbA1lfH3 mmOo4QEte9dDldTzssHqQBK+82ALKVW170vTy2zcvOdOwBpJ/LVxevDg6BB0w0owGdVD uzdQ== X-Gm-Message-State: AOJu0YyqvJemIvhBDv5NiUeR8Mdrc1ZTjkB0CWnQLj5HJxer6ixPPKex bSz7OoBqt7ZaFhQFZqJSlnQ/aE2bmTfk/A48JwW1Hri/XqI= X-Received: by 2002:a05:600c:1396:b0:40e:3d82:2394 with SMTP id u22-20020a05600c139600b0040e3d822394mr3513432wmf.19.1705417957388; Tue, 16 Jan 2024 07:12:37 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id m14-20020adff38e000000b003379b549a00sm10091357wro.10.2024.01.16.07.12.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jan 2024 07:12:37 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 19/21] hw/timer: fix systick trace message Date: Tue, 16 Jan 2024 15:12:26 +0000 Message-Id: <20240116151228.2430754-20-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240116151228.2430754-1-peter.maydell@linaro.org> References: <20240116151228.2430754-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x332.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, T_SCC_BODY_TEXT_LINE=-0.01 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 From: Samuel Tardieu Signed-off-by: Samuel Tardieu Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Laurent Vivier Message-id: 20240109184508.3189599-1-sam@rfc1149.net Fixes: ff68dacbc786 ("armv7m: Split systick out from NVIC") Signed-off-by: Peter Maydell --- hw/timer/trace-events | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/timer/trace-events b/hw/timer/trace-events index 3eccef83858..8145e18e3da 100644 --- a/hw/timer/trace-events +++ b/hw/timer/trace-events @@ -35,7 +35,7 @@ aspeed_timer_read(uint64_t offset, unsigned size, uint64_t value) "From 0x%" PRI # armv7m_systick.c systick_reload(void) "systick reload" -systick_timer_tick(void) "systick reload" +systick_timer_tick(void) "systick tick" systick_read(uint64_t addr, uint32_t value, unsigned size) "systick read addr 0x%" PRIx64 " data 0x%" PRIx32 " size %u" systick_write(uint64_t addr, uint32_t value, unsigned size) "systick write addr 0x%" PRIx64 " data 0x%" PRIx32 " size %u"