From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web10.10612.1595505472497716918 for ; Thu, 23 Jul 2020 04:57:52 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=oEy0hM1x; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: ashraf.javeed@intel.com) IronPort-SDR: eiR0EYR2wx9lXHI9V71JD3m/+GMaf1SHIwC7QvIf5K75CWHuWDLB0MPPsvI1D0yuqHP1zJfjxx 7G+ccGS9UtKg== X-IronPort-AV: E=McAfee;i="6000,8403,9690"; a="130579259" X-IronPort-AV: E=Sophos;i="5.75,386,1589266800"; d="scan'208";a="130579259" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jul 2020 04:57:51 -0700 IronPort-SDR: zLTtULmidDNahPNw9YDu6vPhR6dusI01Ud/3me0bJWvN3WR01gVNC64BD9qmswT053wobZ+EaT gqcpd7OfyHIg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,386,1589266800"; d="scan'208";a="318970809" Received: from orsmsx104.amr.corp.intel.com ([10.22.225.131]) by orsmga008.jf.intel.com with ESMTP; 23 Jul 2020 04:57:50 -0700 Received: from orsmsx159.amr.corp.intel.com (10.22.240.24) by ORSMSX104.amr.corp.intel.com (10.22.225.131) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 23 Jul 2020 04:57:50 -0700 Received: from ORSEDG002.ED.cps.intel.com (10.7.248.5) by ORSMSX159.amr.corp.intel.com (10.22.240.24) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 23 Jul 2020 04:57:50 -0700 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.176) by edgegateway.intel.com (134.134.137.101) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 23 Jul 2020 04:57:49 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SmtqPGKIeKXvMrxmetvhW33w/s0Xoh/NG4C0sGJzjwPB9LIRELEebNIKjg+iVR2WUugoC0jhteC9hgGBZwagdSGIW/cuibTOR4dMkiiqRtczDqdkLNsb4pWgwxa/dkbR9KK46jQnFA+uq98gwGXPyTXweMtE8qJR8CoQrB3DzBoB+lEd71lmqFHbhV+KdALOXvU3x9VRKEpptJ3APwY2GoaJrXJrlIDFW7q1MqNMQ+auht+Sc1hQiZMqHi5EytrIWhIr8UVd0wiIaCUB/fP/c9BneJKrqXWeGjzT4NKZ6AlocQXjnyFZ3LMXs0u4QtjuXq+3f1fDQKU9/uSUdXC7vQ== 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=A94ryqAebhIS7TX5OJo/7/gdrgxUYLKPoTPD9hmbjMU=; b=FI4eOspjRY2mlhXFHpH3HKyhfcNgOhkCVIBO6+vZd28l6DGX5EDQn7tfUuDrR0z1vVDU2kI0wdcMqVKQHHJX8vsf9YNx9UNntzr1aFGTbRCB0e2qIQ6dKSAlpC6p1kQL0ReKFe1IP6TQwwkq4y7uHTpiqV7mIEdYhXJFCakfZ8aKeEOsgb3bf//jMXE+jp7UU5ROb6AIC3Ik7R6uCHE1JbT+PxFklPjv3d9qm0t0j+JyGg7ANGf1vvutdHtkhxkQyN9TcDKPVxG2QCmOR5YDe9xiMgkc2V4hoZfkh2LEXCx7sHOBksjqp26YAOEkOysRQ1Jg8lz75q7kmvZGe0tSlA== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=A94ryqAebhIS7TX5OJo/7/gdrgxUYLKPoTPD9hmbjMU=; b=oEy0hM1xbs71YrgORMTIFrm4533N+nqh065HX6mLW3zZM9ZSCEbdN8RCJEcrusGY+EIRoLHxspCxJ3hFiMHPhV0iGyF3R0IO/xNvOdU6fkjuoX8CzGeeCK8I8WPmQdy0gNwX0/p6IRjjfb+jqFcD1Ztx/vXjinVNMC9fSCsgjHM= Received: from BN6PR11MB1873.namprd11.prod.outlook.com (2603:10b6:404:106::19) by BN6PR11MB1987.namprd11.prod.outlook.com (2603:10b6:404:4a::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3216.23; Thu, 23 Jul 2020 11:57:48 +0000 Received: from BN6PR11MB1873.namprd11.prod.outlook.com ([fe80::e905:14db:71a9:6efa]) by BN6PR11MB1873.namprd11.prod.outlook.com ([fe80::e905:14db:71a9:6efa%2]) with mapi id 15.20.3216.023; Thu, 23 Jul 2020 11:57:47 +0000 From: "Javeed, Ashraf" To: "Gao, Liming" , "devel@edk2.groups.io" CC: "Kinney, Michael D" Subject: Re: [edk2-devel] [PATCH V3 1/2] MdePkg/Include/IndustryStandard: CXL 1.1 Registers Thread-Topic: [edk2-devel] [PATCH V3 1/2] MdePkg/Include/IndustryStandard: CXL 1.1 Registers Thread-Index: AQHWYNjkfah3EUOez0KN0EvjRdmSBqkVDrSQ Date: Thu, 23 Jul 2020 11:57:47 +0000 Message-ID: References: <20200722152139.16496-1-ashraf.javeed@intel.com> <20200722152139.16496-2-ashraf.javeed@intel.com> In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-version: 11.2.0.6 dlp-product: dlpe-windows dlp-reaction: no-action authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [49.207.197.101] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 3fca9668-a22a-40a5-82a6-08d82eff9e44 x-ms-traffictypediagnostic: BN6PR11MB1987: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:8882; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 61eUtEbvCsyPjV/P7q/MVmDoQn9Xq2P/h5IanEIVIuIeH8nolOLzBwVnt2PU4SechboUBm0jSKgF0wAtt1ZH9s4L+2cwEmqYXwKwMibuBnLkAtckrllZjuR3NeqCI7o2BTJkg6cg71U3FoxxU+HA5vG33Guk5lUvbrSkdljnfJQZ6sDBVtDB76lEvuxE2GwBWrSpFCToiQ5Y+9DXDAGYeNdxKqhnKY094milTrgHiqXT25R6z3TFoLLe30m5Vv8OOPVARmXpyikLwNTYuYLVy+yawQ9ZOlFLwJjotnwdzbX1K2zSIQhH02IBXekevW4o5VtueOC64yeXKOrSYq3LQKvcY1S4l91etkv+U7SA0lpHJ2exbN89pFVF1xvt0QvCRlnFu1yq5mW2qWCLnts0xA== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BN6PR11MB1873.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(366004)(346002)(136003)(39860400002)(376002)(396003)(26005)(4326008)(53546011)(6506007)(478600001)(5660300002)(66446008)(66476007)(66946007)(66556008)(55236004)(55016002)(9686003)(110136005)(107886003)(7696005)(76116006)(64756008)(86362001)(52536014)(30864003)(2906002)(33656002)(8936002)(316002)(966005)(83380400001)(8676002)(19627235002)(186003)(71200400001)(579004)(559001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: 3k8FrY0flffjHFBOjSAgr1Y/bQvXoaBN2UMQEbpJ30I98VZL/Ot7P9vIqwcbY2mm8TQP1uWqMGHoRNhIur5XQLWoj5iC0HtOYXMWKmJhgqR+7HcrGiyR5UuCxIe+/yq6QqJrwIxH4BYgMiFzLjsFb6NiwvVT2oKEY3+vDFUlP08QaBSraFENAIrnzGzLYah538xbgtJAhR7pfZAf5OV2Z7vzOjVZK17pLVzewVei0EDPbzIXSp+xYyJABUyLDrdeoAIt4et8C4GVWvlP3QKlpTe8hpu7mNuaRMkDAlJ9asgfjlnvQYzMGSKUWxGTK8yEhUPylY6Gjx8aA6GFfDQwDNHnloRYC/6k43JpREOg0j/D1xtaNTdt3/1PNVWjEApxhE44maJr8/+Vc2H0Izi9Cf2dEWRceDoZDzOG6aY/yvQZqGUMqtLi/FbEO0zB43kt8cK9O8MPqtahoXzKlkd0WlOIHvYAqKtpGWl9P5SzQGaF5Yz+Cnr4fLDE75uGiEKR MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN6PR11MB1873.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3fca9668-a22a-40a5-82a6-08d82eff9e44 X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Jul 2020 11:57:47.7274 (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: raM7w5yjxPkNr7WV7xjRDQfUoXdVbtB7GKNIdQxQ7jLsCaxthDgD6bDyDGLnPkf3V8X6frGcX2fVlqaxPekLrA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1987 Return-Path: ashraf.javeed@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="iso-2022-jp" Content-Transfer-Encoding: quoted-printable Liming; My response inline. Thanks for the review. Ashraf > -----Original Message----- > From: Gao, Liming > Sent: Thursday, July 23, 2020 3:36 PM > To: devel@edk2.groups.io; Javeed, Ashraf > Cc: Kinney, Michael D > Subject: RE: [edk2-devel] [PATCH V3 1/2] MdePkg/Include/IndustryStandard= : > CXL 1.1 Registers >=20 > Ashraf: >=20 > -----Original Message----- > From: devel@edk2.groups.io On Behalf Of Javeed, > Ashraf > Sent: 2020=1B$BG/=1B(B7=1B$B7n=1B(B22=1B$BF|=1B(B 23:22 > To: devel@edk2.groups.io > Cc: Kinney, Michael D ; Gao, Liming > > Subject: [edk2-devel] [PATCH V3 1/2] MdePkg/Include/IndustryStandard: CX= L 1.1 > Registers >=20 > BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2611 >=20 > Register definitions from chapter 7 of Compute Express Link Specificatio= n > Revision 1.1 are ported into the new Cxl11.h. > The CXL Flex Bus registers are based on the PCIe Extended Capability DVS= EC > structure header, led to the inclusion of upgraded Pci.h. >=20 > Signed-off-by: Ashraf Javeed > Cc: Michael D Kinney > Cc: Liming Gao > -- >=20 > V2: Indentation and double declaration fix, copyright date update >=20 > V3: Copyright date fix > --- > MdePkg/Include/IndustryStandard/Cxl11.h | 569 > +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > +++++++++++++++++++++++++++++++++++++++++++++++++ > MdePkg/Include/IndustryStandard/Pci.h | 6 ++---- > 2 files changed, 571 insertions(+), 4 deletions(-) >=20 > diff --git a/MdePkg/Include/IndustryStandard/Cxl11.h > b/MdePkg/Include/IndustryStandard/Cxl11.h > new file mode 100644 > index 0000000000..a261bb3fae > --- /dev/null > +++ b/MdePkg/Include/IndustryStandard/Cxl11.h > @@ -0,0 +1,569 @@ > +/** @file > + CXL 1.1 Register definitions > + > + This file contains the register definitions based on the Compute > + Express Link > + (CXL) Specification Revision 1.1. > + > +Copyright (c) 2020, Intel Corporation. All rights reserved.
> +SPDX-License-Identifier: BSD-2-Clause-Patent > + > +**/ > + > +#ifndef _CXL11_H_ > +#define _CXL11_H_ > + > +#include > +// > +// DVSEC Vendor ID > +// Compute Express Link Specification Revision: 1.1 - Chapter 7.1.1 - > +Table 58 // (subject to change as per CXL assigned Vendor ID) // > +#define INTEL_CXL_DVSEC_VENDOR_ID = 0x8086 > + > +// > +// CXL Flex Bus Device default device and function number // Compute > +Express Link Specification Revision: 1.1 - Chapter 7.1.1 // > +#define CXL_DEV_DEV = 0 > +#define CXL_DEV_FUNC = 0 > + > +// > +// Ensure proper structure formats > +// > +#pragma pack(1) > + > +/// > +/// The PCIe DVSEC for Flex Bus Device > +///@{ > +typedef union { > + struct { > + UINT16 CacheCapable : 1; //= bit 0 > + UINT16 IoCapable : 1; //= bit 1 > + UINT16 MemCapable : 1; //= bit 2 > + UINT16 MemHwInitMode : 1; //= bit 3 > + UINT16 HdmCount : 2; //= bit 4..5 > + UINT16 Reserved1 : 8; //= bit 6..13 > + UINT16 ViralCapable : 1; //= bit 14 > + UINT16 Reserved2 : 1; //= bit 15 > + }Bits; >=20 > This line should have one space between } and Bits. Otherwise, ECC will = report > the issue. > Please fix it in this header file. >=20 > }Bits =3D=3D> } Bits >=20 > Thanks > Liming I did run the ECC Python script and it did not report any issues. I shall check again and make the fixed if required. > + UINT16 Uint16; > +} CXL_DVSEC_FLEX_BUS_DEVICE_CAPABILITY; > + > +typedef union { > + struct { > + UINT16 CacheEnable : 1; //= bit 0 > + UINT16 IoEnable : 1; //= bit 1 > + UINT16 MemEnable : 1; //= bit 2 > + UINT16 CacheSfCoverage : 5; //= bit 3..7 > + UINT16 CacheSfGranularity : 3; //= bit 8..10 > + UINT16 CacheCleanEviction : 1; //= bit 11 > + UINT16 Reserved1 : 2; //= bit 12..13 > + UINT16 ViralEnable : 1; //= bit 14 > + UINT16 Reserved2 : 1; //= bit 15 > + }Bits; > + UINT16 Uint16; > +} CXL_DVSEC_FLEX_BUS_DEVICE_CONTROL; > + > +typedef union { > + struct { > + UINT16 Reserved1 : 14; /= / bit 0..13 > + UINT16 ViralStatus : 1; /= / bit 14 > + UINT16 Reserved2 : 1; /= / bit 15 > + }Bits; > + UINT16 Uint16; > +} CXL_DVSEC_FLEX_BUS_DEVICE_STATUS; > + > +typedef union { > + struct { > + UINT16 Reserved1 : 1; /= / bit 0 > + UINT16 Reserved2 : 1; /= / bit 1 > + UINT16 Reserved3 : 1; /= / bit 2 > + UINT16 Reserved4 : 13; /= / bit 3..15 > + }Bits; > + UINT16 Uint16; > +} CXL_1_1_DVSEC_FLEX_BUS_DEVICE_CONTROL2; > + > +typedef union { > + struct { > + UINT16 Reserved1 : 1; /= / bit 0 > + UINT16 Reserved2 : 1; /= / bit 1 > + UINT16 Reserved3 : 14; /= / bit 2..15 > + }Bits; > + UINT16 Uint16; > +} CXL_1_1_DVSEC_FLEX_BUS_DEVICE_STATUS2; > + > +typedef union { > + struct { > + UINT16 ConfigLock : 1; /= / bit 0 > + UINT16 Reserved1 : 15; /= / bit 1..15 > + }Bits; > + UINT16 Uint16; > +} CXL_DVSEC_FLEX_BUS_DEVICE_LOCK; > + > +typedef union { > + struct { > + UINT32 MemorySizeHigh : 32; /= / bit 0..31 > + }Bits; > + UINT32 Uint32; > +} CXL_DVSEC_FLEX_BUS_DEVICE_RANGE1_SIZE_HIGH; > + > +typedef union { > + struct { > + UINT32 MemoryInfoValid : 1; /= / bit 0 > + UINT32 MemoryActive : 1; /= / bit 1 > + UINT32 MediaType : 3; /= / bit 2..4 > + UINT32 MemoryClass : 3; /= / bit 5..7 > + UINT32 DesiredInterleave : 3; /= / bit 8..10 > + UINT32 Reserved : 17; /= / bit 11..27 > + UINT32 MemorySizeLow : 4; /= / bit 28..31 > + }Bits; > + UINT32 Uint32; > +} CXL_DVSEC_FLEX_BUS_DEVICE_RANGE1_SIZE_LOW; > + > +typedef union { > + struct { > + UINT32 MemoryBaseHigh : 32; /= / bit 0..31 > + }Bits; > + UINT32 Uint32; > +} CXL_DVSEC_FLEX_BUS_DEVICE_RANGE1_BASE_HIGH; > + > +typedef union { > + struct { > + UINT32 Reserved : 28; /= / bit 0..27 > + UINT32 MemoryBaseLow : 4; /= / bit 28..31 > + }Bits; > + UINT32 Uint32; > +} CXL_DVSEC_FLEX_BUS_DEVICE_RANGE1_BASE_LOW; > + > + > +typedef union { > + struct { > + UINT32 MemorySizeHigh : 32; /= / bit 0..31 > + }Bits; > + UINT32 Uint32; > +} CXL_DVSEC_FLEX_BUS_DEVICE_RANGE2_SIZE_HIGH; > + > +typedef union { > + struct { > + UINT32 MemoryInfoValid : 1; /= / bit 0 > + UINT32 MemoryActive : 1; /= / bit 1 > + UINT32 MediaType : 3; /= / bit 2..4 > + UINT32 MemoryClass : 3; /= / bit 5..7 > + UINT32 DesiredInterleave : 3; /= / bit 8..10 > + UINT32 Reserved : 17; /= / bit 11..27 > + UINT32 MemorySizeLow : 4; /= / bit 28..31 > + }Bits; > + UINT32 Uint32; > +} CXL_DVSEC_FLEX_BUS_DEVICE_RANGE2_SIZE_LOW; > + > +typedef union { > + struct { > + UINT32 MemoryBaseHigh : 32; /= / bit 0..31 > + }Bits; > + UINT32 Uint32; > +} CXL_DVSEC_FLEX_BUS_DEVICE_RANGE2_BASE_HIGH; > + > +typedef union { > + struct { > + UINT32 Reserved : 28; /= / bit 0..27 > + UINT32 MemoryBaseLow : 4; /= / bit 28..31 > + }Bits; > + UINT32 Uint32; > +} CXL_DVSEC_FLEX_BUS_DEVICE_RANGE2_BASE_LOW; > + > +// > +// Flex Bus Device DVSEC ID > +// Compute Express Link Specification Revision: 1.1 - Chapter 7.1.1, > +Table 58 // > +#define FLEX_BUS_DEVICE_DVSEC_ID 0 > + > +// > +// PCIe DVSEC for Flex Bus Device > +// Compute Express Link Specification Revision: 1.1 - Chapter 7.1.1, > +Figure 95 // typedef struct { > + PCI_EXPRESS_EXTENDED_CAPABILITIES_HEADER Header; > // offset 0 > + PCI_EXPRESS_DESIGNATED_VENDOR_SPECIFIC_HEADER_1 > DesignatedVendorSpecificHeader1; // offset 4 > + PCI_EXPRESS_DESIGNATED_VENDOR_SPECIFIC_HEADER_2 > DesignatedVendorSpecificHeader2; // offset 8 > + CXL_DVSEC_FLEX_BUS_DEVICE_CAPABILITY DeviceC= apability; > // offset 10 > + CXL_DVSEC_FLEX_BUS_DEVICE_CONTROL DeviceC= ontrol; > // offset 12 > + CXL_DVSEC_FLEX_BUS_DEVICE_STATUS DeviceS= tatus; > // offset 14 > + CXL_1_1_DVSEC_FLEX_BUS_DEVICE_CONTROL2 DeviceC= ontrol2; > // offset 16 > + CXL_1_1_DVSEC_FLEX_BUS_DEVICE_STATUS2 DeviceS= tatus2; > // offset 18 > + CXL_DVSEC_FLEX_BUS_DEVICE_LOCK DeviceL= ock; > // offset 20 > + UINT16 Reserve= d; // offset 22 > + CXL_DVSEC_FLEX_BUS_DEVICE_RANGE1_SIZE_HIGH > DeviceRange1SizeHigh; // offset 24 > + CXL_DVSEC_FLEX_BUS_DEVICE_RANGE1_SIZE_LOW > DeviceRange1SizeLow; // offset 28 > + CXL_DVSEC_FLEX_BUS_DEVICE_RANGE1_BASE_HIGH > DeviceRange1BaseHigh; // offset 32 > + CXL_DVSEC_FLEX_BUS_DEVICE_RANGE1_BASE_LOW > DeviceRange1BaseLow; // offset 36 > + CXL_DVSEC_FLEX_BUS_DEVICE_RANGE2_SIZE_HIGH > DeviceRange2SizeHigh; // offset 40 > + CXL_DVSEC_FLEX_BUS_DEVICE_RANGE2_SIZE_LOW > DeviceRange2SizeLow; // offset 44 > + CXL_DVSEC_FLEX_BUS_DEVICE_RANGE2_BASE_HIGH > DeviceRange2BaseHigh; // offset 48 > + CXL_DVSEC_FLEX_BUS_DEVICE_RANGE2_BASE_LOW > DeviceRange2BaseLow; // offset 52 > +} CXL_1_1_DVSEC_FLEX_BUS_DEVICE; > +///@} > + > +/// > +/// PCIe DVSEC for FLex Bus Port > +///@{ > +typedef union { > + struct { > + UINT16 CacheCapable : 1; /= / bit 0 > + UINT16 IoCapable : 1; /= / bit 1 > + UINT16 MemCapable : 1; /= / bit 2 > + UINT16 Reserved : 13; /= / bit 3..15 > + }Bits; > + UINT16 Uint16; > +} CXL_1_1_DVSEC_FLEX_BUS_PORT_CAPABILITY; > + > +typedef union { > + struct { > + UINT16 CacheEnable : 1; //= bit 0 > + UINT16 IoEnable : 1; //= bit 1 > + UINT16 MemEnable : 1; //= bit 2 > + UINT16 CxlSyncBypassEnable : 1; //= bit 3 > + UINT16 DriftBufferEnable : 1; //= bit 4 > + UINT16 Reserved : 3; //= bit 5..7 > + UINT16 Retimer1Present : 1; //= bit 8 > + UINT16 Retimer2Present : 1; //= bit 9 > + UINT16 Reserved2 : 6; //= bit 10..15 > + }Bits; > + UINT16 Uint16; > +} CXL_1_1_DVSEC_FLEX_BUS_PORT_CONTROL; > + > +typedef union { > + struct { > + UINT16 CacheEnable : 1; //= bit 0 > + UINT16 IoEnable : 1; //= bit 1 > + UINT16 MemEnable : 1; //= bit 2 > + UINT16 CxlSyncBypassEnable : 1; //= bit 3 > + UINT16 DriftBufferEnable : 1; //= bit 4 > + UINT16 Reserved : 3; //= bit 5..7 > + UINT16 CxlCorrectableProtocolIdFramingError : 1; //= bit 8 > + UINT16 CxlUncorrectableProtocolIdFramingError : 1; //= bit 9 > + UINT16 CxlUnexpectedProtocolIdDropped : 1; //= bit 10 > + UINT16 Reserved2 : 5; //= bit 11..15 > + }Bits; > + UINT16 Uint16; > +} CXL_1_1_DVSEC_FLEX_BUS_PORT_STATUS; > + > +// > +// Flex Bus Port DVSEC ID > +// Compute Express Link Specification Revision: 1.1 - Chapter 7.2.1.3, > +Table 62 // > +#define FLEX_BUS_PORT_DVSEC_ID 7 > + > +// > +// PCIe DVSEC for Flex Bus Port > +// Compute Express Link Specification Revision: 1.1 - Chapter 7.2.1.3, > +Figure 99 // typedef struct { > + PCI_EXPRESS_EXTENDED_CAPABILITIES_HEADER Header; > // offset 0 > + PCI_EXPRESS_DESIGNATED_VENDOR_SPECIFIC_HEADER_1 > DesignatedVendorSpecificHeader1; // offset 4 > + PCI_EXPRESS_DESIGNATED_VENDOR_SPECIFIC_HEADER_2 > DesignatedVendorSpecificHeader2; // offset 8 > + CXL_1_1_DVSEC_FLEX_BUS_PORT_CAPABILITY PortCap= ability; > // offset 10 > + CXL_1_1_DVSEC_FLEX_BUS_PORT_CONTROL PortCon= trol; > // offset 12 > + CXL_1_1_DVSEC_FLEX_BUS_PORT_STATUS PortSta= tus; > // offset 14 > +} CXL_1_1_DVSEC_FLEX_BUS_PORT; > +///@} > + > +/// > +/// CXL 1.1 Upstream and Downstream Port Subsystem Component registers > +/// > + > +/// The CXL.Cache and CXL.Memory Architectural register definitions /// > +Based on chapter 7.2.2 of Compute Express Link Specification Revision: > +1.1 ///@{ > + > +#define CXL_CAPABILITY_HEADER_OFFSET 0 > +typedef union { > + struct { > + UINT32 CxlCapabilityId : 16; /= / bit 0..15 > + UINT32 CxlCapabilityVersion : 4; /= / bit 16..19 > + UINT32 CxlCacheMemVersion : 4; /= / bit 20..23 > + UINT32 ArraySize : 8; /= / bit 24..31 > + } Bits; > + UINT32 Uint32; > +} CXL_CAPABILITY_HEADER; > + > +#define CXL_RAS_CAPABILITY_HEADER_OFFSET 4 > +typedef union { > + struct { > + UINT32 CxlCapabilityId : 16; /= / bit 0..15 > + UINT32 CxlCapabilityVersion : 4; /= / bit 16..19 > + UINT32 CxlRasCapabilityPointer : 12; /= / bit 20..31 > + } Bits; > + UINT32 Uint32; > +} CXL_RAS_CAPABILITY_HEADER; > + > +#define CXL_SECURITY_CAPABILITY_HEADER_OFFSET 8 > +typedef union { > + struct { > + UINT32 CxlCapabilityId : 16; /= / bit 0..15 > + UINT32 CxlCapabilityVersion : 4; /= / bit 16..19 > + UINT32 CxlSecurityCapabilityPointer : 12; /= / bit 20..31 > + } Bits; > + UINT32 Uint32; > +} CXL_SECURITY_CAPABILITY_HEADER; > + > +#define CXL_LINK_CAPABILITY_HEADER_OFFSET 0xC > +typedef union { > + struct { > + UINT32 CxlCapabilityId : 16; /= / bit 0..15 > + UINT32 CxlCapabilityVersion : 4; /= / bit 16..19 > + UINT32 CxlLinkCapabilityPointer : 12; /= / bit 20..31 > + } Bits; > + UINT32 Uint32; > +} CXL_LINK_CAPABILITY_HEADER; > + > +typedef union { > + struct { > + UINT32 CacheDataParity : 1; /= / bit 0..0 > + UINT32 CacheAddressParity : 1; /= / bit 1..1 > + UINT32 CacheByteEnableParity : 1; /= / bit 2..2 > + UINT32 CacheDataEcc : 1; /= / bit 3..3 > + UINT32 MemDataParity : 1; /= / bit 4..4 > + UINT32 MemAddressParity : 1; /= / bit 5..5 > + UINT32 MemByteEnableParity : 1; /= / bit 6..6 > + UINT32 MemDataEcc : 1; /= / bit 7..7 > + UINT32 ReInitThreshold : 1; /= / bit 8..8 > + UINT32 RsvdEncodingViolation : 1; /= / bit 9..9 > + UINT32 PoisonReceived : 1; /= / bit 10..10 > + UINT32 ReceiverOverflow : 1; /= / bit 11..11 > + UINT32 Reserved : 20; /= / bit 12..31 > + } Bits; > + UINT32 Uint32; > +} CXL_1_1_UNCORRECTABLE_ERROR_STATUS; > + > +typedef union { > + struct { > + UINT32 CacheDataParityMask : 1; /= / bit 0..0 > + UINT32 CacheAddressParityMask : 1; /= / bit 1..1 > + UINT32 CacheByteEnableParityMask : 1; /= / bit 2..2 > + UINT32 CacheDataEccMask : 1; /= / bit 3..3 > + UINT32 MemDataParityMask : 1; /= / bit 4..4 > + UINT32 MemAddressParityMask : 1; /= / bit 5..5 > + UINT32 MemByteEnableParityMask : 1; /= / bit 6..6 > + UINT32 MemDataEccMask : 1; /= / bit 7..7 > + UINT32 ReInitThresholdMask : 1; /= / bit 8..8 > + UINT32 RsvdEncodingViolationMask : 1; /= / bit 9..9 > + UINT32 PoisonReceivedMask : 1; /= / bit 10..10 > + UINT32 ReceiverOverflowMask : 1; /= / bit 11..11 > + UINT32 Reserved : 20; /= / bit 12..31 > + } Bits; > + UINT32 Uint32; > +} CXL_1_1_UNCORRECTABLE_ERROR_MASK; > + > +typedef union { > + struct { > + UINT32 CacheDataParitySeverity : 1; /= / bit 0..0 > + UINT32 CacheAddressParitySeverity : 1; /= / bit 1..1 > + UINT32 CacheByteEnableParitySeverity : 1; /= / bit 2..2 > + UINT32 CacheDataEccSeverity : 1; /= / bit 3..3 > + UINT32 MemDataParitySeverity : 1; /= / bit 4..4 > + UINT32 MemAddressParitySeverity : 1; /= / bit 5..5 > + UINT32 MemByteEnableParitySeverity : 1; /= / bit 6..6 > + UINT32 MemDataEccSeverity : 1; /= / bit 7..7 > + UINT32 ReInitThresholdSeverity : 1; /= / bit 8..8 > + UINT32 RsvdEncodingViolationSeverity : 1; /= / bit 9..9 > + UINT32 PoisonReceivedSeverity : 1; /= / bit 10..10 > + UINT32 ReceiverOverflowSeverity : 1; /= / bit 11..11 > + UINT32 Reserved : 20; /= / bit 12..31 > + } Bits; > + UINT32 Uint32; > +} CXL_1_1_UNCORRECTABLE_ERROR_SEVERITY; > + > +typedef union { > + struct { > + UINT32 CacheDataEcc : 1; /= / bit 0..0 > + UINT32 MemoryDataEcc : 1; /= / bit 1..1 > + UINT32 CrcThreshold : 1; /= / bit 2..2 > + UINT32 RetryThreshold : 1; /= / bit 3..3 > + UINT32 CachePoisonReceived : 1; /= / bit 4..4 > + UINT32 MemoryPoisonReceived : 1; /= / bit 5..5 > + UINT32 PhysicalLayerError : 1; /= / bit 6..6 > + UINT32 Reserved : 25; /= / bit 7..31 > + } Bits; > + UINT32 Uint32; > +} CXL_CORRECTABLE_ERROR_STATUS; > + > +typedef union { > + struct { > + UINT32 CacheDataEccMask : 1; /= / bit 0..0 > + UINT32 MemoryDataEccMask : 1; /= / bit 1..1 > + UINT32 CrcThresholdMask : 1; /= / bit 2..2 > + UINT32 RetryThresholdMask : 1; /= / bit 3..3 > + UINT32 CachePoisonReceivedMask : 1; /= / bit 4..4 > + UINT32 MemoryPoisonReceivedMask : 1; /= / bit 5..5 > + UINT32 PhysicalLayerErrorMask : 1; /= / bit 6..6 > + UINT32 Reserved : 25; /= / bit 7..31 > + } Bits; > + UINT32 Uint32; > +} CXL_CORRECTABLE_ERROR_MASK; > + > +typedef union { > + struct { > + UINT32 FirstErrorPointer : 4; /= / bit 0..3 > + UINT32 Reserved1 : 5; /= / bit 4..8 > + UINT32 MultipleHeaderRecordingCapability : 1; /= / bit 9..9 > + UINT32 Reserved2 : 3; /= / bit 10..12 > + UINT32 PoisonEnabled : 1; /= / bit 13..13 > + UINT32 Reserved3 : 18; /= / bit 14..31 > + } Bits; > + UINT32 Uint32; > +} CXL_ERROR_CAPABILITIES_AND_CONTROL; > + > +typedef struct { > + CXL_1_1_UNCORRECTABLE_ERROR_STATUS > UncorrectableErrorStatus; > + CXL_1_1_UNCORRECTABLE_ERROR_MASK > UncorrectableErrorMask; > + CXL_1_1_UNCORRECTABLE_ERROR_SEVERITY > UncorrectableErrorSeverity; > + CXL_CORRECTABLE_ERROR_STATUS > CorrectableErrorStatus; > + CXL_CORRECTABLE_ERROR_MASK Correct= ableErrorMask; > + CXL_ERROR_CAPABILITIES_AND_CONTROL > ErrorCapabilitiesAndControl; > + UINT32 HeaderL= og[16]; > +} CXL_1_1_RAS_CAPABILITY_STRUCTURE; > + > +typedef union { > + struct { > + UINT32 DeviceTrustLevel : 2; /= / bit 0..1 > + UINT32 Reserved : 30; /= / bit 2..31 > + } Bits; > + UINT32 Uint32; > +} CXL_1_1_SECURITY_POLICY; > + > +typedef struct { > + CXL_1_1_SECURITY_POLICY Securit= yPolicy; > +} CXL_1_1_SECURITY_CAPABILITY_STRUCTURE; > + > +typedef union { > + struct { > + UINT64 CxlLinkVersionSupported : 4; /= / bit 0..3 > + UINT64 CxlLinkVersionReceived : 4; /= / bit 4..7 > + UINT64 LlrWrapValueSupported : 8; /= / bit 8..15 > + UINT64 LlrWrapValueReceived : 8; /= / bit 16..23 > + UINT64 NumRetryReceived : 5; /= / bit 24..28 > + UINT64 NumPhyReinitReceived : 5; /= / bit 29..33 > + UINT64 WrPtrReceived : 8; /= / bit 34..41 > + UINT64 EchoEseqReceived : 8; /= / bit 42..49 > + UINT64 NumFreeBufReceived : 8; /= / bit 50..57 > + UINT64 Reserved : 6; /= / bit 58..63 > + } Bits; > + UINT64 Uint64; > +} CXL_LINK_LAYER_CAPABILITY; > + > +typedef union { > + struct { > + UINT16 LlReset : 1; /= / bit 0..0 > + UINT16 LlInitStall : 1; /= / bit 1..1 > + UINT16 LlCrdStall : 1; /= / bit 2..2 > + UINT16 InitState : 2; /= / bit 3..4 > + UINT16 LlRetryBufferConsumed : 8; /= / bit 5..12 > + UINT16 Reserved : 3; /= / bit 13..15 > + } Bits; > + UINT16 Uint16; > +} CXL_LINK_LAYER_CONTROL_AND_STATUS; > + > +typedef union { > + struct { > + UINT64 CacheReqCredits : 10; /= / bit 0..9 > + UINT64 CacheRspCredits : 10; /= / bit 10..19 > + UINT64 CacheDataCredits : 10; /= / bit 20..29 > + UINT64 MemReqRspCredits : 10; /= / bit 30..39 > + UINT64 MemDataCredits : 10; /= / bit 40..49 > + } Bits; > + UINT64 Uint64; > +} CXL_LINK_LAYER_RX_CREDIT_CONTROL; > + > +typedef union { > + struct { > + UINT64 CacheReqCredits : 10; /= / bit 0..9 > + UINT64 CacheRspCredits : 10; /= / bit 10..19 > + UINT64 CacheDataCredits : 10; /= / bit 20..29 > + UINT64 MemReqRspCredits : 10; /= / bit 30..39 > + UINT64 MemDataCredits : 10; /= / bit 40..49 > + } Bits; > + UINT64 Uint64; > +} CXL_LINK_LAYER_RX_CREDIT_RETURN_STATUS; > + > +typedef union { > + struct { > + UINT64 CacheReqCredits : 10; /= / bit 0..9 > + UINT64 CacheRspCredits : 10; /= / bit 10..19 > + UINT64 CacheDataCredits : 10; /= / bit 20..29 > + UINT64 MemReqRspCredits : 10; /= / bit 30..39 > + UINT64 MemDataCredits : 10; /= / bit 40..49 > + } Bits; > + UINT64 Uint64; > +} CXL_LINK_LAYER_TX_CREDIT_STATUS; > + > +typedef union { > + struct { > + UINT32 AckForceThreshold : 8; /= / bit 0..7 > + UINT32 AckFLushRetimer : 10; /= / bit 8..17 > + } Bits; > + UINT32 Uint32; > +} CXL_LINK_LAYER_ACK_TIMER_CONTROL; > + > +typedef union { > + struct { > + UINT32 MdhDisable : 1; /= / bit 0..0 > + UINT32 Reserved : 31; /= / bit 1..31 > + } Bits; > + UINT32 Uint32; > +} CXL_LINK_LAYER_DEFEATURE; > + > +typedef struct { > + CXL_LINK_LAYER_CAPABILITY LinkLay= erCapability; > + CXL_LINK_LAYER_CONTROL_AND_STATUS > LinkLayerControlStatus; > + CXL_LINK_LAYER_RX_CREDIT_CONTROL > LinkLayerRxCreditControl; > + CXL_LINK_LAYER_RX_CREDIT_RETURN_STATUS > LinkLayerRxCreditReturnStatus; > + CXL_LINK_LAYER_TX_CREDIT_STATUS > LinkLayerTxCreditStatus; > + CXL_LINK_LAYER_ACK_TIMER_CONTROL > LinkLayerAckTimerControl; > + CXL_LINK_LAYER_DEFEATURE LinkLay= erDefeature; > +} CXL_1_1_LINK_CAPABILITY_STRUCTURE; > + > +#define CXL_IO_ARBITRATION_CONTROL_OFFSET 0x180 > +typedef union { > + struct { > + UINT32 Reserved1 : 4; /= / bit 0..3 > + UINT32 WeightedRoundRobinArbitrationWeight : 4; /= / bit 4..7 > + UINT32 Reserved2 : 24; /= / bit 8..31 > + } Bits; > + UINT32 Uint32; > +} CXL_IO_ARBITRATION_CONTROL; > + > +#define CXL_CACHE_MEMORY_ARBITRATION_CONTROL_OFFSET 0x1C0 > +typedef union { > + struct { > + UINT32 Reserved1 : 4; /= / bit 0..3 > + UINT32 WeightedRoundRobinArbitrationWeight : 4; /= / bit 4..7 > + UINT32 Reserved2 : 24; /= / bit 8..31 > + } Bits; > + UINT32 Uint32; > +} CXL_CACHE_MEMORY_ARBITRATION_CONTROL; > +///@} > + > +/// The CXL.RCRB base register definition /// Based on chapter 7.3 of > +Compute Express Link Specification Revision: 1.1 ///@{ typedef union { > + struct { > + UINT64 RcrbEnable : 1; /= / bit 0..0 > + UINT64 Reserved : 12; /= / bit 1..12 > + UINT64 RcrbBaseAddress : 51; /= / bit 13..63 > + } Bits; > + UINT64 Uint64; > +} CXL_RCRB_BASE; > +///@} > + > +#pragma pack() > + > +// > +// CXL Downstream / Upstream Port RCRB space register offsets // > +Compute Express Link Specification Revision: 1.1 - Chapter 7.2.1.1 - > +Figure 97 // > +#define CXL_PORT_RCRB_MEMBAR0_LOW_OFFSET = 0x010 > +#define CXL_PORT_RCRB_MEMBAR0_HIGH_OFFSET = 0x014 > +#define CXL_PORT_RCRB_EXTENDED_CAPABILITY_BASE_OFFSET > 0x100 > + > +#endif > diff --git a/MdePkg/Include/IndustryStandard/Pci.h > b/MdePkg/Include/IndustryStandard/Pci.h > index 8ed96b992a..42c00ac762 100644 > --- a/MdePkg/Include/IndustryStandard/Pci.h > +++ b/MdePkg/Include/IndustryStandard/Pci.h > @@ -1,7 +1,7 @@ > /** @file > Support for the latest PCI standard. >=20 > -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
> +Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.
> SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > **/ > @@ -9,9 +9,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #ifndef > _PCI_H_ #define _PCI_H_ >=20 > -#include > -#include -#include > > +#include > #include >=20 > #endif > -- > 2.21.0.windows.1 >=20 >=20 >=20