From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.93, mailfrom: michael.a.kubacki@intel.com) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by groups.io with SMTP; Fri, 17 May 2019 00:42:02 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 May 2019 00:42:02 -0700 X-ExtLoop1: 1 Received: from orsmsx110.amr.corp.intel.com ([10.22.240.8]) by orsmga005.jf.intel.com with ESMTP; 17 May 2019 00:41:59 -0700 Received: from orsmsx159.amr.corp.intel.com (10.22.240.24) by ORSMSX110.amr.corp.intel.com (10.22.240.8) with Microsoft SMTP Server (TLS) id 14.3.408.0; Fri, 17 May 2019 00:42:01 -0700 Received: from orsmsx121.amr.corp.intel.com ([169.254.10.47]) by ORSMSX159.amr.corp.intel.com ([169.254.11.57]) with mapi id 14.03.0415.000; Fri, 17 May 2019 00:42:01 -0700 From: "Kubacki, Michael A" To: "devel@edk2.groups.io" , "Chen, Marc W" CC: "Chaganty, Rangasai V" Subject: Re: [edk2-devel] [edk2-platform][PATCH v2] MinPlatformPkg: Add multiple segment support for PciHostBridgeLib Thread-Topic: [edk2-devel] [edk2-platform][PATCH v2] MinPlatformPkg: Add multiple segment support for PciHostBridgeLib Thread-Index: AQHVDHsvDNdBlUTw5UO3bKOgz3UjDaZu7YlA Date: Fri, 17 May 2019 07:42:00 +0000 Message-ID: <49AB4ACB9627B8468F29D589A27B745588945978@ORSMSX121.amr.corp.intel.com> References: <20190517063826.44500-1-marc.w.chen@intel.com> In-Reply-To: <20190517063826.44500-1-marc.w.chen@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMTQ2ZWU2MDUtYmNkZC00Yjk2LWJhOTUtOTJjNTBhZDQ3YmRhIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiUnk2eVU5WEV6S2JDSWozNXpIeVNTOGlReXc2S1Z0empCK1wvaHN6aTZoeVhuSmxheWgrU1dmamZVNjBYM3FuNE8ifQ== x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.600.7 dlp-reaction: no-action x-originating-ip: [10.22.254.140] MIME-Version: 1.0 Return-Path: michael.a.kubacki@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Please make two quick updates in V3: 1. Add the Contributed-under tag (1.1 agreement) since these files have no= t moved to the BSD+Patent license yet. 2. Please prefix the BZ link with "REF:" as shown here: https://github.com/tianocore/tianocore.github.io/wiki/Commit-Message-= Format > -----Original Message----- > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of > Marc W Chen > Sent: Thursday, May 16, 2019 11:38 PM > To: devel@edk2.groups.io > Cc: Chen, Marc W ; Kubacki, Michael A > ; Chaganty, Rangasai V > > Subject: [edk2-devel] [edk2-platform][PATCH v2] MinPlatformPkg: Add > multiple segment support for PciHostBridgeLib >=20 > https://bugzilla.tianocore.org/show_bug.cgi?id=3D1799 >=20 > 1. Add PcdPciSegmentCount PCD in MinPlatformPkg.dec and set default to 1 > 2. Base on PciHostBridge related PCDs to Initialize RootBridges. >=20 > Signed-off-by: Marc Chen > Cc: Michael Kubacki > Cc: Sai Chaganty > --- > Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec | 3 +- > .../PciHostBridgeLibSimple.c | 83 ++++++++++++++-= ------- > .../PciHostBridgeLibSimple.inf | 4 +- > 3 files changed, 59 insertions(+), 31 deletions(-) >=20 > diff --git a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec > b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec > index 3185776ac3..e1ae8004cb 100644 > --- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec > +++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec > @@ -6,7 +6,7 @@ > # INF files to generate AutoGen.c and AutoGen.h files # for the build > infrastructure. > # > -# Copyright (c) 2017, Intel Corporation. All rights reserved.
> +# Copyright (c) 2017 - 2019, Intel Corporation. All rights > +reserved.
> # > # This program and the accompanying materials are licensed and made > available under # the terms and conditions of the BSD License which > accompanies this distribution. > @@ -223,6 +223,7 @@ > gMinPlatformPkgTokenSpaceGuid.PcdPcIoApicEnable|0x0|UINT32|0x90000 > 019 > gMinPlatformPkgTokenSpaceGuid.PcdPciDmaAbove4G > |FALSE|BOOLEAN|0x4001004B > gMinPlatformPkgTokenSpaceGuid.PcdPciNoExtendedConfigSpace > |FALSE|BOOLEAN|0x4001004C > gMinPlatformPkgTokenSpaceGuid.PcdPciResourceAssigned > |FALSE|BOOLEAN|0x4001004D > + gMinPlatformPkgTokenSpaceGuid.PcdPciSegmentCount |0x1 > |UINT8|0x4001004E >=20 >=20 > gMinPlatformPkgTokenSpaceGuid.PcdAcpiPm1AEventBlockAddress|0x1800| > UINT16|0x00010035 >=20 > gMinPlatformPkgTokenSpaceGuid.PcdAcpiPm1BEventBlockAddress|0x0000| > UINT16|0x00010036 > diff --git > a/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHo > stBridgeLibSimple.c > b/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHo > stBridgeLibSimple.c > index 557ac2a5b3..25259e2f2d 100644 > --- > a/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHo > stBridgeLibSimple.c > +++ b/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/P > +++ ciHostBridgeLibSimple.c > @@ -1,7 +1,7 @@ > /** @file > - SA PciHostBridge Library > + PciHostBridge Library >=20 > -Copyright (c) 2017, Intel Corporation. All rights reserved.
> +Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.
> This program and the accompanying materials are licensed and made > available under the terms and conditions of the BSD License that > accompanies this distribution. > The full text of the license may be found at @@ -15,6 +15,7 @@ WITHOUT > WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR > IMPLIED. > #include > #include > #include > +#include > #include > #include #include @= @ > -28,7 +29,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY > KIND, EITHER EXPRESS OR IMPLIED. > GLOBAL_REMOVE_IF_UNREFERENCED CHAR16 > *mPciHostBridgeLibAcpiAddressSpaceTypeStr[] =3D { > L"Mem", L"I/O", L"Bus" > }; > -ACPI_HID_DEVICE_PATH mRootBridgeDeviceNode =3D { > +ACPI_HID_DEVICE_PATH mRootBridgeDeviceNodeTemplate =3D { > { > ACPI_DEVICE_PATH, > ACPI_DP, > @@ -41,7 +42,7 @@ ACPI_HID_DEVICE_PATH mRootBridgeDeviceNode =3D { > 0 > }; >=20 > -PCI_ROOT_BRIDGE mRootBridge =3D { > +PCI_ROOT_BRIDGE mRootBridgeTemplate =3D { > 0, > EFI_PCI_ATTRIBUTE_ISA_MOTHERBOARD_IO | > EFI_PCI_ATTRIBUTE_IDE_PRIMARY_IO | > @@ -66,41 +67,67 @@ PCI_ROOT_BRIDGE mRootBridge =3D { > NULL // DevicePath; > }; >=20 > +/** > + Return all the root bridge instances. > + > + @param Count Return the count of root bridge instances. > + > + @return All the root bridge instances, it will be NULL if system has > insufficient memory > + resources available and count will be zero. > +**/ > + > PCI_ROOT_BRIDGE * > EFIAPI > PciHostBridgeGetRootBridges ( > UINTN *Count > ) > { > - mRootBridge.Mem.Base =3D PcdGet32 (PcdPciReservedMemBase); > + UINT8 Index; > + PCI_ROOT_BRIDGE *RootBridge; > + > + RootBridge =3D AllocateZeroPool (sizeof (PCI_ROOT_BRIDGE) * PcdGet8 > + (PcdPciSegmentCount)); if (RootBridge =3D=3D NULL) { > + DEBUG ((DEBUG_ERROR, "PciHostBridge: Out of resource\n")); > + *Count =3D 0; > + return RootBridge; > + } > + > + mRootBridgeTemplate.Mem.Base =3D PcdGet32 (PcdPciReservedMemBase); > if (PcdGet32(PcdPciReservedMemLimit) !=3D 0) { > - mRootBridge.Mem.Limit =3D PcdGet32 (PcdPciReservedMemLimit); > + mRootBridgeTemplate.Mem.Limit =3D PcdGet32 > (PcdPciReservedMemLimit); > } else { > - mRootBridge.Mem.Limit =3D (UINT32)PcdGet64 > (PcdPciExpressBaseAddress); > + mRootBridgeTemplate.Mem.Limit =3D (UINT32) PcdGet64 > + (PcdPciExpressBaseAddress); > } >=20 > - mRootBridge.MemAbove4G.Base =3D PcdGet64 > (PcdPciReservedMemAbove4GBBase); > - mRootBridge.MemAbove4G.Limit =3D PcdGet64 > (PcdPciReservedMemAbove4GBLimit); > + mRootBridgeTemplate.MemAbove4G.Base =3D PcdGet64 > + (PcdPciReservedMemAbove4GBBase); > mRootBridgeTemplate.MemAbove4G.Limit > + =3D PcdGet64 (PcdPciReservedMemAbove4GBLimit); >=20 > - mRootBridge.PMem.Base =3D PcdGet32 (PcdPciReservedPMemBase); > - mRootBridge.PMem.Limit =3D PcdGet32 (PcdPciReservedPMemLimit); > - mRootBridge.PMemAbove4G.Base =3D PcdGet64 > (PcdPciReservedPMemAbove4GBBase); > - mRootBridge.PMemAbove4G.Limit =3D PcdGet64 > (PcdPciReservedPMemAbove4GBLimit); > + mRootBridgeTemplate.PMem.Base =3D PcdGet32 > (PcdPciReservedPMemBase); > + mRootBridgeTemplate.PMem.Limit =3D PcdGet32 > (PcdPciReservedPMemLimit); > + mRootBridgeTemplate.PMemAbove4G.Base =3D PcdGet64 > + (PcdPciReservedPMemAbove4GBBase); > + mRootBridgeTemplate.PMemAbove4G.Limit =3D PcdGet64 > + (PcdPciReservedPMemAbove4GBLimit); >=20 > - if (mRootBridge.MemAbove4G.Base < mRootBridge.MemAbove4G.Limit) { > - mRootBridge.AllocationAttributes |=3D > EFI_PCI_HOST_BRIDGE_MEM64_DECODE; > + if (mRootBridgeTemplate.MemAbove4G.Base < > mRootBridgeTemplate.MemAbove4G.Limit) { > + mRootBridgeTemplate.AllocationAttributes |=3D > + EFI_PCI_HOST_BRIDGE_MEM64_DECODE; > } >=20 > - mRootBridge.Io.Base =3D PcdGet16 (PcdPciReservedIobase); > - mRootBridge.Io.Limit =3D PcdGet16 (PcdPciReservedIoLimit); > + mRootBridgeTemplate.Io.Base =3D PcdGet16 (PcdPciReservedIobase); > + mRootBridgeTemplate.Io.Limit =3D PcdGet16 (PcdPciReservedIoLimit); >=20 > - mRootBridge.DmaAbove4G =3D PcdGetBool (PcdPciDmaAbove4G); > - mRootBridge.NoExtendedConfigSpace =3D PcdGetBool > (PcdPciNoExtendedConfigSpace); > - mRootBridge.ResourceAssigned =3D PcdGetBool (PcdPciResourceAssigned); > + mRootBridgeTemplate.DmaAbove4G =3D PcdGetBool (PcdPciDmaAbove4G); > + mRootBridgeTemplate.NoExtendedConfigSpace =3D PcdGetBool > + (PcdPciNoExtendedConfigSpace); > mRootBridgeTemplate.ResourceAssigned =3D > + PcdGetBool (PcdPciResourceAssigned); > + > + for (Index =3D 0; Index < PcdGet8 (PcdPciSegmentCount); Index ++) { > + mRootBridgeDeviceNodeTemplate.UID =3D Index; > + mRootBridgeTemplate.Segment =3D Index; > + mRootBridgeTemplate.DevicePath =3D NULL; > + mRootBridgeTemplate.DevicePath =3D AppendDevicePathNode (NULL, > &mRootBridgeDeviceNodeTemplate.Header); > + CopyMem (RootBridge + Index, &mRootBridgeTemplate, sizeof > + (PCI_ROOT_BRIDGE)); } >=20 > - mRootBridge.DevicePath =3D AppendDevicePathNode (NULL, > &mRootBridgeDeviceNode.Header); > - *Count =3D 1; > - return &mRootBridge; > + *Count =3D PcdGet8 (PcdPciSegmentCount); return RootBridge; > } >=20 > VOID > @@ -110,7 +137,7 @@ PciHostBridgeFreeRootBridges ( > UINTN Count > ) > { > - ASSERT (Count =3D=3D 1); > + ASSERT (Count <=3D PcdGet8 (PcdPciSegmentCount)); > FreePool (Bridges->DevicePath); > } >=20 > @@ -136,20 +163,20 @@ PciHostBridgeResourceConflict ( > { > EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *Descriptor; > UINTN RootBridgeIndex; > - DEBUG ((EFI_D_ERROR, "PciHostBridge: Resource conflict happens!\n")); > + DEBUG ((DEBUG_ERROR, "PciHostBridge: Resource conflict happens!\n")); >=20 > RootBridgeIndex =3D 0; > Descriptor =3D (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *) Configuration; > while (Descriptor->Desc =3D=3D ACPI_ADDRESS_SPACE_DESCRIPTOR) { > - DEBUG ((EFI_D_ERROR, "RootBridge[%d]:\n", RootBridgeIndex++)); > + DEBUG ((DEBUG_ERROR, "RootBridge[%d]:\n", RootBridgeIndex++)); > for (; Descriptor->Desc =3D=3D ACPI_ADDRESS_SPACE_DESCRIPTOR; > Descriptor++) { > ASSERT (Descriptor->ResType < > sizeof (mPciHostBridgeLibAcpiAddressSpaceTypeStr) / sizeo= f > (mPciHostBridgeLibAcpiAddressSpaceTypeStr[0]) > ); > - DEBUG ((EFI_D_ERROR, " %s: Length/Alignment =3D 0x%lx / 0x%lx\n", > + DEBUG ((DEBUG_ERROR, " %s: Length/Alignment =3D 0x%lx / 0x%lx\n", > mPciHostBridgeLibAcpiAddressSpaceTypeStr[Descriptor->ResT= ype], > Descriptor->AddrLen, Descriptor->AddrRangeMax)); > if (Descriptor->ResType =3D=3D ACPI_ADDRESS_SPACE_TYPE_MEM) { > - DEBUG ((EFI_D_ERROR, " Granularity/SpecificFlag =3D %ld / %= 02x%s\n", > + DEBUG ((DEBUG_ERROR, " Granularity/SpecificFlag =3D %ld / > %02x%s\n", > Descriptor->AddrSpaceGranularity, Descriptor->SpecificF= lag, > ((Descriptor->SpecificFlag & > EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_CACHEABLE_PREFETCHABL > E) !=3D 0) ? L" (Prefetchable)" : L"" > )); > diff --git > a/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHo > stBridgeLibSimple.inf > b/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHo > stBridgeLibSimple.inf > index f9a769155b..b37488e512 100644 > --- > a/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHo > stBridgeLibSimple.inf > +++ > b/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHo > stBridgeLibSimple.inf > @@ -1,7 +1,7 @@ > ## @file > # Component description file for the SA PciHostBridge library > # > -# Copyright (c) 2017, Intel Corporation. All rights reserved.
> +# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved. > # > # This program and the accompanying materials are licensed and made > available under > # the terms and conditions of the BSD License which accompanies this > distribution. > @@ -56,4 +56,4 @@ > gMinPlatformPkgTokenSpaceGuid.PcdPciDmaAbove4G > gMinPlatformPkgTokenSpaceGuid.PcdPciNoExtendedConfigSpace > gMinPlatformPkgTokenSpaceGuid.PcdPciResourceAssigned > - > + gMinPlatformPkgTokenSpaceGuid.PcdPciSegmentCount > -- > 2.16.2.windows.1 >=20 >=20 >=20