From nobody Tue Feb 10 04:13:29 2026 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