From nobody Fri May 17 11:05:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+112003+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+112003+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1701667119; cv=none; d=zohomail.com; s=zohoarc; b=BqBpQEMADNCYa2wslkJtbm53yQ05GS4nv/dSFxEOrSHg5XrjwaXYp5vpjHi1hb31SQ6s5Q2aegqg/eaQ381JxF10F0lytBDZnCy/UEImlEQbRwizNqzVpg+Fr2rusdDJXeQHkQosqWuXGtbJ09QtNKeq+tUceAwgtK4W3igO62o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1701667119; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=5zuqPN6vCvuOpS9cCz03cK6rPpdD3zBvPVG/Xi5wabI=; b=WL86yCQPqbO1Yj2CJWiKXU4/ozdaIpjz7H8cq61CTltSkBmbQztQozthqminabmjAeJ1LiZtKKGil5Yobma2bcGhV51O+21vpItgv2KXm38OGMIYRZmVNd/5899tzkryQ5LwgabIgaTHscHIE8hlmq4xks/rnYQwIQpvUXUpimM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+112003+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1701667119707880.0117605605411; Sun, 3 Dec 2023 21:18:39 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=WWI0zBoEXINyCH9aLpQVkIWovonbry+KnSgPnNmC1SA=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20140610; t=1701667119; v=1; b=KF+5Mr3AAAt4O7oPAViDOgqmmBlZfT/ht0xi1zhPOb50tjx9j2xCfyA6mC9bdM2Rj+FxAiYf j68gvlYEPDtIpR21PIV5v79nDW42LJah0VvNlBheFjjU7nthi1p1+mE72Xemt4fV+Hkd9rwTJbH YCsYFK0L1LxTBh8/Y8HETH50= X-Received: by 127.0.0.2 with SMTP id 3vpaYY1788612xI4oOz3wdVr; Sun, 03 Dec 2023 21:18:39 -0800 X-Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mx.groups.io with SMTP id smtpd.web10.62981.1701667118809143844 for ; Sun, 03 Dec 2023 21:18:38 -0800 X-Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-6cddc148285so4381069b3a.2 for ; Sun, 03 Dec 2023 21:18:38 -0800 (PST) X-Gm-Message-State: ZlACymWnnfU1R1VlUKBSVHMAx1787277AA= X-Google-Smtp-Source: AGHT+IFx6YP52EBbABWKwIuhkZaLsC99IzDEAeJ8m/B9JhZZ6UbSsRuHDvVTaS85OiI8hAouxdiuGw== X-Received: by 2002:aa7:9a45:0:b0:6cd:d639:b353 with SMTP id x5-20020aa79a45000000b006cdd639b353mr3801619pfj.18.1701667117981; Sun, 03 Dec 2023 21:18:37 -0800 (PST) X-Received: from dhaval.blr.rivosinc.com ([49.249.129.34]) by smtp.gmail.com with ESMTPSA id x31-20020a056a00189f00b006ce5c583c89sm186221pfh.15.2023.12.03.21.18.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Dec 2023 21:18:37 -0800 (PST) From: "Dhaval Sharma" To: devel@edk2.groups.io Cc: Liming Gao , Zhiguang Liu , Dandan Bi , chasel.chiu@intel.com Subject: [edk2-devel] [PATCH v4 1/1] MdeModulePkg/AcpiTableDxe: Prefer xDSDT over DSDT when installing tables Date: Mon, 4 Dec 2023 10:47:47 +0530 Message-Id: <20231204051747.63076-2-dhaval@rivosinc.com> In-Reply-To: <20231204051747.63076-1-dhaval@rivosinc.com> References: <20231204051747.63076-1-dhaval@rivosinc.com> MIME-Version: 1.0 Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,dhaval@rivosinc.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1701667122048100001 Content-Type: text/plain; charset="utf-8" As per ACPI Spec 6.5+ Table 5-9 if xDSDT is available, it should be used first. Handle required flow when xDSDT is absent or present. Test: Tested on RISCV64 Qemu platform with xDSDT and booted to linux kernel. Cc: Liming Gao Cc: Zhiguang Liu Cc: Dandan Bi Signed-off-by: Dhaval Sharma Acked-by: Chasel Chiu --- Notes: v4: - Fix typos and commit message adding more clarity to patch subject v3: - Added description of ACPI spec clarification based on which this patc= h is created - Optimizing if-else flow v2: - Added proper indentation for else if MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c | 23 ++++++++= ++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c b= /MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c index e09bc9b704f5..61af6047a2a7 100644 --- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c +++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c @@ -1892,14 +1892,23 @@ InstallAcpiTableFromHob ( } } =20 - if (((EFI_ACPI_3_0_FIXED_ACPI_DESCRIPTION_TABLE *)ChildTable)->Dsd= t !=3D 0) { + // + // First check if xDSDT is available, as that is preferred as per + // ACPI Spec 6.5+ Table 5-9 X_DSDT definition + // + if (((EFI_ACPI_3_0_FIXED_ACPI_DESCRIPTION_TABLE *)ChildTable)->XDs= dt !=3D 0) { + TableToInstall =3D (VOID *)(UINTN)((EFI_ACPI_3_0_FIXED_ACPI_DESC= RIPTION_TABLE *)ChildTable)->XDsdt; + } else if (((EFI_ACPI_3_0_FIXED_ACPI_DESCRIPTION_TABLE *)ChildTabl= e)->Dsdt !=3D 0) { TableToInstall =3D (VOID *)(UINTN)((EFI_ACPI_3_0_FIXED_ACPI_DESC= RIPTION_TABLE *)ChildTable)->Dsdt; - Status =3D AddTableToList (AcpiTableInstance, TableToIns= tall, TRUE, Version, TRUE, &TableKey); - if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "InstallAcpiTableFromHob: Fail to add ACP= I table DSDT\n")); - ASSERT_EFI_ERROR (Status); - break; - } + } else { + break; + } + + Status =3D AddTableToList (AcpiTableInstance, TableToInstall, TRUE= , Version, TRUE, &TableKey); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "InstallAcpiTableFromHob: Fail to add ACPI = table DSDT\n")); + ASSERT_EFI_ERROR (Status); + break; } } } --=20 2.39.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#112003): https://edk2.groups.io/g/devel/message/112003 Mute This Topic: https://groups.io/mt/102965684/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-