From nobody Tue Feb 10 05:45:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) client-ip=209.85.128.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1611520112; cv=none; d=zohomail.com; s=zohoarc; b=mADL633ty8rsCdmCWEfOZPqiyA3AJVoVoBEAPzzgrtgiz70C5Jm2Mh6l4VlvMFmZGtTPzTocju0C9hoDuMp+mCIkZ1oYG4Xr02iMqzNCzTYpNJ/76UqnfmKL3Me0gwFkMsP1J9REscMyqXsQbTT8uPQDVOr3j5WUabxZfbPav50= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611520112; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+5slmPoo61HxnQOohyNLZo6tnq7nkp2gmI544rH0wak=; b=C9qbNloB0kDJEzEfEiG33U7JOmcOJH9n8BMcch6uZay2BaZ+0kJEc/baIM0P4tWPE385m+18+cMHSjiWtQw+2U6PpNUbBwdpA/ZlfonK14FMSVAT0jT40giRWMXPCspxfVvoEnFQHdlbi/biZchnoEwk7/MlLoCit5JXDQ3Lh7I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mx.zohomail.com with SMTPS id 1611520112400631.4941234061527; Sun, 24 Jan 2021 12:28:32 -0800 (PST) Received: by mail-wm1-f48.google.com with SMTP id o10so9477494wmc.1 for ; Sun, 24 Jan 2021 12:28:31 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (13.red-83-57-169.dynamicip.rima-tde.net. [83.57.169.13]) by smtp.gmail.com with ESMTPSA id n125sm2786075wmf.30.2021.01.24.12.28.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Jan 2021 12:28:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+5slmPoo61HxnQOohyNLZo6tnq7nkp2gmI544rH0wak=; b=G0PMksLv/UF/DrQ2Nzr/t0B/F0/GOCnhUkl+hRL5qWjuaUnCn1BSMFbxTx6uAnI0b3 E5eysODPudhVQR/Q0nQn4w8GGQvmbd4Xg4ZfjeGshZwf8njLd4JSxWZjZnW/ew4ObfoQ V8isKwu0I0QS6XU+oZykL+0Q3hVKnwsx0hGulb7WPEHL0pxZe9bhneKSArdNfMFjxtnX 6JEQQLTsfTY5aRPWrIvak9gjhxQ/bAPvKExvjitTK1XzG69jfWBAovtrizqMZp9k8cMO FOtPzAfZmBzqEJhnDHWQiZe9RDNwrkMT0fI9m5oE2+2f8L9xG4PjQkzXCNp3LZLb4uZA 8hTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=+5slmPoo61HxnQOohyNLZo6tnq7nkp2gmI544rH0wak=; b=O+ZGrgWb2wF24iFKOgYeaGmLZ8ArxWTqEvi5jce4xk0c5jASy0eXk9A4pYxJhHpIuZ zP4wOxkKl+lhmW/GPa6zcfvDn4rLfnHfrLmbN9d6rUbJVjRvf0ZZKoJmXB5yqg+YYAGw /XysIgtDcV14/rAxqnzmdbQiUUoOljKQX+7PqhFGGm1u9WtBmCPeUthY8QnV0hraq4qo E13mIxSiEDoZh+pdn+L9A5KD7Pnafkqjae1fehqtD8GC9UaUKJ9VFxM/ujbZORxFWuAE OgOe0p6OuC9nweSONBGQDQoucg5mZiNxfxytyNd2qEOCIWeVhIc6BOigKHHOwaxFIOyC infg== X-Gm-Message-State: AOAM530G8eUeBwDEn4QIx9TmolsyZ9rkbWaTITm6VdjR231pEyNobqx8 T+rT7oNHqrtF1DoPRWzlStY= X-Google-Smtp-Source: ABdhPJz1Imu5jsf0SZ6Wv+aSNBAdTv98YqAWtTVwatJcYhn84//PfW78ar2P0a3qnT9NdvtZdwTbDA== X-Received: by 2002:a1c:a716:: with SMTP id q22mr2827044wme.143.1611520110581; Sun, 24 Jan 2021 12:28:30 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Bin Meng Cc: Alistair Francis , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pragnesh Patel , Bin Meng Subject: [PATCH v3 2/6] hw/sd: sd: Remove duplicated codes in single/multiple block read/write Date: Sun, 24 Jan 2021 21:28:13 +0100 Message-Id: <20210124202817.2624557-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210124202817.2624557-1-f4bug@amsat.org> References: <20210124202817.2624557-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) From: Bin Meng The single block read (CMD17) codes are the same as the multiple block read (CMD18). Merge them into one. The same applies to single block write (CMD24) and multiple block write (CMD25). Signed-off-by: Bin Meng Acked-by: Alistair Francis Message-Id: <20210123104016.17485-13-bmeng.cn@gmail.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sd.c | 47 ----------------------------------------------- 1 file changed, 47 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index b3952514fed..09753359bb2 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -1181,24 +1181,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, = SDRequest req) break; =20 case 17: /* CMD17: READ_SINGLE_BLOCK */ - switch (sd->state) { - case sd_transfer_state: - - if (addr + sd->blk_len > sd->size) { - sd->card_status |=3D ADDRESS_ERROR; - return sd_r1; - } - - sd->state =3D sd_sendingdata_state; - sd->data_start =3D addr; - sd->data_offset =3D 0; - return sd_r1; - - default: - break; - } - break; - case 18: /* CMD18: READ_MULTIPLE_BLOCK */ switch (sd->state) { case sd_transfer_state: @@ -1245,35 +1227,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, = SDRequest req) =20 /* Block write commands (Class 4) */ case 24: /* CMD24: WRITE_SINGLE_BLOCK */ - switch (sd->state) { - case sd_transfer_state: - /* Writing in SPI mode not implemented. */ - if (sd->spi) - break; - - if (addr + sd->blk_len > sd->size) { - sd->card_status |=3D ADDRESS_ERROR; - return sd_r1; - } - - sd->state =3D sd_receivingdata_state; - sd->data_start =3D addr; - sd->data_offset =3D 0; - sd->blk_written =3D 0; - - if (sd_wp_addr(sd, sd->data_start)) { - sd->card_status |=3D WP_VIOLATION; - } - if (sd->csd[14] & 0x30) { - sd->card_status |=3D WP_VIOLATION; - } - return sd_r1; - - default: - break; - } - break; - case 25: /* CMD25: WRITE_MULTIPLE_BLOCK */ switch (sd->state) { case sd_transfer_state: --=20 2.26.2