david/ipxe
david/ipxe
Archived
1
0
Fork 0
Code

[bofm] Pass BOFM version 2 table to SetStatus() if applicable

Browse Source 
Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown 2011-05-05 16:51:31 +01:00
parent 8f51db233a
commit e58e4238b6
1 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/interface/efi/efi_bofm.c
View File

@ -97,6 +97,9 @@ typedef struct {
typedef struct _IBM_BOFM_DRIVER_CONFIGURATION_PROTOCOL typedef struct _IBM_BOFM_DRIVER_CONFIGURATION_PROTOCOL
IBM_BOFM_DRIVER_CONFIGURATION_PROTOCOL; IBM_BOFM_DRIVER_CONFIGURATION_PROTOCOL;
typedef struct _IBM_BOFM_DRIVER_CONFIGURATION_PROTOCOL2
IBM_BOFM_DRIVER_CONFIGURATION_PROTOCOL2;
typedef EFI_STATUS ( EFIAPI *IBM_BOFM_DRIVER_CONFIGURATION_SUPPORT ) ( typedef EFI_STATUS ( EFIAPI *IBM_BOFM_DRIVER_CONFIGURATION_SUPPORT ) (
IN IBM_BOFM_DRIVER_CONFIGURATION_PROTOCOL *This, IN IBM_BOFM_DRIVER_CONFIGURATION_PROTOCOL *This,
EFI_HANDLE ControllerHandle, EFI_HANDLE ControllerHandle,
@ -112,20 +115,27 @@ typedef EFI_STATUS ( EFIAPI *IBM_BOFM_DRIVER_CONFIGURATION_STATUS ) (
UINT8 BOFMReturnCode UINT8 BOFMReturnCode
); );
typedef EFI_STATUS ( EFIAPI *IBM_BOFM_DRIVER_CONFIGURATION_STATUS2 ) (
IN IBM_BOFM_DRIVER_CONFIGURATION_PROTOCOL2 *This,
EFI_HANDLE ControllerHandle,
BOOLEAN ResetRequired,
UINT8 BOFMReturnCode
);
struct _IBM_BOFM_DRIVER_CONFIGURATION_PROTOCOL { struct _IBM_BOFM_DRIVER_CONFIGURATION_PROTOCOL {
IBM_BOFM_TABLE BofmTable; IBM_BOFM_TABLE BofmTable;
IBM_BOFM_DRIVER_CONFIGURATION_STATUS SetStatus; IBM_BOFM_DRIVER_CONFIGURATION_STATUS SetStatus;
IBM_BOFM_DRIVER_CONFIGURATION_SUPPORT RegisterSupport; IBM_BOFM_DRIVER_CONFIGURATION_SUPPORT RegisterSupport;
}; };
typedef struct _IBM_BOFM_DRIVER_CONFIGURATION_PROTOCOL2 { struct _IBM_BOFM_DRIVER_CONFIGURATION_PROTOCOL2 {
UINT32 Signature; UINT32 Signature;
UINT32 Reserved1; UINT32 Reserved1;
UINT64 Reserved2; UINT64 Reserved2;
IBM_BOFM_DRIVER_CONFIGURATION_STATUS SetStatus; IBM_BOFM_DRIVER_CONFIGURATION_STATUS2 SetStatus;
IBM_BOFM_DRIVER_CONFIGURATION_SUPPORT RegisterSupport; IBM_BOFM_DRIVER_CONFIGURATION_SUPPORT RegisterSupport;
IBM_BOFM_TABLE BofmTable; IBM_BOFM_TABLE BofmTable;
} IBM_BOFM_DRIVER_CONFIGURATION_PROTOCOL2; };
/*************************************************************************** /***************************************************************************
* *
@ -280,7 +290,6 @@ static EFI_STATUS EFIAPI efi_bofm_start ( EFI_DRIVER_BINDING_PROTOCOL *driver,
bofmtab2->Parameters.Length ); bofmtab2->Parameters.Length );
assert ( bofm2.bofm2->RegisterSupport == assert ( bofm2.bofm2->RegisterSupport ==
bofm1.bofm1->RegisterSupport ); bofm1.bofm1->RegisterSupport );
assert ( bofm2.bofm2->SetStatus == bofm1.bofm1->SetStatus );
} else { } else {
DBGC ( efidrv, "EFIBOFM " PCI_FMT " cannot find BOFM2 " DBGC ( efidrv, "EFIBOFM " PCI_FMT " cannot find BOFM2 "
"protocol\n", PCI_ARGS ( &efipci->pci ) ); "protocol\n", PCI_ARGS ( &efipci->pci ) );
@ -311,12 +320,22 @@ static EFI_STATUS EFIAPI efi_bofm_start ( EFI_DRIVER_BINDING_PROTOCOL *driver,
} }
/* Return BOFM status */ /* Return BOFM status */
if ( ( efirc = bofm1.bofm1->SetStatus ( bofm1.bofm1, device, FALSE, if ( bofmtab2 ) {
bofmrc ) ) != 0 ) { if ( ( efirc = bofm2.bofm2->SetStatus ( bofm2.bofm2, device,
DBGC ( efidrv, "EFIBOFM " PCI_FMT " could not set BOFM status: " FALSE, bofmrc ) ) != 0){
"%s\n", PCI_ARGS ( &efipci->pci ), DBGC ( efidrv, "EFIBOFM " PCI_FMT " could not set "
efi_strerror ( efirc ) ); "BOFM2 status: %s\n", PCI_ARGS ( &efipci->pci ),
goto err_set_status; efi_strerror ( efirc ) );
goto err_set_status;
}
} else {
if ( ( efirc = bofm1.bofm1->SetStatus ( bofm1.bofm1, device,
FALSE, bofmrc ) ) != 0){
DBGC ( efidrv, "EFIBOFM " PCI_FMT " could not set "
"BOFM status: %s\n", PCI_ARGS ( &efipci->pci ),
efi_strerror ( efirc ) );
goto err_set_status;
}
} }
/* Destroy the PCI device anyway; we have no further use for it */ /* Destroy the PCI device anyway; we have no further use for it */