From nobody Tue Feb 10 13:16:17 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.218.50 as permitted sender) client-ip=209.85.218.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613780004; cv=none; d=zohomail.com; s=zohoarc; b=PgEU7DB5CFv2EMOihclt2QOGcsGKJ+MCcq+qCVla8SHXnMWFoQOAGTi+R3ln1AjsUxi4QaGCMxuXHd2ILGRIk+u+lNWZZ2j2hn9zva2MYGWSZLWoQP/XGp3EOQv150roTVlme+UeprsNE9CNu+XQ21ELVHbMAiWRHzzdXcK1rug= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613780004; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=nrlOa5uEAXGuJkLltzQnPowCn7sKixIFglrfWbQ5DbM=; b=OMRHZ6GeknRy0mn7oWpmkCxMb2BBtdCLh60v9bY10HNXwpiXKlsQ56s1GiYK0UYQe/7HiwPciKnshSMInUZWVJW7sTiUCV64nvXicX3VeDWnCxiNLG6cOrjO/aVbobWuz5x0a2PfMGTVKwUIRNp4NLyaes+VHG8ZoKApyL/5Tqw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) by mx.zohomail.com with SMTPS id 161378000449169.36483044072838; Fri, 19 Feb 2021 16:13:24 -0800 (PST) Received: by mail-ej1-f50.google.com with SMTP id k13so15041289ejs.10 for ; Fri, 19 Feb 2021 16:13:23 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id t19sm5303919ejc.62.2021.02.19.16.13.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Feb 2021 16:13:22 -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=nrlOa5uEAXGuJkLltzQnPowCn7sKixIFglrfWbQ5DbM=; b=QAD6ACOIlM/KBAnKRsx6IA7sa+qDc0jKWXbKf7a1gioSTHTybKlQZwcPkc3h7AZqPE YMifDlRa9c1DTp0h2mQgtC8eQ1lnPbRx3qP96dz6OgwfdxJ/8kK1MaD2oEIb69G6eH1f n6Eu4JlWuDrDFCzMBqrGkMdKzaRq92+M2Dg9GWnstVRLMS2MOCdxPf32iOnX7w3zuG/W WI65/1hzEgAb6zKbCp78wNPuCc4ep2wH8CZ5FRrowWZOOkSr3ZD1uUmJZWsmN9Sqc2t5 4N9lWfCW1qKY7HD40OpgV0oaq71ifIXvOBbELaPXkHGAggPg1saZRCP+HArsk2YmKBJP JroQ== 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=nrlOa5uEAXGuJkLltzQnPowCn7sKixIFglrfWbQ5DbM=; b=sfLy99b0971bvjcPMZWu87cG/pJi62nCiZEatIIIVhl3aXkny+rNvy+8NCDyd40vWT GLvuVpWuzGeCKfNEOtxDiQIyL+So3iDLz9kyzjeZl28aLx8Nwt740fetKqh4E+5aJr7P idRy6aQx1+2Jb5/vhIQ/GFs53SgH1LKiB+N7rxwLsvRir4vYnCt6LNjemfFyxPO3rFFO xvlwUORCnpnud1+vZcZfPJmSBNRDyre4ByMq2yYHOSMKIYIBLNOkO5LOAqCGJbJ5ad8J Gr88L4WR+L0X4he4o/An6do0Xwm49vK662oh5FG/Pi+Iudk6PoHjNgKmR75nUPe2WfWr GdXg== X-Gm-Message-State: AOAM531POdcfcnHawVsOSYcSYlFvBOzJcxpISSZdlQueKcsr+5JanmZL ELahkneurqVdy6ilwURRUczIjr+O43M= X-Google-Smtp-Source: ABdhPJw3VH+7yNQ6NrAnDw7jATmQ3stVlfUY7cC4HbKWONnshGWdjfJLz5KWx+6bKc3eMjq6gghFKw== X-Received: by 2002:a17:906:4f96:: with SMTP id o22mr10634328eju.511.1613780002800; Fri, 19 Feb 2021 16:13:22 -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 Cc: Bin Meng , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alistair Francis Subject: [PULL 02/18] hw/sd: sd: Remove duplicated codes in single/multiple block read/write Date: Sat, 20 Feb 2021 01:12:53 +0100 Message-Id: <20210220001309.2225022-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210220001309.2225022-1-f4bug@amsat.org> References: <20210220001309.2225022-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 Tested-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Alistair Francis Message-Id: <20210128063035.15674-3-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 8517dbce8ba..a85a821abbe 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