From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9416DD16260 for ; Mon, 14 Oct 2024 13:14:52 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6AE0189155; Mon, 14 Oct 2024 15:12:40 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=9elements.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; secure) header.d=9elements.com header.i=@9elements.com header.b="O232c9jJ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B8A6689135; Mon, 14 Oct 2024 15:12:38 +0200 (CEST) Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 7907C89130 for ; Mon, 14 Oct 2024 15:12:36 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=9elements.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=patrick.rudolph@9elements.com Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-4305413aec9so41507665e9.2 for ; Mon, 14 Oct 2024 06:12:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; t=1728911549; x=1729516349; darn=lists.denx.de; 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=cSf8VyxxdSz3eg+oyq0+Y4/Et9zURnoYgGiRCVkdOMU=; b=O232c9jJYZ5pOh8hnMUiDwflEXDI+gSQKF6CkDV18ns2Kt4IMKQXVur0B8pzyS1Zk6 sDVP5gtlWGIcKu2e+5s/jR8bWv5CQWSAxc2rmz0P8pqSyNyk8rNnX87XTGbfpzCHqfsq TWhL/khSlNaBvVG7ofscLGKALGtEAqlYqZxD4cELg0PSsqnM8JfjMry9FJw8qw1g4o/J RI7T5ja3DEsNZXnxUiqaPWG8yuykYAk3nPdvumVKi+L/m8lXt8738XdoOZ8YDvJl/3Bj GB0SsGLZh4x97zLoTwRZJfsPJRLaOsvD78dbnpg2gRgO66GalW9ScKCoWjI17L/0rb28 qK7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728911549; x=1729516349; 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=cSf8VyxxdSz3eg+oyq0+Y4/Et9zURnoYgGiRCVkdOMU=; b=YLRYa3npCf/Tq0qo4bs9VCnGk5I3py81WK64CvPvariiTJ44szI6LWNmNG8TSBeUDv viRDyFO3Pzz7rdH5YMEIbygt+Q+jTb3fZdsyFcon6sUu8egXzVbC6V+kQc2RMWu+y81a 9LMFtY/vXJS6o2FhtO0an/OHAccKU8nigbnUMJZkqnvMKKSg6W5oyEwCwi2aP9GP5s// Jybf+Hq6s0dJkyjsGx4XORemQU7+IhWM4aiv7RrYi0ae3l8QE3mpKrj++3xTz7HX3enP 8SYXVokHi4kYWyhULpatv468LiDpOtmU1PSUbJTxY9ftcWh+/vg7q9xzF6mJ/IyNS8Kh tIDw== X-Gm-Message-State: AOJu0Yx3cP38Qh+/m2U6SEZLvRki9vvDIN0VxgZQrRtD5v1HBdxdXEOP S3K+uNU/JB41YzGanLAc3xNL9knUSGr6/4i6waDiezzNnnqOaOUknMYFheonuyYcFMpudJIZ+yK F X-Google-Smtp-Source: AGHT+IGiK1mA5X3DLOD+J/msuzdW1C7BfU1cAfIOzR/vVgzUoSIXsHVzPmSE5RVG4z4F4NqxW/npYg== X-Received: by 2002:a05:600c:3501:b0:430:699b:7d22 with SMTP id 5b1f17b1804b1-4311df423e3mr100729635e9.26.1728911549199; Mon, 14 Oct 2024 06:12:29 -0700 (PDT) Received: from fedora.sec.9e.network (ip-037-049-067-221.um09.pools.vodafone-ip.de. [37.49.67.221]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37d605c197bsm7103718f8f.38.2024.10.14.06.12.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Oct 2024 06:12:28 -0700 (PDT) From: Patrick Rudolph To: u-boot@lists.denx.de, Simon Glass Cc: Patrick Rudolph , Tom Rini Subject: [PATCH v8 14/37] acpi: Allocate and write ACPI tables Date: Mon, 14 Oct 2024 15:10:30 +0200 Message-ID: <20241014131152.267405-15-patrick.rudolph@9elements.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241014131152.267405-1-patrick.rudolph@9elements.com> References: <20241014131152.267405-1-patrick.rudolph@9elements.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Allocate memory for ACPI tables in generic acpi code. When ACPI wasn't installed in other places, install the ACPI table using BLOBLISTs. This allows non x86 platforms to boot using ACPI only in case the EFI loader is being used, since EFI is necessary to advertise the location of the ACPI tables in memory. TEST: Booted QEMU SBSA (no QFW) using EFI and ACPI only. Signed-off-by: Patrick Rudolph Cc: Simon Glass Cc: Tom Rini --- Changelog v8: - Only use bloblist to store tables on arm --- lib/acpi/acpi_table.c | 66 +++++++++++++++++++++++++++++++- test/py/tests/test_event_dump.py | 1 + 2 files changed, 66 insertions(+), 1 deletion(-) diff --git a/lib/acpi/acpi_table.c b/lib/acpi/acpi_table.c index d6357bdc4d..e6ebffcf1b 100644 --- a/lib/acpi/acpi_table.c +++ b/lib/acpi/acpi_table.c @@ -5,8 +5,11 @@ * Copyright 2019 Google LLC */ -#include +#include #include +#include +#include +#include #include #include #include @@ -16,6 +19,14 @@ #include #include #include +#include +#include + +enum { + TABLE_SIZE = SZ_64K, +}; + +DECLARE_GLOBAL_DATA_PTR; /* * OEM_REVISION is 32-bit unsigned number. It should be increased only when @@ -752,3 +763,56 @@ static int acpi_write_iort(struct acpi_ctx *ctx, const struct acpi_writer *entry } ACPI_WRITER(5iort, "IORT", acpi_write_iort, 0); + +/* + * Allocate memory for ACPI tables and write ACPI tables to the + * allocated buffer. + * + * Return: status code + */ +static int alloc_write_acpi_tables(void) +{ + u64 table_end; + void *addr; + + if (IS_ENABLED(CONFIG_X86) || + IS_ENABLED(CONFIG_QFW_ACPI) || + IS_ENABLED(CONFIG_SANDBOX)) { + log_debug("Skipping writing ACPI tables as already done\n"); + return 0; + } + + if (!IS_ENABLED(CONFIG_BLOBLIST_TABLES)) { + log_debug("Skipping writing ACPI tables as BLOBLIST_TABLES is not selected\n"); + return 0; + } + + /* Align the table to a 4KB boundary to keep EFI happy */ + addr = bloblist_add(BLOBLISTT_ACPI_TABLES, TABLE_SIZE, + ilog2(SZ_4K)); + + if (!addr) + return log_msg_ret("mem", -ENOMEM); + + gd->arch.table_start_high = virt_to_phys(addr); + gd->arch.table_end_high = gd->arch.table_start_high + TABLE_SIZE; + + table_end = write_acpi_tables(gd->arch.table_start_high); + if (!table_end) { + log_err("Can't create ACPI configuration table\n"); + return -EINTR; + } + + log_debug("- wrote 'acpi' to %lx, end %llx\n", gd->arch.table_start_high, table_end); + if (table_end > gd->arch.table_end_high) { + log_err("Out of space for configuration tables: need %llx, have %x\n", + table_end - gd->arch.table_start_high, TABLE_SIZE); + return log_msg_ret("acpi", -ENOSPC); + } + + log_debug("- done writing tables\n"); + + return 0; +} + +EVENT_SPY_SIMPLE(EVT_LAST_STAGE_INIT, alloc_write_acpi_tables); diff --git a/test/py/tests/test_event_dump.py b/test/py/tests/test_event_dump.py index e282c67335..45143c1c7d 100644 --- a/test/py/tests/test_event_dump.py +++ b/test/py/tests/test_event_dump.py @@ -18,6 +18,7 @@ def test_event_dump(u_boot_console): -------------------- ------------------------------ ------------------------------ EVT_FT_FIXUP bootmeth_vbe_ft_fixup .*boot/vbe_request.c:.* EVT_FT_FIXUP bootmeth_vbe_simple_ft_fixup .*boot/vbe_simple_os.c:.* +EVT_LAST_STAGE_INIT alloc_write_acpi_tables .*lib/acpi/acpi_table.c:.* EVT_LAST_STAGE_INIT install_smbios_table .*lib/efi_loader/efi_smbios.c:.* EVT_MISC_INIT_F sandbox_early_getopt_check .*arch/sandbox/cpu/start.c:.* EVT_TEST h_adder_simple .*test/common/event.c:''' -- 2.46.2