From patchwork Tue Jun 25 07:34:36 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: 807266 Delivered-To: patch@linaro.org Received: by 2002:a5d:508d:0:b0:362:4979:7f74 with SMTP id a13csp2222695wrt; Tue, 25 Jun 2024 00:36:09 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWrg3luRgCbYpAyf6N3Lf5X9658v/J1k3R4xZXKpomM9Bcr3KyJR/+xyDePhA95pydUwUDze1qJnmL+kkjdsO+R X-Google-Smtp-Source: AGHT+IEk0/hbjelc/rWUJQ6DYU5hJcb6o8lqzUwib18nFGhpstlxUYjNwq8aQXYAI5iI3mWvNGNO X-Received: by 2002:ac8:7f02:0:b0:444:d2d0:9a52 with SMTP id d75a77b69052e-444f8a32740mr5794361cf.35.1719300969595; Tue, 25 Jun 2024 00:36:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719300969; cv=none; d=google.com; s=arc-20160816; b=CUMPKiSf3xoBYIenS/cYc1q4wztACnKDR/6OsBU1SsrUsirc4W4fPB+182dCG9QmPg 4q90/2lWCa/rvHVc2EmpbdiiVG3RlbcTIOPt4F8Txnk9+PbviHdGBJzHEM/cjVhnPdfz 0weSVkS8PJ16xk4P1/2hSQrmjkE68x5UMuJCpowUPTixwAkw3mPu5Rql7A35YPUmBxbP ZVDQE9i3Ca66qF+b9TKpnUi0arST96d+MFbvVKGILzozv0I8WGtY+C4uc7f8daNyW9K4 PiSGLof3XNhH3jgKPiXnoQAq1UH+FH89Pr5kfdVWXtx4my5WQOyljoeczB8gwDfu+eia 2iHg== 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=MFRKHAqO647KOdwqqDJufJ/DZoqjTVohRrJvslLGVMw=; fh=RCxNUJwt/amfcWvs/lXDf/JmxshGBXr892O+ARTFYyU=; b=HJMCND8rwrnoyxQ1ctlIYhAlqeemaxI0tVJDQOvAjjF+rHzFHKzmyoakMfzKY7v084 CPodxXtT8rN5rLbNq3pRtw2yGpLmWC8CR4bS8AxcuCEcdwk8RzJJwAkxaiKJemuYa21P aSSvxU9iEvUwqPXeQ0FQolB3CzUBW711kms7ZreV1snkZe6EuiLo9WrcjTaSCYCPJoZy 911oTY0/UkfrwNy+lcacOqPijqfytI8+BQ79UqNgW2xpJII/qsdVTRZNFUZLmObUYp6C iPcg/WVU4NyR1Z/dvAwEOvOR7W3CcXDvGCDR7COWVl7T4/3nEpjms9tW3FLQmAzKi7t6 57sg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JaFdkVuN; 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 d75a77b69052e-444f07e63c8si17259071cf.309.2024.06.25.00.36.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Jun 2024 00:36:09 -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=JaFdkVuN; 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 1sM0hh-0004XB-71; Tue, 25 Jun 2024 03:35:01 -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 1sM0hf-0004Wp-Jm for qemu-devel@nongnu.org; Tue, 25 Jun 2024 03:34:59 -0400 Received: from mail-lj1-x231.google.com ([2a00:1450:4864:20::231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sM0hd-0003kj-V1 for qemu-devel@nongnu.org; Tue, 25 Jun 2024 03:34:59 -0400 Received: by mail-lj1-x231.google.com with SMTP id 38308e7fff4ca-2eaa89464a3so60313641fa.3 for ; Tue, 25 Jun 2024 00:34:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719300896; x=1719905696; 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=MFRKHAqO647KOdwqqDJufJ/DZoqjTVohRrJvslLGVMw=; b=JaFdkVuNjkwxcVhuSofUzbSLP6bLTa8eUJp3tAzdIHzh7VjidthKPCzWVYLr+ACLGt jvEWyLVon0Bb20iCgH20QYWuX0pzvcS67tg4tIh1cjQIXSD/+oof2q4u1qKEnBCm1V6Q vip0msazKJBcfJYLbc84wJdbZhJUCILy8elPALQ3SLnQ0EPJRnLWlULIrFUukfaN+dVG og2kDzyRGfuH+zUVu9I4NpDMN3Ix9k4/VaBhAFVHaJen/hBvnla2d+/S4gUA0xEjWxzl mY+y9Y3Rro0IkTmhZC/y+iJ0G1yTueyrc2o42zrzKUwwfy2l/bUOVdS9Gyj4pGQVVaS0 gurw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719300896; x=1719905696; 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=MFRKHAqO647KOdwqqDJufJ/DZoqjTVohRrJvslLGVMw=; b=KQ4dqdaoeyy+B8aMfSX/LgShTDKjvu5LCcDinoce3eGMXY4O7IF+n78aiYWEVefBIv 1xPlQmqjgS5D2KNKOWK7QaxzRo2uAgoz/bdl/myNaUZNCgubcoDQJsVVuL3+fFMr4uGF EQnCrWdk0TaPBXMs9He2DGCPhfCnzwQYA99HGv+fMifp3hz0ZpdFzb+yX+x7y1agfX7y 4RULhMVAvo08JIaHMKynmoQ/qXeIjTgcB+qBdSzKE2N4m6mtiGz5gfF8pbCPoBcqwxZk rzrt/HfUobZR3wOLHL3LflyZyjNhpXxnTcrAsQdjY2+sB7Nday7Elg+tE1TaU/7TArIE E3hg== X-Gm-Message-State: AOJu0YwQtvBqVkyPrnD4kbcOKUY4vIKTjuZKlnEp5KKvxGqP9D0nqWLL f3p59Tyvcs70Q6ubdCv89D+WrunZcyvpQ8vfuYf5hg5Yf2ipXcTWRww9cEdlx6tHmpJEuKb1W1y E X-Received: by 2002:a2e:8617:0:b0:2ec:561d:dee1 with SMTP id 38308e7fff4ca-2ec57967b7fmr46632371fa.8.1719300895562; Tue, 25 Jun 2024 00:34:55 -0700 (PDT) Received: from m1x-phil.lan (mau49-h01-176-184-41-129.dsl.sta.abo.bbox.fr. [176.184.41.129]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4247d0be818sm200163415e9.15.2024.06.25.00.34.54 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 25 Jun 2024 00:34:55 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Bin Meng , =?utf-8?q?C=C3=A9dric_Le_Goater?= Subject: [PATCH 2/7] hw/sd/sdcard: Duplicate WRITE_SINGLE_BLOCK / WRITE_MULTIPLE_BLOCK cases Date: Tue, 25 Jun 2024 09:34:36 +0200 Message-ID: <20240625073441.34203-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240625073441.34203-1-philmd@linaro.org> References: <20240625073441.34203-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::231; envelope-from=philmd@linaro.org; helo=mail-lj1-x231.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 WRITE_SINGLE_BLOCK case in the next commit, duplicate it first. Signed-off-by: Philippe Mathieu-Daudé --- hw/sd/sd.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 7fea0afb62..8c30826754 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -1437,6 +1437,35 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) /* Block write commands (Class 4) */ case 24: /* CMD24: WRITE_SINGLE_BLOCK */ + addr = sd_req_get_address(sd, req); + switch (sd->state) { + case sd_transfer_state: + + if (!address_in_range(sd, "WRITE_SINGLE_BLOCK", addr, + sd->blk_len)) { + return sd_r1; + } + + sd->state = sd_receivingdata_state; + sd->data_start = addr; + sd->data_offset = 0; + + if (sd->size <= SDSC_MAX_CAPACITY) { + if (sd_wp_addr(sd, sd->data_start)) { + sd->card_status |= WP_VIOLATION; + } + } + if (sd->csd[14] & 0x30) { + sd->card_status |= WP_VIOLATION; + } + sd->blk_written = 0; + return sd_r1; + + default: + break; + } + break; + case 25: /* CMD25: WRITE_MULTIPLE_BLOCK */ addr = sd_req_get_address(sd, req); switch (sd->state) {