From nobody Fri Mar 29 12:38:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+49624+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49624+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=nvidia.com ARC-Seal: i=1; a=rsa-sha256; t=1572406709; cv=none; d=zoho.com; s=zohoarc; b=R/O94JT10F+Csggfzm/U2/iakX2AaekscYwZwEQP6ugkAsUOzuyHn/U7zW1wjj+A5Mm8mVqUWASjSBhyBNpnvQBygacLyvl3MJJP/jafYyqDpinXEw/VoX/9zZUWif++bBzD9iySGrhMPWxDAgae+vwPl7jhBiZuTAnNc/LMzUc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572406709; h=Content-Type:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=1LZYM3I7yPTv5JiiurMYpN3HPvi3m1+TwIwE8WAZjCk=; b=h3osOtDsnSKQxont5iG8RxltqmU6WBL++tdVrHDidkJ25+X7KMp8lbPEhtcvUmFsc6zQkKDelpJbuejmsm+9j4sNEJ7LjMeLTmmjf1ChpSZnHKMQeRHdTc8jWnyQr3+ymwteJ833Yxo8V7TW9To/iu3tI8MqdESDytFByIiCb9E= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+49624+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1572406709200439.4861330377955; Tue, 29 Oct 2019 20:38:29 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id qdEZYY1788612xpz4DSuldge; Tue, 29 Oct 2019 20:38:28 -0700 X-Received: from hqemgate14.nvidia.com (hqemgate14.nvidia.com [216.228.121.143]) by mx.groups.io with SMTP id smtpd.web11.973.1572406708145006944 for ; Tue, 29 Oct 2019 20:38:28 -0700 X-Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqemgate14.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Tue, 29 Oct 2019 20:38:33 -0700 X-Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate101.nvidia.com (PGP Universal service); Tue, 29 Oct 2019 20:38:27 -0700 X-PGP-Universal: processed; by hqpgpgate101.nvidia.com on Tue, 29 Oct 2019 20:38:27 -0700 X-Received: from HQMAIL107.nvidia.com (172.20.187.13) by HQMAIL111.nvidia.com (172.20.187.18) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Wed, 30 Oct 2019 03:38:27 +0000 X-Received: from hqnvemgw01.nvidia.com (172.20.150.20) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1473.3 via Frontend Transport; Wed, 30 Oct 2019 03:38:27 +0000 X-Received: from ashishsingha-lnx.nvidia.com (Not Verified[10.28.48.147]) by hqnvemgw01.nvidia.com with Trustwave SEG (v7,5,8,10121) id ; Tue, 29 Oct 2019 20:38:27 -0700 From: "Ashish Singhal" To: , , CC: Ashish Singhal Subject: [edk2-devel] [PATCH] EmbeddedPkg/DtPlatformDxe: Add DT/ACPI Default Flexibility Date: Tue, 29 Oct 2019 21:38:24 -0600 Message-ID: <0fd3af31134ae81ade4ede6d91fe807521a6865d.1572406299.git.ashishsingha@nvidia.com> In-Reply-To: References: X-NVConfidentiality: public MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,ashishsingha@nvidia.com X-Gm-Message-State: Cx0Na6LmdFrhrgsn2uRUEARcx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1572406708; bh=BCQx0R4TeawYN/PbsT+soeV595xBXJWlUb3SYgwjC4U=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=tiVgPdNVHZ5mj6kx4nWirU8iova8Xz0QtuJ3sbx5Fhu5GAF6L5cJwiVIxfuDpQjunvO 1AEeyGWFDk73wYzMru13uLH6vpA+r9X+HFa3sfQ/CgooMg5VGEKK45vzeBJdzUbwa5LNV 4/IqeTSSmPAG9N9fDtIta1cHyVO5Liurkog= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add a PCD to govern whether to use DT or ACPI in case the variable governing this is not found or is not valid. Signed-off-by: Ashish Singhal --- EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.c | 16 ++++++++++------ EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.inf | 3 +++ EmbeddedPkg/EmbeddedPkg.dec | 5 +++++ 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.c b/EmbeddedPk= g/Drivers/DtPlatformDxe/DtPlatformDxe.c index 907d46a..e35ca33 100644 --- a/EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.c +++ b/EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.c @@ -124,18 +124,22 @@ DtPlatformDxeEntryPoint ( Status =3D gRT->GetVariable(DT_ACPI_VARIABLE_NAME, &gDtPlatformFormSet= Guid, NULL, &BufferSize, &DtAcpiPref); if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_WARN, "%a: no DT/ACPI preference found, defaulting to = DT\n", - __FUNCTION__)); - DtAcpiPref.Pref =3D DT_ACPI_SELECT_DT; + DEBUG ((DEBUG_WARN, "%a: no DT/ACPI preference found, defaulting to = %s\n", + __FUNCTION__, PcdGetBool (PcdDefaultDtPref) ? L"DT" : L"ACPI")); + DtAcpiPref.Pref =3D PcdGetBool (PcdDefaultDtPref) ? + DT_ACPI_SELECT_DT : + DT_ACPI_SELECT_ACPI; } } =20 if (!EFI_ERROR (Status) && DtAcpiPref.Pref !=3D DT_ACPI_SELECT_ACPI && DtAcpiPref.Pref !=3D DT_ACPI_SELECT_DT) { - DEBUG ((DEBUG_WARN, "%a: invalid value for %s, defaulting to DT\n", - __FUNCTION__, DT_ACPI_VARIABLE_NAME)); - DtAcpiPref.Pref =3D DT_ACPI_SELECT_DT; + DEBUG ((DEBUG_WARN, "%a: invalid value for %s, defaulting to %s\n", + __FUNCTION__, DT_ACPI_VARIABLE_NAME, PcdGetBool (PcdDefaultDtPref) ?= L"DT" : L"ACPI")); + DtAcpiPref.Pref =3D PcdGetBool (PcdDefaultDtPref) ? + DT_ACPI_SELECT_DT : + DT_ACPI_SELECT_ACPI; Status =3D EFI_INVALID_PARAMETER; // trigger setvar below } =20 diff --git a/EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.inf b/Embedded= Pkg/Drivers/DtPlatformDxe/DtPlatformDxe.inf index b68f154..450ea29 100644 --- a/EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.inf +++ b/EmbeddedPkg/Drivers/DtPlatformDxe/DtPlatformDxe.inf @@ -46,6 +46,9 @@ gEdkiiPlatformHasAcpiGuid gFdtTableGuid =20 +[Pcd] + gEmbeddedTokenSpaceGuid.PcdDefaultDtPref + [Depex] gEfiVariableArchProtocolGuid AND gEfiVariableWriteArchProtocolGuid diff --git a/EmbeddedPkg/EmbeddedPkg.dec b/EmbeddedPkg/EmbeddedPkg.dec index bbaadc5..8812a6d 100644 --- a/EmbeddedPkg/EmbeddedPkg.dec +++ b/EmbeddedPkg/EmbeddedPkg.dec @@ -185,3 +185,8 @@ # truncation on overflow to specify negative offsets. # gEmbeddedTokenSpaceGuid.PcdDmaDeviceOffset|0x0|UINT64|0x0000058 + + # + # Selection between DT and ACPI as a default + # + gEmbeddedTokenSpaceGuid.PcdDefaultDtPref|TRUE|BOOLEAN|0x0000059 --=20 2.7.4 -=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 (#49624): https://edk2.groups.io/g/devel/message/49624 Mute This Topic: https://groups.io/mt/39747241/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-