From patchwork Mon Mar 15 23:35:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12140855 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0916AC433E0 for ; Mon, 15 Mar 2021 23:46:17 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8C09464F5E for ; Mon, 15 Mar 2021 23:46:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8C09464F5E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:47820 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lLwud-0004dR-MS for qemu-devel@archiver.kernel.org; Mon, 15 Mar 2021 19:46:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36076) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lLwl3-0001x5-V7 for qemu-devel@nongnu.org; Mon, 15 Mar 2021 19:36:21 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:41949) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lLwl0-0006Fc-AP for qemu-devel@nongnu.org; Mon, 15 Mar 2021 19:36:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615851377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=x+IDLwTWOrFHz8fuSTd2bsf4O8rILYVfhYt77um4UJ4=; b=X5F2H0z16g5dAOErMrTWoC5kYOuic2RYK9s6mCjUthCKo/RivjfzeANLps5VmdEG+LdaMR A0V3m0Epfn0vYGnlqXt9QWOSnIwoRxvn7ieAKWlt9PLlo+0ucGN78QfDllbI6Dun2+vHd4 4ahnb1nA37Llv/D8GJMu2N1Z/UYrBdg= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-139-LzbxacMINwOSOBFKzZzVSQ-1; Mon, 15 Mar 2021 19:36:14 -0400 X-MC-Unique: LzbxacMINwOSOBFKzZzVSQ-1 Received: by mail-wm1-f72.google.com with SMTP id c9so3115890wme.5 for ; Mon, 15 Mar 2021 16:36:13 -0700 (PDT) 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=x+IDLwTWOrFHz8fuSTd2bsf4O8rILYVfhYt77um4UJ4=; b=uKd7OZk5T2R2bBKN6LCBlysT7eyQ4F2gcdOuv1aUowuXgMYkhDGipGRM+SEqjAW7pj 5//R0X8uA3zOprusfrLhO36fDs3Cn8C7Aj91etbuBcfrx6b63tZ+foq6HLcs5yt1zLlv AWPpkuKtW1xMW7SnPKW+O9Oq9zpIqaMLkB4jXGKiqJYDdCfdam7aI+yzpDVLEXRiNoc+ vhxk/u+VqjwfmT/Dc5eO1zjEQX8sPaHTXnrlQbjCW6SAlTQjy0n3M+TEBsOqgtfFm8D3 DA7GjGNOgU1DlNh9Sc7J6QqUym39uIJvra+Pq2c6QbNe14MpfXbeDER9g+sciS1psmep XGkQ== X-Gm-Message-State: AOAM531crkaVxjnZhZ1D80rTkd40Zp2/ZfSuitwdrv5NR3KT/TZ7JeJE IUpUHhgmoWz78HRRY6num3nCY8NccysM2RN+/NdakuumG695rnMJlTgXibPc3h79eeNwaKFm4TC t/3ycvGWVCXHFU5oaeGyPBuA5w6XXqLAjSs3dcnOGkzLQA5UgKOe4U1+Xn/Qx/3q3 X-Received: by 2002:adf:ee8f:: with SMTP id b15mr1838985wro.314.1615851372843; Mon, 15 Mar 2021 16:36:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzdsqJkBc2sxoI8zyAR+y0KLKr+nMCjhEnfrrYgZkqhSPgmL5nJ1o5acctA5DilsoUjWbSF1w== X-Received: by 2002:adf:ee8f:: with SMTP id b15mr1838968wro.314.1615851372711; Mon, 15 Mar 2021 16:36:12 -0700 (PDT) Received: from x1w.redhat.com (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id y18sm19949823wrq.61.2021.03.15.16.36.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 16:36:12 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 09/11] hw/block/pflash_cfi01: Clarify trace events Date: Tue, 16 Mar 2021 00:35:25 +0100 Message-Id: <20210315233527.2988483-10-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210315233527.2988483-1-philmd@redhat.com> References: <20210315233527.2988483-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-block@nongnu.org, Max Reitz , David Edmondson , Bin Meng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Use the 'mode_read_array' event when we set the device in such mode, and use the 'reset' event in DeviceReset handler. Reviewed-by: Bin Meng Reviewed-by: David Edmondson Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20210310170528.1184868-10-philmd@redhat.com> --- hw/block/pflash_cfi01.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index 779a62f3b06..c8cecb3ac8b 100644 --- a/hw/block/pflash_cfi01.c +++ b/hw/block/pflash_cfi01.c @@ -663,7 +663,7 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offset, "\n", __func__, offset, pfl->wcycle, pfl->cmd, value); mode_read_array: - trace_pflash_reset(); + trace_pflash_mode_read_array(); memory_region_rom_device_set_romd(&pfl->mem, true); pfl->wcycle = 0; pfl->cmd = 0x00; /* This model reset value for READ_ARRAY (not CFI) */ @@ -886,6 +886,7 @@ static void pflash_cfi01_system_reset(DeviceState *dev) { PFlashCFI01 *pfl = PFLASH_CFI01(dev); + trace_pflash_reset(); /* * The command 0x00 is not assigned by the CFI open standard, * but QEMU historically uses it for the READ_ARRAY command (0xff).