From patchwork Tue Jul 16 18:41:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 812794 Delivered-To: patch@linaro.org Received: by 2002:a5d:42c4:0:b0:367:895a:4699 with SMTP id t4csp447226wrr; Tue, 16 Jul 2024 11:43:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXa4YaOP2q5QBrFd4/GgRNNF18RakAULlj9zm0/aT9DgpGgr05rBD5e5DbgSbkoc219K8TOlu3/nRIiZuRcfgzy X-Google-Smtp-Source: AGHT+IG5cbHpWsmhQGuLg2H/X9KtPfKxkXxtuZuW3sys3OknwYpsCmKnNTGJCld1wd8Vnc24Mz5m X-Received: by 2002:a05:620a:40d2:b0:79f:90:7d53 with SMTP id af79cd13be357-7a17b6786femr359426985a.23.1721155410747; Tue, 16 Jul 2024 11:43:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1721155410; cv=none; d=google.com; s=arc-20160816; b=Royz8xynsREa4kgns6QH5JLjuiXtPoxWkKgYdhdoRBRfp3KEdRiKzwvElcypEpDHGV svrNeMNYflmDbwialM279J6LMtLju7vlApQB/PFtK2XJwdLbXyMeBjJ9hvOdPC8F1SN8 xK4nA2piygjW7Neo6C05qHgBXFgy3IF7UcOb8nYk83b+4WCgHF/WcjLKVBEokEWlfYQK b7UiB2SkT0/j50ZJdXKv9C+e49e9ckfZlijuBjoHllVLoIy4hjkYUwFj7jmB30YJh4vI FaefuIqngB/Vp4KOAtWgSfZmAUf4UZnVBKQVNiwS5GkWD8LpxNwSkVtjO+Ul0PznWHvi IXOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=CwOgxVGDanFcrFU38J0jPymvkHnr/xX1CeOfYwqHvwc=; fh=akjfINPLr2Wxn1OxrSfD0sWqus3tlBlnA5tw3YdHy1I=; b=wZkYczPEFD+DWdapg7WfOgkzFSZQoP0OejffT/6uHbk3mv1cztmN9JaeDq/Rbr//Ce n0XFUd/ka9CFP3eEbj77rILkpgTavsLRwns2uXzf1ypsCH2W3LX/AgyxrCMqJ2SIzKwt sZUC9svaJ+wAN+D5RLweodG8AiMNLQT15NI6IhhuU2hozB3q9AZhrOpTIWW8sZFQy5pL Gziu4PPU6MpJp9SKuZtTFz0d9dzGHI27JaxxNHycZbEzM4Lq6/2hsH8N67fAMG5FH6Tf d5rmocInhNHHsLg6gTRV1r+/fk9BB8mswqy/EaoBVYY1LGVRmNCQefOrr86GGaqSiWeC YPlQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HI7YM5QX; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-44f5b81419esi84157711cf.614.2024.07.16.11.43.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Jul 2024 11:43:30 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HI7YM5QX; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sTn90-0005ge-AT; Tue, 16 Jul 2024 14:43:22 -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 1sTn8h-0004ry-9h for qemu-devel@nongnu.org; Tue, 16 Jul 2024 14:43:07 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sTn8f-0007Pf-BH for qemu-devel@nongnu.org; Tue, 16 Jul 2024 14:43:02 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-4266fd39527so43712535e9.1 for ; Tue, 16 Jul 2024 11:42:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1721155379; x=1721760179; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CwOgxVGDanFcrFU38J0jPymvkHnr/xX1CeOfYwqHvwc=; b=HI7YM5QX85G7zD1PnhD8mBQyzE4957XzccSlasNGnOtlF2XoNoQsKWSt5Qp2N9vAst 6WFVcOZzUjkCam4yCBdxGSYakAHPrq2XeVZV93YZ8gblhnjnvCFr9uPhtDyKMtn0FhH7 u3jX0isSltp/kPNYqMWdUMslLAkmaJzUVfo7aTTDiCy68FxOtypJpUd7tn/z70kGAtXK awPhTF8EzBEOH9Lo1XMAv5Krhv7wA4B+l2XIXCKwtf1BZ7Q0jTvWDnlwxrsZz1NusiZn 6n/nxlQBRfjt7qfCG123ITO9gUP8SJ6YCUmrw7FxEZ6NcumqpmctE+w7vJMoDCmYykQf NMyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721155379; x=1721760179; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CwOgxVGDanFcrFU38J0jPymvkHnr/xX1CeOfYwqHvwc=; b=AZTb5J4KMKIYVufU8ogq8ILffOxPhirNtdJM8/OrCgJ9SWp4+FPwfgS0MBfJWYeu0b LpQD2F5SMCUpkdoP+/fBFoXebHxdZ1lDCJyaMPsVjhnRpuYyGcUQv0fxL2sOThFJ7ZwW h6KbJL76B7Qc8oPKW0MY9lTYe+C+bpTRFnoiL2QpYwN0jV4zS1AynyLws5vaXmjUaOQz OhQMOIg1nBvd0Px/5NYH6dFk9X1WXdBO4447cQy1KK6GPZMMx29OUdX92j5IzOBq2X5y gtP1Dsrv0gOb7ub/JPwaWLVvuE6nLDxO0MeNbccufOXlIQF9PeRUdJD7Bkai014S2/sS 7Atg== X-Gm-Message-State: AOJu0YxnkiyaQSpv0H56Ied86WZLRjlfQDr6667h7OGgjLPXlxKx4hjE dn9PpkEfh3r/xca6l8N/8yc7lSwuddnVzC4q40PeTHumf+RmXfPPHxwvGBZVgFjkkOCV3p+BO4Z ouaQJ9w== X-Received: by 2002:a05:600c:4ed1:b0:426:6861:a1ab with SMTP id 5b1f17b1804b1-427ba73df6emr22806715e9.39.1721155378628; Tue, 16 Jul 2024 11:42:58 -0700 (PDT) Received: from localhost.localdomain ([176.187.209.82]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4279f239876sm174099075e9.3.2024.07.16.11.42.56 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 16 Jul 2024 11:42:58 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Joel Stanley , =?utf-8?q?C=C3=A9dric_Le_Goater?= , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PULL 11/11] hw/sd/sdcard: Support boot area in emmc image Date: Tue, 16 Jul 2024 20:41:44 +0200 Message-ID: <20240716184144.42463-12-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240716184144.42463-1-philmd@linaro.org> References: <20240716184144.42463-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Joel Stanley This assumes a specially constructed image: $ dd if=/dev/zero of=mmc-bootarea.img count=2 bs=1M $ dd if=u-boot-spl.bin of=mmc-bootarea.img conv=notrunc $ dd if=u-boot.bin of=mmc-bootarea.img conv=notrunc count=64 bs=1K $ cat mmc-bootarea.img obmc-phosphor-image.wic > mmc.img $ truncate --size 16GB mmc.img For now this still requires a mtd image to load the SPL: $ qemu-system-arm -M tacoma-bmc -nographic \ -global driver=sd-card,property=emmc,value=true \ -drive file=mmc.img,if=sd,index=2,format=raw Signed-off-by: Joel Stanley Signed-off-by: Cédric Le Goater Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20240712162719.88165-12-philmd@linaro.org> --- hw/sd/sd.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 1f16c16fd1..07cb97d88c 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -137,6 +137,7 @@ struct SDState { uint8_t spec_version; uint64_t boot_part_size; BlockBackend *blk; + uint8_t boot_config; const SDProto *proto; @@ -513,6 +514,9 @@ static void emmc_set_ext_csd(SDState *sd, uint64_t size) sd->ext_csd[EXT_CSD_CARD_TYPE] = 0b11; sd->ext_csd[EXT_CSD_STRUCTURE] = 2; sd->ext_csd[EXT_CSD_REV] = 3; + + /* Mode segment (RW) */ + sd->ext_csd[EXT_CSD_PART_CONFIG] = sd->boot_config; } static void emmc_set_csd(SDState *sd, uint64_t size) @@ -763,6 +767,40 @@ static uint32_t sd_blk_len(SDState *sd) return sd->blk_len; } +/* + * 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. + */ +static uint32_t sd_bootpart_offset(SDState *sd) +{ + bool partitions_enabled; + unsigned partition_access; + + if (!sd->boot_part_size || !sd_is_emmc(sd)) { + return 0; + } + + partitions_enabled = sd->ext_csd[EXT_CSD_PART_CONFIG] + & EXT_CSD_PART_CONFIG_EN_MASK; + if (!partitions_enabled) { + return 0; + } + + partition_access = sd->ext_csd[EXT_CSD_PART_CONFIG] + & EXT_CSD_PART_CONFIG_ACC_MASK; + switch (partition_access) { + case EXT_CSD_PART_CONFIG_ACC_DEFAULT: + return sd->boot_part_size * 2; + case EXT_CSD_PART_CONFIG_ACC_BOOT0: + return 0; + case EXT_CSD_PART_CONFIG_ACC_BOOT0 + 1: + return sd->boot_part_size * 1; + default: + g_assert_not_reached(); + } +} + static uint64_t sd_req_get_address(SDState *sd, SDRequest req) { uint64_t addr; @@ -795,6 +833,7 @@ static void sd_reset(DeviceState *dev) sect = 0; } size = sect << HWBLOCK_SHIFT; + size -= sd_bootpart_offset(sd); sect = sd_addr_to_wpnum(size) + 1; @@ -1003,6 +1042,7 @@ void sd_set_cb(SDState *sd, qemu_irq readonly, qemu_irq insert) static void sd_blk_read(SDState *sd, uint64_t addr, uint32_t len) { trace_sdcard_read_block(addr, len); + addr += sd_bootpart_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"); } @@ -1011,6 +1051,7 @@ static void sd_blk_read(SDState *sd, uint64_t addr, uint32_t len) static void sd_blk_write(SDState *sd, uint64_t addr, uint32_t len) { trace_sdcard_write_block(addr, len); + addr += sd_bootpart_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"); } @@ -2763,6 +2804,7 @@ static Property sd_properties[] = { static Property emmc_properties[] = { DEFINE_PROP_UINT64("boot-partition-size", SDState, boot_part_size, 0), + DEFINE_PROP_UINT8("boot-config", SDState, boot_config, 0x0), DEFINE_PROP_END_OF_LIST() };