From patchwork Sat Jan 8 21:58:14 2022 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: 1577324 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=InMvGKLq; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JWYrW6X9Nz9t6g for ; Sun, 9 Jan 2022 08:58:51 +1100 (AEDT) Received: from localhost ([::1]:57532 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6Jjd-0002cl-7B for incoming@patchwork.ozlabs.org; Sat, 08 Jan 2022 16:58:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36400) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6JjH-0002Yp-BA; Sat, 08 Jan 2022 16:58:27 -0500 Received: from [2a00:1450:4864:20::42e] (port=40491 helo=mail-wr1-x42e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n6JjF-0002Se-OA; Sat, 08 Jan 2022 16:58:27 -0500 Received: by mail-wr1-x42e.google.com with SMTP id l10so18642780wrh.7; Sat, 08 Jan 2022 13:58: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=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=yYE+9xAIBZdTxkOHHt+DIF+JXTbKC12HOuPzngz19hwSS2LIX+VaFGP4UlPtw1o58/ zU2kmhuC3crwRT/jhOe9TlMNB4d0J3yeepTMkTMP9Rw8PPfw/HSgSdZoFq0Eyi/8wFIc bm+WbZnGXHBhb4u531ys1GK90kc3mxZ97UNgdgBy+4Tq9Bc3H7jZaW3p1wH/LVQ2dkFO nlRIDdHrBRZWHeFR04TR2DWwp74rhwKEZwRxiUuV8sYRDnKEV8OIwr+kPOGP7VhXFyTf Ed+ng7l6EEfkT4ykmA5gXJMse3CaiNijJR9IhpwrEDjliSWNipdylCVM2p7pCmt853kD +YZw== X-Gm-Message-State: AOAM5305QpzktAcnRFOD1M77/Gs+xLwo8FmI2eXnXTYiPzvI53wf3uK1 lv5ikcOTuRjPb8rZWIH8G4gdYziAf2cmRw== 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::42e (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42e.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: Alexander Bulekov , Bin Meng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" '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é 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); - g_free(sd->wp_groups); + g_free(sd->wp_group_bmap); sd->wp_switch = sd->blk ? !blk_is_writable(sd->blk) : false; - sd->wpgrps_size = sect; - sd->wp_groups = bitmap_new(sd->wpgrps_size); + sd->wp_group_bits = sect; + sd->wp_group_bmap = bitmap_new(sd->wp_group_bits); memset(sd->function_group, 0, sizeof(sd->function_group)); sd->erase_start = INVALID_ADDRESS; sd->erase_end = INVALID_ADDRESS; @@ -673,7 +673,7 @@ static const VMStateDescription sd_vmstate = { 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 = 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 |= 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 |= (1 << i); } } @@ -869,7 +869,7 @@ static void sd_function_switch(SDState *sd, uint32_t arg) 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); } static void sd_lock_command(SDState *sd) @@ -897,7 +897,7 @@ static void sd_lock_command(SDState *sd) sd->card_status |= 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] &= ~0x10; sd->card_status &= ~CARD_IS_LOCKED; sd->pwd_len = 0; @@ -1348,7 +1348,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) } sd->state = 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 = sd_transfer_state; return sd_r1b; @@ -1370,7 +1370,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) } sd->state = 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 = sd_transfer_state; return sd_r1b; From patchwork Sat Jan 8 21:58:15 2022 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: 1577325 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=fWLMP7oC; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JWYst6ykRz9t6g for ; Sun, 9 Jan 2022 09:00:02 +1100 (AEDT) Received: from localhost ([::1]:33674 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6Jkm-0005Zy-Qo for incoming@patchwork.ozlabs.org; Sat, 08 Jan 2022 17:00:00 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36414) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6JjL-0002iy-BY; Sat, 08 Jan 2022 16:58:32 -0500 Received: from [2a00:1450:4864:20::42a] (port=46950 helo=mail-wr1-x42a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n6JjJ-0002Sy-PD; Sat, 08 Jan 2022 16:58:31 -0500 Received: by mail-wr1-x42a.google.com with SMTP id l25so7799469wrb.13; Sat, 08 Jan 2022 13:58:29 -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=I169+QCSQ3HZ7FCkI2XG126oQ4f7D0FzlZgBepqdwF/f99rJcVSLIuhVXzqTQ0RIY8 jeH6Q7iwRRxkXg90jmuZJlK+CteP1g34h2tgAFw/QpJgBGYszp2AXGG+NC15M0quur/R 63kaSwjFIV4J3VYl0kMpWqgOxEzDVok5uPPRlWmPdBxJTKoaI97Yi0DoYj7MsuDP0d0g 6obLo4ytT6WZ7f8qWPXGtivkPTyf+fynQNZH2dvunSEBkO8eM4M1FZ5OcmVF4jZCLuAb XFS4wpJcYjoz5/wsefwxKHysQFBT45jdjD/0U8TTbMYtffbIGQdYfCH9WO4Otjlv2gQr j6YA== X-Gm-Message-State: AOAM533SwYPdGJ55/2nl8bg8tt2YW0vP++o5pQkCvSDdGz5aDZL+44Vf noNVVE2qAswKWb4CW1xhwtfl6ohTMJ4BIg== 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::42a (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42a.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Cc: Frank Chang , Bin Meng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, Jim Shu Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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é Message-Id: <20211228125719.14712-1-frank.chang@sifive.com> Signed-off-by: Philippe Mathieu-Daudé --- 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) -static void sd_set_ocr(SDState *sd) -{ - /* All voltages OK */ - sd->ocr = R_OCR_VDD_VOLTAGE_WIN_HI_MASK; -} - static void sd_ocr_powerup(void *opaque) { SDState *sd = opaque; @@ -311,6 +305,22 @@ static void sd_ocr_powerup(void *opaque) } } +static void sd_set_ocr(SDState *sd) +{ + /* All voltages OK */ + sd->ocr = 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 reset. + * The card's capacity status bit should also be set if SD card size + * is larger than 2GB for SDHC support. + */ + sd_ocr_powerup(sd); + } +} + static void sd_set_scr(SDState *sd) { sd->scr[0] = 0 << 4; /* SCR structure version 1.0 */ @@ -560,6 +570,7 @@ static void sd_reset(DeviceState *dev) sd->state = sd_idle_state; sd->rca = 0x0000; + sd->size = 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 = INVALID_ADDRESS; sd->erase_end = INVALID_ADDRESS; - sd->size = size; sd->blk_len = 0x200; sd->pwd_len = 0; sd->expecting_acmd = false;