From nobody Thu May 9 02:27:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) client-ip=209.85.221.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 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=1641679104; cv=none; d=zohomail.com; s=zohoarc; b=oCzC8u5vP16UxkrwWOYHaRYTQ5i9XccyC63Rc2pFZ+kRZUtvrDuuFtDQws0LEMcmC4P6qAyz3iIF15RoRdbpxHf2K+kOz437Rn6Nil40zRjf72xe/1KolMRkTL8NK/lDqoI7C03wR+dZOM4KZlN7AWs0hFvZyUSBx+OabVoz7So= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641679104; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JKfxvZum9//X1JeGHKZDnyjMBnY2y6N1dpFgEWbkZPM=; b=AEImnr80tJdxOD/WEKW+ENbZ1XU/lH3PC+hA+OQgBKoQn1SO5He4IP4mHjDIy2v1l6c7XmtaiZq4Cs1Fnx5heWIr+b7VeVRZzbkIOexQgLvhB6YLDN7hSYekRYy/O2+bzHkVOIZ0FAExyiSzZlWpJyQzmIBfc3GBjcog7TGBfcc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.zohomail.com with SMTPS id 1641679104715843.7553540725477; Sat, 8 Jan 2022 13:58:24 -0800 (PST) Received: by mail-wr1-f43.google.com with SMTP id q8so18576644wra.12 for ; Sat, 08 Jan 2022 13:58:24 -0800 (PST) Return-Path: Return-Path: Received: from nuc.. (83.red-83-50-87.dynamicip.rima-tde.net. [83.50.87.83]) by smtp.gmail.com with ESMTPSA id v5sm1052634wrq.80.2022.01.08.13.58.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Jan 2022 13:58:22 -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=JKfxvZum9//X1JeGHKZDnyjMBnY2y6N1dpFgEWbkZPM=; b=InMvGKLqTlnZ0KSe4qdI7Qa4dGM97GEFnk0Q2mmG1cAy93xnASKiugTIkuMOxpnVPT im6HjIJyH+jzDQR7Hv6ZLtHjQ6sJV8lpaTKXhs4rzoCwG6iCQ8NLuI1YFmfG0GoxE3Cd u5pDyZ2GfEfOzK1WG1KK1hEDPlBOxsVEzW1dxJGPq9kDsA4cOBbYwbAR1wUnIeebooOu NWu/rMnispbzUySF5PHJhfOhqphNTAvWTaUIBzZLpjAtmSSFmf375CV4qVmFTOwxsXbS jaVe8rkeEW7t7DUlqDRKi5V54z5I4I+mqlxzjftcRI3v40ou2I7iPYvla2irUVMr9MSP uu5A== 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=JKfxvZum9//X1JeGHKZDnyjMBnY2y6N1dpFgEWbkZPM=; b=k7rzv+w6vq/w+q/AAvFjkwFdhrZODllivuM3/XHn5n3kH51EqonfBRaWcWMszwhyV6 mhSiAyhF3ux92N6/F0TyL9Lf0PijAFTel8izHX+RMkB6YqcU9QviRJhcaHKYx4CuJ2oO IbMhPudrl5DTKb/F0VyGJNtSUuS3n9+QtEI/1Vo1vXF0BCOCQlUmV6tS/zKfUPPl4WEK Xh7Dv/5EhkFcQexuvwoNQM4yo7tBZXle+q/sHVFMMBK0cXWYLnlzrpHEcwPuND/rDuTZ GT33JCe9R+L2+ZiYsFdkXdIIynHr0YK3O/7TGaXksJCBz4QEUZhRvCv4lHJFWpGkqt+V F5AQ== X-Gm-Message-State: AOAM530IzWRyW6Q/Wf2f8eSppvNhLGi+BKHdhI4ng5cPTAckN6ta0dv1 fXxUn2Ugxq29TuhLsJR5BzsgGoVeCXZgvQ== X-Google-Smtp-Source: ABdhPJy3ocy/M20pvkgWg7/Mt0MTCPZg8jXshVfRhU9SPOvuUDMsctuRZdx5prdJgks+E25wRlfjpA== X-Received: by 2002:adf:d1e2:: with SMTP id g2mr61361864wrd.105.1641679102946; Sat, 08 Jan 2022 13:58: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?= , Alexander Bulekov Subject: [PULL 1/2] hw/sd/sdcard: Rename Write Protect Group variables Date: Sat, 8 Jan 2022 22:58:14 +0100 Message-Id: <20220108215815.551241-2-f4bug@amsat.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220108215815.551241-1-f4bug@amsat.org> References: <20220108215815.551241-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: 1641679106972100001 '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 | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index bb5dbff68c0..c10a1e469b7 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; } @@ -828,8 +828,8 @@ static uint32_t sd_wpbits(SDState *sd, uint64_t addr) */ continue; } - 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)) { ret |=3D (1 << i); } } @@ -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 9 02:27:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) client-ip=209.85.221.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 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=1641679109; cv=none; d=zohomail.com; s=zohoarc; b=cojTx52vc4AtAl4XFxiSL158xRxBfBAZkOlwU4Xr0b++gw7ypJ1uU6Fpm0ARdT0UrNOZ3vMrIv483KK/jQSPdnZl5vShWQJvhx+1N3l3uJ7HUcu6Cm7aesoBJIX7Y6Ja0uZkIcnT8CO3BIm5TK4XvCrLs6PRctEepNz0yFbmV2s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641679109; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WeW5GAt608lg7IJIEIoHnKi4Rqvvxe15V5MIMCzbIdg=; b=TPcKDifuZkDciuwBM99hHtRlwDfHS56oUnNTOGIqpbsvuMSeHGuvOmJ3F5+txCD1IZswir3bg4SEtX6aqhH2aCYIhbpjK3nheGBlga+xttYxSST8v5biQYF2IXES0mOZWGcjxX+jgqLJ48y5chW+++AKMbf1RJccJAtxS20nGp8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mx.zohomail.com with SMTPS id 1641679109323945.0727274660661; Sat, 8 Jan 2022 13:58:29 -0800 (PST) Received: by mail-wr1-f51.google.com with SMTP id o3so18623461wrh.10 for ; Sat, 08 Jan 2022 13:58:28 -0800 (PST) Return-Path: Return-Path: Received: from nuc.. (83.red-83-50-87.dynamicip.rima-tde.net. [83.50.87.83]) by smtp.gmail.com with ESMTPSA id m5sm2405001wml.48.2022.01.08.13.58.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Jan 2022 13:58:27 -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=WeW5GAt608lg7IJIEIoHnKi4Rqvvxe15V5MIMCzbIdg=; b=fWLMP7oC3veazTecUwTADhbJy1xbudeKP9JFjBsaso61rI4dF+n48VqUxqq0HUnW9T zs0Me/YIG1MGQyprhkb8ScRAuZUKD40PHtYyxMn1s1E0R7ofPGhJNGxybVVh/4q9YWB1 eeTnyzrQVsZCiQRH+/cq1+8Xkf8MO2tn9zn0upiXp3fLErqdMOZsLZbBLwW1/CzjY3In vrYayu8OTBrUwILNiFMcTDssTKwzgcJUL1235W2bO8x1BHjAuE/RVEvOI4jBbcvQVntM z0hSlxd2rrgjvW4AYk7WomEeNLRdeu1ygEfflDCXGag7noAhs5UEf9huNtC5qasrW5pV V+jg== 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=WeW5GAt608lg7IJIEIoHnKi4Rqvvxe15V5MIMCzbIdg=; b=5ZpN7tBzcacn8o5wWV9ZybVGOS0kuR8CmnivNsw7Y3zU5W795QXjx+OyTmpxSeALnM 2eGmR8R8Dbj1rLutjLmueuMFtXGPTvAbfbZSOKpElMS2hsmZH9VuDd4J6TsvuSR49zSp Qrx8f/ogIrAVJ1h0fW5hfr5r+vukbqkLuFrXgTK1h5XwWYpT8jKXaFw4A78wETQbvFed JEaJJxfQgCKDXp4kuK8F1Sgcky5iXbTZuMZcxQgTmDNk7rjqp/Gemw8NmncBdRdDCQ+Z 8MrCUCZ7CQiwR88VdU9jBjdgBTeJS6ARtqSUT8qcaHnygqXc3ZcconzYtMg3+ftXpMSx WoXA== X-Gm-Message-State: AOAM531CpNGhdaCjaLDTbYdLKCKIIf1UPG7Ke+9ym6D+ZS3lN312V9uD viLD/KYjdeBQw/MvAfO3qn4= X-Google-Smtp-Source: ABdhPJxRWlZ1dFGTxD2DXXfKp5xl9nIlwTZYX5d77cBHjZvE8jQP+kNCWcQJ6MOjoH/HvH8cv0TkNA== X-Received: by 2002:a5d:6f09:: with SMTP id ay9mr15874197wrb.671.1641679107640; Sat, 08 Jan 2022 13:58:27 -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?= , Frank Chang , Jim Shu Subject: [PULL 2/2] hw/sd: Add SDHC support for SD card SPI-mode Date: Sat, 8 Jan 2022 22:58:15 +0100 Message-Id: <20220108215815.551241-3-f4bug@amsat.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220108215815.551241-1-f4bug@amsat.org> References: <20220108215815.551241-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: 1641679110519100001 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 c10a1e469b7..cd67a7bac8e 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