From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by mx.groups.io with SMTP id smtpd.web09.34993.1658190348641829540 for ; Mon, 18 Jul 2022 17:25:48 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=MOExSCTX; spf=pass (domain: gmail.com, ip: 209.85.215.169, mailfrom: kuqin12@gmail.com) Received: by mail-pg1-f169.google.com with SMTP id 72so12104256pge.0 for ; Mon, 18 Jul 2022 17:25:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UNeeVNVO4GXp7wrlJTGIz+eIB7VuXputSNAlyPjKZM4=; b=MOExSCTXTuj4tCrD1MWrY8++r2MEEUs5Kj6X93HmeF3tTuEpEbuKy/y1F3iLK3uWuq EBO8H0Ju8RLliKpZHBDSY7urQ1GhMk92+HWETFjAbPCN0gp8oDktaBdjbqz59dZzY8Ja bqZCh9iFuch+gd+2AVyeIX7I59BJDQX/4wI9rm5mTaclpr0SbWZCqGwnlDJWEUXK8Uko TK2dxcX7f1R08h/KnNk16456N8NLilQ5xeWOQp/7O83njZXH76E8w2o60L6li9+IgJTR iEiAFDrS/8nB7+zQs9dKPHBdpioqgkSZVfzM3HxAIA9P9Dbfk4VTicY94ep1/dyDdk8a asGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UNeeVNVO4GXp7wrlJTGIz+eIB7VuXputSNAlyPjKZM4=; b=urfLN1QafXqr00+KIOp8v0meC5rmLNju1SfYwudS+EoWuW+zSCogEJ6BpcD3bBbo3w vjcwbhJEGDfSJQAA/Vb/mdSZinWc4hf9MgmRFTtybdDHZy2Vca6T422Kyr2q2KatTsSI yZ0OQ3hfiBKKYoQoUJJk7wdRTEUPbp8j1Jn0IecqLQ72mc03W0jcvvn8HPu0Txbwhqql BVOAi8vAASmEMmdMgGa1E7XYy6JyzbbU2/N7MbHfpBph2llds0vpR+iWP+fh5INKk75b TsS3Jh33snDY7cQykcgV97SaG4LjGB15OdATH4HYIYUIGZFZcxPe4Uk6GA0ZATv7pnX1 b1JA== X-Gm-Message-State: AJIora9Aryc940pwE/BcHM0kKatWoNSnGBOQ7ikJMpT25cgu8LJLVWnQ 7x1YckuauB/iAEKgQjq+QSgCog6yf2U= X-Google-Smtp-Source: AGRyM1vUImT0vTy6RWrntpjTf9mvyYuuKyEBdHPM4Z9jlusrwYW5V32X/pV6+qqhdEiaEGViAI9KxQ== X-Received: by 2002:a63:210f:0:b0:40d:dd27:8361 with SMTP id h15-20020a63210f000000b0040ddd278361mr26863026pgh.306.1658190347964; Mon, 18 Jul 2022 17:25:47 -0700 (PDT) Return-Path: Received: from MININT-0U7P5GU.redmond.corp.microsoft.com ([2001:4898:80e8:9:6532:8264:ce7d:ced]) by smtp.gmail.com with ESMTPSA id n10-20020aa7984a000000b005251c6fbd0csm9941521pfq.29.2022.07.18.17.25.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Jul 2022 17:25:47 -0700 (PDT) From: "Kun Qin" To: devel@edk2.groups.io Cc: Joe Lopez Subject: [PATCH v1 5/6] DynamicTablesPkg: AcpiSsdtPcieLibArm: Added function to reserve ECAM space Date: Mon, 18 Jul 2022 17:22:53 -0700 Message-Id: <20220719002254.1891-6-kuqin12@gmail.com> X-Mailer: git-send-email 2.36.0.windows.1 In-Reply-To: <20220719002254.1891-1-kuqin12@gmail.com> References: <20220719002254.1891-1-kuqin12@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3998 Certain OSes will complain if the ECAM config space is not reserved in the ACPI namespace. This change adds a function to reserve PNP motherboard resources for a given PCI node. Co-authored-by: Joe Lopez Signed-off-by: Kun Qin --- DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerator.c |= 130 ++++++++++++++++++++ 1 file changed, 130 insertions(+) diff --git a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieG= enerator.c b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieG= enerator.c index 626e53d70205..d9ed513a2ee3 100644 --- a/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerato= r.c +++ b/DynamicTablesPkg/Library/Acpi/Arm/AcpiSsdtPcieLibArm/SsdtPcieGenerato= r.c @@ -772,6 +772,128 @@ error_handler: return Status;=0D }=0D =0D +/** Generate a Pci Resource Template to hold Address Space Info=0D +=0D + @param [in] Generator The SSDT Pci generator.=0D + @param [in] CfgMgrProtocol Pointer to the Configuration Manager=0D + Protocol interface.=0D + @param [in] PciInfo Pci device information.=0D + @param [in, out] PciNode RootNode of the AML tree to populate.= =0D +=0D + @retval EFI_SUCCESS The function completed successfully.=0D + @retval EFI_INVALID_PARAMETER Invalid parameter.=0D + @retval EFI_OUT_OF_RESOURCES Could not allocate memory.=0D +**/=0D +STATIC=0D +EFI_STATUS=0D +EFIAPI=0D +GeneratePciRes (=0D + IN ACPI_PCI_GENERATOR *Generator,= =0D + IN CONST EDKII_CONFIGURATION_MANAGER_PROTOCOL *CONST CfgMgrProtoc= ol,=0D + IN CONST CM_ARM_PCI_CONFIG_SPACE_INFO *PciInfo,=0D + IN OUT AML_OBJECT_NODE_HANDLE PciNode=0D + )=0D +{=0D + EFI_STATUS Status;=0D + UINT32 EisaId;=0D + AML_OBJECT_NODE_HANDLE ResNode;=0D + AML_OBJECT_NODE_HANDLE CrsNode;=0D + BOOLEAN Translation;=0D + UINT32 Index;=0D + CM_ARM_OBJ_REF *RefInfo;=0D + UINT32 RefCount;=0D + CM_ARM_PCI_ADDRESS_MAP_INFO *AddrMapInfo;=0D +=0D + // ASL: Device (PCIx) {}=0D + Status =3D AmlCodeGenDevice ("RES0", PciNode, &ResNode);=0D + if (EFI_ERROR (Status)) {=0D + ASSERT (0);=0D + return Status;=0D + }=0D +=0D + // ASL: Name (_HID, EISAID ("PNP0C02"))=0D + Status =3D AmlGetEisaIdFromString ("PNP0C02", &EisaId); /* PNP Motherboa= rd Resources */=0D + if (EFI_ERROR (Status)) {=0D + ASSERT (0);=0D + return Status;=0D + }=0D +=0D + Status =3D AmlCodeGenNameInteger ("_HID", EisaId, ResNode, NULL);=0D + if (EFI_ERROR (Status)) {=0D + ASSERT (0);=0D + return Status;=0D + }=0D +=0D + // ASL: Name (_CRS, ResourceTemplate () {})=0D + Status =3D AmlCodeGenNameResourceTemplate ("_CRS", ResNode, &CrsNode);=0D + if (EFI_ERROR (Status)) {=0D + ASSERT (0);=0D + return Status;=0D + }=0D +=0D + // Get the array of CM_ARM_OBJ_REF referencing the=0D + // CM_ARM_PCI_ADDRESS_MAP_INFO objects.=0D + Status =3D GetEArmObjCmRef (=0D + CfgMgrProtocol,=0D + PciInfo->AddressMapToken,=0D + &RefInfo,=0D + &RefCount=0D + );=0D + if (EFI_ERROR (Status)) {=0D + ASSERT (0);=0D + return Status;=0D + }=0D +=0D + for (Index =3D 0; Index < RefCount; Index++) {=0D + // Get CM_ARM_PCI_ADDRESS_MAP_INFO structures one by one.=0D + Status =3D GetEArmObjPciAddressMapInfo (=0D + CfgMgrProtocol,=0D + RefInfo[Index].ReferenceToken,=0D + &AddrMapInfo,=0D + NULL=0D + );=0D + if (EFI_ERROR (Status)) {=0D + ASSERT (0);=0D + return Status;=0D + }=0D +=0D + Translation =3D (AddrMapInfo->CpuAddress !=3D AddrMapInfo->PciAddress)= ;=0D +=0D + switch (AddrMapInfo->SpaceCode) {=0D + case PCI_SS_CONFIG:=0D + Status =3D AmlCodeGenRdQWordMemory (=0D + FALSE,=0D + TRUE,=0D + TRUE,=0D + TRUE,=0D + FALSE, // non-cacheable=0D + TRUE,=0D + 0,=0D + AddrMapInfo->PciAddress,=0D + AddrMapInfo->PciAddress + AddrMapInfo->AddressSize - 1,= =0D + Translation ? AddrMapInfo->CpuAddress : 0,=0D + AddrMapInfo->AddressSize,=0D + 0,=0D + NULL,=0D + 0,=0D + TRUE,=0D + CrsNode,=0D + NULL=0D + );=0D + break;=0D + default:=0D + break;=0D + } // switch=0D +=0D + if (EFI_ERROR (Status)) {=0D + ASSERT (0);=0D + return Status;=0D + }=0D + }=0D +=0D + return Status;=0D +}=0D +=0D /** Generate a Pci device.=0D =0D @param [in] Generator The SSDT Pci generator.=0D @@ -855,9 +977,17 @@ GeneratePciDevice ( return Status;=0D }=0D =0D + // Add the PNP Motherboard Resources Device to reserve ECAM space=0D + Status =3D GeneratePciRes (Generator, CfgMgrProtocol, PciInfo, PciNode);= =0D + if (EFI_ERROR (Status)) {=0D + ASSERT (0);=0D + return Status;=0D + }=0D +=0D // Add the template _OSC method.=0D Status =3D AddOscMethod (PciNode);=0D ASSERT_EFI_ERROR (Status);=0D +=0D return Status;=0D }=0D =0D --=20 2.36.0.windows.1