From nobody Sun May 5 11:47:39 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+76514+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+76514+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one); dmarc=fail(p=none dis=none) header.from=intel.com Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1623748571252162.0121180730256; Tue, 15 Jun 2021 02:16:11 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 1KHAYY1788612xroT4GMgBi2; Tue, 15 Jun 2021 02:16:10 -0700 X-Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web12.6851.1623748565415684216 for ; Tue, 15 Jun 2021 02:16:05 -0700 IronPort-SDR: pZ4kqdS5fkbODfQtrrtBGq7bxaGflKVgsDd4NceWxFmuaL5+0gNjY4wV13ugASy8uHD21wryDo 3Kz/5SiKOIvA== X-IronPort-AV: E=McAfee;i="6200,9189,10015"; a="227419034" X-IronPort-AV: E=Sophos;i="5.83,275,1616482800"; d="scan'208,217";a="227419034" X-Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jun 2021 02:16:04 -0700 IronPort-SDR: 3btQd/T/TMo+GR/Af09H0PzPROO1FU3gaX4m30Dw7QhuIAdhNhLi86mPqpKH85zIY2sudeChfc HiocailatD5Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,275,1616482800"; d="scan'208,217";a="637066031" X-Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by fmsmga006.fm.intel.com with ESMTP; 15 Jun 2021 02:16:04 -0700 X-Received: from fmsmsx608.amr.corp.intel.com (10.18.126.88) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.4; Tue, 15 Jun 2021 02:16:04 -0700 X-Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx608.amr.corp.intel.com (10.18.126.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.4 via Frontend Transport; Tue, 15 Jun 2021 02:16:04 -0700 X-Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.109) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2242.4; Tue, 15 Jun 2021 02:16:02 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AC7hXSFvWWrxscRqbaX+dM3FdaTQEbCDODyJ9qOY+9AtmeohMBCq2S+druzJZcK8Sus6EpR7NJS73GEtdbSnM7hjuseB614ex163CtY9QvqBGvZRxuP/ZyEBYTeA9kVNgPgsItVXHjCOrs4datG8ndNlgoZg6YrpJ+jguYKTp/N8ZACknKOLY0ddYtwkP3YKutz/mk6gTA8xlbmA2xCrAAfmJyH5vXW1eH2hfwyt+bOUhbr6ah9eVsPfcRuKhQCBBqa1U2xj3QewNetmNTPYd3jcvWJwtQGCb3ahUF1/yHjejNpjR1MM3rxpdf1z13nv3QI4Wj+9cQv9pAZsVSVxxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hhF0RMgHrASfylq2nFC/++Q7zwM5tua2iFjlXAaS4XU=; b=MVu+ZFE1bZVUdz7YaPjTcNfTl0SCdWALvxgAn4Q1ljJiEjUCkZWSTup5lWhFOi5FoqW2Zr2WpTRM1x1xjyC6Ej3C+QogBdhwp6vVpP4BRSYJ0x3x74PNBmICAiLccG46chSjhqd0hi1ZZ496vftnS9BJ7aYmKFMHKL0aZFPFxpnOKRv4TAsXZhWp/yxo3oagyCMmiY3E4Rsb9afc+N2ZFiJzLduwR2Jr1X7XvAcTW6rNUdibxt7QXm6dTrB45tcA/l7MVmL9082U+dKWReh2BsmIw0A2P2ucIQ26oYZNGJO0PRjwomy1EUuvAN9bpqAl1jHZOzCKFSpw3FD9sEhl5A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none X-Received: from PH0PR11MB5048.namprd11.prod.outlook.com (2603:10b6:510:3d::14) by PH0PR11MB5160.namprd11.prod.outlook.com (2603:10b6:510:3e::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21; Tue, 15 Jun 2021 09:16:01 +0000 X-Received: from PH0PR11MB5048.namprd11.prod.outlook.com ([fe80::8c52:953e:b2c2:d4e1]) by PH0PR11MB5048.namprd11.prod.outlook.com ([fe80::8c52:953e:b2c2:d4e1%2]) with mapi id 15.20.4219.025; Tue, 15 Jun 2021 09:16:01 +0000 From: "Zhiguang Liu" To: "devel@edk2.groups.io" , "Liu, Zhiguang" , "Wu, Hao A" Subject: =?UTF-8?B?5Zue5aSNOiBbZWRrMi1kZXZlbF0gW1BhdGNoIFY1IDIvOV0gTWRlTW9kdWxlUGtnOiBBZGQgbmV3IHN0cnVjdHVyZSBmb3IgdGhlIFBDSSBSb290IEJyaWRnZSBJbmZvIEhvYg==?= Thread-Topic: [edk2-devel] [Patch V5 2/9] MdeModulePkg: Add new structure for the PCI Root Bridge Info Hob Thread-Index: AQHXYcalyyTR+wTFiUeWaJvH9PLp2asUyfBk Date: Tue, 15 Jun 2021 09:16:00 +0000 Message-ID: References: <20210615091211.801-1-zhiguang.liu@intel.com>,<1688B684999885BD.24110@groups.io> In-Reply-To: <1688B684999885BD.24110@groups.io> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [192.198.142.9] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 2b4b2329-1d0a-446e-275a-08d92fde31a6 x-ms-traffictypediagnostic: PH0PR11MB5160: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:9508; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: /9xBUqKHBNO9+gEO44A2lZt842+j+kDs6pzuk/z5wbSu66Yqfo2DIxnP7eOEepPuzq5wuBUMfPvc21eilUg4cqbYrFR+TlMtRhLIoLfpKubWTNSQsbKM/bLjnmAegKGuNRUWWH0/rpKyt4lyimyFOjZ1zyLWgR0xwyq7azVCfv0UA/nTPTvrOhyBxh4WmAvDxV6/afVP3v3xlpiwq5XQekOGlMOlTwF5GcCWNKCDkmBqzKPST8dpZbFF0OJuSxxcx+rMwtU5kOyt03TfJr/nvbX0C8vKSr30eE/5aRnLZjBVhawgTq5Jkw7IgpsgMFbdD0PmjV7EwpOwBKzTatHKYh7G74BeW4SdD2CeZX+1pTifWalwqsdXFEXw9aDhcIH1UIjDa6XvdZKI7ZzAJ/e5SxVoyzwt0u1jcCr+jDPSEkxj/Ax8PDQnLB5zB34JH/ENHuXbJWc2TpPqXvcJbP+qV3yIwTlncCmH7Q/6M0ltje4SoxUrG/5E5jMGnOdzgM1kqmZBSRwm79Hmq/EjLF5LPn9E/oRZSEWAZv+vrFn9niwu3wl6wbTUotwwHJHVpvTjeP7wcs04+1snaAMgzY6NquQFiRv1WFmFHHBNd48fSFSbjcOBRgSHvoPSLpYqNxispD4D/lmihRmcL11D8LaUoO11T3G+Xm/7udsO+tAnKqDUzhPPjXHozdRpg1D+YQ9L7cQSfNeHN2LULd3oXH7MvfgaQsyWjfMg5lZZQ6ycCTAN8q16E6M7ke9t44m9CVM+pauBPIEGPBdz61f81k52vvW8iRpBN9Xg9gZrx0S26rE/RlJlJ9WL7cI0wOYVCEhK x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?gb2312?B?NTBuc2UrMXBaUFlBREJDVlhNb0x1clFDMWpHRWg4UWRRVkZnWkNwbWJyUHF5?= =?gb2312?B?NktVVURiVTFiSWNpMEVJS2plTHcrRFlCelRpcW03UlZUcWNaVTRyUFhteVA0?= =?gb2312?B?RDBrUWJVU2JaTVpVM2lLSE5CbHAvRGdueWNZTDhQZFpJUWNYc0ZXd2s5S2gz?= =?gb2312?B?eFVlaGJIQ2hocGQ5b3ZRbUlFVExuYVE1OWNyZkFMZHpVOVp3T01CQjgyeGNi?= =?gb2312?B?c3B1enJwZVNLTFM1cnIzMVpOQ2lDRFBYU2VZSUdSdG9XcU1TRzl0cGovYSs2?= =?gb2312?B?ZHV4RXhFdFhXbHE0ZXY0ajYwWklJV2RvVWJHQm1wdHpWTUo2OGZ3SVVUK3hI?= =?gb2312?B?QlF0RW1vMXUvQjB2dUJSTEhlNjA0WkNFVmRoakh2VGVwbi9zM095NjJuMnpI?= =?gb2312?B?clJRK1liTTRMMzFUS0FVNkZaSFFqUWpLblJORjlUS2ZodmpsMnJKdk50QW16?= =?gb2312?B?czhZQzlpYkY0L2ZST2V2YXAzYSt0S2o2UFRLbVJTN1R1K2ozbU1adU4rbkN5?= =?gb2312?B?OXZvNTFxMnVoMWlxcUpRcHZJRHoxbmRMZlBkeFlwWTFsVU40MFpKeEpNRjU3?= =?gb2312?B?dGRIa0N2RFBSSm1vVUdjTmhWOGc3eCtWTzdVbkRFTlpiUXJ1TFByTWdBYm84?= =?gb2312?B?ZUltM2tOTzVTSERHRUFmUnZ4YmhyNE9iZGFpU29DZDRuWUdpRlFyQ3NXNkE2?= =?gb2312?B?OE1QUFhGdVpoK1FQSEVDdFp4bWJYTldia1h1Wnp5L2JjcG51LzhhZnlOL2hH?= =?gb2312?B?cENSeFZTaWE1YytEZlY2bk9RVXZBczJEc1M1NG51RnorbmExM1FTTExRdHhW?= =?gb2312?B?T1pWanJFbEVZdU9zWjlFdWRXSHZiZ2FhMGtjeG9RL3NoaXlvZXNNbXc4YVhO?= =?gb2312?B?c2prd3E0aVBsSVJlOXhsWTk2U2I0cXk0dGJsTGd0Nlo4Qyt6OWhsZWlwV2h1?= =?gb2312?B?RXVvR1pKK1NSRGJIVDBBN21kMi9GcDFTNlgxbUtKbTlLLzZHcllkOG5EeWk5?= =?gb2312?B?eEdWbjQyaXZwK1UrY2wrcENPQ0diZzhiekVsdHRHUzBYank5dXVxZ2hxZDFH?= =?gb2312?B?eVpsMHREV2x2a2FHK1RQOWdEa0o5WHFLSVcvMERFYkRoOVptNG5VeCtqNzY2?= =?gb2312?B?MklETy84U2tNSFVLdU9nUmE2ejFnQm9QYkU1RjY1S3pEeWFaNzA1bzhXUGNF?= =?gb2312?B?UnQrZTlJaWExOWVQU0p2cHA2Z3pBUmhMRU1Rb3ZvRy9jMWVYOXptTjRYMUh5?= =?gb2312?B?c0lzQmZXNWVlRkJ4MGxpbmJLb1YxWDg1VGM5Yi9hL0VMek9WUkpLUW9QRFRz?= =?gb2312?B?TVdpTGg5MVhHcHBhWkRKMGVtQlVhUVlmWWtaRXFzcmRSUHo3T1U0SUlrM1hD?= =?gb2312?B?cFZSWDBpWFo2dU1qNlpxQlQyNWFNZEVYVE9qd1NZTTJOck9udkUwOFZjaXYz?= =?gb2312?B?aVdaWWkvTVo4VXdHd1JrSjF3dy9MVjFoelhjUTZKTGl1UzdUbWwweCtqbkxV?= =?gb2312?B?b2hXQkZkUVFQNVFPUW9oODA5SzRWTE80OWI5Vld5WG9rOEw5alg0bWJnOHdy?= =?gb2312?B?ZUhCZmNaSVhnR1dQZ05sZ1hwK2k4dy9ZeHZjSzJZb1oxTDYybnZvR0Nwc2Fx?= =?gb2312?B?S1M2aEtWUTB0Nk1lMWlzZnJvbDR6R1JpL2h4azdERmRtUDJFQWVNZ1ZYVW4z?= =?gb2312?B?WUwxMUN4ZW5yemtFMEZDY01MSTFRQnQxWkFIM0k5dVJZVE9hZGZ2ZDhYcWFk?= =?gb2312?Q?1dOysEJCWMOBbIdSbE=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB5048.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2b4b2329-1d0a-446e-275a-08d92fde31a6 X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Jun 2021 09:16:00.7841 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 78CjbCgkv017969vD1POXLb58dBQQNTFnSd9ubaEyjesRNkreVBcVF9quyBfUk1zbXlcRRxbfr2PGCPgRK3gLQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB5160 X-OriginatorOrg: intel.com Precedence: Bulk List-Unsubscribe: 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,zhiguang.liu@intel.com X-Gm-Message-State: jATrmQiBMpMTIYOhcSAxRv1Bx1787277AA= Content-Language: zh-CN Content-Type: multipart/alternative; boundary="_000_PH0PR11MB5048CDDC68A5506F831B204C90309PH0PR11MB5048namp_" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1623748570; bh=cAE6HzEdKB62rXQ5S0w5iIGzhnRggm6HfMtEy8N2dRQ=; h=Content-Type:Date:From:Reply-To:Subject:To; b=dsSE0Sm+e7S65JeHDkE/fctgHkJlL2rN57zLxspz0r2NkJGjow8aytRGnQsWi1V33Uc /42oBVpNy9ncishQmcFjr/HJKbR4fU8vpPoRElZYUjKtM+mSDmdfCXLmebpZjN4Zf6WaN bZD/hhDiaXV2j7SOD5HBeN4kKvof13O8QGY= X-ZohoMail-DKIM: pass (identity @groups.io) --_000_PH0PR11MB5048CDDC68A5506F831B204C90309PH0PR11MB5048namp_ Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Hi Hao, For this patch, can I keep your reviewed-by? I just added ExceptionList in MdeModulePkg\MdeModulePkg.ci.yaml, to avoid C= I failure. Thanks Zhiguang ________________________________ =E5=8F=91=E4=BB=B6=E4=BA=BA: devel@edk2.groups.io = =E4=BB=A3=E8=A1=A8 Zhiguang Liu =E5=8F=91=E9=80=81=E6=97=B6=E9=97=B4: 2021=E5=B9=B46=E6=9C=8815=E6=97=A5 17= :12 =E6=94=B6=E4=BB=B6=E4=BA=BA: devel@edk2.groups.io =E6=8A=84=E9=80=81: Kinney, Michael D ; Liming = Gao ; Wang, Jian J ; Wu, H= ao A =E4=B8=BB=E9=A2=98: [edk2-devel] [Patch V5 2/9] MdeModulePkg: Add new struc= ture for the PCI Root Bridge Info Hob V5: Add ExceptionList in MdeModulePkg\MdeModulePkg.ci.yaml, to avoid open CI issue, because UID and HID are terms which are already used in current source code. Cc: Michael D Kinney Cc: Liming Gao Cc: Jian J Wang Cc: Hao A Wu Reviewed-by: Hao A Wu Signed-off-by: Zhiguang Liu Reviewed-by: Hao A Wu > --- MdeModulePkg/Include/UniversalPayload/PciRootBridges.h | 91 ++++++++++++++= +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++= ++ MdeModulePkg/MdeModulePkg.ci.yaml | 2 ++ MdeModulePkg/MdeModulePkg.dec | 6 ++++++ 3 files changed, 99 insertions(+) diff --git a/MdeModulePkg/Include/UniversalPayload/PciRootBridges.h b/MdeMo= dulePkg/Include/UniversalPayload/PciRootBridges.h new file mode 100644 index 0000000000..3a7aae82d4 --- /dev/null +++ b/MdeModulePkg/Include/UniversalPayload/PciRootBridges.h @@ -0,0 +1,91 @@ +/** @file + This file defines the structure for the PCI Root Bridges. + + Copyright (c) 2021, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent + + @par Revision Reference: + - Universal Payload Specification 0.75 (https://universalpayload.githu= b.io/documentation/) +**/ + +#ifndef UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGES_H_ +#define UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGES_H_ + +#include + +#pragma pack(1) + +// +// (Base > Limit) indicates an aperture is not available. +// +typedef struct { + // + // Base and Limit are the device address instead of host address when + // Translation is not zero + // + UINT64 Base; + UINT64 Limit; + // + // According to UEFI 2.7, Device Address =3D Host Address + Translation, + // so Translation =3D Device Address - Host Address. + // On platforms where Translation is not zero, the subtraction is probab= ly to + // be performed with UINT64 wrap-around semantics, for we may translate = an + // above-4G host address into a below-4G device address for legacy PCIe = device + // compatibility. + // + // NOTE: The alignment of Translation is required to be larger than any = BAR + // alignment in the same root bridge, so that the same alignment can be + // applied to both device address and host address, which simplifies the + // situation and makes the current resource allocation code in generic P= CI + // host bridge driver still work. + // + UINT64 Translation; +} UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGE_APERTURE; + +/// +/// Payload PCI Root Bridge Information HOB +/// +typedef struct { + UINT32 Segment; ///< S= egment number. + UINT64 Supports; ///< S= upported attributes. + ///< R= efer to EFI_PCI_ATTRIBUTE_xxx used by GetAttributes() + ///< a= nd SetAttributes() in EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL. + UINT64 Attributes; ///< I= nitial attributes. + ///< R= efer to EFI_PCI_ATTRIBUTE_xxx used by GetAttributes() + ///< a= nd SetAttributes() in EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL. + BOOLEAN DmaAbove4G; ///< D= MA above 4GB memory. + ///< S= et to TRUE when root bridge supports DMA above 4GB memory. + BOOLEAN NoExtendedConfigSpace; ///< W= hen FALSE, the root bridge supports + ///< E= xtended (4096-byte) Configuration Space. + ///< W= hen TRUE, the root bridge supports + ///< 2= 56-byte Configuration Space only. + UINT64 AllocationAttributes; ///< A= llocation attributes. + ///< R= efer to EFI_PCI_HOST_BRIDGE_COMBINE_MEM_PMEM and + ///< E= FI_PCI_HOST_BRIDGE_MEM64_DECODE used by GetAllocAttributes() + ///< i= n EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL. + UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGE_APERTURE Bus; ///< B= us aperture which can be used by the root bridge. + UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGE_APERTURE Io; ///< I= O aperture which can be used by the root bridge. + UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGE_APERTURE Mem; ///< M= MIO aperture below 4GB which can be used by the root bridge. + UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGE_APERTURE MemAbove4G; ///< M= MIO aperture above 4GB which can be used by the root bridge. + UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGE_APERTURE PMem; ///< P= refetchable MMIO aperture below 4GB which can be used by the root bridge. + UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGE_APERTURE PMemAbove4G; ///< P= refetchable MMIO aperture above 4GB which can be used by the root bridge. + UINT32 HID; ///< P= nP hardware ID of the root bridge. This value must match the corresponding + ///< _= HID in the ACPI name space. + UINT32 UID; ///< U= nique ID that is required by ACPI if two devices have the same _HID. + ///< T= his value must also match the corresponding _UID/_HID pair in the ACPI name= space. +} UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGE; + +typedef struct { + UNIVERSAL_PAYLOAD_GENERIC_HEADER Header; + BOOLEAN ResourceAssigned; + UINT8 Count; + UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGE RootBridge[0]; +} UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGES; + +#pragma pack() + +#define UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGES_REVISION 1 + +extern GUID gUniversalPayloadPciRootBridgeInfoGuid; + +#endif // UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGES_H_ diff --git a/MdeModulePkg/MdeModulePkg.ci.yaml b/MdeModulePkg/MdeModulePkg.= ci.yaml index 45783f12c1..4c71468bd3 100644 --- a/MdeModulePkg/MdeModulePkg.ci.yaml +++ b/MdeModulePkg/MdeModulePkg.ci.yaml @@ -16,6 +16,8 @@ ## "", "" ## ] "ExceptionList": [ + "8005", "UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGE.UID", + "8005", "UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGE.HID", ], ## Both file path and directory path are accepted. "IgnoreFiles": [ diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec index 8d38383915..5cee4e159a 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec @@ -404,6 +404,12 @@ ## Include/Guid/MigratedFvInfo.h gEdkiiMigratedFvInfoGuid =3D { 0xc1ab12f7, 0x74aa, 0x408d, { 0xa2, 0xf4,= 0xc6, 0xce, 0xfd, 0x17, 0x98, 0x71 } } + # + # GUID defined in UniversalPayload + # + ## Include/UniversalPayload/PciRootBridges.h + gUniversalPayloadPciRootBridgeInfoGuid =3D { 0xec4ebacb, 0x2638, 0x416e,= { 0xbe, 0x80, 0xe5, 0xfa, 0x4b, 0x51, 0x19, 0x01 }} + [Ppis] ## Include/Ppi/AtaController.h gPeiAtaControllerPpiGuid =3D { 0xa45e60d1, 0xc719, 0x44aa, { 0xb0,= 0x7a, 0xaa, 0x77, 0x7f, 0x85, 0x90, 0x6d }} -- 2.30.0.windows.2 -=3D-=3D-=3D-=3D-=3D-=3D Groups.io Links: You receive all messages sent to this group. View/Reply Online (#76506): https://edk2.groups.io/g/devel/message/76506 Mute This Topic: https://groups.io/mt/83551777/1779286 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [zhiguang.liu@intel.com] -=3D-=3D-=3D-=3D-=3D-=3D -=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 (#76514): https://edk2.groups.io/g/devel/message/76514 Mute This Topic: https://groups.io/mt/83551873/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- --_000_PH0PR11MB5048CDDC68A5506F831B204C90309PH0PR11MB5048namp_ Content-Type: text/html; charset="gb2312" Content-Transfer-Encoding: quoted-printable
Hi Hao,

For this patch, can I keep your reviewed-by?

I just added&n= bsp;ExceptionList in MdeModulePkg\MdeModulePkg.ci.yaml, to avoid CI failure.

Thanks<= /div>
Zhiguang
=B7=A2=BC=FE=C8=CB: devel@= edk2.groups.io <devel@edk2.groups.io> =B4=FA=B1=ED Zhiguang Liu <z= higuang.liu@intel.com>
=B7=A2=CB=CD=CA=B1=BC=E4: 2021=C4=EA6=D4=C215=C8=D5 17:12
=CA=D5=BC=FE=C8=CB: devel@edk2.groups.io <devel@edk2.groups.io&g= t;
=B3=AD=CB=CD: Kinney, Michael D <michael.d.kinney@intel.com>;= Liming Gao <gaoliming@byosoft.com.cn>; Wang, Jian J <jian.j.wang@= intel.com>; Wu, Hao A <hao.a.wu@intel.com>
=D6=F7=CC=E2: [edk2-devel] [Patch V5 2/9] MdeModulePkg: Add new str= ucture for the PCI Root Bridge Info Hob
 
V5:
Add ExceptionList in MdeModulePkg\MdeModulePkg.ci.yaml, to avoid open CI issue, because UID and HID are terms which are already used in current
source code.

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>
Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
---
 MdeModulePkg/Include/UniversalPayload/PciRootBridges.h | 91 ++++++++= +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++= ++++++++
 MdeModulePkg/MdeModulePkg.ci.yaml      = ;            &n= bsp;   |  2 ++
 MdeModulePkg/MdeModulePkg.dec      &nb= sp;            =        |  6 ++++++
 3 files changed, 99 insertions(+)

diff --git a/MdeModulePkg/Include/UniversalPayload/PciRootBridges.h b/MdeM= odulePkg/Include/UniversalPayload/PciRootBridges.h
new file mode 100644
index 0000000000..3a7aae82d4
--- /dev/null
+++ b/MdeModulePkg/Include/UniversalPayload/PciRootBridges.h
@@ -0,0 +1,91 @@
+/** @file

+  This file defines the structure for the PCI Root Bridges.

+

+  Copyright (c) 2021, Intel Corporation. All rights reserved.<BR&= gt;

+  SPDX-License-Identifier: BSD-2-Clause-Patent

+

+  @par Revision Reference:

+    - Universal Payload Specification 0.75 (https://universalpayload.gi= thub.io/documentation/)

+**/

+

+#ifndef UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGES_H_

+#define UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGES_H_

+

+#include <UniversalPayload/UniversalPayload.h>

+

+#pragma pack(1)

+

+//

+// (Base > Limit) indicates an aperture is not available.

+//

+typedef struct {

+  //

+  // Base and Limit are the device address instead of host address w= hen

+  // Translation is not zero

+  //

+  UINT64 Base;

+  UINT64 Limit;

+  //

+  // According to UEFI 2.7, Device Address =3D Host Address + Transl= ation,

+  // so Translation =3D Device Address - Host Address.

+  // On platforms where Translation is not zero, the subtraction is = probably to

+  // be performed with UINT64 wrap-around semantics, for we may tran= slate an

+  // above-4G host address into a below-4G device address for legacy= PCIe device

+  // compatibility.

+  //

+  // NOTE: The alignment of Translation is required to be larger tha= n any BAR

+  // alignment in the same root bridge, so that the same alignment c= an be

+  // applied to both device address and host address, which simplifi= es the

+  // situation and makes the current resource allocation code in gen= eric PCI

+  // host bridge driver still work.

+  //

+  UINT64 Translation;

+} UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGE_APERTURE;

+

+///

+/// Payload PCI Root Bridge Information HOB

+///

+typedef struct {

+  UINT32          =             &nb= sp;            =   Segment;          =      ///< Segment number.

+  UINT64          =             &nb= sp;            =   Supports;          = ;    ///< Supported attributes.

+            &= nbsp;           &nbs= p;            &= nbsp;           &nbs= p;            &= nbsp;     ///< Refer to EFI_PCI_ATTRIBUTE_xxx used b= y GetAttributes()

+            &= nbsp;           &nbs= p;            &= nbsp;           &nbs= p;            &= nbsp;     ///< and SetAttributes() in EFI_PCI_ROOT_B= RIDGE_IO_PROTOCOL.

+  UINT64          =             &nb= sp;            =   Attributes;         &nb= sp;  ///< Initial attributes.

+            &= nbsp;           &nbs= p;            &= nbsp;           &nbs= p;            &= nbsp;     ///< Refer to EFI_PCI_ATTRIBUTE_xxx used b= y GetAttributes()

+            &= nbsp;           &nbs= p;            &= nbsp;           &nbs= p;            &= nbsp;     ///< and SetAttributes() in EFI_PCI_ROOT_B= RIDGE_IO_PROTOCOL.

+  BOOLEAN          = ;            &n= bsp;            = ; DmaAbove4G;          &n= bsp; ///< DMA above 4GB memory.

+            &= nbsp;           &nbs= p;            &= nbsp;           &nbs= p;            &= nbsp;     ///< Set to TRUE when root bridge supports= DMA above 4GB memory.

+  BOOLEAN          = ;            &n= bsp;            = ; NoExtendedConfigSpace; ///< When FALSE, the root bridge supports

+            &= nbsp;           &nbs= p;            &= nbsp;           &nbs= p;            &= nbsp;     ///< Extended (4096-byte) Configuration Sp= ace.

+            &= nbsp;           &nbs= p;            &= nbsp;           &nbs= p;            &= nbsp;     ///< When TRUE, the root bridge supports
+            &= nbsp;           &nbs= p;            &= nbsp;           &nbs= p;            &= nbsp;     ///< 256-byte Configuration Space only.
+  UINT64          =             &nb= sp;            =   AllocationAttributes;  ///< Allocation attributes.

+            &= nbsp;           &nbs= p;            &= nbsp;           &nbs= p;            &= nbsp;     ///< Refer to EFI_PCI_HOST_BRIDGE_COMBINE_= MEM_PMEM and

+            &= nbsp;           &nbs= p;            &= nbsp;           &nbs= p;            &= nbsp;     ///< EFI_PCI_HOST_BRIDGE_MEM64_DECODE used= by GetAllocAttributes()

+            &= nbsp;           &nbs= p;            &= nbsp;           &nbs= p;            &= nbsp;     ///< in EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOC= ATION_PROTOCOL.

+  UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGE_APERTURE Bus;   &= nbsp;           &nbs= p;   ///< Bus aperture which can be used by the root bridge.
+  UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGE_APERTURE Io;   &n= bsp;            = ;    ///< IO aperture which can be used by the root bridg= e.

+  UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGE_APERTURE Mem;   &= nbsp;           &nbs= p;   ///< MMIO aperture below 4GB which can be used by the roo= t bridge.

+  UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGE_APERTURE MemAbove4G;  =           ///< MMIO apertur= e above 4GB which can be used by the root bridge.

+  UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGE_APERTURE PMem;   =             &nb= sp;  ///< Prefetchable MMIO aperture below 4GB which can be used by= the root bridge.

+  UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGE_APERTURE PMemAbove4G;  = ;         ///< Prefetchable MMIO= aperture above 4GB which can be used by the root bridge.

+  UINT32          =             &nb= sp;            =   HID;          &nbs= p;        ///< PnP hardware ID of the= root bridge. This value must match the corresponding

+            &= nbsp;           &nbs= p;            &= nbsp;           &nbs= p;            &= nbsp;     ///< _HID in the ACPI name space.

+  UINT32          =             &nb= sp;            =   UID;          &nbs= p;        ///< Unique ID that is requ= ired by ACPI if two devices have the same _HID.

+            &= nbsp;           &nbs= p;            &= nbsp;           &nbs= p;            &= nbsp;     ///< This value must also match the corres= ponding _UID/_HID pair in the ACPI name space.

+} UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGE;

+

+typedef struct {

+  UNIVERSAL_PAYLOAD_GENERIC_HEADER   Header;

+  BOOLEAN          = ;            &n= bsp;     ResourceAssigned;

+  UINT8          &= nbsp;           &nbs= p;       Count;

+  UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGE  RootBridge[0];

+} UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGES;

+

+#pragma pack()

+

+#define UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGES_REVISION 1

+

+extern GUID gUniversalPayloadPciRootBridgeInfoGuid;

+

+#endif // UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGES_H_

diff --git a/MdeModulePkg/MdeModulePkg.ci.yaml b/MdeModulePkg/MdeModulePkg= .ci.yaml
index 45783f12c1..4c71468bd3 100644
--- a/MdeModulePkg/MdeModulePkg.ci.yaml
+++ b/MdeModulePkg/MdeModulePkg.ci.yaml
@@ -16,6 +16,8 @@
         ##    = ; "<ErrorID>", "<KeyWord>"

         ## ]

         "ExceptionList"= : [

+            "= 8005", "UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGE.UID",

+            "= 8005", "UNIVERSAL_PAYLOAD_PCI_ROOT_BRIDGE.HID",

         ],

         ## Both file path and dir= ectory path are accepted.

         "IgnoreFiles": = [

diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec=
index 8d38383915..5cee4e159a 100644
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -404,6 +404,12 @@
   ## Include/Guid/MigratedFvInfo.h

   gEdkiiMigratedFvInfoGuid =3D { 0xc1ab12f7, 0x74aa, 0x408d, { = 0xa2, 0xf4, 0xc6, 0xce, 0xfd, 0x17, 0x98, 0x71 } }

 

+  #

+  # GUID defined in UniversalPayload

+  #

+  ## Include/UniversalPayload/PciRootBridges.h

+  gUniversalPayloadPciRootBridgeInfoGuid =3D { 0xec4ebacb, 0x2638, 0= x416e, { 0xbe, 0x80, 0xe5, 0xfa, 0x4b, 0x51, 0x19, 0x01 }}

+

 [Ppis]

   ## Include/Ppi/AtaController.h

   gPeiAtaControllerPpiGuid       = = =3D { 0xa45e60d1, 0xc719, 0x44aa, { 0xb0, 0x7a, 0xaa, 0x77, 0x7f, 0x85, 0x= 90, 0x6d }}

--
2.30.0.windows.2



-=3D-=3D-=3D-=3D-=3D-=3D
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#76506): https://edk2.groups.io/g/devel/message/76506
Mute This Topic: https:/= /groups.io/mt/83551777/1779286
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2= .groups.io/g/devel/unsub [zhiguang.liu@intel.com]
-=3D-=3D-=3D-=3D-=3D-=3D


_._,_._,_
= Groups.io Links:

You receive all messages sent to this group.

<= a target=3D"_blank" href=3D"https://edk2.groups.io/g/devel/message/76514">V= iew/Reply Online (#76514) | | Mute This Topic | New Topic
Your Subscription | Contact Group Owner | Unsubscribe [importer@patchew.org]
_._,_._,_

=20 --_000_PH0PR11MB5048CDDC68A5506F831B204C90309PH0PR11MB5048namp_--