From nobody Sun Dec 14 06:42:48 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1762774087; cv=none; d=zohomail.com; s=zohoarc; b=IDT+oydel9YK1xms26Urg0zt7/iAF+7hSuT27gQO0U96ZJr6DLLeDCCJVK7p5p7p+rd5+rRaMxrrxoA20pQFZAIb1/6ZSiG818lIDsOfl6zsi19NSPFuQWF2ZOmqMNjqsyzUkxRZtU/IEx/Fw87dRBr6baQyQWjgJfO6VSJijo0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1762774087; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=PaPRV3m2ug6rViwh4fj+exaEjkJN6PuQ+MHs9M0qPJg=; b=bGRWqX6bdXqTNgCxx1ljv/V+IjJjfXPozhc0RcnWYPGVqTmodLEHIA5ABnGEEclwr0TDBQbE6zCL2hjBCeUPgXUopJCPGWBNUut80X23ivY/ZUmWVzEr+SBbw3EiyRs4JM4Qtv9BQ9QgSMehEvw9kQhs7e5nkxm7vimsT5JBOyA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1762774087265437.3732826424855; Mon, 10 Nov 2025 03:28:07 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vIQ31-0006mV-TH; Mon, 10 Nov 2025 06:26:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vIPi1-0002Jr-4c for qemu-devel@nongnu.org; Mon, 10 Nov 2025 06:05:22 -0500 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vIPhz-0003h7-9J for qemu-devel@nongnu.org; Mon, 10 Nov 2025 06:05:16 -0500 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-29516a36affso26429365ad.3 for ; Mon, 10 Nov 2025 03:05:14 -0800 (PST) Received: from ubuntu.. ([111.196.133.211]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29651ca1b8csm145706605ad.85.2025.11.10.03.05.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Nov 2025 03:05:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762772714; x=1763377514; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PaPRV3m2ug6rViwh4fj+exaEjkJN6PuQ+MHs9M0qPJg=; b=FWOurqUrNaXbhsgQfnTtPh6i1CiiBIN47m+y8pX9mXE+NdCkhExNi3HV0pV7w0gdyC 27kuzBaxEuga2qJwyYLXcrZ2DryiYUL0zETKW8pRx5TEpBJqf1FWDh5c/Zd08R/z5brg Wksmdq441MX1LXK03BN9Q21wT/ePzvwvPXclOH4AgF9phhxsit7oxhmei1mHq4d9XemH TYVW4v2L2YfESv4NVPdH6jgMPpN3vY+eOIlzDyMXNc0UVRcpwWj01u5LG8EJdmq9ar74 E/yvcKN3t7PhTQ63AN9xyZBcFUb61jJWA66FZM3tN8LEXHAgeR+sQLKoWu5uA78jnrIB +PIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762772714; x=1763377514; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=PaPRV3m2ug6rViwh4fj+exaEjkJN6PuQ+MHs9M0qPJg=; b=sF0m3cVFPawuRnhLijetzP9qJr9CiFrfKN2bkj9f1jOqZQI61Z5XhtwhiSeAxxpJkQ bLDuo0M1nNf15ZKtboDpoIcgjPT1BaNLwRmWNSTKLG3EG0uru6Znlu+6AlBayShTPPrw r63TdHxrv0MKTU9uAb6L8Hzl9UKTFBzUCEIHUZRJ35FPeVZMGQbSpQkfB23KQ4lcL6LD hUHev92KHQnKmSszg19IEOK4QaIMiiVp+abh+BdXSNV8gUUJf+6RVcij13/XmUN6dWu1 SlguwDSl8vtndJbWkJ8KxRdV/xv5r37bSL8IAQFsCtraPRjgbQT5Zfh9RG8bDXU9YFmK hQkQ== X-Gm-Message-State: AOJu0YzLpxnNtp/9qIL3Qz4yN3rUJAkizZdKNPM9dzgEZgbalj5kLsy9 LAoUIEG6hMFykrmRy+LomGx1Jxu2FCrfJbb8AZ/+3Jn6BKTu2VEe6MshNOdZ866cV0o= X-Gm-Gg: ASbGnct3n3LPo/cbK3i2rQRTSHZYZaIJsqtkLak3/xc+3ky9usZEedefM9oH3OKW4RG nts6iW7Cs6b4B/AOPlRJubUVbAHEQVIm9Aa2ab5ZZsScFbsUttYroe1isYNysc9jk1SDjJpBSiG EXhj4dFhKXxERcH7hqT/UP1bJL8yL9LC+exu0DiPAUf85yXIYlxCWwQp/s9L+VmQgQhk/ooDM3+ X6Z4Z5V28R/wimTlFjEknV7P/aOE1I1igmmvA3GnCvB9FO4QU4j4YVkuKK43MJnIrSK4TjIN65j LoQGx2EhiPHG9sZsLMSfmCLUb9ONmVctluj8vIj5RmMqLHcAehlAvUxJTYjzEMtIitGOvkL0Uue Qqa9GoYH5rSsnGaSTpXiWicOjTiuPm3mr8YKdPg4DCoxx51X1d4gOFKd18YA2tnDxwA8z7xvacx BmD8yNow== X-Google-Smtp-Source: AGHT+IHW3Fp9tgZVbPsRDikj71R5JdyK7nwYS4hO5MSis4IhWXyi4VX8TfoBGVs1iuclVAecSavGnA== X-Received: by 2002:a17:903:244a:b0:295:82b5:73e9 with SMTP id d9443c01a7336-297e56c9927mr98181715ad.35.1762772713605; Mon, 10 Nov 2025 03:05:13 -0800 (PST) From: Bin Meng To: QEMU , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Cc: Tom Rini Subject: [PATCH 1/2] hw/sd: Fix incorrect idle state reporting in R1 response for SPI mode Date: Mon, 10 Nov 2025 19:05:06 +0800 Message-Id: <20251110110507.1641042-2-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251110110507.1641042-1-bmeng.cn@gmail.com> References: <20251110110507.1641042-1-bmeng.cn@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62f; envelope-from=bmeng.cn@gmail.com; helo=mail-pl1-x62f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1762774088222158500 Since commit b66f73a0 ("hw/sd: Add SDHC support for SD card SPI-mode"), the CARD_POWER_UP bit in the OCR register has been set after reset. Therefore, checking this bit against zero in sd_response_r1_make() to determine the card=E2=80=99s idle state is incorrect in SPI mode. As a resu= lt, QEMU makes the U-Boot mmc-spi driver believe the card never leaves the reset state. Fixes: 1585ab9f ("hw/sd/sdcard: Fill SPI response bits in card code") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2945 Reported-by: Tom Rini Signed-off-by: Bin Meng Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sd.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 9c86c016cc..5aae541363 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -789,8 +789,7 @@ static size_t sd_response_size(SDState *sd, sd_rsp_type= _t rtype) static void sd_response_r1_make(SDState *sd, uint8_t *response) { if (sd_is_spi(sd)) { - response[0] =3D sd->state =3D=3D sd_idle_state - && !FIELD_EX32(sd->ocr, OCR, CARD_POWER_UP); + response[0] =3D sd->state =3D=3D sd_idle_state; response[0] |=3D FIELD_EX32(sd->card_status, CSR, ERASE_RESET) << = 1; response[0] |=3D FIELD_EX32(sd->card_status, CSR, ILLEGAL_COMMAND)= << 2; response[0] |=3D FIELD_EX32(sd->card_status, CSR, COM_CRC_ERROR) <= < 3; --=20 2.34.1 From nobody Sun Dec 14 06:42:48 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1762774010; cv=none; d=zohomail.com; s=zohoarc; b=ii/vMVc0yYHdstxlnJuDhDPTuAeVQU9OOGYFHfWCGCjNPE3WJvSGX2A+g2d5DhSlP1pAQ2woXsUWzBUVXsh5cSj2iOZ/Iedep9NJofi+dwj2y3oTdBRVVlcdORuTTYELnRmnXexGAUB9Mho4CtwPzcvOnNb5/2gT0MvUMxnhdBI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1762774010; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=20o9Xst9XlcOWtdTfHw9EuIvq0wWeaEzw9AmUw6Jg9w=; b=Pi8iAZWZGbsEhwW6YCbJn6r5lh9WfMUFv+4grBUh5IwwC5JMvr45fxFSU7YqrQei4uq7HPdZx1YknlTWwziTuuAN5gwdRwNVMuPowfG5eqAY4rE50SoeRisbBznRUYpFGqK352nYvZSpkUx4B6lsUSOPVCy+1077mYRFB8CkZF4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1762774010374555.9534854039213; Mon, 10 Nov 2025 03:26:50 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vIQ2Y-0005pY-Fv; Mon, 10 Nov 2025 06:26:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vIPi3-0002K3-Cw for qemu-devel@nongnu.org; Mon, 10 Nov 2025 06:05:22 -0500 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vIPi1-0003hN-Bj for qemu-devel@nongnu.org; Mon, 10 Nov 2025 06:05:18 -0500 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-297d4a56f97so19527915ad.1 for ; Mon, 10 Nov 2025 03:05:16 -0800 (PST) Received: from ubuntu.. ([111.196.133.211]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-29651ca1b8csm145706605ad.85.2025.11.10.03.05.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Nov 2025 03:05:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762772716; x=1763377516; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=20o9Xst9XlcOWtdTfHw9EuIvq0wWeaEzw9AmUw6Jg9w=; b=cJOfF8AqVE6j0QKz2u1bGFXuWG/z0XsZGvIXvo+7stiBII4JDICzTeIuX/5R8bPMb9 TmNrKbw14t0Q5veUWBSCHKCfTsvMNzDrYdSS8CR14Z9OIYtB28daVRZTpTNpBum+dITU GHsW2ebDu2ymWjQlOj3ZAwaXIlunqPW68tkTi9GcqTI8Asnz/6BTqiV+sg65yC1NIW1N kaDdVHlJiRKWO5Lw4j5VV4vGlaE1uFjQelADOYsEpOWbR4FUgt8w1O6hRj5aGPBbTmEJ mJTHKNU2S08oTiJ6xlCO/+0itnpzyC5miYq3vHWnCCShG+/m981BPQFBjiGlfDgZ/PAV kslg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762772716; x=1763377516; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=20o9Xst9XlcOWtdTfHw9EuIvq0wWeaEzw9AmUw6Jg9w=; b=EQzKGvzFgx4+0hpdrjOLb+g2dTXtFtlhHjmG6NeioBuuhBB1z9JRHStweRC49eoQsL GIX3GmhEg7wyWfLJN8cGRIT42/zs2Spg2jXhL+X8Z5burplLvdejyMPqwrDzwFngzkK2 DZT8dpUrP4+7ll18ZGIV8Rwvcd2xtaFmatum4SI/aDlmQYoibegEXfz30XbBW34WY4TL JZTsFxLLDta4VEagl89GvXRJeDb2lrfrsMQSh4ppGh3pVipHNZoAtppo2o7ntuXrf3Qv gNO6q8FUGDSs2g/vERBzgK0U/hcJloED80z/oX4c8DyE1J/u6OKe7PF085c7pTjQ4xuD KouA== X-Gm-Message-State: AOJu0Ywioy2nOq2uNIDu92ulQ27W41ve13hyXny8QXJIlfR0lyc7O+vT rwk0KNbMDWuUvHRzv7+b9WP6B91nL5K101z9u2VOqnz1R6u0kiOWy2Wp/q8hZfP/qcM= X-Gm-Gg: ASbGnctUxSybtvzIDTf9QiktYjzPS6xeScmVvD0riOFkJzvXL+awiYD7yH3otW58+Pz 95PenCWHhKqTMAtBxZ4GqC8gkk2y+Dz6sah0LS+440TF74LN33W4nttvbuvAea8t4NiSHnpw43v odxTzcxYHWQkRQYBwdpMILWa9iTD/Zdbpr1+nSGZq3qzBVzRsFhx0dp4WrAhzkdzkmH1iCbyUCW hCHAaQu9KJ/hYqn5bRk0zqyjjT3h+N7hVGbgkX8jv8h/q7DKm5Rb0s4hCGrh1A0vkfxJZMs6xaQ /I/Jwycii7l1jQaf1pUQcm/Ucdiz4ZGgvQ+NmFqhUNYicsK8fi6qSW9eKMU4p1xC50/gBjUCG7K e43ts0ec99bMftwBvwx/4HFnSPawlSdYd5IUd0Vt5N++mH6dQbD7quWsBwhZWf4PpaxgY8VA= X-Google-Smtp-Source: AGHT+IHaYR8vbceRo5WmnHK2jM/sWc7chrh8xZH3UA+HvXG97kRMw+SLjgRlnUYq8OvxlWtZaSLfWA== X-Received: by 2002:a17:902:ec90:b0:295:560a:e474 with SMTP id d9443c01a7336-297e56c9f49mr106692215ad.32.1762772715568; Mon, 10 Nov 2025 03:05:15 -0800 (PST) From: Bin Meng To: QEMU , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Cc: Tom Rini Subject: [PATCH 2/2] hw/sd: Fix ACMD41 state machine in SPI mode Date: Mon, 10 Nov 2025 19:05:07 +0800 Message-Id: <20251110110507.1641042-3-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251110110507.1641042-1-bmeng.cn@gmail.com> References: <20251110110507.1641042-1-bmeng.cn@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::636; envelope-from=bmeng.cn@gmail.com; helo=mail-pl1-x636.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1762774010977158500 Content-Type: text/plain; charset="utf-8" In SPI mode, the ACMD41 argument only defines bit 30 (HCS); all other bits are reserved. The current implementation incorrectly checks the voltage window bits even in SPI mode, preventing the state machine from transitioning to the READY state. As a result, the U-Boot mmc-spi driver falls into an endless CMD55/ACMD41 loop. Fixes: 3241a61a ("hw/sd/sdcard: Use complete SEND_OP_COND implementation in= SPI mode") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2945 Reported-by: Tom Rini Signed-off-by: Bin Meng Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sd.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 5aae541363..11c3a64080 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -2289,20 +2289,21 @@ static sd_rsp_type_t sd_cmd_SEND_OP_COND(SDState *s= d, SDRequest req) } } =20 - if (FIELD_EX32(sd->ocr & req.arg, OCR, VDD_VOLTAGE_WINDOW)) { - /* - * We accept any voltage. 10000 V is nothing. - * - * Once we're powered up, we advance straight to ready state - * unless it's an enquiry ACMD41 (bits 23:0 =3D=3D 0). - */ - sd->state =3D sd_ready_state; - } - if (sd_is_spi(sd)) { + sd->state =3D sd_ready_state; return sd_r1; + } else { + if (FIELD_EX32(sd->ocr & req.arg, OCR, VDD_VOLTAGE_WINDOW)) { + /* + * We accept any voltage. 10000 V is nothing. + * + * Once we're powered up, we advance straight to ready state + * unless it's an enquiry ACMD41 (bits 23:0 =3D=3D 0). + */ + sd->state =3D sd_ready_state; + } + return sd_r3; } - return sd_r3; } =20 /* ACMD42 */ --=20 2.34.1