Received: by 2002:a17:505:564d:b0:1be9:327d:8ee3 with SMTP id jl13csp382190njb; Wed, 3 Jul 2024 22:38:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVdtVt0NhqZ+ZRACuivvJVV1fDap+BXxRxqqSRMO+nGsemM7qExa5t7aIUJTqj6y3iTzSkJUGpa5NOsyp7ScmtA0zUAyN53 X-Google-Smtp-Source: AGHT+IGK2fi8n5jFOfFwTe+lNsmc425BKWdEUqAT4se1xu2a2/WTNqW1Uy154TGsL9dtRFcraimp X-Received: by 2002:a05:6214:248c:b0:6b5:e886:d8a9 with SMTP id 6a1803df08f44-6b5ed01ed52mr6882556d6.29.1720071488405; Wed, 03 Jul 2024 22:38:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720071488; cv=none; d=google.com; s=arc-20160816; b=djM/etfJAEG+E7K38R4xtXylVkOJiBRxp0zXvLXOmHSteDxZCtQm47QZsq0B4Cg5uo REby3stlw23eBY4aXPmCIHchF8CWUf23lorlHEusH95YaTVszZmlUO/Bx44BMmt/JMO4 qdtDaDcqDXnfodny9S5jYoNKPctL2QrtqKhYtVoPdTfrC2Ldx43hWF9IH41V7xUYaisQ gqkFronXfw4mI0PsHn+VyaGO22tl9v4s+HQOK3TKKt79FuhH/ZAfgZuAuxeOMSX8m2by U8BkyxV2OtinlMducbR0p2OrMr2TwbxcanY7L2kPhY/BeZ/7TTgLdeveTDkHGvAXvC9a ZeeA== 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=iVjUqdr0AgE6YxFxS+iCOHZGEf9x6TZE1YkTRPXpF/w=; fh=pmKRfOPFN0ULs83IIygI07LSKzxt8irZuLBhP9+6oM8=; b=kelNHTKCjMKlV+YTQPgGgUxMK4bxmvhAqnYHE39afZ8v+Bf4SWiG4dOqM0u5YA6xe5 nX4/XugHxbB5sx41Orcdn9jPnRbDgDhzKdNKl41pA+dSQCmLJqHOUFuJjuWHOhGo1BzR iV+8YR9tT81kcjcXCzdIslhS72OTGkjHqxXTcv66HWf54IayaVGXvHhcjHtWsR7q+0eC bL+tsAaEHhx9Zz8SskmErAriMGAE71AiSN96Kas1+/U3Iuv3yBLLioRV5gNiZFYN4EUw HcsBGaQVxoLu7ICo2yne9hjk9syEAuFdzo7wf46oN16lMKIxM7RFrm62+M3rfXv5P4iv te5Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=fS4gVDz3; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-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-6b59e5eb323si142028456d6.324.2024.07.03.22.38.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 Jul 2024 22:38:08 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-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=fS4gVDz3; spf=pass (google.com: domain of qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-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 1sPF9l-0001qL-3H; Thu, 04 Jul 2024 01:37:21 -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 1sPF9i-0001pj-MN for qemu-devel@nongnu.org; Thu, 04 Jul 2024 01:37:18 -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 1sPF9g-00024z-8v for qemu-devel@nongnu.org; Thu, 04 Jul 2024 01:37:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1720071435; 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=iVjUqdr0AgE6YxFxS+iCOHZGEf9x6TZE1YkTRPXpF/w=; b=fS4gVDz3WWHTz++8k983B4NwhLhKlwFSEKg90phw3aoGt+NCR0QTVz8UhzM0EwGFSxbvLa 2tJ0EvqIHEtKthXXjU+bYG1L7RxUaDebG6udMW6Z9Tk+tqkSsOToXe/6codYBpL6N8+Jfn dtqgPs7EshtxsT/vxW3q/vTQ4bZnTuA= Received: from mx-prod-mc-04.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-643-NxOpUeD8M5OEN5hDs0g2NA-1; Thu, 04 Jul 2024 01:37:09 -0400 X-MC-Unique: NxOpUeD8M5OEN5hDs0g2NA-1 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7F40019560B0; Thu, 4 Jul 2024 05:37:07 +0000 (UTC) Received: from corto.redhat.com (unknown [10.39.192.90]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C5B08195607C; Thu, 4 Jul 2024 05:37:03 +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 2/8] aspeed: Load eMMC first boot area as a boot rom Date: Thu, 4 Jul 2024 07:36:45 +0200 Message-ID: <20240704053651.1100732-3-clg@redhat.com> In-Reply-To: <20240704053651.1100732-1-clg@redhat.com> References: <20240704053651.1100732-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.15 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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+alex.bennee=linaro.org@nongnu.org Sender: qemu-devel-bounces+alex.bennee=linaro.org@nongnu.org X-TUID: SOnZEBgl8b6x 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 --- 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