From patchwork Thu Jun 27 16:27:22 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: 807829 Delivered-To: patch@linaro.org Received: by 2002:adf:e842:0:b0:362:4979:7f74 with SMTP id d2csp891210wrn; Thu, 27 Jun 2024 09:28:42 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWealBrMOsOhY9BbV6pkIPB6i79MbKBOt0kW/9nTDg3s7yQUNV945m/Dwwn84MUtGXIqVrMSBPcaplVJ0HFbA6C X-Google-Smtp-Source: AGHT+IFlAi2lnxtm3LDHoZu5VB5IJGoJAu8oIf+hoLxT3tGrn6A8ct8tALJ2t2pBG5YxStda1TZR X-Received: by 2002:a05:620a:4549:b0:795:fc7b:4bcc with SMTP id af79cd13be357-79be0bfa768mr1778193885a.6.1719505722149; Thu, 27 Jun 2024 09:28:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719505722; cv=none; d=google.com; s=arc-20160816; b=DD1TbYpjk9tRT/GCiHSTl9ZZUbYpdtlQCyDzwRhDUbaelJ0gEZ4GGCCWHtHW+ruFAQ G9gznuX6PFblYd9/gWsUqGRnWyTIhaecVCOQcRuUrTHYeJaSBoO401gxITAMtnienOJJ idAVVSLAO4TBDZt97oMX02VwNA3QKcAFmrH1JF0SW7QfCDzM4WubMwrMRvnA+x8LaT3M RmpyToDCsOs5Rc4/WTMtKrZ5qOsvME9TwIdkIw20c2j5TopOPc6HCkm5LQfUf3/JbUv9 mnkIPWjvJFM9twzRmoe0KtLxR1nsgclt3TxNtQ/nrxpYYi2l+mZgfNZD1Yds2yhMapLx GShg== 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:cc:to :from:dkim-signature; bh=Nu8acyjpOBs616osR1RalX8TR2/NJv3m9AnCQgylDWw=; fh=CQ9QAhiPZZ1APu1JLxgbtxAnzrroUJn9RCDrjAjVXrk=; b=DeOiP3fwP1AcczQTTVMfM2pO+JJfIm9eTGmuQ2cU68cqV97ymVi4JZpKR5hI48vKuU watzxyN8VYbrYhPSC9buJjFgtb0lxYy5nifXCbGSlSB1AX3lIwsnlVbOQeB7qbEm1ZsE ThYuIahlSiVu3JNHfJYrmgp+LtzeQNW2fogN3tdgtMH6JcGXUv87U8WM2fqVCnnLxptc j0bVWugeMDEpJ8gRRV7MsMbrobed4WdS6NTZo3XjbqvpZdGLjYR6AFADNlGwck2mk2lr EsPJwzmmMC/6QWJGnWGY/N/9d4LrXv5DCtJ29+zkMUI4by8hgPivOggY+yopPOhDasWu rokw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kbq85n7A; 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 af79cd13be357-79d5c789da1si163591285a.136.2024.06.27.09.28.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Jun 2024 09:28:42 -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=kbq85n7A; 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 1sMrz1-00026J-Fq; Thu, 27 Jun 2024 12:28:27 -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 1sMryz-0001zt-A1 for qemu-devel@nongnu.org; Thu, 27 Jun 2024 12:28:25 -0400 Received: from mail-lf1-x134.google.com ([2a00:1450:4864:20::134]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sMryu-0003RW-Gx for qemu-devel@nongnu.org; Thu, 27 Jun 2024 12:28:25 -0400 Received: by mail-lf1-x134.google.com with SMTP id 2adb3069b0e04-52ce6a9fd5cso5040659e87.3 for ; Thu, 27 Jun 2024 09:28:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719505698; x=1720110498; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Nu8acyjpOBs616osR1RalX8TR2/NJv3m9AnCQgylDWw=; b=kbq85n7ApPOGi9S5wvgOjM4bpa9bC6cpI56kHkVC7EUJPmVsVmJZ2BI6Rmvq45h1JO uD1mGAgAHFjskqrenjCXup5o84H53Lalv/JGz8CN225rRS1It8ldpW9ZMd61d1jJ1UY2 UkX7LukTWpwj2INhuXXHTVY1pDu4VKkT1dljG07eA/0Aj3oalK7thOUMoSKmlr4j6p50 0RLUH/rkn6fvMomc25qOk3nCPbxWH0KjmYYByn4W6UIz0PLalVIysPDoV+DACLvdHEVP GmClgJWbhgqc3rxxEPmGALBL2aMjuBeLzq7mbb4sAYpaW7fwWngTCpo/0/Yrtr8HZnCD Gwjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719505698; x=1720110498; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Nu8acyjpOBs616osR1RalX8TR2/NJv3m9AnCQgylDWw=; b=WzMAmvWGP4i63f2nvBwivQu8/AJ7Oek5CWuWHYvX2+rotx05s1to+y6S7/QyHeRbmf HHXcq+2OCOvfduHuFryFEUnDr00ocICdbkkxMGGflCnsMkDo77RoCDGkDboVNgdnUXLj RNA1kVBcyhwwkpFRitONFx38qf2dDxAXfRtvWcDRTmuxkoJkahENai/COg/e2l8s5F7j e+g3Vr71g76x97vzEoa7q5bAv5LZqD+OfxajXJQHxM8PgPrSm5gWk4dS060+28nNM767 dvfeuwFmvoXwmt1BSVpUVTYXgCIJnoUpns+oWKWYZdfzTW5QlX1dhbfxOpj0E3CD+d43 hfWQ== X-Gm-Message-State: AOJu0Yzxk2VKiqb4hcUCQhiEHdLLsg62IzNxhdHlu4COe6k71gAbFapH 2uLlIdwzvMpglArE8uo6Nzy3b7159LHiBx98QPB2ZMoU59UTKego7yY0PdnzYzQpxbLuw8O0NeO 0tfI= X-Received: by 2002:ac2:5490:0:b0:52c:9e51:c3f with SMTP id 2adb3069b0e04-52ce185cfb0mr9045412e87.42.1719505698287; Thu, 27 Jun 2024 09:28:18 -0700 (PDT) Received: from localhost.localdomain (33.red-95-127-46.staticip.rima-tde.net. [95.127.46.33]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-424c8245e87sm76229945e9.9.2024.06.27.09.28.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 27 Jun 2024 09:28:17 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, =?utf-8?q?C=C3=A9dric_Le_Goater?= , Francisco Iglesias , Bin Meng , Sai Pavan Boddu , Joel Stanley , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Luc Michel Subject: [PATCH v2 04/11] hw/sd/sdcard: Duplicate READ_SINGLE_BLOCK / READ_MULTIPLE_BLOCK cases Date: Thu, 27 Jun 2024 18:27:22 +0200 Message-ID: <20240627162729.80909-5-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240627162729.80909-1-philmd@linaro.org> References: <20240627162729.80909-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::134; envelope-from=philmd@linaro.org; helo=mail-lf1-x134.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=unavailable 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 In order to modify the READ_SINGLE_BLOCK case in the next commit, duplicate it first. Signed-off-by: Philippe Mathieu-Daudé --- hw/sd/sd.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 8201f3245c..dfcb213aa9 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -1398,6 +1398,24 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) break; case 17: /* CMD17: READ_SINGLE_BLOCK */ + addr = sd_req_get_address(sd, req); + switch (sd->state) { + case sd_transfer_state: + + if (!address_in_range(sd, "READ_SINGLE_BLOCK", addr, sd->blk_len)) { + return sd_r1; + } + + sd->state = sd_sendingdata_state; + sd->data_start = addr; + sd->data_offset = 0; + return sd_r1; + + default: + break; + } + break; + case 18: /* CMD18: READ_MULTIPLE_BLOCK */ addr = sd_req_get_address(sd, req); switch (sd->state) {