From nobody Wed Feb 11 04:02:54 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.218.44 as permitted sender) client-ip=209.85.218.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1613780073; cv=none; d=zohomail.com; s=zohoarc; b=TkcpIMY4djPhIg30GYCbQjC9d/a5KMk2J01QwAhwqk4EZZXFcrWSLkbi7jDK8bfdQa7dzzCQqhncEeUijMm9JKUMYZ4OJc0L5ixMZmZg/nQvC/ZFoFeQMmiUhS57MNao9tSvf8xThfIDTbcXg9DolGk8Qk9ks5fOWqWcIVWzF3c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613780073; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=eGr5UWWx36FyPb21wHNpZuBCvW0pzWxLYXr/5FODULE=; b=kobBv9+s3hTRvQ4lNPk495CxWeziz77IggsU15568nTGYEd0VCGWRASvXx+1qll+QXelsYrHCo70f414DEvSrTnSXx1/F23S4Sktw9WJbQfvqxRB4Acc8AmiGBOIjLbZAvK3Gwwy6CqvhBYUjKGOx9fS4aNzA4UHMsqYTCYtzX4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) by mx.zohomail.com with SMTPS id 1613780072656243.0074670120622; Fri, 19 Feb 2021 16:14:32 -0800 (PST) Received: by mail-ej1-f44.google.com with SMTP id w1so16779104ejf.11 for ; Fri, 19 Feb 2021 16:14:32 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id t23sm5378406ejs.4.2021.02.19.16.14.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Feb 2021 16:14:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eGr5UWWx36FyPb21wHNpZuBCvW0pzWxLYXr/5FODULE=; b=nNBba7oEqfjtEothvithV0gs6KG7Tzi5ru6mEsocc/NCNDURfeTD6zmTrP0Xe9N6QV NUkcyXLOz7r4a/jwZM2Nb4w/swl4SOZDFmmYQw06OSxMAfIJaM0P9umXiqaZQiXosXGS HOWnCzSXmZE7MyerELq+3jMMqlspnKDMay1oWhZoKj8YxcGbIMFV6thO+WKRFIN1NnCK ZQLfLnz3+hy9av2nl9lMk/Wy2Bd0Mt0zzifCBk2+8cBOm6BRmERQivmJdX9EgKkzDlSW 9wvTNpZ2G76PfXcWGGmD4KZAzZ4khe0Pf4Cec6ssvtcnGqKwQMoVTcWsOhBiL7fbha6G dmnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=eGr5UWWx36FyPb21wHNpZuBCvW0pzWxLYXr/5FODULE=; b=KOZnFffVqUxZzETavtA+K2AKqiO3VnUJ///EjNrYIVm3X1BFjfVQcgAkaPq0noiCuO pGyhHf0wTSeJWvQaayrRcAO7rojak6bmmq8paYbraqlpDuHwfBEyog6waNslTWif0o73 nZtZSgO+lOr31zbm2NmHpXQfFIFYzIa9ECNteScX92BcIeh5TdjZ9Kec9oVl48SWV3wU Rth+dEyIPO+Cu68mvgAr/HZjlz0hgXI4Gh2lvf77n0pzMG8r9xcXHWoiNTgTPpyYP9+y 1gwm16cw8RhvNhmp79EZkiJYg6mEdkyBvbCJdClpmoZtzPnoNfboVxpQW0l9jlyWXniG 228Q== X-Gm-Message-State: AOAM532BMwOAPrQg3fL+OOZqi6IE4KZ6nKzyPtFcSH66OAh1xkCDg5zL muJbRh97oDTqivx/wQ8i3JE= X-Google-Smtp-Source: ABdhPJzRyuxF2sHZH33iGG7bJjVLSY3IUmMj354kdj2qJxjik6NgSq18VOFex1PmBr7SFS1WsQsBAQ== X-Received: by 2002:a17:906:4a0a:: with SMTP id w10mr11189069eju.551.1613780070856; Fri, 19 Feb 2021 16:14:30 -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?= Subject: [PULL 15/18] hw/sd: sd: Skip write protect groups check in CMD24/25 for high capacity cards Date: Sat, 20 Feb 2021 01:13:06 +0100 Message-Id: <20210220001309.2225022-16-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210220001309.2225022-1-f4bug@amsat.org> References: <20210220001309.2225022-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) From: Bin Meng High capacity cards don't support write protection hence we should not perform the write protect groups check in CMD24/25 for them. Signed-off-by: Bin Meng Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210216150225.27996-8-bmeng.cn@gmail.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sd.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 883c04de028..3a515a5365f 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -1268,8 +1268,10 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, = SDRequest req) sd->data_offset =3D 0; sd->blk_written =3D 0; =20 - if (sd_wp_addr(sd, sd->data_start)) { - sd->card_status |=3D WP_VIOLATION; + if (sd->size <=3D SDSC_MAX_CAPACITY) { + if (sd_wp_addr(sd, sd->data_start)) { + sd->card_status |=3D WP_VIOLATION; + } } if (sd->csd[14] & 0x30) { sd->card_status |=3D WP_VIOLATION; @@ -1821,9 +1823,11 @@ void sd_write_byte(SDState *sd, uint8_t value) sd->card_status |=3D ADDRESS_ERROR; break; } - if (sd_wp_addr(sd, sd->data_start)) { - sd->card_status |=3D WP_VIOLATION; - break; + if (sd->size <=3D SDSC_MAX_CAPACITY) { + if (sd_wp_addr(sd, sd->data_start)) { + sd->card_status |=3D WP_VIOLATION; + break; + } } } sd->data[sd->data_offset++] =3D value; --=20 2.26.2