From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 9E6E0C2BBCA for ; Fri, 28 Jun 2024 07:32:51 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sN65S-0008NP-M1; Fri, 28 Jun 2024 03:32:03 -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 1sN64s-00085o-JI for qemu-devel@nongnu.org; Fri, 28 Jun 2024 03:31:31 -0400 Received: from gandalf.ozlabs.org ([150.107.74.76] helo=mail.ozlabs.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sN64q-0007d4-Lx for qemu-devel@nongnu.org; Fri, 28 Jun 2024 03:31:26 -0400 Received: from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4W9RvG3MHwz4wcC; Fri, 28 Jun 2024 17:31:22 +1000 (AEST) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (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 mail.ozlabs.org (Postfix) with ESMTPSA id 4W9RvF3JhLz4wb7; Fri, 28 Jun 2024 17:31:21 +1000 (AEST) Message-ID: <38ce1b2f-3bcf-4732-ada5-e01121da2cb3@kaod.org> Date: Fri, 28 Jun 2024 09:31:19 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v42 05/98] hw/sd/sdcard: Trace requested address computed by sd_req_get_address() To: =?UTF-8?Q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org References: <20240628070216.92609-1-philmd@linaro.org> <20240628070216.92609-6-philmd@linaro.org> Content-Language: en-US, fr From: =?UTF-8?Q?C=C3=A9dric_Le_Goater?= In-Reply-To: <20240628070216.92609-6-philmd@linaro.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=150.107.74.76; envelope-from=SRS0=GU6n=N6=kaod.org=clg@ozlabs.org; helo=mail.ozlabs.org X-Spam_score_int: -39 X-Spam_score: -4.0 X-Spam_bar: ---- X-Spam_report: (-4.0 / 5.0 requ) BAYES_00=-1.9, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 6/28/24 9:00 AM, Philippe Mathieu-Daudé wrote: > Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Cédric Le Goater Thanks, C. > --- > hw/sd/sd.c | 9 +++++++-- > hw/sd/trace-events | 1 + > 2 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/hw/sd/sd.c b/hw/sd/sd.c > index 090a6fdcdb..464576751a 100644 > --- a/hw/sd/sd.c > +++ b/hw/sd/sd.c > @@ -608,10 +608,15 @@ static void sd_response_r7_make(SDState *sd, uint8_t *response) > > static uint64_t sd_req_get_address(SDState *sd, SDRequest req) > { > + uint64_t addr; > + > if (FIELD_EX32(sd->ocr, OCR, CARD_CAPACITY)) { > - return (uint64_t) req.arg << HWBLOCK_SHIFT; > + addr = (uint64_t) req.arg << HWBLOCK_SHIFT; > + } else { > + addr = req.arg; > } > - return req.arg; > + trace_sdcard_req_addr(req.arg, addr); > + return addr; > } > > static inline uint64_t sd_addr_to_wpnum(uint64_t addr) > diff --git a/hw/sd/trace-events b/hw/sd/trace-events > index 0eee98a646..43eaeba149 100644 > --- a/hw/sd/trace-events > +++ b/hw/sd/trace-events > @@ -50,6 +50,7 @@ sdcard_ejected(void) "" > sdcard_erase(uint32_t first, uint32_t last) "addr first 0x%" PRIx32" last 0x%" PRIx32 > sdcard_lock(void) "" > sdcard_unlock(void) "" > +sdcard_req_addr(uint32_t req_arg, uint64_t addr) "req 0x%" PRIx32 " addr 0x%" PRIx64 > sdcard_read_block(uint64_t addr, uint32_t len) "addr 0x%" PRIx64 " size 0x%x" > sdcard_write_block(uint64_t addr, uint32_t len) "addr 0x%" PRIx64 " size 0x%x" > sdcard_write_data(const char *proto, const char *cmd_desc, uint8_t cmd, uint32_t offset, uint8_t value) "%s %20s/ CMD%02d ofs %"PRIu32" value 0x%02x"