From patchwork Fri Jun 28 07:00:41 2024 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: 808150 Delivered-To: patch@linaro.org Received: by 2002:adf:fe0a:0:b0:362:4979:7f74 with SMTP id n10csp221627wrr; Fri, 28 Jun 2024 00:03:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVX7YvJ8FM9Q50h4EBTYIq36izBMu8wr/WB+le+uLAMfZkH9FtpEa52TXKSCmGibp+a+2mPwYsx53Bsqbsahx5c X-Google-Smtp-Source: AGHT+IEhH9pLl226dft8mAoNE49riNqSKKOqb7ykjfPcTkB7HuPSBVO0pxvBl2VLXlYjKSg3ufN0 X-Received: by 2002:a05:6214:acc:b0:6b4:fd24:95f9 with SMTP id 6a1803df08f44-6b5409e1427mr210323036d6.38.1719558230161; Fri, 28 Jun 2024 00:03:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719558230; cv=none; d=google.com; s=arc-20160816; b=AthN3KF30Z3dlwsYxiXeqpL8uU+T6RimZns4VcxCG1rdYLOyYtsOutt0jEW0b3yaEk IR+MJ22nLuRoJOqHIzf+fxAYQGTPIs0z6OVugr94OwfwrxiCpOiJFFS65qW2sRGWvU1Q AbfHzBgw+Pr9XvtVggM2GoqFcT5cRaisn6dn5UuqS4cldziSMAIdmlsziBzdnnNyVlK8 egXIwnyLdbsO5bPPE3YsI8/94zCg4Q+N3TRwmf4mkgPi5VybuqgpU7oEBCMKpNjKNf/l iP2Z484CQSeOLV11gbEXzLzit/8iZuMK2GNhmW/ZYvjSaDOem/hQxiIza9pMNoJ7kS8D RFoA== 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=2IVH6b/MHuau58htKVq2uNBSYst/d06FDWZAuadlm1c=; fh=Vqz0ILX7NeXJwCG5xiS+Wtk94IhOmAmLtOfN3kRbil4=; b=ZEcfb2XF9fkIsmKbvHnRx1cPp2j5/9AMPe1i89uuTHcVOBv6efJI/V4gfgqCH27/18 QYgrRNK0J+vSd1ApqgiHjVsuotfHwQRcy8J2GMKFrVhZtuI/F1qM4wE0MJS9J1cLvwDZ cQjQTZhqwMkGBpvcv8jtJkxRQurUdGp3K/KkfmU1UzXoAExBN6YtWslatwXhhfBeglHz EXDN0VcN2/LLw0wjgdQVo82wR7eab+3kkA6vmXt60WrigSwX/7j+GYcyUrImFwJwLFsP H0i8OfvG4oW2b1EtrbBSmYDc/iPXMEaULlFpTwnKEYACMuhWK9FPfptjmmoS1n8hcD88 Cu8w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=b+4D0E8Y; 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 6a1803df08f44-6b59e5aea9esi13741056d6.247.2024.06.28.00.03.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 28 Jun 2024 00:03:50 -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=b+4D0E8Y; 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 1sN5dC-0008UM-4h; Fri, 28 Jun 2024 03:02:50 -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 1sN5dB-0008U6-D5 for qemu-devel@nongnu.org; Fri, 28 Jun 2024 03:02:49 -0400 Received: from mail-lj1-x22a.google.com ([2a00:1450:4864:20::22a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sN5d9-0006eo-Mo for qemu-devel@nongnu.org; Fri, 28 Jun 2024 03:02:49 -0400 Received: by mail-lj1-x22a.google.com with SMTP id 38308e7fff4ca-2ebed33cb65so2526401fa.2 for ; Fri, 28 Jun 2024 00:02:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719558165; x=1720162965; 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=2IVH6b/MHuau58htKVq2uNBSYst/d06FDWZAuadlm1c=; b=b+4D0E8YsZ35s5XIjBX0Ux4GDovRa/u7ocdwfiyqTB2NHFf/XTvcDD3efN7ink9WAl 9hUxYzaHEZmQvUA+QAHVdJKBCBl8sCyqwr2NWucKV5IpBPsS+yoDRl+kXLl3Ul8o8fR/ GGOu3uqutFsSYoi/5CSEPzeIveaY0VWVpqmtvpDmb4HZEhiacJlfHV6WYIDvHu8InmnY nLSKPVlcniqV8VmTsgUnTEqphArEwIKNJv8Vzq4UTWEDAFHCWQHP+vNFGvXK2CaMHK/1 Cf6WYphGWKYtxnz90jdTAx86DgRq0ysuutpzqWNz1ThRonWOZbfCRX+2z/40TSHHNtgS f5gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719558165; x=1720162965; 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=2IVH6b/MHuau58htKVq2uNBSYst/d06FDWZAuadlm1c=; b=q44iuEKf85uMG2EgNGjQMKHcC+uIbmwuRBMSaQeAKDmdx2SzhcbW1P1gDGb7aMwqXb 07+t4Q2bcwoBTbwrLWcoQp6lICikZW8BT3JwjP0Vh1mekJZfEbp897CA8THpDunXGog9 LREm+YE7oU8RFrLPEAxZDPq+sMoexBHv1ZYg7mfjCOGlneuD2k3GpIH+N8q+TjfTZuMY Z4bTjanCTPS5keNKhypFzZ4rJLeYB2XXD7bgx19Qu78Da0bPZwBBHNRpQ1wUdCx85CcT KNEBjCxCiggY4W/LcupOFQlzzw3YLUxL0CpjdIih4MHuliEdG5tKclCEFPlgFIcItxFX Jsig== X-Gm-Message-State: AOJu0YxftjVD3xOboxibFASAYIR1y9w8kqNh50N36Mm94AoSTX8UoWBW HbQOdVIrU1a/Puj6RCIPQmwwfxyta1VrYMxY4qu7FoOGXCitorxOvsLyUBVKbsCnFVJJCNrHoAO 1knQ= X-Received: by 2002:a2e:9e59:0:b0:2ec:5518:9550 with SMTP id 38308e7fff4ca-2ec5930fdbcmr113733731fa.10.1719558165435; Fri, 28 Jun 2024 00:02:45 -0700 (PDT) Received: from m1x-phil.lan (cho94-h02-176-184-4-239.dsl.sta.abo.bbox.fr. [176.184.4.239]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4256b0642acsm21683805e9.25.2024.06.28.00.02.44 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 28 Jun 2024 00:02:45 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, =?utf-8?q?C=C3=A9dric_Le_Goater?= Subject: [PATCH v42 05/98] hw/sd/sdcard: Trace requested address computed by sd_req_get_address() Date: Fri, 28 Jun 2024 09:00:41 +0200 Message-ID: <20240628070216.92609-6-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240628070216.92609-1-philmd@linaro.org> References: <20240628070216.92609-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::22a; envelope-from=philmd@linaro.org; helo=mail-lj1-x22a.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 Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Luc Michel Reviewed-by: Cédric Le Goater --- 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"