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

Produce all the PciIo & Dpath protocol for all the pci devices under the current host bridge. 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4703 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
qhuang8 2008-02-19 04:17:05 +00:00
parent 23f642e80a
commit eb9a9a5e23
5 changed files with 122 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

144
IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.c
View File

@ -335,27 +335,25 @@ Returns:
PciIoWrite (PciIo, EfiPciIoWidthUint8, 0x3C, 1, &Data8);
//
// Process Platform OpRom
// Process OpRom
//
if (gPciPlatformProtocol != NULL && !PciIoDevice->AllOpRomProcessed) {
if (!PciIoDevice->AllOpRomProcessed) {
PciIoDevice->AllOpRomProcessed = TRUE;
//
// Get the OpRom provided by platform
//
if (gPciPlatformProtocol != NULL) {
Status = gPciPlatformProtocol->GetPciRom (
gPciPlatformProtocol,
PciIoDevice->Handle,
&PlatformOpRomBuffer,
&PlatformOpRomSize
);
if (!EFI_ERROR (Status)) {
//
// Have Platform OpRom
//
PciIoDevice->RomSize = PlatformOpRomSize;
PciIoDevice->PciIo.RomSize = PlatformOpRomSize;
PciIoDevice->PciIo.RomImage = PlatformOpRomBuffer;
//
// For OpROM read from gPciPlatformProtocol:
// Add the Rom Image to internal database for later PCI light enumeration
@ -370,9 +368,15 @@ Returns:
PciIoDevice->PciIo.RomSize
);
}
}
//
// Process Image
// Dispatch the EFI OpRom for the PCI device.
// The OpRom is got from platform in the above code
// or loaded from device in previous bus enumeration
//
if (PciIoDevice->RomSize > 0) {
ProcessOpRomImage (PciIoDevice);
}
}
@ -659,7 +663,6 @@ Returns:
// TODO: EFI_UNSUPPORTED - add return value to function comment
// TODO: EFI_NOT_FOUND - add return value to function comment
{
PCI_IO_DEVICE *Temp;
PCI_IO_DEVICE *PciIoDevice;
EFI_DEV_PATH_PTR Node;
EFI_DEVICE_PATH_PROTOCOL *CurrentDevicePath;
@ -671,13 +674,13 @@ Returns:
while (CurrentLink && CurrentLink != &RootBridge->ChildList) {
Temp = PCI_IO_DEVICE_FROM_LINK (CurrentLink);
PciIoDevice = PCI_IO_DEVICE_FROM_LINK (CurrentLink);
if (RemainingDevicePath != NULL) {
Node.DevPath = RemainingDevicePath;
if (Node.Pci->Device != Temp->DeviceNumber ||
Node.Pci->Function != Temp->FunctionNumber) {
if (Node.Pci->Device != PciIoDevice->DeviceNumber ||
Node.Pci->Function != PciIoDevice->FunctionNumber) {
CurrentLink = CurrentLink->ForwardLink;
continue;
}
@ -685,7 +688,7 @@ Returns:
//
// Check if the device has been assigned with required resource
//
if (!Temp->Allocated) {
if (!PciIoDevice->Allocated) {
return EFI_NOT_READY;
}
@ -693,9 +696,7 @@ Returns:
// Check if the current node has been registered before
// If it is not, register it
//
if (!Temp->Registered) {
PciIoDevice = Temp;
if (!PciIoDevice->Registered) {
Status = RegisterPciDevice (
Controller,
PciIoDevice,
@ -704,8 +705,8 @@ Returns:
}
if (NumberOfChildren != NULL && ChildHandleBuffer != NULL && Temp->Registered) {
ChildHandleBuffer[*NumberOfChildren] = Temp->Handle;
if (NumberOfChildren != NULL && ChildHandleBuffer != NULL && PciIoDevice->Registered) {
ChildHandleBuffer[*NumberOfChildren] = PciIoDevice->Handle;
(*NumberOfChildren)++;
}
@ -720,24 +721,24 @@ Returns:
//
// If it is a PPB
//
if (!IsListEmpty (&Temp->ChildList)) {
if (!IsListEmpty (&PciIoDevice->ChildList)) {
Status = StartPciDevicesOnBridge (
Controller,
Temp,
PciIoDevice,
CurrentDevicePath,
NumberOfChildren,
ChildHandleBuffer
);
Temp->PciIo.Attributes (
&(Temp->PciIo),
PciIoDevice->PciIo.Attributes (
&(PciIoDevice->PciIo),
EfiPciIoAttributeOperationSupported,
0,
&Supports
);
Supports &= EFI_PCI_DEVICE_ENABLE;
Temp->PciIo.Attributes (
&(Temp->PciIo),
PciIoDevice->PciIo.Attributes (
&(PciIoDevice->PciIo),
EfiPciIoAttributeOperationEnable,
Supports,
NULL
@ -759,10 +760,7 @@ Returns:
// try to enable all the pci devices under this bridge
//
if (!Temp->Registered && Temp->Allocated) {
PciIoDevice = Temp;
if (!PciIoDevice->Registered && PciIoDevice->Allocated) {
Status = RegisterPciDevice (
Controller,
PciIoDevice,
@ -771,29 +769,29 @@ Returns:
}
if (NumberOfChildren != NULL && ChildHandleBuffer != NULL && Temp->Registered) {
ChildHandleBuffer[*NumberOfChildren] = Temp->Handle;
if (NumberOfChildren != NULL && ChildHandleBuffer != NULL && PciIoDevice->Registered) {
ChildHandleBuffer[*NumberOfChildren] = PciIoDevice->Handle;
(*NumberOfChildren)++;
}
if (!IsListEmpty (&Temp->ChildList)) {
if (!IsListEmpty (&PciIoDevice->ChildList)) {
Status = StartPciDevicesOnBridge (
Controller,
Temp,
PciIoDevice,
RemainingDevicePath,
NumberOfChildren,
ChildHandleBuffer
);
Temp->PciIo.Attributes (
&(Temp->PciIo),
PciIoDevice->PciIo.Attributes (
&(PciIoDevice->PciIo),
EfiPciIoAttributeOperationSupported,
0,
&Supports
);
Supports &= EFI_PCI_DEVICE_ENABLE;
Temp->PciIo.Attributes (
&(Temp->PciIo),
PciIoDevice->PciIo.Attributes (
&(PciIoDevice->PciIo),
EfiPciIoAttributeOperationEnable,
Supports,
NULL
@ -802,7 +800,6 @@ Returns:
}
CurrentLink = CurrentLink->ForwardLink;
continue;
}
}
@ -811,46 +808,31 @@ Returns:
EFI_STATUS
StartPciDevices (
IN EFI_HANDLE Controller,
IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath
IN EFI_HANDLE Controller
)
/*++
Routine Description:
Start to manage the PCI device according to RemainingDevicePath
If RemainingDevicePath == NULL, the PCI bus driver will start
to manage all the PCI devices it found previously
Start to manage all the PCI devices it found previously under
the entire host bridge.
Arguments:
Controller - An efi handle.
RemainingDevicePath - A pointer to the EFI_DEVICE_PATH_PROTOCOL.
Controller - root bridge handle.
Returns:
None
--*/
// TODO: EFI_UNSUPPORTED - add return value to function comment
// TODO: EFI_SUCCESS - add return value to function comment
{
EFI_DEV_PATH_PTR Node;
PCI_IO_DEVICE *RootBridge;
EFI_HANDLE ThisHostBridge;
LIST_ENTRY *CurrentLink;
if (RemainingDevicePath != NULL) {
//
// Check if the RemainingDevicePath is valid
//
Node.DevPath = RemainingDevicePath;
if ((Node.DevPath->Type != HARDWARE_DEVICE_PATH) ||
((Node.DevPath->SubType != HW_PCI_DP) &&
(DevicePathNodeLength (Node.DevPath) != sizeof (PCI_DEVICE_PATH)))
) {
return EFI_UNSUPPORTED;
}
}
RootBridge = GetRootBridgeByHandle (Controller);
ASSERT (RootBridge != NULL);
ThisHostBridge = RootBridge->PciRootBridgeIo->ParentHandle;
CurrentLink = gPciDevicePool.ForwardLink;
@ -860,11 +842,11 @@ Returns:
//
// Locate the right root bridge to start
//
if (RootBridge->Handle == Controller) {
if (RootBridge->PciRootBridgeIo->ParentHandle == ThisHostBridge) {
StartPciDevicesOnBridge (
Controller,
RootBridge->Handle,
RootBridge,
RemainingDevicePath,
NULL,
NULL,
NULL
);
@ -1007,40 +989,6 @@ Returns:
return NULL;
}
BOOLEAN
RootBridgeExisted (
IN EFI_HANDLE RootBridgeHandle
)
/*++
Routine Description:
This function searches if RootBridgeHandle has already existed
in current device pool.
If so, it means the given root bridge has been already enumerated.
Arguments:
RootBridgeHandle - An efi handle.
Returns:
None
--*/
{
PCI_IO_DEVICE *Bridge;
Bridge = GetRootBridgeByHandle (RootBridgeHandle);
if (Bridge != NULL) {
return TRUE;
}
return FALSE;
}
BOOLEAN
PciDeviceExisted (
IN PCI_IO_DEVICE *Bridge,

4
IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciDeviceSupport.h
View File

@ -244,8 +244,7 @@ Returns:
EFI_STATUS
StartPciDevices (
IN EFI_HANDLE Controller,
IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath
IN EFI_HANDLE Controller
)
/*++
@ -256,7 +255,6 @@ Routine Description:
Arguments:
Controller - TODO: add argument description
RemainingDevicePath - TODO: add argument description
Returns:

15
IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciEnumerator.c
View File

@ -52,13 +52,6 @@ Returns:
return PciEnumeratorLight (Controller);
}
//
// If this host bridge has been already enumerated, then return successfully
//
if (RootBridgeExisted (Controller)) {
return EFI_SUCCESS;
}
//
// Get the rootbridge Io protocol to find the host bridge handle
//
@ -277,7 +270,6 @@ Returns:
{
LIST_ENTRY *CurrentLink;
PCI_IO_DEVICE *Temp;
EFI_STATUS Status;
//
// Go through bridges to reach all devices
@ -290,7 +282,7 @@ Returns:
//
// Go further to process the option rom under this bridge
//
Status = ProcessOptionRom (Temp, RomBase, MaxLength);
ProcessOptionRom (Temp, RomBase, MaxLength);
}
if (Temp->RomSize != 0 && Temp->RomSize <= MaxLength) {
@ -298,10 +290,7 @@ Returns:
//
// Load and process the option rom
//
Status = LoadOpRomImage (Temp, RomBase);
if (Status == EFI_SUCCESS) {
Status = ProcessOpRomImage (Temp);
}
LoadOpRomImage (Temp, RomBase);
}
CurrentLink = CurrentLink->ForwardLink;

11
IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciEnumeratorSupport.c
View File

@ -1000,6 +1000,12 @@ Returns:
}
PciRomGetImageMapping (Temp);
//
// The OpRom has already been processed in the first round
//
Temp->AllOpRomProcessed = TRUE;
CurrentLink = CurrentLink->ForwardLink;
}
@ -1856,6 +1862,7 @@ Routine Description:
This routine is used to enumerate entire pci bus system
in a given platform
It is only called on the second start on the same Root Bridge.
Arguments:
@ -1881,9 +1888,9 @@ Returns:
Descriptors = NULL;
//
// If this host bridge has been already enumerated, then return successfully
// If this root bridge has been already enumerated, then return successfully
//
if (RootBridgeExisted (Controller)) {
if (GetRootBridgeByHandle (Controller) != NULL) {
return EFI_SUCCESS;
}

6
IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/pcibus.c
View File

@ -247,11 +247,9 @@ Returns:
}
//
// Enable PCI device specified by remaining device path. BDS or other driver can call the
// start more than once.
// Start all the devices under the entire host bridge.
//
StartPciDevices (Controller, RemainingDevicePath);
StartPciDevices (Controller);
return EFI_SUCCESS;
}