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 6B645C433F5 for ; Sat, 5 Feb 2022 20:20:02 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7FA9383B88; Sat, 5 Feb 2022 21:19:52 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=google.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; unprotected) header.d=google.com header.i=@google.com header.b="SsPbRBns"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3BA3F83B76; Sat, 5 Feb 2022 21:17:53 +0100 (CET) Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) (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 0D1EF83B84 for ; Sat, 5 Feb 2022 21:17:50 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=3bNv-YQcKBjUdfiZkqWXffXcV.Tfdl-SffkcZjkj.UVeo.UV@flex--moritzf.bounces.google.com Received: by mail-yb1-xb4a.google.com with SMTP id k30-20020a25b29e000000b0061cee9079e5so10409881ybj.22 for ; Sat, 05 Feb 2022 12:17:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=LXyqvBjc2Cu96GHgaUVs+rQJQZFWQdflvf21TJ/Edws=; b=SsPbRBnso0tgu7EsQ/+bCUe2+rJRnZMkmCQhz6GXi5peDp6IReSPfxJPs7AsznIxUd 1QEBGxzzCjtOeXCVXztmP9Wa8M0iu+kInJpVTueh9xVxCMrjT0iz3qDvUxETmxsf0tlZ cT9dX+tXYy+OTHiKW3g3k7mUQR5DgVW6cgM19ck0qtulLQURocGUh1K7WCJWc9svcIcJ W3xeQqrpO7fvqhHtBsxBet2bF+4s9uNRTm8FDAaX8hkpVRsAxE3ya5BQj07Omv4+tHo4 5GeYb8n3HKVTrG1XxPPO0hDJQkVcXDKIYe10Lj2pTEiN6yNusHzgzJ9xqIXLz9f+aBin VCaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=LXyqvBjc2Cu96GHgaUVs+rQJQZFWQdflvf21TJ/Edws=; b=02fS7nsu4Aobwo5aQ0vdIqMZFP6GKLjnwM4iDAVw7U6N4T0aYS1B9MxmXynXvX9wd+ VEEXq2c9JRGxrNO5/5haZ86v6yhjW+6Uwi/nfwr7MiNM8yZgnsW+tIJT8qLrgqd23cuv sEmtccAurUp7qVqc3RlgsfRuseWP6UxvUHrlkgYP1Y/98TBQ7VmiJWdJ1XRpJA1uY0YW i/BS9OdcHKzyMBsgBP7VUGghptMkoCg8kCEoUjILjYt+c6//BOLBtNtDcKZa3jVOgpp9 qKK6lX9X0XPfrtSAKmYfI9Gd2Sg6msJ4FIK4ZNmMfdQOcyXCeEBYP+Kp2u6yxC4kGkzF 8gEw== X-Gm-Message-State: AOAM530VT4KpXQr99wjDwwLDlV8ox4FSDWt1cyxYR4YaKBpP14nD7HNV fpqcY23yv3yWJaYFrsb6JWOJJLO89A8FyUCes9/W+kRExAWwu2FygWcidSWMAERtw8dTw9ACWyO zqeHhEMwZuZFg+PuguiMb5J16SxycPtYG0FqgqQ0Mp76VxQL3Ng+ech7KNfdhPg== X-Google-Smtp-Source: ABdhPJyBss8fkyhl6nlvcG9vu31obRp+R0KkUQZvpGrFuA8WmB4rx5YJxDAVOQwk79qpBxBYDctGA25iQfc3 X-Received: from morats.c.googlers.com ([fda3:e722:ac3:cc00:14:4d90:c0a8:6c]) (user=moritzf job=sendgmr) by 2002:a25:3748:: with SMTP id e69mr1919406yba.738.1644092268749; Sat, 05 Feb 2022 12:17:48 -0800 (PST) Date: Sat, 5 Feb 2022 12:17:45 -0800 In-Reply-To: <20220205201745.1059029-1-moritzf@google.com> Message-Id: <20220205201745.1059029-2-moritzf@google.com> Mime-Version: 1.0 References: <20220205201745.1059029-1-moritzf@google.com> X-Mailer: git-send-email 2.35.0.263.gb82422642f-goog Subject: [PATCH 2/2] acpi: Move MCFG implementation to common lib From: Moritz Fischer To: u-boot@lists.denx.de Cc: sjg@chromium.org, bmeng.cn@gmail.com, andriy.shevchenko@linux.intel.com, Moritz Fischer Content-Type: text/plain; charset="UTF-8" X-Mailman-Approved-At: Sat, 05 Feb 2022 21:19:49 +0100 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.5 at phobos.denx.de X-Virus-Status: Clean MCFG tables are used on multiple arches. Move to common ACPI lib. Cc: Simon Glass Signed-off-by: Moritz Fischer --- arch/x86/cpu/intel_common/acpi.c | 15 +++++--- arch/x86/cpu/tangier/acpi.c | 11 ++++-- arch/x86/include/asm/acpi_table.h | 1 - arch/x86/lib/acpi_table.c | 54 -------------------------- lib/acpi/Makefile | 1 + lib/acpi/mcfg.c | 64 +++++++++++++++++++++++++++++++ 6 files changed, 81 insertions(+), 65 deletions(-) create mode 100644 lib/acpi/mcfg.c diff --git a/arch/x86/cpu/intel_common/acpi.c b/arch/x86/cpu/intel_common/acpi.c index 15f19da206..d94ec208f6 100644 --- a/arch/x86/cpu/intel_common/acpi.c +++ b/arch/x86/cpu/intel_common/acpi.c @@ -31,14 +31,17 @@ #include #include -u32 acpi_fill_mcfg(u32 current) +int acpi_fill_mcfg(struct acpi_ctx *ctx) { + size_t size; + /* PCI Segment Group 0, Start Bus Number 0, End Bus Number is 255 */ - current += acpi_create_mcfg_mmconfig((void *)current, - CONFIG_MMCONF_BASE_ADDRESS, 0, 0, - (CONFIG_SA_PCIEX_LENGTH >> 20) - - 1); - return current; + size = acpi_create_mcfg_mmconfig((void *)ctx->current, + CONFIG_MMCONF_BASE_ADDRESS, 0, 0, + (CONFIG_SA_PCIEX_LENGTH >> 20) - 1); + acpi_inc(ctx, size); + + return 0; } static int acpi_sci_irq(void) diff --git a/arch/x86/cpu/tangier/acpi.c b/arch/x86/cpu/tangier/acpi.c index 12f9289612..e3a2fcea76 100644 --- a/arch/x86/cpu/tangier/acpi.c +++ b/arch/x86/cpu/tangier/acpi.c @@ -68,14 +68,17 @@ u32 acpi_fill_madt(u32 current) return current; } -u32 acpi_fill_mcfg(u32 current) +int acpi_fill_mcfg(struct acpi_ctx *ctx) { + size_t size; + /* TODO: Derive parameters from SFI MCFG table */ - current += acpi_create_mcfg_mmconfig - ((struct acpi_mcfg_mmconfig *)current, + size = acpi_create_mcfg_mmconfig + ((struct acpi_mcfg_mmconfig *)ctx->current, MCFG_BASE_ADDRESS, 0x0, 0x0, 0x0); + acpi_inc(ctx, size); - return current; + return 0; } static u32 acpi_fill_csrt_dma(struct acpi_csrt_group *grp) diff --git a/arch/x86/include/asm/acpi_table.h b/arch/x86/include/asm/acpi_table.h index 0d07f7cad8..39547de0d4 100644 --- a/arch/x86/include/asm/acpi_table.h +++ b/arch/x86/include/asm/acpi_table.h @@ -34,7 +34,6 @@ int acpi_create_madt_lapic_nmi(struct acpi_madt_lapic_nmi *lapic_nmi, u32 acpi_fill_madt(u32 current); int acpi_create_mcfg_mmconfig(struct acpi_mcfg_mmconfig *mmconfig, u32 base, u16 seg_nr, u8 start, u8 end); -u32 acpi_fill_mcfg(u32 current); /** * acpi_write_hpet() - Write out a HPET table diff --git a/arch/x86/lib/acpi_table.c b/arch/x86/lib/acpi_table.c index 753bf39619..c5b33dc65d 100644 --- a/arch/x86/lib/acpi_table.c +++ b/arch/x86/lib/acpi_table.c @@ -161,28 +161,6 @@ int acpi_write_madt(struct acpi_ctx *ctx, const struct acpi_writer *entry) } ACPI_WRITER(5x86, NULL, acpi_write_madt, 0); -int acpi_create_mcfg_mmconfig(struct acpi_mcfg_mmconfig *mmconfig, u32 base, - u16 seg_nr, u8 start, u8 end) -{ - memset(mmconfig, 0, sizeof(*mmconfig)); - mmconfig->base_address_l = base; - mmconfig->base_address_h = 0; - mmconfig->pci_segment_group_number = seg_nr; - mmconfig->start_bus_number = start; - mmconfig->end_bus_number = end; - - return sizeof(struct acpi_mcfg_mmconfig); -} - -__weak u32 acpi_fill_mcfg(u32 current) -{ - current += acpi_create_mcfg_mmconfig - ((struct acpi_mcfg_mmconfig *)current, - CONFIG_PCIE_ECAM_BASE, 0x0, 0x0, 255); - - return current; -} - /** * acpi_create_tcpa() - Create a TCPA table * @@ -480,38 +458,6 @@ int acpi_write_gnvs(struct acpi_ctx *ctx, const struct acpi_writer *entry) } ACPI_WRITER(4gnvs, "GNVS", acpi_write_gnvs, 0); -/* MCFG is defined in the PCI Firmware Specification 3.0 */ -int acpi_write_mcfg(struct acpi_ctx *ctx, const struct acpi_writer *entry) -{ - struct acpi_table_header *header; - struct acpi_mcfg *mcfg; - u32 current; - - mcfg = ctx->current; - header = &mcfg->header; - - current = (u32)mcfg + sizeof(struct acpi_mcfg); - - memset(mcfg, '\0', sizeof(struct acpi_mcfg)); - - /* Fill out header fields */ - acpi_fill_header(header, "MCFG"); - header->length = sizeof(struct acpi_mcfg); - header->revision = 1; - - current = acpi_fill_mcfg(current); - - /* (Re)calculate length and checksum */ - header->length = current - (u32)mcfg; - header->checksum = table_compute_checksum(mcfg, header->length); - - acpi_inc(ctx, mcfg->header.length); - acpi_add_table(ctx, mcfg); - - return 0; -} -ACPI_WRITER(5mcfg, "MCFG", acpi_write_mcfg, 0); - /** * acpi_write_hpet() - Write out a HPET table * diff --git a/lib/acpi/Makefile b/lib/acpi/Makefile index f9b504988f..956b5a0d72 100644 --- a/lib/acpi/Makefile +++ b/lib/acpi/Makefile @@ -11,6 +11,7 @@ obj-y += acpi_writer.o ifndef CONFIG_QEMU obj-y += base.o obj-y += csrt.o +obj-y += mcfg.o # Sandbox does not build a .asl file ifndef CONFIG_SANDBOX diff --git a/lib/acpi/mcfg.c b/lib/acpi/mcfg.c new file mode 100644 index 0000000000..2231e25124 --- /dev/null +++ b/lib/acpi/mcfg.c @@ -0,0 +1,64 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Write an ACPI MCFG table + * + * Copyright 2022 Google LLC + */ + +#define LOG_CATEGORY LOGC_ACPI + +#include +#include +#include +#include +#include + +int acpi_create_mcfg_mmconfig(struct acpi_mcfg_mmconfig *mmconfig, u32 base, + u16 seg_nr, u8 start, u8 end) +{ + memset(mmconfig, 0, sizeof(*mmconfig)); + mmconfig->base_address_l = base; + mmconfig->base_address_h = 0; + mmconfig->pci_segment_group_number = seg_nr; + mmconfig->start_bus_number = start; + mmconfig->end_bus_number = end; + + return sizeof(struct acpi_mcfg_mmconfig); +} + +__weak int acpi_fill_mcfg(struct acpi_ctx *ctx) +{ + return -ENOENT; +} + +/* MCFG is defined in the PCI Firmware Specification 3.0 */ +int acpi_write_mcfg(struct acpi_ctx *ctx, const struct acpi_writer *entry) +{ + struct acpi_table_header *header; + struct acpi_mcfg *mcfg; + int ret; + + mcfg = ctx->current; + header = &mcfg->header; + + memset(mcfg, '\0', sizeof(struct acpi_mcfg)); + + /* Fill out header fields */ + acpi_fill_header(header, "MCFG"); + header->length = sizeof(struct acpi_mcfg); + header->revision = 1; + acpi_inc(ctx, sizeof(*header)); + + ret = acpi_fill_mcfg(ctx); + if (ret) + return log_msg_ret("fill", ret); + + /* (Re)calculate length and checksum */ + header->length = (ulong)ctx->current - (ulong)mcfg; + header->checksum = table_compute_checksum(mcfg, header->length); + + acpi_add_table(ctx, mcfg); + + return 0; +} +ACPI_WRITER(5mcfg, "MCFG", acpi_write_mcfg, 0); -- 2.35.0.263.gb82422642f-goog