Received: by 2002:a17:504:3f1b:b0:1be9:327d:8ee3 with SMTP id x27csp621589njk; Tue, 16 Jul 2024 23:31:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUO//j+IQFQuWaZEFeJA/DNxV/CpOR8d2VLlz/C6afdb3/7KfuDT5q8q3t7YSsSlcsh3JmyT72QyJ2wqPHA6Cu8ktSJ/2jm X-Google-Smtp-Source: AGHT+IHEQMAIbV9TKsGU42u0TsB9cLShZ94bvx+09W1u9h27OMWgxSahbP99IP2Ezh+K2S94VyOJ X-Received: by 2002:a05:6102:5792:b0:48f:e7ee:8ea2 with SMTP id ada2fe7eead31-491599dca59mr906394137.25.1721197871211; Tue, 16 Jul 2024 23:31:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1721197871; cv=none; d=google.com; s=arc-20160816; b=bN7IDjaqbUx+uDrqRpc0RljzfrHsgtppyCmsWvjMVOj3dqalT7Cjo3dDyA64J/iUY+ s3Vite021/rjARjcFz5SSuFI3afMVDR/gwvgldeMx+UX4xOPtEtCkGPASkGRjXQF4NiZ 085MvObUsVeCeXzzszXUEIMEXJ0eizt5itMst3XqyqQN5cMjNp/mAHZlZbc5qfvGP171 GBj31zcxjBeDwwG8t/aioSaCZ+w+AE3wU63nABkcexG6i6Peh+qSWNjzsMWSZA6R8hFe ZrtefOaf6X26C8Hkpf8eRlxS1Q6q2ZwOsHZVBi82rSmOjtGOyxtY16bW0RzG7vLttDp3 AysQ== 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=0QZoUUVcnKJ2D/VFCs+20/ZqOIheN3b4TVFT74qsvEQ=; fh=pmKRfOPFN0ULs83IIygI07LSKzxt8irZuLBhP9+6oM8=; b=nJPi0aa9Wsob327mOnaqfqblzsIYfsR9jXZ08Ou+gPJo0x/7AiPrXeeF9LM71c+mOh 8LQcfRNob0Z4X4IQp5K40d1uzpkNnY/Oe2M9X71e8sfwwmvDaHv1ny2APJehcO67Ii1Y sHwBDnPuFANd4CGdyVxNeThNeL5Bz8C9wTDH/27T2rG8ZHf9yzS+cbURo+VghGm7KyyR nEH8OHpYZDS9rJJRO3Xre8ArAHSRu6Rb/9ov+X86DZb2C/J7PfhJ6DfVBzn1heLL8CWD 7xQZMrnGSE0jcf0be8wHVnTRqZedW5ewTWxnMiKy5aMRKpd40BA8oVW4lS/xH4xjMZmQ P6Ew==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=cARxa89h; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6b7956aee93si1338716d6.293.2024.07.16.23.31.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Jul 2024 23:31:11 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=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=@redhat.com header.s=mimecast20190719 header.b=cARxa89h; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sTyBo-0006BR-PB; Wed, 17 Jul 2024 02:31:00 -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 1sTyBi-0005jk-1m for qemu-arm@nongnu.org; Wed, 17 Jul 2024 02:30:54 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sTyBf-0002xE-V9 for qemu-arm@nongnu.org; Wed, 17 Jul 2024 02:30:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1721197850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0QZoUUVcnKJ2D/VFCs+20/ZqOIheN3b4TVFT74qsvEQ=; b=cARxa89hU17HmLAXnVqO4cQBUSRpel1Z+cThZgzSN2Yy+fUjRsMIWkAocqNt/qFUQakjoX u1x3RM6MpZHi6eCymctuRPy1zt7W+neHRvvNyJH80DzP6IGEd+8pw6mJx+EB5fHCmJ1DzW O0fqxjohAaW/NNsEKu+pmVVSibAwYM4= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-269-ooB9s5v6Oe625-IdIzcnwQ-1; Wed, 17 Jul 2024 02:30:46 -0400 X-MC-Unique: ooB9s5v6Oe625-IdIzcnwQ-1 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 5DC6A1955D4A; Wed, 17 Jul 2024 06:30:44 +0000 (UTC) Received: from corto.redhat.com (unknown [10.39.192.88]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1CF941955F65; Wed, 17 Jul 2024 06:30:39 +0000 (UTC) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: Andrew Jeffery , Joel Stanley , Steven Lee , Troy Lee , Jamin Lin , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Subject: [PATCH v2 2/8] aspeed: Load eMMC first boot area as a boot rom Date: Wed, 17 Jul 2024 08:30:16 +0200 Message-ID: <20240717063022.549849-3-clg@redhat.com> In-Reply-To: <20240717063022.549849-1-clg@redhat.com> References: <20240717063022.549849-1-clg@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Received-SPF: pass client-ip=170.10.129.124; envelope-from=clg@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@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-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org X-TUID: h9JWd5s4dKWo From: Cédric Le Goater The first boot area partition (64K) of the eMMC device should contain an initial boot loader (u-boot SPL). Load it as a ROM only if an eMMC device is available to boot from but no flash device is. Signed-off-by: Cédric Le Goater Reviewed-by: Andrew Jeffery Tested-by: Andrew Jeffery --- hw/arm/aspeed.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index 105b990233fa..756deb91efd1 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -364,6 +364,7 @@ static void aspeed_machine_init(MachineState *machine) AspeedMachineClass *amc = ASPEED_MACHINE_GET_CLASS(machine); AspeedSoCClass *sc; int i; + DriveInfo *emmc0 = NULL; bmc->soc = ASPEED_SOC(object_new(amc->soc_name)); object_property_add_child(OBJECT(machine), "soc", OBJECT(bmc->soc)); @@ -440,9 +441,8 @@ static void aspeed_machine_init(MachineState *machine) } if (bmc->soc->emmc.num_slots) { - sdhci_attach_drive(&bmc->soc->emmc.slots[0], - drive_get(IF_SD, 0, bmc->soc->sdhci.num_slots), - true); + emmc0 = drive_get(IF_SD, 0, bmc->soc->sdhci.num_slots); + sdhci_attach_drive(&bmc->soc->emmc.slots[0], emmc0, true); } if (!bmc->mmio_exec) { @@ -452,6 +452,8 @@ static void aspeed_machine_init(MachineState *machine) if (fmc0) { uint64_t rom_size = memory_region_size(&bmc->soc->spi_boot); aspeed_install_boot_rom(bmc, fmc0, rom_size); + } else if (emmc0) { + aspeed_install_boot_rom(bmc, blk_by_legacy_dinfo(emmc0), 64 * KiB); } } -- 2.45.2