From nobody Sun Sep 28 15:29:11 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=jan.kiszka@siemens.com; 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=reject dis=none) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; t=1757854815; cv=none; d=zohomail.com; s=zohoarc; b=L1ZiM1IyPYUJg7XmMBDBwbGTUZK3A0LUoUlDFwKgPvn5pKCtfOe1eo8MfByHl8d/1XJkKEaQCBSvxinJSOtpMkas3bZV/KcbEzowQmyAoKWM844RrrLyIG2nANPBcKE+j8NKUQU54uKjR19ovY+ydYSdEeRzZ0UMzhU6EjGSyXg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757854815; 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=9kg7dAy8SrX16vADrsAZRSF9godIAqn610Eq+o94Rw0=; b=C850dFvWUw63A/FhBcDICSLsUu8ur1Rjx3buxzn123yTG2kw7yVi7xPdTy2vJxzNo4XWnFU7awQNiGPIaBcEHwulm9i9oWDqm1r+FfCbkMWYBt0mhj6yfYBch9yKcdQxfI7FfuHUkv9CLDUbLrLRuHixaMQfrd1TBbbSj/TWVkE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=jan.kiszka@siemens.com; 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=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1757854815985440.7380936950159; Sun, 14 Sep 2025 06:00:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uxmIH-0004Xi-45; Sun, 14 Sep 2025 08:57:25 -0400 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 1uxmI5-0004UL-PR for qemu-devel@nongnu.org; Sun, 14 Sep 2025 08:57:15 -0400 Received: from mta-64-226.siemens.flowmailer.net ([185.136.64.226]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uxmHw-0002ND-Rt for qemu-devel@nongnu.org; Sun, 14 Sep 2025 08:57:13 -0400 Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 202509141246488b648be968000207a2 for ; Sun, 14 Sep 2025 14:46:48 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=jan.kiszka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=9kg7dAy8SrX16vADrsAZRSF9godIAqn610Eq+o94Rw0=; b=qArgQk0psgyBT0x2sNAowtDpQgVztXIBrVm0lB1+DrARXyBlMy7x5gY26qdKOrrtSO0TgH 1dSKyFafWRzZSqRZAsFGsrXOoupSZB5TfcG1kgKWwN3kRBmlsfCpNg9ZuUYl3NSYu8uLmynY 2UmRBiDO6adaNsoCn6kh87A9UJgXsZ1hLYMxoWK7xu1zXSv0zkGtwJzKU2nnhTdTqrxkv/tw hOx+GfWJ4sX70x8N891rO6oJmRYY6pSkFap91oifybiQ8ERZrWAOnPeMVEK3Uhy/5qd9wkBz x2J+6wWC+FFb4xTu9rifvzoDibKfqZRJ1wXef0LPXEUBOcwiuuPcFy2A==; From: Jan Kiszka To: qemu-devel Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bin Meng , qemu-block@nongnu.org, Ilias Apalodimas , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Jan=20L=C3=BCbbe?= , Jerome Forissier , Warner Losh , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Joel Stanley , Alistair Francis , Alexander Bulekov Subject: [PATCH v4 1/6] hw/sd/sdcard: Fix size check for backing block image Date: Sun, 14 Sep 2025 14:46:41 +0200 Message-ID: <48930c1092424d22dc2171140378de19e0814ef3.1757854006.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer 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=185.136.64.226; envelope-from=fm-294854-202509141246488b648be968000207a2-G54YOY@rts-flowmailer.siemens.com; helo=mta-64-226.siemens.flowmailer.net X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable 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 jan.kiszka@siemens.com) X-ZM-MESSAGEID: 1757854816875116600 From: Jan Kiszka Alignment rules apply the the individual partitions (user, boot, later on also RPMB) and depend both on the size of the image and the type of the device. Up to and including 2GB, the power-of-2 rule applies to the user data area. For larger images, multiples of 512 sectors must be used for eMMC and multiples of 512K for SD-cards. Fix the check accordingly and also detect if the image is too small to even hold the boot partitions. Signed-off-by: Jan Kiszka Reviewed-by: Warner Losh --- CC: Warner Losh CC: C=C3=A9dric Le Goater CC: Joel Stanley CC: Alistair Francis CC: Alexander Bulekov --- hw/sd/sd.c | 61 +++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 42 insertions(+), 19 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index d7a496d77c..b42cd01d1f 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -2759,6 +2759,28 @@ static void sd_instance_finalize(Object *obj) timer_free(sd->ocr_power_timer); } =20 +static void sd_blk_size_error(SDState *sd, int64_t blk_size, + int64_t blk_size_aligned, const char *rule, + Error **errp) +{ + const char *dev_type =3D sd_is_emmc(sd) ? "eMMC" : "SD card"; + char *blk_size_str; + + blk_size_str =3D size_to_str(blk_size); + error_setg(errp, "Invalid %s size: %s", dev_type, blk_size_str); + g_free(blk_size_str); + + blk_size_str =3D size_to_str(blk_size_aligned); + error_append_hint(errp, + "%s size has to be %s, e.g. %s.\n" + "You can resize disk images with" + " 'qemu-img resize '\n" + "(note that this will lose data if you make the" + " image smaller than it currently is).\n", + dev_type, rule, blk_size_str); + g_free(blk_size_str); +} + static void sd_realize(DeviceState *dev, Error **errp) { SDState *sd =3D SDMMC_COMMON(dev); @@ -2781,25 +2803,26 @@ static void sd_realize(DeviceState *dev, Error **er= rp) return; } =20 - blk_size =3D blk_getlength(sd->blk); - if (blk_size > 0 && !is_power_of_2(blk_size)) { - int64_t blk_size_aligned =3D pow2ceil(blk_size); - char *blk_size_str; - - blk_size_str =3D size_to_str(blk_size); - error_setg(errp, "Invalid SD card size: %s", blk_size_str); - g_free(blk_size_str); - - blk_size_str =3D size_to_str(blk_size_aligned); - error_append_hint(errp, - "SD card size has to be a power of 2, e.g. %= s.\n" - "You can resize disk images with" - " 'qemu-img resize '\n" - "(note that this will lose data if you make = the" - " image smaller than it currently is).\n", - blk_size_str); - g_free(blk_size_str); - + blk_size =3D blk_getlength(sd->blk) - sd->boot_part_size * 2; + if (blk_size > SDSC_MAX_CAPACITY) { + if (sd_is_emmc(sd) && blk_size % (1 << HWBLOCK_SHIFT) !=3D 0) { + int64_t blk_size_aligned =3D + ((blk_size >> HWBLOCK_SHIFT) + 1) << HWBLOCK_SHIFT; + sd_blk_size_error(sd, blk_size, blk_size_aligned, + "multiples of 512", errp); + return; + } else if (!sd_is_emmc(sd) && blk_size % (512 * KiB)) { + int64_t blk_size_aligned =3D ((blk_size >> 19) + 1) << 19; + sd_blk_size_error(sd, blk_size, blk_size_aligned, + "multiples of 512K", errp); + return; + } + } else if (blk_size > 0 && !is_power_of_2(blk_size)) { + sd_blk_size_error(sd, blk_size, pow2ceil(blk_size), "a power o= f 2", + errp); + return; + } else if (blk_size < 0) { + error_setg(errp, "eMMC image smaller than boot partitions"); return; } =20 --=20 2.51.0 From nobody Sun Sep 28 15:29:11 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=jan.kiszka@siemens.com; 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=reject dis=none) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; t=1757854806; cv=none; d=zohomail.com; s=zohoarc; b=Qyr5d4lnggdolVIk7ppJ/VX5AA39COY7Amki1inJm+Z3GRTosVZ6jVt1U8qlROvMFj0o8AmsdBem3DS9U3jQ1BpA3rIP+Y5SYWjtQf76Poh2hltb7udjHgmrj5sSyIx5I3jSLihwHJQFjQnBquctPlyJCcM4mCOoSnTXk1p7Ogw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757854806; h=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=s3ZtzpvKMW/LKc6jZTgrh0+bspaB/1gW/W4kkRDduB0=; b=S6WUT7KCkeFgRgXHSmIz4kNvuyby7YpMQjOnMZ/S2LTHxrX+71fpq9kTuA0EpZP/A1WjuOesfSG1bGwjpQ8+leL0cmKirnt8vOAzDcpRSGPo+hyCNLZLSWpca5VxEc82mD5UE1Z46XeO1XbEKJCyBQYZwE+C4rF9d6I/Nl+Nf0w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=jan.kiszka@siemens.com; 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=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1757854806725965.5049493163344; Sun, 14 Sep 2025 06:00:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uxmIW-0004bF-Gb; Sun, 14 Sep 2025 08:57:42 -0400 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 1uxmIH-0004Xl-6R for qemu-devel@nongnu.org; Sun, 14 Sep 2025 08:57:27 -0400 Received: from mta-65-228.siemens.flowmailer.net ([185.136.65.228]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uxmHz-0002N3-8t for qemu-devel@nongnu.org; Sun, 14 Sep 2025 08:57:24 -0400 Received: by mta-65-228.siemens.flowmailer.net with ESMTPSA id 20250914124648e491eeb33d000207db for ; Sun, 14 Sep 2025 14:46:48 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=jan.kiszka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=s3ZtzpvKMW/LKc6jZTgrh0+bspaB/1gW/W4kkRDduB0=; b=Kbq4AyPK2zEyv4+MFuVyGywWanVTFfMkVu71VmIVDyX0191fQoIWnM6ldn42kpbZkB4xNE QbB+47xUEoOfnuZoml6A1Q2Kz7NDOZUYErlByq4U4KXQAyjsl/xQamMjeiAJO5mhkQzrAolT ILG3PX1c62934JAPBiOYCWNqvlixwb8CxkSk0o6+6LcHAXbSwRBoLP9MyTyI0wNBTLZ/Hl26 IO5EBUiJy9QswTW0r7Ghx9Y8W0prKfTOWmpJjdrrjI3JqpoINBTJNqEoeGyUzoK6t54AWXTQ vrDBMfzfJBLi/10VECaTpFzgNbO8rhLjY9d94fPQKCLi6UU6nVrEB4sg==; From: Jan Kiszka To: qemu-devel Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bin Meng , qemu-block@nongnu.org, Ilias Apalodimas , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Jan=20L=C3=BCbbe?= , Jerome Forissier Subject: [PATCH v4 2/6] hw/sd/sdcard: Allow user-instantiated eMMC Date: Sun, 14 Sep 2025 14:46:42 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer 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=185.136.65.228; envelope-from=fm-294854-20250914124648e491eeb33d000207db-ut1UNC@rts-flowmailer.siemens.com; helo=mta-65-228.siemens.flowmailer.net X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.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, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable 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 jan.kiszka@siemens.com) X-ZM-MESSAGEID: 1757854809145116600 Content-Type: text/plain; charset="utf-8" From: Jan Kiszka Enable user-instantiation so that PCI-attached eMMCs can be created for virt machines, for QA purposes for the eMMC model itself and for complex firmware/OS integrations using the upcoming RPMB partition support. Signed-off-by: Jan Kiszka --- hw/sd/sd.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index b42cd01d1f..b86cbf0fbd 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -2926,8 +2926,6 @@ static void emmc_class_init(ObjectClass *klass, const= void *data) dc->desc =3D "eMMC"; dc->realize =3D emmc_realize; device_class_set_props(dc, emmc_properties); - /* Reason: Soldered on board */ - dc->user_creatable =3D false; =20 sc->proto =3D &sd_proto_emmc; =20 --=20 2.51.0 From nobody Sun Sep 28 15:29:11 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=jan.kiszka@siemens.com; 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=reject dis=none) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; t=1757854904; cv=none; d=zohomail.com; s=zohoarc; b=eQp6pSMxbAaba/p+YL68s7oMg+Qqzeh3yEO4ftbqHf4M3dhbAs2wXn1iCpRBT69blhccsREeIh/vCGUkBecrpPkxJ/Q/SKQwgXCiEePY7wpFaywNJM8zzkvEYqWeZ0h+e/4bjFSapa41+TGm17n0PPJxPyTPKGXxdxCyjhHQz9k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757854904; h=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=gkJjkzfJ54aOpvtw66vqBrI2Glax4zLSb9r/OOdb3Vs=; b=AzJl6Qu9pRzin5442FzEl/CcwCCOxPCfe761Shr2YWWnn6uSK1kR7kCatoddacrDry3bVnwHbaZoa4ectL7J/6350v8CKFHLUeUuyV7FtJY19lMKz/wZ60xtb9varz0WJKmPP4+dAeebxS2WNCzI6tfEt3raNPRjxiK+dmQhng0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=jan.kiszka@siemens.com; 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=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1757854903380113.29886898403413; Sun, 14 Sep 2025 06:01:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uxmIM-0004Z5-5F; Sun, 14 Sep 2025 08:57:30 -0400 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 1uxmIE-0004WV-AT for qemu-devel@nongnu.org; Sun, 14 Sep 2025 08:57:23 -0400 Received: from mta-64-228.siemens.flowmailer.net ([185.136.64.228]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uxmHx-0002N0-76 for qemu-devel@nongnu.org; Sun, 14 Sep 2025 08:57:19 -0400 Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 2025091412464988ca4a05380002077e for ; Sun, 14 Sep 2025 14:46:49 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=jan.kiszka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=gkJjkzfJ54aOpvtw66vqBrI2Glax4zLSb9r/OOdb3Vs=; b=IvrLboIuiEz/NhwBDG1G6qADh9CbralN1YlPZsK0T3fXVbdpgb3QGBR31WISM7No+G7tTH o5BYH/joGS1asR9l056VKlScrPi7bUBPzQZdLiJc03J7ArXsBVGk+xcwtHVqsgnI1jn0yjGt ZLi4PwVuMQPM9NOqFbbfhPv11wSK3BTNqxkKWPyInXwTqn5tbn2M8qQpeeyWsyF+sfNbmhX4 0zS88pywXFLOhAlrERh1f0OapCxsDOuduwF3VIKnKSSesHN2u/6g/JEPeJcYOqAZdHOebCLX A+GGSJNweZeSdSx/7Goj6+dzpABFWA1YlvsNgZXQzAqj9aV2/8ltFUrg==; From: Jan Kiszka To: qemu-devel Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bin Meng , qemu-block@nongnu.org, Ilias Apalodimas , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Jan=20L=C3=BCbbe?= , Jerome Forissier Subject: [PATCH v4 3/6] hw/sd/sdcard: Add basic support for RPMB partition Date: Sun, 14 Sep 2025 14:46:43 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer 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=185.136.64.228; envelope-from=fm-294854-2025091412464988ca4a05380002077e-Aj5bTV@rts-flowmailer.siemens.com; helo=mta-64-228.siemens.flowmailer.net X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, T_SPF_TEMPERROR=0.01 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 jan.kiszka@siemens.com) X-ZM-MESSAGEID: 1757854905780116600 Content-Type: text/plain; charset="utf-8" From: Jan Kiszka The Replay Protected Memory Block (RPMB) is available since eMMC 4.4 which has been obsoleted by 4.41. Therefore lift the provided EXT_CSD_REV to 5 (4.41) and provide the basic logic to implement basic support for it. This allows to set the authentication key, read the write counter and authenticated perform data read and write requests. Those aren't actually authenticated yet, support for that will be added later. The RPMB image needs to be added to backing block images after potential boot partitions and before the user data. It's size is controlled by the rpmb-partition-size property. Also missing in this version (and actually not only for RPMB bits) is persistence of registers that are supposed to survive power cycles. Most prominent are the write counters or the authentication key. This feature can be added later, e.g. by append a state structure to the backing block image. Signed-off-by: Jan Kiszka --- hw/sd/sd.c | 207 +++++++++++++++++++++++++++++++++++++++-- hw/sd/sdmmc-internal.h | 21 +++++ hw/sd/trace-events | 2 + 3 files changed, 222 insertions(+), 8 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index b86cbf0fbd..f7e41512a1 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -117,6 +117,20 @@ typedef struct SDProto { } cmd[SDMMC_CMD_MAX], acmd[SDMMC_CMD_MAX]; } SDProto; =20 +#define RPMB_KEY_MAC_LEN 32 + +typedef struct { + uint8_t stuff_bytes[196]; + uint8_t key_mac[RPMB_KEY_MAC_LEN]; + uint8_t data[256]; + uint8_t nonce[16]; + uint32_t write_counter; + uint16_t address; + uint16_t block_count; + uint16_t result; + uint16_t req_resp; +} RPMBDataFrame; + struct SDState { DeviceState parent_obj; =20 @@ -140,6 +154,7 @@ struct SDState { =20 uint8_t spec_version; uint64_t boot_part_size; + uint64_t rpmb_part_size; BlockBackend *blk; uint8_t boot_config; =20 @@ -172,6 +187,10 @@ struct SDState { uint32_t data_offset; size_t data_size; uint8_t data[512]; + RPMBDataFrame rpmb_result; + uint32_t rpmb_write_counter; + uint8_t rpmb_key[32]; + uint8_t rpmb_key_set; QEMUTimer *ocr_power_timer; uint8_t dat_lines; bool cmd_line; @@ -506,7 +525,9 @@ static void emmc_set_ext_csd(SDState *sd, uint64_t size) sd->ext_csd[205] =3D 0x46; /* Min read perf for 4bit@26Mhz */ sd->ext_csd[EXT_CSD_CARD_TYPE] =3D 0b11; sd->ext_csd[EXT_CSD_STRUCTURE] =3D 2; - sd->ext_csd[EXT_CSD_REV] =3D 3; + sd->ext_csd[EXT_CSD_REV] =3D 5; + sd->ext_csd[EXT_CSD_RPMB_MULT] =3D sd->rpmb_part_size / (128 * KiB); + sd->ext_csd[EXT_CSD_PARTITION_SUPPORT] =3D 0b111; =20 /* Mode segment (RW) */ sd->ext_csd[EXT_CSD_PART_CONFIG] =3D sd->boot_config; @@ -834,7 +855,8 @@ static uint32_t sd_blk_len(SDState *sd) /* * This requires a disk image that has two boot partitions inserted at the * beginning of it, followed by an RPMB partition. The size of the boot - * partitions is the "boot-partition-size" property. + * partitions is the "boot-partition-size" property, the one of the RPMB + * partition is 'rpmb-partition-size'. */ static uint32_t sd_part_offset(SDState *sd) { @@ -848,11 +870,13 @@ static uint32_t sd_part_offset(SDState *sd) & EXT_CSD_PART_CONFIG_ACC_MASK; switch (partition_access) { case EXT_CSD_PART_CONFIG_ACC_DEFAULT: - return sd->boot_part_size * 2; + return sd->boot_part_size * 2 + sd->rpmb_part_size; case EXT_CSD_PART_CONFIG_ACC_BOOT1: return 0; case EXT_CSD_PART_CONFIG_ACC_BOOT2: return sd->boot_part_size * 1; + case EXT_CSD_PART_CONFIG_ACC_RPMB: + return sd->boot_part_size * 2; default: g_assert_not_reached(); } @@ -891,7 +915,7 @@ static void sd_reset(DeviceState *dev) } size =3D sect << HWBLOCK_SHIFT; if (sd_is_emmc(sd)) { - size -=3D sd->boot_part_size * 2; + size -=3D sd->boot_part_size * 2 + sd->rpmb_part_size; } =20 sect =3D sd_addr_to_wpnum(size) + 1; @@ -979,6 +1003,34 @@ static const VMStateDescription sd_ocr_vmstate =3D { }, }; =20 +static bool vmstate_needed_for_rpmb(void *opaque) +{ + SDState *sd =3D opaque; + + return sd->rpmb_part_size > 0; +} + +static const VMStateDescription emmc_rpmb_vmstate =3D { + .name =3D "sd-card/ext_csd_modes-state", + .version_id =3D 1, + .minimum_version_id =3D 1, + .needed =3D vmstate_needed_for_rpmb, + .fields =3D (const VMStateField[]) { + VMSTATE_UINT8_ARRAY(rpmb_result.key_mac, SDState, RPMB_KEY_MAC_LEN= ), + VMSTATE_UINT8_ARRAY(rpmb_result.data, SDState, 256), + VMSTATE_UINT8_ARRAY(rpmb_result.nonce, SDState, 16), + VMSTATE_UINT32(rpmb_result.write_counter, SDState), + VMSTATE_UINT16(rpmb_result.address, SDState), + VMSTATE_UINT16(rpmb_result.block_count, SDState), + VMSTATE_UINT16(rpmb_result.result, SDState), + VMSTATE_UINT16(rpmb_result.req_resp, SDState), + VMSTATE_UINT32(rpmb_write_counter, SDState), + VMSTATE_UINT8_ARRAY(rpmb_key, SDState, 32), + VMSTATE_UINT8(rpmb_key_set, SDState), + VMSTATE_END_OF_LIST() + }, +}; + static bool vmstate_needed_for_emmc(void *opaque) { SDState *sd =3D opaque; @@ -1045,6 +1097,7 @@ static const VMStateDescription sd_vmstate =3D { .subsections =3D (const VMStateDescription * const []) { &sd_ocr_vmstate, &emmc_extcsd_vmstate, + &emmc_rpmb_vmstate, NULL }, }; @@ -1067,6 +1120,105 @@ static void sd_blk_write(SDState *sd, uint64_t addr= , uint32_t len) } } =20 +static void emmc_rpmb_blk_read(SDState *sd, uint64_t addr, uint32_t len) +{ + uint16_t resp =3D be16_to_cpu(sd->rpmb_result.req_resp); + uint16_t result =3D be16_to_cpu(sd->rpmb_result.result); + unsigned int curr_block =3D 0; + + if ((result & ~RPMB_RESULT_COUTER_EXPIRED) =3D=3D RPMB_RESULT_OK && + resp =3D=3D RPMB_RESP(RPMB_REQ_AUTH_DATA_READ)) { + curr_block =3D be16_to_cpu(sd->rpmb_result.address); + if (sd->rpmb_result.block_count =3D=3D 0) { + sd->rpmb_result.block_count =3D cpu_to_be16(sd->multi_blk_cnt); + } else { + curr_block +=3D be16_to_cpu(sd->rpmb_result.block_count) - + sd->multi_blk_cnt; + } + addr =3D curr_block * 256 + sd_part_offset(sd); + if (blk_pread(sd->blk, addr, 256, sd->rpmb_result.data, 0) < 0) { + fprintf(stderr, "sd_blk_read: read error on host side\n"); + memset(sd->rpmb_result.data, 0, sizeof(sd->rpmb_result.data)); + sd->rpmb_result.result =3D cpu_to_be16(RPMB_RESULT_READ_FAILUR= E | + (result & RPMB_RESULT_COUTER_EXPIRED)); + } + } + memcpy(sd->data, &sd->rpmb_result, sizeof(sd->rpmb_result)); + + trace_sdcard_rpmb_read_block(resp, curr_block, + be16_to_cpu(sd->rpmb_result.result)); +} + +static void emmc_rpmb_blk_write(SDState *sd, uint64_t addr, uint32_t len) +{ + RPMBDataFrame *frame =3D (RPMBDataFrame *)sd->data; + uint16_t req =3D be16_to_cpu(frame->req_resp); + + if (req =3D=3D RPMB_REQ_READ_RESULT) { + /* just return the current result register */ + goto exit; + } + memset(&sd->rpmb_result, 0, sizeof(sd->rpmb_result)); + memcpy(sd->rpmb_result.nonce, frame->nonce, sizeof(sd->rpmb_result.non= ce)); + sd->rpmb_result.result =3D cpu_to_be16(RPMB_RESULT_OK); + sd->rpmb_result.req_resp =3D cpu_to_be16(RPMB_RESP(req)); + + if (!sd->rpmb_key_set && req !=3D RPMB_REQ_PROGRAM_AUTH_KEY) { + sd->rpmb_result.result =3D cpu_to_be16(RPMB_RESULT_NO_AUTH_KEY); + goto exit; + } + + switch (req) { + case RPMB_REQ_PROGRAM_AUTH_KEY: + if (sd->rpmb_key_set) { + sd->rpmb_result.result =3D cpu_to_be16(RPMB_RESULT_WRITE_FAILU= RE); + break; + } + memcpy(sd->rpmb_key, frame->key_mac, sizeof(sd->rpmb_key)); + sd->rpmb_key_set =3D 1; + break; + case RPMB_REQ_READ_WRITE_COUNTER: + sd->rpmb_result.write_counter =3D cpu_to_be32(sd->rpmb_write_count= er); + break; + case RPMB_REQ_AUTH_DATA_WRITE: + /* We only support single-block writes so far */ + if (sd->multi_blk_cnt !=3D 1) { + sd->rpmb_result.result =3D cpu_to_be16(RPMB_RESULT_GENERAL_FAI= LURE); + break; + } + if (sd->rpmb_write_counter =3D=3D 0xffffffff) { + sd->rpmb_result.result =3D cpu_to_be16(RPMB_RESULT_WRITE_FAILU= RE); + break; + } + if (be32_to_cpu(frame->write_counter) !=3D sd->rpmb_write_counter)= { + sd->rpmb_result.result =3D cpu_to_be16(RPMB_RESULT_COUNTER_FAI= LURE); + break; + } + sd->rpmb_result.address =3D frame->address; + addr =3D be16_to_cpu(frame->address) * 256 + sd_part_offset(sd); + if (blk_pwrite(sd->blk, addr, 256, frame->data, 0) < 0) { + fprintf(stderr, "sd_blk_write: write error on host side\n"); + sd->rpmb_result.result =3D cpu_to_be16(RPMB_RESULT_WRITE_FAILU= RE); + } else { + sd->rpmb_write_counter++; + } + sd->rpmb_result.write_counter =3D cpu_to_be32(sd->rpmb_write_count= er); + break; + case RPMB_REQ_AUTH_DATA_READ: + sd->rpmb_result.address =3D frame->address; + break; + default: + qemu_log_mask(LOG_UNIMP, "RPMB request %d not implemented\n", req); + sd->rpmb_result.result =3D cpu_to_be16(RPMB_RESULT_GENERAL_FAILURE= ); + break; + } +exit: + if (sd->rpmb_write_counter =3D=3D 0xffffffff) { + sd->rpmb_result.result |=3D cpu_to_be16(RPMB_RESULT_COUTER_EXPIRED= ); + } + trace_sdcard_rpmb_write_block(req, be16_to_cpu(sd->rpmb_result.result)= ); +} + static void sd_erase(SDState *sd) { uint64_t erase_start =3D sd->erase_start; @@ -1180,6 +1332,19 @@ static void emmc_function_switch(SDState *sd, uint32= _t arg) break; } =20 + if (index =3D=3D EXT_CSD_PART_CONFIG) { + uint8_t part =3D b & EXT_CSD_PART_CONFIG_ACC_MASK; + + if (((part =3D=3D EXT_CSD_PART_CONFIG_ACC_BOOT1 || + part =3D=3D EXT_CSD_PART_CONFIG_ACC_BOOT2) && !sd->boot_part= _size) || + (part =3D=3D EXT_CSD_PART_CONFIG_ACC_RPMB && !sd->rpmb_part_si= ze)) { + qemu_log_mask(LOG_GUEST_ERROR, + "MMC switching to illegal partition\n"); + sd->card_status |=3D R_CSR_SWITCH_ERROR_MASK; + return; + } + } + trace_sdcard_ext_csd_update(index, sd->ext_csd[index], b); sd->ext_csd[index] =3D b; } @@ -2378,6 +2543,7 @@ static bool sd_generic_read_byte(SDState *sd, uint8_t= *value) =20 static void sd_write_byte(SDState *sd, uint8_t value) { + unsigned int partition_access; int i; =20 if (!sd->blk || !blk_is_inserted(sd->blk)) { @@ -2427,7 +2593,13 @@ static void sd_write_byte(SDState *sd, uint8_t value) if (sd->data_offset >=3D sd->blk_len) { /* TODO: Check CRC before committing */ sd->state =3D sd_programming_state; - sd_blk_write(sd, sd->data_start, sd->data_offset); + partition_access =3D sd->ext_csd[EXT_CSD_PART_CONFIG] + & EXT_CSD_PART_CONFIG_ACC_MASK; + if (partition_access =3D=3D EXT_CSD_PART_CONFIG_ACC_RPMB) { + emmc_rpmb_blk_write(sd, sd->data_start, sd->data_offset); + } else { + sd_blk_write(sd, sd->data_start, sd->data_offset); + } sd->blk_written++; sd->data_start +=3D sd->blk_len; sd->data_offset =3D 0; @@ -2510,6 +2682,7 @@ static uint8_t sd_read_byte(SDState *sd) { /* TODO: Append CRCs */ const uint8_t dummy_byte =3D 0x00; + unsigned int partition_access; uint8_t ret; uint32_t io_len; =20 @@ -2553,7 +2726,13 @@ static uint8_t sd_read_byte(SDState *sd) sd->data_start, io_len)) { return dummy_byte; } - sd_blk_read(sd, sd->data_start, io_len); + partition_access =3D sd->ext_csd[EXT_CSD_PART_CONFIG] + & EXT_CSD_PART_CONFIG_ACC_MASK; + if (partition_access =3D=3D EXT_CSD_PART_CONFIG_ACC_RPMB) { + emmc_rpmb_blk_read(sd, sd->data_start, io_len); + } else { + sd_blk_read(sd, sd->data_start, io_len); + } } ret =3D sd->data[sd->data_offset ++]; =20 @@ -2803,7 +2982,8 @@ static void sd_realize(DeviceState *dev, Error **errp) return; } =20 - blk_size =3D blk_getlength(sd->blk) - sd->boot_part_size * 2; + blk_size =3D blk_getlength(sd->blk) - sd->boot_part_size * 2 - + sd->rpmb_part_size; if (blk_size > SDSC_MAX_CAPACITY) { if (sd_is_emmc(sd) && blk_size % (1 << HWBLOCK_SHIFT) !=3D 0) { int64_t blk_size_aligned =3D @@ -2842,13 +3022,23 @@ static void sd_realize(DeviceState *dev, Error **er= rp) "The boot partition size must be multiples of 12= 8K" "and not larger than 32640K.\n"); } + if (sd->rpmb_part_size % (128 * KiB) || + sd->rpmb_part_size > 128 * 128 * KiB) { + char *size_str =3D size_to_str(sd->boot_part_size); + + error_setg(errp, "Invalid RPMB partition size: %s", size_str); + g_free(size_str); + error_append_hint(errp, + "The RPMB partition size must be multiples of 12= 8K" + "and not larger than 16384K.\n"); + } } =20 static void emmc_realize(DeviceState *dev, Error **errp) { SDState *sd =3D SDMMC_COMMON(dev); =20 - sd->spec_version =3D SD_PHY_SPECv3_01_VERS; /* Actually v4.3 */ + sd->spec_version =3D SD_PHY_SPECv3_01_VERS; /* Actually v4.5 */ =20 sd_realize(dev, errp); } @@ -2865,6 +3055,7 @@ static const Property sd_properties[] =3D { static const Property emmc_properties[] =3D { DEFINE_PROP_UINT64("boot-partition-size", SDState, boot_part_size, 0), DEFINE_PROP_UINT8("boot-config", SDState, boot_config, 0x0), + DEFINE_PROP_UINT64("rpmb-partition-size", SDState, rpmb_part_size, 0), }; =20 static void sdmmc_common_class_init(ObjectClass *klass, const void *data) diff --git a/hw/sd/sdmmc-internal.h b/hw/sd/sdmmc-internal.h index ce6bc4e6ec..c4a9aa8edf 100644 --- a/hw/sd/sdmmc-internal.h +++ b/hw/sd/sdmmc-internal.h @@ -118,9 +118,30 @@ DECLARE_OBJ_CHECKERS(SDState, SDCardClass, SDMMC_COMMO= N, TYPE_SDMMC_COMMON) #define EXT_CSD_PART_CONFIG_ACC_DEFAULT (0x0) #define EXT_CSD_PART_CONFIG_ACC_BOOT1 (0x1) #define EXT_CSD_PART_CONFIG_ACC_BOOT2 (0x2) +#define EXT_CSD_PART_CONFIG_ACC_RPMB (0x3) =20 #define EXT_CSD_PART_CONFIG_EN_MASK (0x7 << 3) #define EXT_CSD_PART_CONFIG_EN_BOOT0 (0x1 << 3) #define EXT_CSD_PART_CONFIG_EN_USER (0x7 << 3) =20 +#define RPMB_REQ_PROGRAM_AUTH_KEY (1) +#define RPMB_REQ_READ_WRITE_COUNTER (2) +#define RPMB_REQ_AUTH_DATA_WRITE (3) +#define RPMB_REQ_AUTH_DATA_READ (4) +#define RPMB_REQ_READ_RESULT (5) +#define RPMB_REQ_AUTH_CONFIG_WRITE (6) +#define RPMB_REQ_AUTH_CONFIG_READ (7) + +#define RPMB_RESP(__req__) ((__req__) << 8) + +#define RPMB_RESULT_OK (0) +#define RPMB_RESULT_GENERAL_FAILURE (1) +#define RPMB_RESULT_AUTH_FAILURE (2) +#define RPMB_RESULT_COUNTER_FAILURE (3) +#define RPMB_RESULT_ADDRESS_FAILURE (4) +#define RPMB_RESULT_WRITE_FAILURE (5) +#define RPMB_RESULT_READ_FAILURE (6) +#define RPMB_RESULT_NO_AUTH_KEY (7) +#define RPMB_RESULT_COUTER_EXPIRED (0x80) + #endif diff --git a/hw/sd/trace-events b/hw/sd/trace-events index 8d49840917..d30daa2143 100644 --- a/hw/sd/trace-events +++ b/hw/sd/trace-events @@ -59,6 +59,8 @@ sdcard_read_data(const char *proto, const char *cmd_desc,= uint8_t cmd, uint32_t sdcard_set_voltage(uint16_t millivolts) "%u mV" sdcard_ext_csd_update(unsigned index, uint8_t oval, uint8_t nval) "index %= u: 0x%02x -> 0x%02x" sdcard_switch(unsigned access, unsigned index, unsigned value, unsigned se= t) "SWITCH acc:%u idx:%u val:%u set:%u" +sdcard_rpmb_read_block(uint16_t resp, uint16_t read_addr, uint16_t result)= "resp 0x%x read_addr 0x%x result 0x%x" +sdcard_rpmb_write_block(uint16_t req, uint16_t result) "req 0x%x result 0x= %x" =20 # pl181.c pl181_command_send(uint8_t cmd, uint32_t arg) "sending CMD%02d arg 0x%08" = PRIx32 --=20 2.51.0 From nobody Sun Sep 28 15:29:11 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=jan.kiszka@siemens.com; 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=reject dis=none) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; t=1757854811; cv=none; d=zohomail.com; s=zohoarc; b=hkpRPas+7ErfA66Z1dHGAlZTYjZn+hxn8MvIr45NR0h1LeSYu6HiRs1R9buaQBwlljfFQ7q24dn/1P9d+cOdyB+E8YaCqA5V8AWRIzsJ2mZHCV/xPCBwFdcpQA8vmvEyQGeRCr644XMyN0coJ/KASBDGjXJZUs2mNogeSnWN2T0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757854811; h=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=9hvqbXXknAWKoD8HDVYgVeJRmyNtPk4inrajVRBMyzE=; b=ZAU/VPeFBabowLm+aFNZSa74wpGgx3dbwIiZc8NYW1MSgUMzrrpzwpdMt1SNWRxQwAH9UZ7Knn+QZxBBv5tByY82TM7nP2f5dZvNJ9L/IMUr+5UpinkV+7hHFFM751UUbCsHR++eqVCSBi8fP3A3S39SEz6hU4raHBeqwBEau3I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=jan.kiszka@siemens.com; 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=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1757854810978461.24639382896976; Sun, 14 Sep 2025 06:00:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uxmIZ-0004bv-C9; Sun, 14 Sep 2025 08:57:43 -0400 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 1uxmIE-0004Wc-Cv for qemu-devel@nongnu.org; Sun, 14 Sep 2025 08:57:23 -0400 Received: from mta-64-226.siemens.flowmailer.net ([185.136.64.226]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uxmI0-0002Na-8x for qemu-devel@nongnu.org; Sun, 14 Sep 2025 08:57:21 -0400 Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 202509141246493afec731d3000207c2 for ; Sun, 14 Sep 2025 14:46:49 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=jan.kiszka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=9hvqbXXknAWKoD8HDVYgVeJRmyNtPk4inrajVRBMyzE=; b=pb51RhGsROqeszWyFpAVSojI+r7BqxPT3+Bidi5cFdfa+XmzeK0b/ihM6F2T13Dj0qSvSb 27pJRPyA7fLOPjy0E84sZjf7YJu4eRrl8BKyj5hLqCEyRkWk0lX6VanEQWDdo7+mpPb6wE+k yue63kA9QSo1uacNWdaMyQOhMQfR4moe2JuPlofE+aIJ5qctPU/MFJk06AbOUuhSYfPL9b+v I5qCmcbvcHiKc6jH0gyoM0hmnKsdtmbJwpzYp43XpZvsWWapOYAobCjMPAtZRMmGW3jWhtjy /ZjQLek9qJhmzmeax0e6rBh5WUXS2iHM0rI9J0VswqY9btTwaKVxMEOQ==; From: Jan Kiszka To: qemu-devel Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bin Meng , qemu-block@nongnu.org, Ilias Apalodimas , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Jan=20L=C3=BCbbe?= , Jerome Forissier Subject: [PATCH v4 4/6] hw/sd/sdcard: Handle RPMB MAC field Date: Sun, 14 Sep 2025 14:46:44 +0200 Message-ID: <826132eea90f9381f7ed1646a8cb2b21a1e7dc7a.1757854006.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer 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=185.136.64.226; envelope-from=fm-294854-202509141246493afec731d3000207c2-KEw2AH@rts-flowmailer.siemens.com; helo=mta-64-226.siemens.flowmailer.net 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, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable 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 jan.kiszka@siemens.com) X-ZM-MESSAGEID: 1757854813485116600 Content-Type: text/plain; charset="utf-8" From: Jan Kiszka Implement correct setting of the MAC field when passing RPMB frames back to the guest. Also check the MAC on authenticated write requests. This depends on HMAC support for QCRYPTO_HASH_ALGO_SHA256 which is always available via glib - assert this, just to be safe. Signed-off-by: Jan Kiszka --- hw/sd/sd.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index f7e41512a1..0656d7a374 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -51,6 +51,7 @@ #include "qemu/module.h" #include "sdmmc-internal.h" #include "trace.h" +#include "crypto/hmac.h" =20 //#define DEBUG_SD 1 =20 @@ -118,6 +119,7 @@ typedef struct SDProto { } SDProto; =20 #define RPMB_KEY_MAC_LEN 32 +#define RPMB_HASH_LEN 284 =20 typedef struct { uint8_t stuff_bytes[196]; @@ -1120,6 +1122,66 @@ static void sd_blk_write(SDState *sd, uint64_t addr,= uint32_t len) } } =20 +static bool rpmb_calc_hmac(SDState *sd, RPMBDataFrame *frame, + unsigned int num_blocks, uint8_t *mac) +{ + size_t mac_len =3D RPMB_KEY_MAC_LEN; + bool success =3D true; + Error *err =3D NULL; + QCryptoHmac *hmac; + uint64_t addr; + + hmac =3D qcrypto_hmac_new(QCRYPTO_HASH_ALGO_SHA256, sd->rpmb_key, + RPMB_KEY_MAC_LEN, &err); + if (!hmac) { + error_report_err(err); + return false; + } + + /* + * This implies a read request because we only support single-block wr= ite + * requests so far. + */ + if (num_blocks > 1) { + /* + * Unfortunately, the underlying crypto libraries do not allow us = to + * migrate an active QCryptoHmac state. Therefore, we have to calc= ulate + * the HMAC in one run. To avoid buffering a complete read sequenc= e in + * SDState, reconstruct all frames except for the last one. + */ + char *buf =3D (char *)sd->data; + + memcpy(buf, frame->data, RPMB_HASH_LEN); + addr =3D be16_to_cpu(frame->address) * 256 + sd_part_offset(sd); + do { + if (blk_pread(sd->blk, addr, 256, buf, 0) < 0) { + fprintf(stderr, "sd_blk_read: read error on host side\n"); + success =3D false; + break; + } + if (qcrypto_hmac_bytes(hmac, buf, RPMB_HASH_LEN, NULL, NULL, + &err) < 0) { + error_report_err(err); + success =3D false; + break; + } + addr +=3D 256; + } while (--num_blocks > 1); + } + + if (success && + qcrypto_hmac_bytes(hmac, (const char*)frame->data, RPMB_HASH_LEN, = &mac, + &mac_len, &err) < 0) { + error_report_err(err); + success =3D false; + } + assert(!success || mac_len =3D=3D RPMB_KEY_MAC_LEN); + + qcrypto_hmac_free(hmac); + + return success; +} + static void emmc_rpmb_blk_read(SDState *sd, uint64_t addr, uint32_t len) { uint16_t resp =3D be16_to_cpu(sd->rpmb_result.req_resp); @@ -1142,6 +1204,17 @@ static void emmc_rpmb_blk_read(SDState *sd, uint64_t= addr, uint32_t len) sd->rpmb_result.result =3D cpu_to_be16(RPMB_RESULT_READ_FAILUR= E | (result & RPMB_RESULT_COUTER_EXPIRED)); } + if (sd->multi_blk_cnt =3D=3D 1 && + !rpmb_calc_hmac(sd, &sd->rpmb_result, + be16_to_cpu(sd->rpmb_result.block_count), + sd->rpmb_result.key_mac)) { + memset(sd->rpmb_result.data, 0, sizeof(sd->rpmb_result.data)); + sd->rpmb_result.result =3D cpu_to_be16(RPMB_RESULT_AUTH_FAILUR= E); + } + } else if (!rpmb_calc_hmac(sd, &sd->rpmb_result, 1, + sd->rpmb_result.key_mac)) { + memset(sd->rpmb_result.data, 0, sizeof(sd->rpmb_result.data)); + sd->rpmb_result.result =3D cpu_to_be16(RPMB_RESULT_AUTH_FAILURE); } memcpy(sd->data, &sd->rpmb_result, sizeof(sd->rpmb_result)); =20 @@ -1153,6 +1226,7 @@ static void emmc_rpmb_blk_write(SDState *sd, uint64_t= addr, uint32_t len) { RPMBDataFrame *frame =3D (RPMBDataFrame *)sd->data; uint16_t req =3D be16_to_cpu(frame->req_resp); + uint8_t mac[RPMB_KEY_MAC_LEN]; =20 if (req =3D=3D RPMB_REQ_READ_RESULT) { /* just return the current result register */ @@ -1190,6 +1264,11 @@ static void emmc_rpmb_blk_write(SDState *sd, uint64_= t addr, uint32_t len) sd->rpmb_result.result =3D cpu_to_be16(RPMB_RESULT_WRITE_FAILU= RE); break; } + if (!rpmb_calc_hmac(sd, frame, 1, mac) || + memcmp(frame->key_mac, mac, RPMB_KEY_MAC_LEN) !=3D 0) { + sd->rpmb_result.result =3D cpu_to_be16(RPMB_RESULT_AUTH_FAILUR= E); + break; + } if (be32_to_cpu(frame->write_counter) !=3D sd->rpmb_write_counter)= { sd->rpmb_result.result =3D cpu_to_be16(RPMB_RESULT_COUNTER_FAI= LURE); break; @@ -3114,6 +3193,8 @@ static void emmc_class_init(ObjectClass *klass, const= void *data) DeviceClass *dc =3D DEVICE_CLASS(klass); SDCardClass *sc =3D SDMMC_COMMON_CLASS(klass); =20 + assert(qcrypto_hmac_supports(QCRYPTO_HASH_ALGO_SHA256)); + dc->desc =3D "eMMC"; dc->realize =3D emmc_realize; device_class_set_props(dc, emmc_properties); --=20 2.51.0 From nobody Sun Sep 28 15:29:11 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=jan.kiszka@siemens.com; 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=reject dis=none) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; t=1757854781; cv=none; d=zohomail.com; s=zohoarc; b=TQ+pJllHY/HzKbBrrvH+tdh4EOMwVESu0wy7i/WUG8XyHkbaZVaxLo7fEOdEzC9n4439Qbw3FZgDv13SK3LQQBCugNeKzKS7sxHhd1OKqBXBVfZfrQ7JWdbVa7Rnd8yDLszF8DSXQW1hhATLzUX+3ZJUqeK0W6gAhSDzhMVYL24= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757854781; h=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=pSXOj215qHK8mmWdQKcr3dJFy9ec0f8hK6u6byFRCpA=; b=AW0neDGdwJMxamva+F4lUFk9QZkcfunY4+nvj9qSzCdyEw81XZN8pXmRhfrtinz6uHGUxIlUEwHmxvD2s28DcSZ83UAzJVpzKKaDS8komHcsPPgnMDzJWWl865L6yGAthjXSKGEvBpkVsw2Mfa3JbBIdHohMuDTZBKt9F3Y31kg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=jan.kiszka@siemens.com; 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=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1757854781115678.8227456915871; Sun, 14 Sep 2025 05:59:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uxmIF-0004VW-1i; Sun, 14 Sep 2025 08:57:23 -0400 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 1uxmI6-0004UO-7L for qemu-devel@nongnu.org; Sun, 14 Sep 2025 08:57:15 -0400 Received: from mta-65-225.siemens.flowmailer.net ([185.136.65.225]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uxmHu-0002N5-GS for qemu-devel@nongnu.org; Sun, 14 Sep 2025 08:57:13 -0400 Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 202509141246493a6ae490ee00020799 for ; Sun, 14 Sep 2025 14:46:50 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=jan.kiszka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=pSXOj215qHK8mmWdQKcr3dJFy9ec0f8hK6u6byFRCpA=; b=Z8R7/9dFzKjCOxawdUnnQPiZ4gLof15uSLWHPzJscpmwA/PoXCdXpCkStee3EkIyCN3ziu KnhiWuZqOMx7Av1H0dZjUm/DiOC86m/47Pc7pALNfTIqdIFTY1l0JbackWpZ5eiVgV6A3Q7C sIOWpe+24jGxBr4xrx8qfxbaWkdnKn9o1ut01YzlZi91AnkhAOR7W6g00wkCigYqRbeC3DjC NN/i6q5kw992HJvPvWg4jnZ+jGzInsM5lcTG0xAWU1uElrsobQJYoAv6BVNHgVE3or2+BfRF +slN07sIDUUKIuXJLj1TlDOgWmKshaWRhf/rSmsxJZo341Eca1uJNCQA==; From: Jan Kiszka To: qemu-devel Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bin Meng , qemu-block@nongnu.org, Ilias Apalodimas , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Jan=20L=C3=BCbbe?= , Jerome Forissier Subject: [PATCH v4 5/6] scripts: Add helper script to generate eMMC block device images Date: Sun, 14 Sep 2025 14:46:45 +0200 Message-ID: <3159b43285803b8791b3ef3e3d89daf5d00507de.1757854006.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer 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=185.136.65.225; envelope-from=fm-294854-202509141246493a6ae490ee00020799-OMxCDH@rts-flowmailer.siemens.com; helo=mta-65-225.siemens.flowmailer.net X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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 jan.kiszka@siemens.com) X-ZM-MESSAGEID: 1757854782955116600 Content-Type: text/plain; charset="utf-8" From: Jan Kiszka As an eMMC block device image may consist of more than just the user data partition, provide a helper script that can compose the image from boot partitions, an RPMB partition and the user data image. The script also does the required size validation and/or rounding. Signed-off-by: Jan Kiszka --- scripts/mkemmc.sh | 218 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 218 insertions(+) create mode 100755 scripts/mkemmc.sh diff --git a/scripts/mkemmc.sh b/scripts/mkemmc.sh new file mode 100755 index 0000000000..1a2b7a6193 --- /dev/null +++ b/scripts/mkemmc.sh @@ -0,0 +1,218 @@ +#!/bin/sh -e +# SPDX-License-Identifier: GPL-2.0-only +# +# Create eMMC block device image from boot, RPMB and user data images +# +# Copyright (c) Siemens, 2025 +# +# Authors: +# Jan Kiszka +# +# This work is licensed under the terms of the GNU GPL version 2. +# See the COPYING file in the top-level directory. +# + +usage() { + echo "$0 [OPTIONS] USER_IMG[:SIZE] OUTPUT_IMG" + echo "" + echo "SIZE must be a power of 2 up to 2G and multiples of 512 byte fro= m there on." + echo "If no SIZE is specified, the size of USER_ING will be used (roun= ded up)." + echo "" + echo "Supported options:" + echo " -b BOOT1_IMG[:SIZE] Add boot partitions. SIZE must be multip= les of 128K. If" + echo " no SIZE is specified, the size of BOOT= 1_IMG will be" + echo " used (rounded up). BOOT1_IMG will be s= tored in boot" + echo " partition 1, and a boot partition 2 of= the same size" + echo " will be created as empty (all zeros) u= nless -B is" + echo " specified as well." + echo " -B BOOT2_IMG Fill boot partition 2 with BOOT2_IMG. Mu= st be combined" + echo " with -b which is also defining the par= tition size." + echo " -r RPMB_IMG[:SIZE] Add RPMB partition. SIZE must be multipl= es of 128K. If" + echo " no SIZE is specified, the size of RPMB= _IMG will be" + echo " used (rounded up)." + echo " -h, --help This help" + echo "" + echo "All SIZE parameters support the units K, M, G. If SIZE is smalle= r than the" + echo "associated image, it will be truncated in the output image." + exit "$1" +} + +process_size() { + name=3D$1 + image_file=3D$2 + alignment=3D$3 + image_arg=3D$4 + if [ "${image_arg#*:}" =3D "$image_arg" ]; then + if ! size=3D$(stat -L -c %s "$image_file" 2>/dev/null); then + echo "Missing $name image '$image_file'." >&2 + exit 1 + fi + if [ "$alignment" =3D 128 ]; then + size=3D$(( (size + 128 * 1024 - 1) & ~(128 * 1024 - 1) )) + elif [ $size -gt $((2 * 1024 * 1024 * 1024)) ]; then + size=3D$(( (size + 511) & ~511 )) + elif [ $(( size & (size - 1) )) -gt 0 ]; then + n=3D0 + while [ "$size" -gt 0 ]; do + size=3D$((size >> 1)) + n=3D$((n + 1)) + done + size=3D$((1 << n)) + fi + else + value=3D"${image_arg#*:}" + if [ "${value%K}" !=3D "$value" ]; then + size=3D${value%K} + multiplier=3D1024 + elif [ "${value%M}" !=3D "$value" ]; then + size=3D${value%M} + multiplier=3D$((1024 * 1024)) + elif [ "${value%G}" !=3D "$value" ]; then + size=3D${value%G} + multiplier=3D$((1024 * 1024 * 1024)) + else + size=3D$value + multiplier=3D1 + fi + if [ "$size" -eq "$size" ] 2>/dev/null; then + size=3D$((size * multiplier)) + else + echo "Invalid value '$value' specified for $image_file image s= ize." >&2 + exit 1 + fi + if [ "$alignment" =3D 128 ]; then + if [ $(( size & (128 * 1024 - 1) )) -ne 0 ]; then + echo "The $name image size must be multiples of 128K." >&2 + exit 1 + fi + elif [ $size -gt $((2 * 1024 * 1024 * 1024)) ]; then + if [ $(( size & 511)) -ne 0 ]; then + echo "The $name image size must be multiples of 512 (if >2= G)." >&2 + exit 1 + fi + elif [ $(( size & (size - 1) )) -gt 0 ]; then + echo "The $name image size must be power of 2 (up to 2G)." >&2 + exit 1 + fi + fi + echo $size +} + +check_truncation() { + image_file=3D$1 + output_size=3D$2 + if [ "$image_file" =3D "/dev/zero" ]; then + return + fi + if ! actual_size=3D$(stat -L -c %s "$image_file" 2>/dev/null); then + echo "Missing image '$image_file'." >&2 + exit 1 + fi + if [ "$actual_size" -gt "$output_size" ]; then + echo "Warning: image '$image_file' will be truncated on output." + fi +} + +userimg=3D +outimg=3D +bootimg1=3D +bootimg2=3D/dev/zero +bootsz=3D0 +rpmbimg=3D +rpmbsz=3D0 + +while [ $# -gt 0 ]; do + case "$1" in + -b) + shift + [ $# -ge 1 ] || usage 1 + bootimg1=3D${1%%:*} + bootsz=3D$(process_size boot "$bootimg1" 128 "$1") + shift + ;; + -B) + shift + [ $# -ge 1 ] || usage 1 + bootimg2=3D$1 + shift + ;; + -r) + shift + [ $# -ge 1 ] || usage 1 + rpmbimg=3D${1%%:*} + rpmbsz=3D$(process_size RPMB "$rpmbimg" 128 "$1") + shift + ;; + -h|--help) + usage 0 + ;; + *) + if [ -z "$userimg" ]; then + userimg=3D${1%%:*} + usersz=3D$(process_size user "$userimg" U "$1") + elif [ -z "$outimg" ]; then + outimg=3D$1 + else + usage 1 + fi + shift + ;; + esac +done + +[ -n "$outimg" ] || usage 1 + +if [ "$bootsz" -gt $((32640 * 1024)) ]; then + echo "Boot image size is larger than 32640K." >&2 + exit 1 +fi +if [ "$rpmbsz" -gt $((16384 * 1024)) ]; then + echo "RPMB image size is larger than 16384K." >&2 + exit 1 +fi + +echo "Creating eMMC image" + +truncate "$outimg" -s 0 +pos=3D0 + +if [ "$bootsz" -gt 0 ]; then + echo " Boot partition 1 and 2: $((bootsz / 1024))K each" + blocks=3D$(( bootsz / (128 * 1024) )) + check_truncation "$bootimg1" "$bootsz" + dd if=3D"$bootimg1" of=3D"$outimg" conv=3Dsparse bs=3D128K count=3D$bl= ocks \ + status=3Dnone + check_truncation "$bootimg2" "$bootsz" + dd if=3D"$bootimg2" of=3D"$outimg" conv=3Dsparse bs=3D128K count=3D$bl= ocks \ + seek=3D$blocks status=3Dnone + pos=3D$((2 * bootsz)) +fi + +if [ "$rpmbsz" -gt 0 ]; then + echo " RPMB partition: $((rpmbsz / 1024))K" + blocks=3D$(( rpmbsz / (128 * 1024) )) + check_truncation "$rpmbimg" "$rpmbsz" + dd if=3D"$rpmbimg" of=3D"$outimg" conv=3Dsparse bs=3D128K count=3D$blo= cks \ + seek=3D$(( pos / (128 * 1024) )) status=3Dnone + pos=3D$((pos + rpmbsz)) +fi + +if [ "$usersz" -lt 1024 ]; then + echo " User data: $usersz bytes" +elif [ "$usersz" -lt $((1024 * 1024)) ]; then + echo " User data: $(( (usersz + 1023) / 1024 ))K ($use= rsz)" +elif [ "$usersz" -lt $((1024 * 1024 * 1024)) ]; then + echo " User data: $(( (usersz + 1048575) / 1048576))M = ($usersz)" +else + echo " User data: $(( (usersz + 1073741823) / 10737418= 24))G ($usersz)" +fi +check_truncation "$userimg" "$usersz" +dd if=3D"$userimg" of=3D"$outimg" conv=3Dsparse bs=3D128K seek=3D$(( pos /= (128 * 1024) )) \ + count=3D$(( (usersz + 128 * 1024 - 1) / (128 * 1024) )) status=3Dnone +pos=3D$((pos + usersz)) +truncate "$outimg" -s $pos + +echo "" +echo "Instantiate by appending to the qemu command line:" +echo " -drive file=3D$outimg,if=3Dnone,format=3Draw,id=3Demmc-img" +echo " -device emmc,boot-partition-size=3D$bootsz,rpmb-partition-size=3D$= rpmbsz,drive=3Demmc-img" --=20 2.51.0 From nobody Sun Sep 28 15:29:11 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=jan.kiszka@siemens.com; 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=reject dis=none) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; t=1757854816; cv=none; d=zohomail.com; s=zohoarc; b=TCCin1PTyiWSLtNOOTKc6JVQWCTiWndoqkHWzMMLiBSZtpbo7RwSooubTyAZEAkTbmX6EbI4mhJ6wqIVGhzLZXN5EeigfMF1Fkq06A6NLAz1Sm1/c7R0l5a6YIawGC8//SImIpJtdXY5dFMZ6azz45a46i+HSJUwtnqRcCO+cE8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757854816; 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=n8i+jjUuq9cfattAVJFgrNhUxynT3tjgjOkOD34uDkY=; b=nPcqnMDrvygyvt8lvty70KjBk+RKdOxjICJFE+En09puJEQlV+ejGNJDEEOhFcdiojklvTQk5vOGYmY5XshL7oUZea30Nhm7NpOGm8Y9+95tGZGW8w19LmypcFKVcq6kygV5Y8CgpLo/2S6HccU5s8nPUJ3uLi0RniLHPNpMYgw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=jan.kiszka@siemens.com; 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=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1757854816718330.18291041142504; Sun, 14 Sep 2025 06:00:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uxmIR-0004ZO-9s; Sun, 14 Sep 2025 08:57:36 -0400 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 1uxmID-0004WY-I3 for qemu-devel@nongnu.org; Sun, 14 Sep 2025 08:57:23 -0400 Received: from mta-65-227.siemens.flowmailer.net ([185.136.65.227]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uxmI1-0002Np-0r for qemu-devel@nongnu.org; Sun, 14 Sep 2025 08:57:21 -0400 Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 20250914124650bc210655fb000207c7 for ; Sun, 14 Sep 2025 14:46:50 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=jan.kiszka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=n8i+jjUuq9cfattAVJFgrNhUxynT3tjgjOkOD34uDkY=; b=osKkD7BvZe/E3+4t21PhajP+vgI8vqnhmbLgmXVjPiREFDL7ltqjRxajTiU1BJg/1hD6P1 wJd/287gPp6oH9Tvf8fE7C8fO0RQCKqpYvXOiEl8dnBW7A45Cl7yz3uMDXmqt6RGxlE/kc2v 59svawZfGoOZ4GMEjj78IUuoG/Ov55uDPTuaG3W9+L0Glem6Ps0ViHrUXLN5WB8i512UI8La DE71svJ60QwGPhEA53r4CWVA+03vlKNaTpPCQG04TIuHLJuT7jM9VuRKqebulD+Yf6Wc5V3O TW+yNjjADrs5F266zMDJHQHCOLi3FV4bt65uWjC/Id57VfmoG+dHWmbA==; From: Jan Kiszka To: qemu-devel Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bin Meng , qemu-block@nongnu.org, Ilias Apalodimas , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Jan=20L=C3=BCbbe?= , Jerome Forissier Subject: [PATCH v4 6/6] docs: Add eMMC device model description Date: Sun, 14 Sep 2025 14:46:46 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer 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=185.136.65.227; envelope-from=fm-294854-20250914124650bc210655fb000207c7-yjyGvZ@rts-flowmailer.siemens.com; helo=mta-65-227.siemens.flowmailer.net X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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 jan.kiszka@siemens.com) X-ZM-MESSAGEID: 1757854819008116600 From: Jan Kiszka Signed-off-by: Jan Kiszka Reviewed-by: Alex Benn=C3=A9e --- docs/system/device-emulation.rst | 1 + docs/system/devices/emmc.rst | 52 ++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 docs/system/devices/emmc.rst diff --git a/docs/system/device-emulation.rst b/docs/system/device-emulatio= n.rst index 911381643f..36429b1d17 100644 --- a/docs/system/device-emulation.rst +++ b/docs/system/device-emulation.rst @@ -101,3 +101,4 @@ Emulated Devices devices/canokey.rst devices/usb-u2f.rst devices/igb.rst + devices/emmc.rst diff --git a/docs/system/devices/emmc.rst b/docs/system/devices/emmc.rst new file mode 100644 index 0000000000..dbea6d6c7e --- /dev/null +++ b/docs/system/devices/emmc.rst @@ -0,0 +1,52 @@ +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +eMMC Emulation +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +Besides SD card emulation, QEMU also offers an eMMC model as found on many +embedded boards. An eMMC, just like an SD card, is connected to the machine +via an SDHCI controller. + +Create eMMC Images +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +A recent eMMC consists of 4 partitions: 2 boot partitions, 1 Replay protec= ted +Memory Block (RPMB), and the user data area. QEMU expects backing images f= or +the eMMC to contain those partitions concatenated in exactly that order. +However, the boot partitions as well as the RPMB might be absent if their = sizes +are configured to zero. + +The eMMC specification defines alignment constraints for the partitions. T= he +two boot partitions must be of the same size. Furthermore, boot and RPMB +partitions must be multiples of 128 KB with a maximum of 32640 KB for each +boot partition and 16384K for the RPMB partition. + +The alignment constrain of the user data area depends on its size. Up to 2 +GByte, the size must be a power of 2. From 2 GByte onward, the size has to= be +multiples of 512 byte. + +QEMU is enforcing those alignment rules before instantiating the device. +Therefore, the provided image has to strictly follow them as well. The hel= per +script `scripts/mkemmc.sh` can be used to create compliant images, with or +without pre-filled partitions. E.g., to create an eMMC image from a firmwa= re +image and an OS image with an empty 2 MByte RPMB, use the following comman= d: + +.. code-block:: console + + scripts/mkemmc.sh -b firmware.img -r /dev/zero:2MB os.img emmc.img + +This will take care of rounding up the partition sizes to the next valid v= alue +and will leave the RPMB and the second boot partition empty (zeroed). + +Adding eMMC Devices +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +An eMMC is either automatically created by a machine model (e.g. Aspeed bo= ards) +or can be user-created when using a PCI-attached SDHCI controller. To +instantiate the eMMC image from the example above while assuming that the +firmware needs a boot partitions of 1 MB, use the following options: + +.. code-block:: console + + -drive file=3Demmc.img,if=3Dnone,format=3Draw,id=3Demmc-img + -device sdhci-pci + -device emmc,drive=3Demmc-img,boot-partition-size=3D1048576,rpmb-parti= tion-size=3D2097152 --=20 2.51.0