From nobody Thu May 2 21:35:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) client-ip=209.85.221.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1641282860; cv=none; d=zohomail.com; s=zohoarc; b=PGyG2nCyoTn8Z/Eko9T8PqZ7PW1KTiss37/Bv6UzXIwj1OPcY0frUpLsTJWy4bi3MuOLxBhasMPzpY5syQFUk1s/xWZcBLIuYo+X3fZbbYodrs3Tk1qDjBAV3YECe0DkHladH8b2AABX/SA8MrvEymDzjg76/kYsAHIBx7GFWJI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641282860; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=eBJgYpxMfElZCjSoM/LIb7+pEggDV+9LpvhxGVUtM6k=; b=CUb+W2LJznqtIsfQlUs9B1w0+QWrOIRgiiqoUuLBhe+KHO7E6+DhZmSPZPWAWW2OHHQY94FKsVfh+SmnfAD3n7KHT1SYOyl3MwkF/t0VsBIQcsiDI4ULnD4DW2HmarxtrEHvxyR+GgxnxV2JTPwoW/Bm5QkESBytfdlJdCS1KIw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.zohomail.com with SMTPS id 1641282860954351.99572611494875; Mon, 3 Jan 2022 23:54:20 -0800 (PST) Received: by mail-wr1-f45.google.com with SMTP id e5so74383054wrc.5 for ; Mon, 03 Jan 2022 23:54:20 -0800 (PST) Return-Path: Return-Path: Received: from x1w.. (26.red-83-50-86.dynamicip.rima-tde.net. [83.50.86.26]) by smtp.gmail.com with ESMTPSA id l2sm37545576wru.83.2022.01.03.23.54.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jan 2022 23:54:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eBJgYpxMfElZCjSoM/LIb7+pEggDV+9LpvhxGVUtM6k=; b=Ruk3r5wFFU0Y7dO4gXZ7PA6NplKKwWSnJjmptGNd2EsRQ94gaHhHGm/qxZN8cv9ZN1 SydGjF2EpoH9LRfPpOj+vsG9qIqGpSKm1GNTsErhRFmU5r2pB99GuepwtEPU2GxVyOCP 6vix+Hxcuk4biikzGXjcIXkJNvTwanYnvazayM5v09OFaglaMlVPTSEOn4/4wN8FNiTg f7+PvzzPGd6oIvQF8mDhO/0+gfsd8RRekHS73aHaQhu8eSx08WFFW0d/oEhajo6snQGB cXq7OaRWVLLOHVrXWFVXCKTl/qOXYVlVp8U/5MmUYgxVtY7Gf+4VVi0klzhys1MLT6Km zR2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=eBJgYpxMfElZCjSoM/LIb7+pEggDV+9LpvhxGVUtM6k=; b=QAVY6AnLRjKH8JV68ekDiq3G+Vrx1+o758Ig33zQVZLB3xb2MHcfNPeaG7GAbfJAoG n6lnGIG37KSRHPJYo9++L2TySwr1jwFtXiWiptElZkC5bOwPRpP4bQNR3tNCKFH7BJc9 b9Loa6hqdFDi51nl8gV/gSCArncjYazdv78/xXBvHhOdl7NAhrkoCxpmZw3IA72wQxWO pEmppyH+Gqi5kFqE1u7LaZuOW3P3fFj11LQbHaN3EDD3tNfnSNHtnsCwxLR06mMqOBmN Eg0bgc0+a+HuS5sHiEvYXj5QKsmiSccviRDnumZk22y5SujBx+HE9xLFNY8xJgYwraOG WbzA== X-Gm-Message-State: AOAM531FusrBJ8KoensK9aFoh6rLLolKB4GdjGq+twNljN54xAkqAeEn wWFcWiQUjA/lDi1oLuptkJ8= X-Google-Smtp-Source: ABdhPJzwUprtIiK4OhIfP9UbUHM3M2CnDbmYP+PT3RRFvgq9y6I2b5+64Le9Zi0Cbpnt2CGiCzWc4w== X-Received: by 2002:a5d:6c6a:: with SMTP id r10mr41154070wrz.60.1641282859150; Mon, 03 Jan 2022 23:54:19 -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: qemu-block@nongnu.org, Bin Meng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alexander Bulekov Subject: [PULL 1/2] hw/sd/sdcard: Rename Write Protect Group variables Date: Tue, 4 Jan 2022 08:54:11 +0100 Message-Id: <20220104075412.2088859-2-f4bug@amsat.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220104075412.2088859-1-f4bug@amsat.org> References: <20220104075412.2088859-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) X-ZM-MESSAGEID: 1641282861926100003 'wp_groups' holds a bitmap, rename it as 'wp_group_bmap'. 'wpgrps_size' is the bitmap size (in bits), rename it as 'wp_group_bits'. Patch created mechanically using: $ sed -i -e s/wp_groups/wp_group_bmap/ \ -e s/wpgrps_size/wp_group_bits/ hw/sd/sd.c Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210728181728.2012952-4-f4bug@amsat.org> Reviewed-by: Alexander Bulekov --- hw/sd/sd.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index bb5dbff68c0..0bb99352cc1 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -116,8 +116,8 @@ struct SDState { int32_t state; /* current card state, one of SDCardStates */ uint32_t vhs; bool wp_switch; - unsigned long *wp_groups; - int32_t wpgrps_size; + unsigned long *wp_group_bmap; + int32_t wp_group_bits; uint64_t size; uint32_t blk_len; uint32_t multi_blk_cnt; @@ -567,10 +567,10 @@ static void sd_reset(DeviceState *dev) sd_set_cardstatus(sd); sd_set_sdstatus(sd); =20 - g_free(sd->wp_groups); + g_free(sd->wp_group_bmap); sd->wp_switch =3D sd->blk ? !blk_is_writable(sd->blk) : false; - sd->wpgrps_size =3D sect; - sd->wp_groups =3D bitmap_new(sd->wpgrps_size); + sd->wp_group_bits =3D sect; + sd->wp_group_bmap =3D bitmap_new(sd->wp_group_bits); memset(sd->function_group, 0, sizeof(sd->function_group)); sd->erase_start =3D INVALID_ADDRESS; sd->erase_end =3D INVALID_ADDRESS; @@ -673,7 +673,7 @@ static const VMStateDescription sd_vmstate =3D { VMSTATE_UINT32(card_status, SDState), VMSTATE_PARTIAL_BUFFER(sd_status, SDState, 1), VMSTATE_UINT32(vhs, SDState), - VMSTATE_BITMAP(wp_groups, SDState, 0, wpgrps_size), + VMSTATE_BITMAP(wp_group_bmap, SDState, 0, wp_group_bits), VMSTATE_UINT32(blk_len, SDState), VMSTATE_UINT32(multi_blk_cnt, SDState), VMSTATE_UINT32(erase_start, SDState), @@ -803,8 +803,8 @@ static void sd_erase(SDState *sd) if (sdsc) { /* Only SDSC cards support write protect groups */ wpnum =3D sd_addr_to_wpnum(erase_addr); - assert(wpnum < sd->wpgrps_size); - if (test_bit(wpnum, sd->wp_groups)) { + assert(wpnum < sd->wp_group_bits); + if (test_bit(wpnum, sd->wp_group_bmap)) { sd->card_status |=3D WP_ERASE_SKIP; continue; } @@ -869,7 +869,7 @@ static void sd_function_switch(SDState *sd, uint32_t ar= g) =20 static inline bool sd_wp_addr(SDState *sd, uint64_t addr) { - return test_bit(sd_addr_to_wpnum(addr), sd->wp_groups); + return test_bit(sd_addr_to_wpnum(addr), sd->wp_group_bmap); } =20 static void sd_lock_command(SDState *sd) @@ -897,7 +897,7 @@ static void sd_lock_command(SDState *sd) sd->card_status |=3D LOCK_UNLOCK_FAILED; return; } - bitmap_zero(sd->wp_groups, sd->wpgrps_size); + bitmap_zero(sd->wp_group_bmap, sd->wp_group_bits); sd->csd[14] &=3D ~0x10; sd->card_status &=3D ~CARD_IS_LOCKED; sd->pwd_len =3D 0; @@ -1348,7 +1348,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, S= DRequest req) } =20 sd->state =3D sd_programming_state; - set_bit(sd_addr_to_wpnum(addr), sd->wp_groups); + set_bit(sd_addr_to_wpnum(addr), sd->wp_group_bmap); /* Bzzzzzzztt .... Operation complete. */ sd->state =3D sd_transfer_state; return sd_r1b; @@ -1370,7 +1370,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, S= DRequest req) } =20 sd->state =3D sd_programming_state; - clear_bit(sd_addr_to_wpnum(addr), sd->wp_groups); + clear_bit(sd_addr_to_wpnum(addr), sd->wp_group_bmap); /* Bzzzzzzztt .... Operation complete. */ sd->state =3D sd_transfer_state; return sd_r1b; --=20 2.33.1 From nobody Thu May 2 21:35:31 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) client-ip=209.85.221.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1641282865; cv=none; d=zohomail.com; s=zohoarc; b=Y9n1yfh98wKCaBubkLevlMGqoFjZnBiCtTAFAxiqtFkM16rxd+3UJms2MT8hbuPVIk9M7AwV882SWzJ95Cv1UU6I3gSBhdnSx8YYCKBqDzP5PP2iJCpgxddz2+ujjY978wN5zXiKHP1tj1JDjYMHxdmP8EiNCuYHzxFRZ73Tl3U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641282865; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Wd/Soq2H07h5BSMvthuGipUGkg5Y9nHl9X+h1GuA2BY=; b=noLjumhJr+ASoHb4bqrC+7hOFe/46aSJY6A1viB1j+KG3UmCQ+GnQfrylGN595WgmiA9ZfzT2CMD8QK9/At3bzou7LYf52INjdpKZ2u7skw0OLR4GQdhynM004LjlIi5UtqxQBzDLiZrxOmv76m1yQzF2TrKHqktEF5ofFosVHY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.zohomail.com with SMTPS id 1641282865444988.5872407884902; Mon, 3 Jan 2022 23:54:25 -0800 (PST) Received: by mail-wr1-f47.google.com with SMTP id i22so74366503wrb.13 for ; Mon, 03 Jan 2022 23:54:24 -0800 (PST) Return-Path: Return-Path: Received: from x1w.. (26.red-83-50-86.dynamicip.rima-tde.net. [83.50.86.26]) by smtp.gmail.com with ESMTPSA id f10sm16295181wmq.16.2022.01.03.23.54.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jan 2022 23:54:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Wd/Soq2H07h5BSMvthuGipUGkg5Y9nHl9X+h1GuA2BY=; b=Bw7i9dVjJFZHPlqWcIvp9Vxedw4D97BnbyJEC+8Wmr9HqKOacfuLfVywXdQYxEstfF 1c4ApXpcEuztNJDZVmAbkxViFNgB57qh3Fa4B151xsrED40yEw4gjKQimfaMDdj8sVCB 1u1/jwcR3Y6gz9JeK+nf5WPt3asuHxtloMWGL3hXWz8ubXzMIiOQkRn0gQuaanZkl0P8 XhyOGDKSmGi3FpzSr8soh72e1d89Gt5cavYwb8hbZw8xXRye5Vb05v/uh5ADr8kHP/wS QfcERxeAa4A4SXCrswfjWM4FSoz9a/CE19B3NK1/ZZPYveAqVEavNEZYUVfI9zxt3z7B /a9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Wd/Soq2H07h5BSMvthuGipUGkg5Y9nHl9X+h1GuA2BY=; b=iMVc5W9T3cKqeECS4cw7mDF1YipTfrdJ6z6daaMF6U4pvP4KAEJZ17yXiiaNcGafkh mQs8SQii9IWv+uVUj4kw21a4C43Wie+u38gg2KadLlzvaINLnt+Bf1wm8+dgLhLV6DrH 8R34qNdMJqwE9XvL77vK2xspJ8/4RiFhW1yi+sVZkTsPVoE7YUzorVZm4O9CaAaJPNyk Yoh0KZPGqcsOoRcypenxKJodRTp1PVo1MfEdwF+IihSpDd3Vej3eZ8g+HZY5Nfcs00oX bJf3iQHGkASUsaTJXIN7IW7ShaIS2+vNy530fYWn2P9Jr5bUHlsFTJxszZVmVeT7TIgC K37g== X-Gm-Message-State: AOAM530dYEvKFRu8V6mVv4R2JgofNrCI8AyYnmLL0Qxx8+rOCPxRNEj6 v+y1i8DHBzPOQp7fKn2lFgD7aOlG8OdJ1g== X-Google-Smtp-Source: ABdhPJzmcC/QKRkJql+EPxuMU0Jio+JBx9MUrN8fYMMUDMmNqRbn/ToLDlkMyzV2C8ZmOw9CQfok2w== X-Received: by 2002:adf:f48e:: with SMTP id l14mr41835621wro.88.1641282863763; Mon, 03 Jan 2022 23:54:23 -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: qemu-block@nongnu.org, Bin Meng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Frank Chang , Jim Shu Subject: [PULL 2/2] hw/sd: Add SDHC support for SD card SPI-mode Date: Tue, 4 Jan 2022 08:54:12 +0100 Message-Id: <20220104075412.2088859-3-f4bug@amsat.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220104075412.2088859-1-f4bug@amsat.org> References: <20220104075412.2088859-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) X-ZM-MESSAGEID: 1641282866375100001 From: Frank Chang In SPI-mode, SD card's OCR register: Card Capacity Status (CCS) bit is not set to 1 correclty when the assigned SD image size is larger than 2GB (SDHC). This will cause the SD card to be indentified as SDSC incorrectly. CCS bit should be set to 1 if we are using SDHC. Also, as there's no power up emulation in SPI-mode. The OCR register: Card power up status bit bit (busy) should also be set to 1 when reset. (busy bit is set to LOW if the card has not finished the power up routine.) Signed-off-by: Frank Chang Reviewed-by: Jim Shu Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20211228125719.14712-1-frank.chang@sifive.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sd.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 0bb99352cc1..551d03cf5ec 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -290,12 +290,6 @@ FIELD(OCR, CARD_POWER_UP, 31, 1) | R_OCR_CARD_CAPACITY_MASK \ | R_OCR_CARD_POWER_UP_MASK) =20 -static void sd_set_ocr(SDState *sd) -{ - /* All voltages OK */ - sd->ocr =3D R_OCR_VDD_VOLTAGE_WIN_HI_MASK; -} - static void sd_ocr_powerup(void *opaque) { SDState *sd =3D opaque; @@ -311,6 +305,22 @@ static void sd_ocr_powerup(void *opaque) } } =20 +static void sd_set_ocr(SDState *sd) +{ + /* All voltages OK */ + sd->ocr =3D R_OCR_VDD_VOLTAGE_WIN_HI_MASK; + + if (sd->spi) { + /* + * We don't need to emulate power up sequence in SPI-mode. + * Thus, the card's power up status bit should be set to 1 when re= set. + * The card's capacity status bit should also be set if SD card si= ze + * is larger than 2GB for SDHC support. + */ + sd_ocr_powerup(sd); + } +} + static void sd_set_scr(SDState *sd) { sd->scr[0] =3D 0 << 4; /* SCR structure version 1.0 */ @@ -560,6 +570,7 @@ static void sd_reset(DeviceState *dev) =20 sd->state =3D sd_idle_state; sd->rca =3D 0x0000; + sd->size =3D size; sd_set_ocr(sd); sd_set_scr(sd); sd_set_cid(sd); @@ -574,7 +585,6 @@ static void sd_reset(DeviceState *dev) memset(sd->function_group, 0, sizeof(sd->function_group)); sd->erase_start =3D INVALID_ADDRESS; sd->erase_end =3D INVALID_ADDRESS; - sd->size =3D size; sd->blk_len =3D 0x200; sd->pwd_len =3D 0; sd->expecting_acmd =3D false; --=20 2.33.1