Received: by 2002:a17:504:3f1b:b0:1be9:327d:8ee3 with SMTP id x27csp622296njk; Tue, 16 Jul 2024 23:33:13 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVfTd+id6w+9TqXM8pPZHHwmDQNyeDkxu7w+4z0LuTRAbwfK62V53B9QAhY3XpXgFEorhs/LF0hmY3KHfuEi3gnBlMlp5hr X-Google-Smtp-Source: AGHT+IGclyuS8HVQJA73RK114UlLPLZW5zEcml5QenTRcPK10O4HgNFI4Q99PZPnzUjv+dCgFM/Q X-Received: by 2002:a05:620a:2547:b0:79e:f932:7ca7 with SMTP id af79cd13be357-7a186eb69eamr123443885a.29.1721197993077; Tue, 16 Jul 2024 23:33:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1721197993; cv=none; d=google.com; s=arc-20160816; b=gvY+gIbmhJVleDzmpZarRcGatdoPPY1k8BP7voAehxfGh+ZrqTv0fQoBgxXlovwZGs UUpS7W/fU4TXw2P0JvTAQgf2xziCYCsZRHDgpsvRfy9wUQZ4kXG0dzbvDIlzXxE8neZs wDz3vPjaj8AsM+LMaIz5amURFYUqpDGd2EqlAu9v32KXSefZ3oK2dLiqVsvEs2j7XPT2 SPHX568KtFEnn4UMj9ocwgouFyxy8YpqkLroDqo4/lyL8F1ElQF1bKiM0bC8xzc5fu93 SuvmQfp/CtHT9UZgkdDIYRYBzzxwRaXRELFtib2IGzmtZFPI9FSS06sRYBarWTZIYpzO XGIQ== 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=tg878PEggQ9yjP8hwvC2hflD3G9fDs60xIb0uRWaszE=; fh=pmKRfOPFN0ULs83IIygI07LSKzxt8irZuLBhP9+6oM8=; b=CKegtK3AdqgaCrGkiX2pxSpuC7CwpzOCOods0P0AuZKGxANHm17cVZxT+fh2tyoZNp 3VHtA/go5sI/6FcO0VUWiznedHVH2BnwvJKkjGFgGeaiHX6nGY6wtFwya1Q+vpB6tBjy nRAoiEnausGX2PzSlkIJlkTUVgkhduQVjT12uZl1VDY5Y67YrzEy9afdTAfg2VjlxQg6 GepVdZ+ksSb6xxXgf0PppE0BBcWedR/KKUdbJAg+GSjA3urgllK+O9mU6Mo5+XjA4ZYK fFP7VlBgwgc3kSi5OIM6tUtnExFw7U2WFwu0P+64J847RLr3a/jcabsydn8k/+D1xhlA bqqA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=SSf3v7rX; 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 af79cd13be357-7a160c51577si919664885a.227.2024.07.16.23.33.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Jul 2024 23:33:13 -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=SSf3v7rX; 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 1sTyC1-0007JR-PI; Wed, 17 Jul 2024 02:31:13 -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 1sTyC0-000797-BV for qemu-devel@nongnu.org; Wed, 17 Jul 2024 02:31:12 -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 1sTyBy-00031G-Hl for qemu-devel@nongnu.org; Wed, 17 Jul 2024 02:31:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1721197869; 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=tg878PEggQ9yjP8hwvC2hflD3G9fDs60xIb0uRWaszE=; b=SSf3v7rXpQetKATst6ab8ta/JksW6f0b/bexKhimBvWH02yD8YhwUQNw/l+8bwubzmqFzI Zd+QFN+pkpWLR8w1X2FiYFRj4ALiOzQNqUO/PurtL782cJHyTooFXIZFt3Q5y2QE034VXQ kGRI3Mn4bkx7hZ45s1A3BSJEpdV1m9c= Received: from mx-prod-mc-03.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-387-mw6U6T1XOF2aY5gZCE7FXA-1; Wed, 17 Jul 2024 02:31:02 -0400 X-MC-Unique: mw6U6T1XOF2aY5gZCE7FXA-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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B4DD019560B6; Wed, 17 Jul 2024 06:31:00 +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 0092F19560B2; Wed, 17 Jul 2024 06:30:57 +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 5/8] aspeed: Tune eMMC device properties to reflect HW strapping Date: Wed, 17 Jul 2024 08:30:19 +0200 Message-ID: <20240717063022.549849-6-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-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: WbgFvSGL6nD5 From: Cédric Le Goater When the boot-from-eMMC HW strapping bit is set, use the 'boot-config' property to set the boot config register to boot from the first boot area partition of the eMMC device. Also set the boot partition size of the device. Signed-off-by: Cédric Le Goater Reviewed-by: Andrew Jeffery Tested-by: Andrew Jeffery --- hw/arm/aspeed.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index 756deb91efd1..bc4ca1754213 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -327,7 +327,8 @@ void aspeed_board_init_flashes(AspeedSMCState *s, const char *flashtype, } } -static void sdhci_attach_drive(SDHCIState *sdhci, DriveInfo *dinfo, bool emmc) +static void sdhci_attach_drive(SDHCIState *sdhci, DriveInfo *dinfo, bool emmc, + bool boot_emmc) { DeviceState *card; @@ -335,6 +336,11 @@ static void sdhci_attach_drive(SDHCIState *sdhci, DriveInfo *dinfo, bool emmc) return; } card = qdev_new(emmc ? TYPE_EMMC : TYPE_SD_CARD); + if (emmc) { + qdev_prop_set_uint64(card, "boot-partition-size", 1 * MiB); + qdev_prop_set_uint8(card, "boot-config", + boot_emmc ? 0x1 << 3 : 0x0); + } qdev_prop_set_drive_err(card, "drive", blk_by_legacy_dinfo(dinfo), &error_fatal); qdev_realize_and_unref(card, @@ -365,6 +371,7 @@ static void aspeed_machine_init(MachineState *machine) AspeedSoCClass *sc; int i; DriveInfo *emmc0 = NULL; + bool boot_emmc; bmc->soc = ASPEED_SOC(object_new(amc->soc_name)); object_property_add_child(OBJECT(machine), "soc", OBJECT(bmc->soc)); @@ -437,19 +444,21 @@ static void aspeed_machine_init(MachineState *machine) for (i = 0; i < bmc->soc->sdhci.num_slots; i++) { sdhci_attach_drive(&bmc->soc->sdhci.slots[i], - drive_get(IF_SD, 0, i), false); + drive_get(IF_SD, 0, i), false, false); } + boot_emmc = sc->boot_from_emmc(bmc->soc); + if (bmc->soc->emmc.num_slots) { emmc0 = drive_get(IF_SD, 0, bmc->soc->sdhci.num_slots); - sdhci_attach_drive(&bmc->soc->emmc.slots[0], emmc0, true); + sdhci_attach_drive(&bmc->soc->emmc.slots[0], emmc0, true, boot_emmc); } if (!bmc->mmio_exec) { DeviceState *dev = ssi_get_cs(bmc->soc->fmc.spi, 0); BlockBackend *fmc0 = dev ? m25p80_get_blk(dev) : NULL; - if (fmc0) { + if (fmc0 && !boot_emmc) { uint64_t rom_size = memory_region_size(&bmc->soc->spi_boot); aspeed_install_boot_rom(bmc, fmc0, rom_size); } else if (emmc0) { -- 2.45.2