From nobody Fri May 17 10:44:18 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+109137+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+109137+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1695883527; cv=none; d=zohomail.com; s=zohoarc; b=VyVlGUHJp/grGjhtrCRrS/MKQMN3wiQHrd+mSyj/9JPv8lbWhA6PlTutSJpBO/SM34MXn2LDPiedUMwle1IeJdJXzDNzzSk5B0XM1Pmu5/ctSZM0pnGaaGcpXItp5A6BahV47WHVZLXEmzz9nGxFGa7fi1RxpFz+RkeMGpOGDKM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695883527; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=ibIWnRdzpJWBY1C8BIOzSj/+ZdbbfOI7BN252hDYus8=; b=PF/JC7skebV5mXD7ApUQWkSeUqP53N/Ua8qchePe2eHkmIQtMTNKPS5V4BYdD7VJy8esaUCIvH1Gg07Hu/Qk0VMJe3SV5U/T4A9IXo7Z6Mumh55NOzDk+hM5o0I9lnL5/4orCsxn8kLCB77A6Buc2F+WRtnM8Z6A7NEMAZCt85Y= 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+109137+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1695883527051884.9532062699648; Wed, 27 Sep 2023 23:45:27 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=LV5NrVnkWSvOsoIfUMCNLQiTzlytg/baX4wD1eRd62g=; 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=1695883526; v=1; b=fY4rvmZufhvKA9cIvINfxyvT7pntSrSZLu1smjGVum3C7oNPmYuWgmztfHoymIs/lXdAjzt7 XqlDwTj6vGitK9iV3XwwEAsEP14/XwYbgIf3A7Gblh2b1xe1nDD4jWzQt9BhYOALHyRFY/0PQQ7 Vum0wKKcLJzLZdlRXsi2kSA8= X-Received: by 127.0.0.2 with SMTP id Sb4ZYY1788612xLA9neYjR7U; Wed, 27 Sep 2023 23:45:26 -0700 X-Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by mx.groups.io with SMTP id smtpd.web10.8498.1695883526038968935 for ; Wed, 27 Sep 2023 23:45:26 -0700 X-Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-27761d85b31so5937003a91.3 for ; Wed, 27 Sep 2023 23:45:25 -0700 (PDT) X-Gm-Message-State: bmB1BkuWyBZRxjt60jY78zUMx1787277AA= X-Google-Smtp-Source: AGHT+IGdb1XiF86yde9m26ht7HaRAA1F7xqXoEHgYOdvqmPRKW0Q0YHbKzRWB0JkovybSkOOv5cYAQ== X-Received: by 2002:a17:90b:390d:b0:269:621e:a673 with SMTP id ob13-20020a17090b390d00b00269621ea673mr316936pjb.1.1695883525238; Wed, 27 Sep 2023 23:45:25 -0700 (PDT) X-Received: from dhaval.blr.rivosinc.com ([49.249.129.34]) by smtp.gmail.com with ESMTPSA id n20-20020a17090a929400b00274ea190852sm12589741pjo.6.2023.09.27.23.45.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 23:45:24 -0700 (PDT) From: "Dhaval Sharma" To: devel@edk2.groups.io Cc: Jian J Wang , Liming Gao , Zhiguang Liu , Dandan Bi Subject: [edk2-devel] [PATCH v1 1/1] MdeModulePkg: Fix issue with ACPI table creation Date: Thu, 28 Sep 2023 12:15:16 +0530 Message-Id: <20230928064516.120236-2-dhaval@rivosinc.com> In-Reply-To: <20230928064516.120236-1-dhaval@rivosinc.com> References: <20230928064516.120236-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: 1695883527645100005 Content-Type: text/plain; charset="utf-8" As per spec if xDSDT is avaialble, it should be used first. Handle required flow when xDSDT is abscent or present. Test: Tested on RISCV64 Qemu platform with xDSDT and booted to linux kernel. Cc: Jian J Wang Cc: Liming Gao Cc: Zhiguang Liu Cc: Dandan Bi Signed-off-by: Dhaval Sharma --- MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c | 15 ++++++++= ++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c b= /MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c index e09bc9b704f5..d153c96a6bdb 100644 --- a/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c +++ b/MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableProtocol.c @@ -1892,7 +1892,20 @@ InstallAcpiTableFromHob ( } } =20 - if (((EFI_ACPI_3_0_FIXED_ACPI_DESCRIPTION_TABLE *)ChildTable)->Dsd= t !=3D 0) { + // + // First check if xDSDT is available that is preferred + // + 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; + Status =3D AddTableToList (AcpiTableInstance, TableToIns= tall, TRUE, Version, TRUE, &TableKey); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "InstallAcpiTableFromHob: Fail to add ACP= I table xDSDT\n")); + ASSERT_EFI_ERROR (Status); + break; + } + } + + else if (((EFI_ACPI_3_0_FIXED_ACPI_DESCRIPTION_TABLE *)ChildTable)= ->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)) { --=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 (#109137): https://edk2.groups.io/g/devel/message/109137 Mute This Topic: https://groups.io/mt/101633356/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-