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=1756706902; cv=none; d=zohomail.com; s=zohoarc; b=mtd3VQdz8zNLl4qTu9J0VLu2Eo8xEk/kO8AruFQAzBeT1kasup3vMNfsKk4moxh86/MiCC2SttdwqoJS1WqHpCgGDSVzg+p0DzHsyoHIvSwe+OvYfBF7bv+NvFiCQ5nUN7ysklSQ8hCbBUcgBHiE8ig96eX5uqPFPCKPqWslmSo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756706902; 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=UKrXuWkhhtDdfM61O1kYCBCKRtPDr2G+/JbT7cj8dUM=; b=B4qJsPIGTh4wpmt/txMUUqhsds5G4Lb881yapGlmM/OAfNzXJ9kVMAU7v5+xZFNeTdMl17AL697RFoVBSAtrgT+0kX6gkJqVKjkNaKUCrsvBtRXvYb19oSBe7meM04nZ+vreoQPrG5ghXQGirS86Cjtchz/5JpurGfZh5vgtnuE= 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 17567069028171000.9774771354938; Sun, 31 Aug 2025 23:08:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1usxh2-0003F7-Oj; Mon, 01 Sep 2025 02:07:04 -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 1usxgh-00039X-SY for qemu-devel@nongnu.org; Mon, 01 Sep 2025 02:06:43 -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 1usxgc-0001x0-Fa for qemu-devel@nongnu.org; Mon, 01 Sep 2025 02:06:43 -0400 Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 20250901055630ee0accfa81000207a1 for ; Mon, 01 Sep 2025 07:56:30 +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=UKrXuWkhhtDdfM61O1kYCBCKRtPDr2G+/JbT7cj8dUM=; b=iBRT2/fgwJh1HJ8bxSli7LKmPrloiASjhL8k8QXJ1TPF3iaCVXmNNJwzcguyI4Hkahy91n ZH+ZyBrqJ7LQvekJqTFoIqr1w6rCsb0Jg6rDpHPpVG1iagQ8+EeicKouSYlVCsmeeH425FJs BHDDkbh6Ha7Larq7PEDVa+jCoOF5uo5zA4C+50zkEqhqAofk+Qbnyr2szD/bUcBs93+cOd28 BQZRpfLjgtBMPXXdAhnDKK5wVBB5WGt8i4aBiuZDbEOHj+FRSqFan/jKYWyNF/A1n2jS4AlT ymz3fOfO6Njf+1EeJpradEK3S9ELiBcaN3ft8Na8PnDn5LXRH2QmufSw==; From: Jan Kiszka To: qemu-devel Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bin Meng , qemu-block@nongnu.org, Ilias Apalodimas Subject: [PATCH v2 1/8] hw/sd/sdcard: Fix size check for backing block image Date: Mon, 1 Sep 2025 07:56:21 +0200 Message-ID: <86217712232abd5152e7dfa98111f57b9b78d83b.1756706188.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-20250901055630ee0accfa81000207a1-nrUymq@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: 1756706906378124100 From: Jan Kiszka The power-of-2 rule applies to the user data area, not the complete block image. The latter can be concatenation of boot partition images and the user data. Signed-off-by: Jan Kiszka Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 8c290595f0..16aee210b4 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -2789,7 +2789,7 @@ static void sd_realize(DeviceState *dev, Error **errp) return; } =20 - blk_size =3D blk_getlength(sd->blk); + blk_size =3D blk_getlength(sd->blk) - sd->boot_part_size * 2; if (blk_size > 0 && !is_power_of_2(blk_size)) { int64_t blk_size_aligned =3D pow2ceil(blk_size); char *blk_size_str; --=20 2.43.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=1756706947; cv=none; d=zohomail.com; s=zohoarc; b=n+N7yeLgw9rCqYJDlLcazEl8XeFB9FTU/IENV2MqTnKjJGmm/wqrbRHer1DGCii6WwulWIfgmvod8ys+g956EJXE1Jwgj4/BlKxPmygrzL1mSwWgCmO5Sw+HWMD4TF8yK/k+EDv0aFrmvGMU1sSgcMXHGNWDX8Al7T1Ls4j1DFE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756706947; 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=G+jTwrh/Tv10lyU83TPYT5+VrS51epr9jsr352ZMXzk=; b=AKJ7JhDhRvCWkW2g4gTPkgTTCasvxumjT0cfuPlhayxnnVVz5HyKvdxDQIC9/ip7DhE/myDjHIRBEfTQM6mIk9tQaRri7ThQQBjfTfaRyXlYcYRf2K2XRcTSzpabkHUhOG9XsaEHLzIbxjP1xP9BeJ21BmyAOmYRII+ue3j16F4= 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 175670694748514.730659251641328; Sun, 31 Aug 2025 23:09:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1usxgq-0003BZ-Ix; Mon, 01 Sep 2025 02:06:52 -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 1usxgg-00038X-5q for qemu-devel@nongnu.org; Mon, 01 Sep 2025 02:06:42 -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 1usxgb-0001wv-Vo for qemu-devel@nongnu.org; Mon, 01 Sep 2025 02:06:41 -0400 Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 202509010556306f63e0863a000207c1 for ; Mon, 01 Sep 2025 07:56:30 +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=G+jTwrh/Tv10lyU83TPYT5+VrS51epr9jsr352ZMXzk=; b=rfa74Cdn2qGV3Vvfwn9ohPpVWzCtOSnqp0AbJsdQ1ppLkGklCbz28gbZG+hjz+KOIu7+7m x8HCTwL4QnPhoqHsqMVjZ3rLbup5JJasDkUf66Py+Zxymaw84kIdPZDaUU34HAWG2kJSJ0GM IDF/yBZW8u8nBtveK/GrXFJ0plXtkc0XBCQ53ddT8uEUUpcUszrKItCvbUro7CCnj8lnbIwm w26XxQ/32DM0ZJ3Nj2qIAUgRwmuchyjvPdldbNKFA0H/XkC23P4C2oC7JALK/YREtsXS9rn9 YrOmcmF8/a04txxEppqRG+4/5uewFDSBficWVMprGSILHY3idFxuuENw==; From: Jan Kiszka To: qemu-devel Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bin Meng , qemu-block@nongnu.org, Ilias Apalodimas Subject: [PATCH v2 2/8] hw/sd/sdcard: Add validation for boot-partition-size Date: Mon, 1 Sep 2025 07:56:22 +0200 Message-ID: <1fff448da042bdf8cff7733ce67cadff4c540f1d.1756706188.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-202509010556306f63e0863a000207c1-szNMmg@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: 1756706948806116600 Content-Type: text/plain; charset="utf-8" From: Jan Kiszka Make sure we are not silently rounding down or even wrapping around, causing inconsistencies with the provided image. Signed-off-by: Jan Kiszka Reviewed-by: Alex Benn=C3=A9e --- hw/sd/sd.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 16aee210b4..834392b0a8 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -2818,6 +2818,16 @@ static void sd_realize(DeviceState *dev, Error **err= p) } blk_set_dev_ops(sd->blk, &sd_block_ops, sd); } + if (sd->boot_part_size % (128 * KiB) || + sd->boot_part_size > 255 * 128 * KiB) { + char *size_str =3D size_to_str(sd->boot_part_size); + + error_setg(errp, "Invalid boot partition size: %s", size_str); + g_free(size_str); + error_append_hint(errp, + "The boot partition size must be multiples of 12= 8K" + "and not larger than 32640K.\n"); + } } =20 static void emmc_realize(DeviceState *dev, Error **errp) --=20 2.43.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=1756706944; cv=none; d=zohomail.com; s=zohoarc; b=N3D8nZUl8bPWVpU8PuT2CTCqfiCEAZnwgrdpPkymrJMbp6+20SkLoCDkHXAD9M71ucFz9O+Hmk0LOndcnst9SmF5MvYpNSwldY2ed7+8UIBACVD4VPUGSb+y9Pe0YWFTzQMbU51s8xKs9mJGGk2MzIHrhDHk1bM2U9KHzDwlBc8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756706944; 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=xFI1VA5/EHO61KzQO5OccwT8cCfNkw46hYpCrq2jLa0=; b=e8DprVVHygL0GU9hHfebnBSpwDeyKFTDpTcWN5142MtJ8+hnyTnmoWm3os1klaPe/h58WulTsH2S0Ec25DdiirIG4s9gbaFrcXDghZLx//wpD/owbn+0no3IORT5APo2htDbH1dWIAb17oGXEhNgM+vuI4NWmcwrDh9/tlXbeto= 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 1756706944165368.0073774391426; Sun, 31 Aug 2025 23:09:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1usxgt-0003Cy-R3; Mon, 01 Sep 2025 02:06:57 -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 1usxgg-00038f-8i for qemu-devel@nongnu.org; Mon, 01 Sep 2025 02:06:42 -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 1usxgb-0001ww-VT for qemu-devel@nongnu.org; Mon, 01 Sep 2025 02:06:41 -0400 Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 20250901055630fa224eee7e00020764 for ; Mon, 01 Sep 2025 07:56:30 +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=xFI1VA5/EHO61KzQO5OccwT8cCfNkw46hYpCrq2jLa0=; b=DZbkFIu/XR+YFaWYli1pZSlGD1o5uAptvsDtxY0sJsGx21Mblh1N1f15wcRsSoMfaSlbGz kum4AE0i/QaW4XqWPYPM2iRkQujd/ARcCvYW1WL+d7MnevwEEy8tpWEwjkT/QX70PB65gWLT /VSVOA+x8XqZIbcdm+mdKyUzWSlHbiuRGGUB4j7FJVrV1TidClXxADK8kNmNvyiJ8TBDk9v4 C5etNrWHtM8rLwfLVssbdKC0Yx3qEFat9lxU4pc9MkxANIDGklPhjkjb9o/X16zO5/UJ42mT YocV3ghIbFpLho9XNUUYgdVHHa4EFggS2RZG/nY91VDeRrdNHANlP7XQ==; From: Jan Kiszka To: qemu-devel Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bin Meng , qemu-block@nongnu.org, Ilias Apalodimas Subject: [PATCH v2 3/8] hw/sd/sdcard: Allow user-instantiated eMMC Date: Mon, 1 Sep 2025 07:56:23 +0200 Message-ID: <1f9b0ea005e49578ffcb6c6a5175d8b9af514a03.1756706188.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.228; envelope-from=fm-294854-20250901055630fa224eee7e00020764-mSyvn6@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, 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: 1756706944722116600 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 834392b0a8..8a4f58295b 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -2912,8 +2912,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.43.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=1756706874; cv=none; d=zohomail.com; s=zohoarc; b=WB0YPmguQqfM1zFK6l0LWYlJ5uC0fEn/DylMB4LKu98ma9iHj3ssySltcRlBXX1rb9sPfXJ1uZJI7oK6pqOPImKe88NdPvoPIqMpjubfdNR08hyMCxdZnO0zE61pVbI7ywaSkaxH5PpLShPdtjJFwypTG7DqAAafEQDb7m+tNls= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756706874; 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=e3EQT5gyoHqhFMBmKwgqxpylfFDp3FV32G6zJWOQZUw=; b=XphiPecSSNdqH234Ljs8r7lLdS1vlgEq2TOb5q5YRwPloWixBJc1v0aeegmMqv+nhyd65PNpN8auAeqByElpbyt40vC02Z30xia7PPwo8X2o+lpa1JiDySWwkDq0RKiIerQ2ZHL6r97tqhQWZr1uG6iyuP0Xs8hzynVn0WO7huQ= 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 1756706873479194.07979605513458; Sun, 31 Aug 2025 23:07:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1usxgh-00039F-S2; Mon, 01 Sep 2025 02:06: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 1usxge-00037s-Pd for qemu-devel@nongnu.org; Mon, 01 Sep 2025 02:06:40 -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 1usxgc-0001x1-3a for qemu-devel@nongnu.org; Mon, 01 Sep 2025 02:06:40 -0400 Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 2025090105563076d4b775c70002070e for ; Mon, 01 Sep 2025 07:56:31 +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=e3EQT5gyoHqhFMBmKwgqxpylfFDp3FV32G6zJWOQZUw=; b=avRtqdbv3M3zIVPaD3/VK73aonDaIC0V080MrB6BbGpXi40U8rE9DuS1wo8KHryj074eVM Szt1yNaccN97Ys4ZCeaTHsTTIcoG8/0MtMNKBKdZEhFsesMyIVu66pVhhj7ppX6nPTq6zt+d Hw3xaz23j0/EVhxXhFhWiLWkSGmyF4ETK+q6ZXjXts14jI2MqiaYso/qkK0hbm0ONrbFDzIY sqz0ELrMlPZYJ/6F3N8hdQEKOrieo+BZvKlNXnsGk1cEKX0Sgho4hKC0vXkCpXG+XIY8H6q6 mTV//j4zHwdE8sgS4uWKwOwn0tY6piPp/vMUXKt2pHiIbX0OXcZPsfIA==; From: Jan Kiszka To: qemu-devel Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bin Meng , qemu-block@nongnu.org, Ilias Apalodimas Subject: [PATCH v2 4/8] hw/sd/sdcard: Refactor sd_bootpart_offset Date: Mon, 1 Sep 2025 07:56:24 +0200 Message-ID: <66e9b07476aad61820c4f42f4f984cc90752ba5e.1756706188.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-2025090105563076d4b775c70002070e-hZtRxR@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=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: 1756706876186116600 From: Jan Kiszka This function provides the offset for any partition in the block image, not only the boot partitions, therefore rename it. Align the constant names with the numbering scheme in the standard and use constants for both boot partitions for consistency reasons. There is also no reason to return early if boot_part_size is zero because the existing code will provide the right value in that case as well. Signed-off-by: Jan Kiszka Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sd.c | 16 ++++++++-------- hw/sd/sdmmc-internal.h | 3 ++- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 8a4f58295b..b727a37d06 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -838,14 +838,14 @@ static uint32_t sd_blk_len(SDState *sd) =20 /* * This requires a disk image that has two boot partitions inserted at the - * beginning of it. The size of the boot partitions is the "boot-size" - * property. + * beginning of it, followed by an RPMB partition. The size of the boot + * partitions is the "boot-partition-size" property. */ -static uint32_t sd_bootpart_offset(SDState *sd) +static uint32_t sd_part_offset(SDState *sd) { unsigned partition_access; =20 - if (!sd->boot_part_size || !sd_is_emmc(sd)) { + if (!sd_is_emmc(sd)) { return 0; } =20 @@ -854,9 +854,9 @@ static uint32_t sd_bootpart_offset(SDState *sd) switch (partition_access) { case EXT_CSD_PART_CONFIG_ACC_DEFAULT: return sd->boot_part_size * 2; - case EXT_CSD_PART_CONFIG_ACC_BOOT0: + case EXT_CSD_PART_CONFIG_ACC_BOOT1: return 0; - case EXT_CSD_PART_CONFIG_ACC_BOOT0 + 1: + case EXT_CSD_PART_CONFIG_ACC_BOOT2: return sd->boot_part_size * 1; default: g_assert_not_reached(); @@ -1057,7 +1057,7 @@ static const VMStateDescription sd_vmstate =3D { static void sd_blk_read(SDState *sd, uint64_t addr, uint32_t len) { trace_sdcard_read_block(addr, len); - addr +=3D sd_bootpart_offset(sd); + addr +=3D sd_part_offset(sd); if (!sd->blk || blk_pread(sd->blk, addr, len, sd->data, 0) < 0) { fprintf(stderr, "sd_blk_read: read error on host side\n"); } @@ -1066,7 +1066,7 @@ static void sd_blk_read(SDState *sd, uint64_t addr, u= int32_t len) static void sd_blk_write(SDState *sd, uint64_t addr, uint32_t len) { trace_sdcard_write_block(addr, len); - addr +=3D sd_bootpart_offset(sd); + addr +=3D sd_part_offset(sd); if (!sd->blk || blk_pwrite(sd->blk, addr, len, sd->data, 0) < 0) { fprintf(stderr, "sd_blk_write: write error on host side\n"); } diff --git a/hw/sd/sdmmc-internal.h b/hw/sd/sdmmc-internal.h index 91eb5b6b2f..ce6bc4e6ec 100644 --- a/hw/sd/sdmmc-internal.h +++ b/hw/sd/sdmmc-internal.h @@ -116,7 +116,8 @@ DECLARE_OBJ_CHECKERS(SDState, SDCardClass, SDMMC_COMMON= , TYPE_SDMMC_COMMON) =20 #define EXT_CSD_PART_CONFIG_ACC_MASK (0x7) #define EXT_CSD_PART_CONFIG_ACC_DEFAULT (0x0) -#define EXT_CSD_PART_CONFIG_ACC_BOOT0 (0x1) +#define EXT_CSD_PART_CONFIG_ACC_BOOT1 (0x1) +#define EXT_CSD_PART_CONFIG_ACC_BOOT2 (0x2) =20 #define EXT_CSD_PART_CONFIG_EN_MASK (0x7 << 3) #define EXT_CSD_PART_CONFIG_EN_BOOT0 (0x1 << 3) --=20 2.43.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=1756706945; cv=none; d=zohomail.com; s=zohoarc; b=Fju8Lhzsv+MiXVHGBqQPF+1NuvwSfuMNTr3izp1+blqivc8oKNa8stQfvw8CMpQLPNZYbI4/GFe2rKD8XSutsil4kXyNeLKncGYf36BEEmuwH+/bEYR22Ym9Mq1HUUG00xkVzxQBEMlMpIcaPab7zcxPve279fpvgOnDJHs0YY8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756706945; 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=zVAlIC/4G4cGUuc0Mj35+MkgUXdFGx6aL73DxMqX5To=; b=nSFDI4qMhLP+31KY+yUEP3LNHO/Gid1g3fRwXM30s20bgXI1Ubj7rlnw1MPCpgWs+rCrjGTvpI1StrUk0VXjEROTZ8CAF4meaNZANzI6tFc4Jg/aNI2lJkFu3IfOdI/GZ4xoaEvC98D36Oxz88PW6B630xr1Daty7jkzhCV7NJI= 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 1756706945389985.0282714749901; Sun, 31 Aug 2025 23:09:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1usxgv-0003DQ-Pp; Mon, 01 Sep 2025 02:07:02 -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 1usxgj-0003Av-JS for qemu-devel@nongnu.org; Mon, 01 Sep 2025 02:06:47 -0400 Received: from mta-65-226.siemens.flowmailer.net ([185.136.65.226]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1usxgg-0001wy-Tl for qemu-devel@nongnu.org; Mon, 01 Sep 2025 02:06:45 -0400 Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 20250901055631ac09d2d6eb0002075c for ; Mon, 01 Sep 2025 07:56:31 +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=zVAlIC/4G4cGUuc0Mj35+MkgUXdFGx6aL73DxMqX5To=; b=er81pOm1sDOkEK3ZDd4WFM1y1cGgP/EoyQaVtlpKEoKZVkqXxw6ir/pIDgmEMH7MpEjzep +AtJIWdEL9sq5xasShw+QodK3VStjHJ3GRRsh//Qkx8jz8gBtAx5+HquCJw4qpG13YWwhWIU q2cpVdf/l8KjAKXnIHFZzTqL01sQA/rLYzdDnfY7y2rOTRidgTg4ksxMg+OhnQSgzY6PjD3s IzL8xVQ6ZVfS4NeWQW1u6QKFokidv0Or8uNpU4HVl++PIbP1TJYcYAmKlv0T8cVYseEbXXdH dfC6hVoCP72q6/fckal7FPyrFbXrxGEFDvM+bdV9mE3aRHL5HBAYpOcQ==; From: Jan Kiszka To: qemu-devel Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bin Meng , qemu-block@nongnu.org, Ilias Apalodimas Subject: [PATCH v2 5/8] hw/sd/sdcard: Add basic support for RPMB partition Date: Mon, 1 Sep 2025 07:56:25 +0200 Message-ID: <9002256fb0001067f073edab055d99c6dc42c0f4.1756706188.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.226; envelope-from=fm-294854-20250901055631ac09d2d6eb0002075c-XxRNdu@rts-flowmailer.siemens.com; helo=mta-65-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: 1756706947160116600 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 b727a37d06..7b4a48f822 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; @@ -511,7 +530,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; @@ -839,7 +860,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) { @@ -853,11 +875,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(); } @@ -896,7 +920,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; @@ -984,6 +1008,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; @@ -1050,6 +1102,7 @@ static const VMStateDescription sd_vmstate =3D { .subsections =3D (const VMStateDescription * const []) { &sd_ocr_vmstate, &emmc_extcsd_vmstate, + &emmc_rpmb_vmstate, NULL }, }; @@ -1072,6 +1125,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; @@ -1185,6 +1337,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; } @@ -2386,6 +2551,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)) { @@ -2435,7 +2601,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; @@ -2518,6 +2690,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 @@ -2561,7 +2734,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 @@ -2789,7 +2968,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 > 0 && !is_power_of_2(blk_size)) { int64_t blk_size_aligned =3D pow2ceil(blk_size); char *blk_size_str; @@ -2828,13 +3008,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 boot 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); } @@ -2851,6 +3041,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.43.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=1756706914; cv=none; d=zohomail.com; s=zohoarc; b=c0tcOK3DXev/Gij8/zXn3jdI2yjDJAsFRlsjlzgooae1tze+RwsTtOBDyP1JQ9+sFjaRgxosmLnS3OEPHEXtyY92vYAtrDxVlKSagcMoFJthulBfdV6HNrJqGdi2RoMIuJX5vc0YItwsri28OWy666qavPIq7SbXG6poANDWGUE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756706914; 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=nZs+NHAiWdhZBHbplOH5ZYJbBCMnmaq0QyMHL4r+xHM=; b=MfuLD8WfqJV8dRLILlxk1sTAHQOR1dMaXQPrdC/RlINcUvsEdS3tA+FxchYTmvAv8eGKJhSWaI/gbdgk0r5Ua2KJf9Ru5eawxZ4iB1Qvprly+3xVUrn2sAk+yVocjBqDSXhNgPTjTV99bQHwhLEoQrA25n/zFuuJIcU7+9jGz2o= 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 1756706913474512.7882071093533; Sun, 31 Aug 2025 23:08:33 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1usxgi-00039s-M3; Mon, 01 Sep 2025 02:06:44 -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 1usxge-00037v-Tn for qemu-devel@nongnu.org; Mon, 01 Sep 2025 02:06:40 -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 1usxgb-0001wx-Vy for qemu-devel@nongnu.org; Mon, 01 Sep 2025 02:06:40 -0400 Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 2025090105563123583e3955000207ce for ; Mon, 01 Sep 2025 07:56:31 +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=nZs+NHAiWdhZBHbplOH5ZYJbBCMnmaq0QyMHL4r+xHM=; b=FMLijawcCu81EiztfC9DYKPB+Y8D+oM63QWJYxaUrUIxx2d2RI3pmA+Sd+b8uQ8QCvenRw zguAx+7C0ho+QiqthAquUwAMMsqvNvlxF2mPjyXcH9qWk5g76LgtHXZ6joAhrKDWvnnu3CIj czaFgot9U0oRQ6Gv54K3/vlte8hC2YDTnaAne7iEu14HSSjL6mpt91rGZtZBIyCz7BzUWoMs znt0+R+zSOl6ailpQXb26p+IwiWbiVF71yVnvLkTrtnv4O/wHKYNUVZIvsCb9Fc+NNDCenHC aiGfCtppcrgtXAvyugTj2hprp/Y20CvqQ5KdYRLowJgFcO0G8+DYpC+A==; 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?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 6/8] crypto/hmac: Allow to build hmac over multiple qcrypto_gnutls_hmac_bytes[v] calls Date: Mon, 1 Sep 2025 07:56:26 +0200 Message-ID: <2d3539c247a6c323491a3821f0e5b6fc382a4686.1756706188.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.228; envelope-from=fm-294854-2025090105563123583e3955000207ce-C3inl0@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, 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: 1756706916498116600 From: Jan Kiszka If the buffers that should be considered for building the hmac are not available at the same time, the current API is unsuitable. Extend it so that passing a NULL pointer as result_len is used as indicator that further buffers will be passed in succeeding calls to qcrypto_gnutls_hmac_bytes[v]. Signed-off-by: Jan Kiszka Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 --- Cc: "Daniel P. Berrang=C3=A9" --- crypto/hmac-gcrypt.c | 4 +++- crypto/hmac-glib.c | 4 +++- crypto/hmac-gnutls.c | 4 +++- crypto/hmac-nettle.c | 4 +++- include/crypto/hmac.h | 12 ++++++++++++ 5 files changed, 24 insertions(+), 4 deletions(-) diff --git a/crypto/hmac-gcrypt.c b/crypto/hmac-gcrypt.c index 5273086eb9..e428d17479 100644 --- a/crypto/hmac-gcrypt.c +++ b/crypto/hmac-gcrypt.c @@ -121,7 +121,9 @@ qcrypto_gcrypt_hmac_bytesv(QCryptoHmac *hmac, return -1; } =20 - if (*resultlen =3D=3D 0) { + if (resultlen =3D=3D NULL) { + return 0; + } else if (*resultlen =3D=3D 0) { *resultlen =3D ret; *result =3D g_new0(uint8_t, *resultlen); } else if (*resultlen !=3D ret) { diff --git a/crypto/hmac-glib.c b/crypto/hmac-glib.c index ea80c8d1b2..b845133a05 100644 --- a/crypto/hmac-glib.c +++ b/crypto/hmac-glib.c @@ -104,7 +104,9 @@ qcrypto_glib_hmac_bytesv(QCryptoHmac *hmac, return -1; } =20 - if (*resultlen =3D=3D 0) { + if (resultlen =3D=3D NULL) { + return 0; + } else if (*resultlen =3D=3D 0) { *resultlen =3D ret; *result =3D g_new0(uint8_t, *resultlen); } else if (*resultlen !=3D ret) { diff --git a/crypto/hmac-gnutls.c b/crypto/hmac-gnutls.c index 822995505c..3c5bcbe80b 100644 --- a/crypto/hmac-gnutls.c +++ b/crypto/hmac-gnutls.c @@ -119,7 +119,9 @@ qcrypto_gnutls_hmac_bytesv(QCryptoHmac *hmac, return -1; } =20 - if (*resultlen =3D=3D 0) { + if (resultlen =3D=3D NULL) { + return 0; + } else if (*resultlen =3D=3D 0) { *resultlen =3D ret; *result =3D g_new0(uint8_t, *resultlen); } else if (*resultlen !=3D ret) { diff --git a/crypto/hmac-nettle.c b/crypto/hmac-nettle.c index dd5b2ab7a1..2cff7931e1 100644 --- a/crypto/hmac-nettle.c +++ b/crypto/hmac-nettle.c @@ -164,7 +164,9 @@ qcrypto_nettle_hmac_bytesv(QCryptoHmac *hmac, } } =20 - if (*resultlen =3D=3D 0) { + if (resultlen =3D=3D NULL) { + return 0; + } else if (*resultlen =3D=3D 0) { *resultlen =3D qcrypto_hmac_alg_map[hmac->alg].len; *result =3D g_new0(uint8_t, *resultlen); } else if (*resultlen !=3D qcrypto_hmac_alg_map[hmac->alg].len) { diff --git a/include/crypto/hmac.h b/include/crypto/hmac.h index da8a1e3ceb..af3d5f8feb 100644 --- a/include/crypto/hmac.h +++ b/include/crypto/hmac.h @@ -90,6 +90,12 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(QCryptoHmac, qcrypto_hmac_= free) * The memory referenced in @result must be released with a call * to g_free() when no longer required by the caller. * + * If @result_len is set to a NULL pointer, no result will be returned, and + * the hmac object can be used for further invocations of qcrypto_hmac_byt= es() + * or qcrypto_hmac_bytesv() until a non-NULL pointer is provided. This all= ows + * to build the hmac across memory regions that are not available at the s= ame + * time. + * * Returns: * 0 on success, -1 on error */ @@ -123,6 +129,12 @@ int qcrypto_hmac_bytesv(QCryptoHmac *hmac, * The memory referenced in @result must be released with a call * to g_free() when no longer required by the caller. * + * If @result_len is set to a NULL pointer, no result will be returned, and + * the hmac object can be used for further invocations of qcrypto_hmac_byt= es() + * or qcrypto_hmac_bytesv() until a non-NULL pointer is provided. This all= ows + * to build the hmac across memory regions that are not available at the s= ame + * time. + * * Returns: * 0 on success, -1 on error */ --=20 2.43.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=1756706873; cv=none; d=zohomail.com; s=zohoarc; b=YpHO08AC6N9Os8c1mFuLQj+LbfG8030zbYKjwDWoIpAIoLZl1v49LUevE0AAzoWjkTCoYLz2XTX5tiXzOoR7DJD3QwKL5wO01qTTiC+GgMsI3qfBwjim4jqfUq6oWEoiFPNHZ51b+BHaaPMJQQ++nbgzlyj5mH3wYB6eWcTqO14= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756706873; 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=V7KQGpWQzVrtiZ9vdXHJDLfedwP9JL7CMRLSHWdlRrg=; b=Y3E9FRgO8W7RN6nZrbxmN5n/qcHinvnk0eV3O8pKZLqlFMF4a9Ce/r6NzZ7avhuvYavb36EnVGsSI+auGjGS4mKwl/WDVzwdW/YUXz1gJQIwv4IgGjFdadoWqUmeDpis7AHDpwJE5zyfqUcjUfyAqtAbcimkApgigygG4NnIR3w= 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 1756706873370247.38449363994118; Sun, 31 Aug 2025 23:07:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1usxh2-0003Ev-Go; Mon, 01 Sep 2025 02:07:04 -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 1usxgj-0003As-Ia for qemu-devel@nongnu.org; Mon, 01 Sep 2025 02:06:47 -0400 Received: from mta-65-226.siemens.flowmailer.net ([185.136.65.226]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1usxgh-0001wz-MD for qemu-devel@nongnu.org; Mon, 01 Sep 2025 02:06:45 -0400 Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 20250901055632cede844f5a0002073b for ; Mon, 01 Sep 2025 07:56:32 +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=V7KQGpWQzVrtiZ9vdXHJDLfedwP9JL7CMRLSHWdlRrg=; b=l0SgWqC9rRrMK5y7O6OEt0dzaNy4nx/WOB1aze+72ngnBt+LYxc+IwdBK/spajZB4meyCa rMOBVFXacvU9bxXwIhCr9kn+QFPv4ugZFsvwy3TmClp47iX+WbjvcVzj59PwPH25X86Wgg8A I+zoFy3MwIq1Eximpy7wbgay0SkBYm/jOdZRyhmKVCFuOm9bk37KP5VbAaNEo2joXRku2FIq a4uEh7NorPNKIPA91FRWgFFLX9ZjbydQek9KccQ/E39liWhrP5z2jK4n5L8DnBWd+CP2ExNY tRjGE45ZlkLCjyrf2uPaGpT6RJMFIm1Y5eeunOBGjY4lSicRROW6uifA==; From: Jan Kiszka To: qemu-devel Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bin Meng , qemu-block@nongnu.org, Ilias Apalodimas Subject: [PATCH v2 7/8] hw/sd/sdcard: Handle RPMB MAC field Date: Mon, 1 Sep 2025 07:56:27 +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.226; envelope-from=fm-294854-20250901055632cede844f5a0002073b-YU_t0N@rts-flowmailer.siemens.com; helo=mta-65-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: 1756706878810124100 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 7b4a48f822..7ac73b8afa 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]; @@ -1125,6 +1127,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); @@ -1147,6 +1209,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 @@ -1158,6 +1231,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 */ @@ -1195,6 +1269,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; @@ -3100,6 +3179,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.43.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=1756706944; cv=none; d=zohomail.com; s=zohoarc; b=SO6uYg1ZumohDT5yHNSMmy0jAIqN55mMTQEZy3jdgIFAvCv3KSJJwHJ0D0f1NIaUfcN5OrWT+j2QQ6bfEW7kVGnUuOzegGDNcLKNteQmk990XaWxiN37ELHDWQ7cE6jf0SKparsAFQVXDohDm7Ib5XbC6V5FXQgELAMYeb52D2M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756706944; 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=JTU3BFmS3GSE4uH8eM/o4TaOK5XUVgQEjgYT59J0ET0=; b=hwxPANk1JPUHuPBekOt4irEswtMiM1dvKGukC12De5ivdWKuTvAT6aUNn6NgM96oYcgTcmmTpV+GjnrXSt1Djo9E1F+68tf1fYr1hiBf+N6hdMsZt6JgAUZ2IbnWnpz9qUdumEUHoUyg0IV8eLYLzp3T/94Vr6hiywm26KUViCw= 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 1756706944876837.6859668687305; Sun, 31 Aug 2025 23:09:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1usxgq-0003BF-K2; Mon, 01 Sep 2025 02:06:52 -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 1usxgi-00039j-15 for qemu-devel@nongnu.org; Mon, 01 Sep 2025 02:06:44 -0400 Received: from mta-64-227.siemens.flowmailer.net ([185.136.64.227]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1usxgc-0001xB-3K for qemu-devel@nongnu.org; Mon, 01 Sep 2025 02:06:43 -0400 Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 20250901055632efa9c6209000020776 for ; Mon, 01 Sep 2025 07:56:32 +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=JTU3BFmS3GSE4uH8eM/o4TaOK5XUVgQEjgYT59J0ET0=; b=Ls7GIhFFS2eXamz10t7Am6Lw5O6/i+FyGyISmYYbiFXrv5m2j+tsX3rGvuwvHckid7fx/u dFPceJKpGEi5wRDyCFKqEcefzVYciH88Yb5bTSZk7ovD+0p9H6R/eXdAS1Dj1I8mIpxoJTqd nDVlk3RXKgcG2TMSTPG5gx/8Bw5coFVCwK2YlXEvq4JxF1Eyl1kHTYa/17j6K8ZJXzhoj7Pg 8ZqUrphx7gC9sjmKa4UwRTFBJ1TBAc0djRf9kR157bdIV9uRI/hXSAVyyFDvfwdTBWTp7V+b Vu3b4AOvzx7vUFl4EG01v+5pQkI+go1jfXl+pXpk/GuCkM4fdGlH3ZWg==; From: Jan Kiszka To: qemu-devel Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Bin Meng , qemu-block@nongnu.org, Ilias Apalodimas Subject: [PATCH v2 8/8] scripts: Add helper script to generate eMMC block device images Date: Mon, 1 Sep 2025 07:56:28 +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.227; envelope-from=fm-294854-20250901055632efa9c6209000020776-D6TkCx@rts-flowmailer.siemens.com; helo=mta-64-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: 1756706947060116600 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 | 186 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 186 insertions(+) create mode 100755 scripts/mkemmc.sh diff --git a/scripts/mkemmc.sh b/scripts/mkemmc.sh new file mode 100755 index 0000000000..9e52cd5f32 --- /dev/null +++ b/scripts/mkemmc.sh @@ -0,0 +1,186 @@ +#!/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. If no SIZE is specified, the size of = USER_ING will" + echo "be used (rounded 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= _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() { + if [ "${4#*:}" =3D "$4" ]; then + if ! size=3D$(stat -L -c %s "$2" 2>/dev/null); then + echo "Missing $1 image '$2'." >&2 + exit 1 + fi + if [ "$3" =3D 128 ]; then + size=3D$(( (size + 128 * 1024 - 1) & ~(128 * 1024 - 1) )) + 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"${4#*:}" + 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 $2 image size." >&2 + exit 1 + fi + if [ "$3" =3D 128 ]; then + if [ $(( size & (128 * 1024 - 1) )) -ne 0 ]; then + echo "The $2 image size must be multiples of 128K." >&2 + exit 1 + fi + elif [ $(( size & (size - 1) )) -gt 0 ]; then + echo "The %2 image size must be power of 2." >&2 + exit 1 + fi + fi + echo $size +} + +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" 2 "$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) )) + dd if=3D"$bootimg1" of=3D"$outimg" conv=3Dsparse bs=3D128K count=3D$bl= ocks \ + status=3Dnone + 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) )) + 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 +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 via '-device emmc,boot-partition-size=3D$bootsz,rpmb-par= tition-size=3D$rpmbsz,drive=3D$outimg'" --=20 2.43.0