tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MdePkg/PciExpress: Add macro PCI_ECAM_ADDRESS 

The patch adds new macro PCI_ECAM_ADDRESS into PciExpress21.h,
to align to the PCIE spec, and also update PciExpressLib.h to
redirect PCI_EXPRESS_LIB_ADDRESS to the new macro.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
Ruiyu Ni 2017-08-04 13:02:14 +08:00
parent ebdde8ff26
commit c9c270193a
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
MdePkg/Include/IndustryStandard/PciExpress21.h
View File

@ -1,7 +1,7 @@
/** @file /** @file
Support for the latest PCI standard. Support for the latest PCI standard.
Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
(C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR> (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
@ -18,6 +18,23 @@
#include <IndustryStandard/Pci30.h> #include <IndustryStandard/Pci30.h>
/**
Macro that converts PCI Bus, PCI Device, PCI Function and PCI Register to an
ECAM (Enhanced Configuration Access Mechanism) address. The unused upper bits
of Bus, Device, Function and Register are stripped prior to the generation of
the address.
@param Bus PCI Bus number. Range 0..255.
@param Device PCI Device number. Range 0..31.
@param Function PCI Function number. Range 0..7.
@param Register PCI Register number. Range 0..4095.
@return The encode ECAM address.
**/
#define PCI_ECAM_ADDRESS(Bus,Device,Function,Offset) \
(((Offset) & 0xfff) | (((Function) & 0x07) << 12) | (((Device) & 0x1f) << 15) | (((Bus) & 0xff) << 20))
#pragma pack(1) #pragma pack(1)
/// ///
/// PCI Express Capability Structure /// PCI Express Capability Structure

5
MdePkg/Include/Library/PciExpressLib.h
View File

@ -5,7 +5,7 @@
configuration cycles must be through the 256 MB PCI Express MMIO window whose base address configuration cycles must be through the 256 MB PCI Express MMIO window whose base address
is defined by PcdPciExpressBaseAddress. is defined by PcdPciExpressBaseAddress.
Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at which accompanies this distribution. The full text of the license may be found at
@ -35,8 +35,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
@return The encode PCI address. @return The encode PCI address.
**/ **/
#define PCI_EXPRESS_LIB_ADDRESS(Bus,Device,Function,Offset) \ #define PCI_EXPRESS_LIB_ADDRESS(Bus,Device,Function,Offset) PCI_ECAM_ADDRESS ((Bus), (Device), (Function), (Offset))
(((Offset) & 0xfff) | (((Function) & 0x07) << 12) | (((Device) & 0x1f) << 15) | (((Bus) & 0xff) << 20))
/** /**
Registers a PCI device so PCI configuration registers may be accessed after Registers a PCI device so PCI configuration registers may be accessed after