sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MdeModulePkg/SataControllerDxe: Clean up error handling in Start()

Browse Source 
Clean up error handling using cascading labels + goto.

(port of commit 379b179 + bcab714)

Signed-off-by: Pedro Falcato <pedro.falcato@gmail.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>
This commit is contained in:
Pedro Falcato
2023-06-01 18:27:29 +01:00
committed by mergify[bot]
parent ded1d5414b
commit 5e8958472c
1 changed files with 35 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
MdeModulePkg/Bus/Pci/SataControllerDxe/SataController.c
View File

@ -375,8 +375,7 @@ SataControllerStart (
EFI_OPEN_PROTOCOL_BY_DRIVER EFI_OPEN_PROTOCOL_BY_DRIVER
); );
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "SataControllerStart error. return status = %r\n", Status)); goto Bail;
return Status;
} }
// //
@ -385,7 +384,7 @@ SataControllerStart (
Private = AllocateZeroPool (sizeof (EFI_SATA_CONTROLLER_PRIVATE_DATA)); Private = AllocateZeroPool (sizeof (EFI_SATA_CONTROLLER_PRIVATE_DATA));
if (Private == NULL) { if (Private == NULL) {
Status = EFI_OUT_OF_RESOURCES; Status = EFI_OUT_OF_RESOURCES;
goto Done; goto ClosePciIo;
} }
// //
@ -412,7 +411,7 @@ SataControllerStart (
&Private->OriginalPciAttributes &Private->OriginalPciAttributes
); );
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
goto Done; goto FreeSataPrivate;
} }
DEBUG (( DEBUG ((
@ -428,7 +427,7 @@ SataControllerStart (
&Supports &Supports
); );
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
goto Done; goto FreeSataPrivate;
} }
DEBUG ((DEBUG_INFO, "Supported PCI Attributes = 0x%llx\n", Supports)); DEBUG ((DEBUG_INFO, "Supported PCI Attributes = 0x%llx\n", Supports));
@ -441,7 +440,7 @@ SataControllerStart (
NULL NULL
); );
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
goto Done; goto FreeSataPrivate;
} }
DEBUG ((DEBUG_INFO, "Enabled PCI Attributes = 0x%llx\n", Supports)); DEBUG ((DEBUG_INFO, "Enabled PCI Attributes = 0x%llx\n", Supports));
@ -456,7 +455,7 @@ SataControllerStart (
); );
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
ASSERT (FALSE); ASSERT (FALSE);
goto Done; goto RestorePciAttributes;
} }
if (IS_PCI_IDE (&PciData)) { if (IS_PCI_IDE (&PciData)) {
@ -470,7 +469,7 @@ SataControllerStart (
DEBUG ((DEBUG_INFO, "Ports Implemented(PI) = 0x%x\n", Data32)); DEBUG ((DEBUG_INFO, "Ports Implemented(PI) = 0x%x\n", Data32));
if (Data32 == 0) { if (Data32 == 0) {
Status = EFI_UNSUPPORTED; Status = EFI_UNSUPPORTED;
goto Done; goto RestorePciAttributes;
} }
MaxPortNumber = 31; MaxPortNumber = 31;
@ -502,19 +501,19 @@ SataControllerStart (
Private->DisqualifiedModes = AllocateZeroPool ((sizeof (EFI_ATA_COLLECTIVE_MODE)) * TotalCount); Private->DisqualifiedModes = AllocateZeroPool ((sizeof (EFI_ATA_COLLECTIVE_MODE)) * TotalCount);
if (Private->DisqualifiedModes == NULL) { if (Private->DisqualifiedModes == NULL) {
Status = EFI_OUT_OF_RESOURCES; Status = EFI_OUT_OF_RESOURCES;
goto Done; goto RestorePciAttributes;
} }
Private->IdentifyData = AllocateZeroPool ((sizeof (EFI_IDENTIFY_DATA)) * TotalCount); Private->IdentifyData = AllocateZeroPool ((sizeof (EFI_IDENTIFY_DATA)) * TotalCount);
if (Private->IdentifyData == NULL) { if (Private->IdentifyData == NULL) {
Status = EFI_OUT_OF_RESOURCES; Status = EFI_OUT_OF_RESOURCES;
goto Done; goto FreeDisqualifiedModes;
} }
Private->IdentifyValid = AllocateZeroPool ((sizeof (BOOLEAN)) * TotalCount); Private->IdentifyValid = AllocateZeroPool ((sizeof (BOOLEAN)) * TotalCount);
if (Private->IdentifyValid == NULL) { if (Private->IdentifyValid == NULL) {
Status = EFI_OUT_OF_RESOURCES; Status = EFI_OUT_OF_RESOURCES;
goto Done; goto FreeIdentifyData;
} }
// //
@ -527,46 +526,37 @@ SataControllerStart (
NULL NULL
); );
Done:
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
gBS->CloseProtocol ( goto FreeIdentifyValid;
Controller,
&gEfiPciIoProtocolGuid,
This->DriverBindingHandle,
Controller
);
if (Private != NULL) {
if (Private->DisqualifiedModes != NULL) {
FreePool (Private->DisqualifiedModes);
}
if (Private->IdentifyData != NULL) {
FreePool (Private->IdentifyData);
}
if (Private->IdentifyValid != NULL) {
FreePool (Private->IdentifyValid);
}
if (Private->PciAttributesChanged) {
//
// Restore original PCI attributes
//
PciIo->Attributes (
PciIo,
EfiPciIoAttributeOperationSet,
Private->OriginalPciAttributes,
NULL
);
}
FreePool (Private);
}
} }
DEBUG ((DEBUG_INFO, "SataControllerStart end with %r\n", Status)); DEBUG ((DEBUG_INFO, "SataControllerStart end with %r\n", Status));
return Status; return Status;
FreeIdentifyValid:
FreePool (Private->IdentifyValid);
FreeIdentifyData:
FreePool (Private->IdentifyData);
FreeDisqualifiedModes:
FreePool (Private->DisqualifiedModes);
RestorePciAttributes:
//
// Restore original PCI attributes
//
Private->PciIo->Attributes (
Private->PciIo,
EfiPciIoAttributeOperationSet,
Private->OriginalPciAttributes,
NULL
);
FreeSataPrivate:
FreePool (Private);
ClosePciIo:
gBS->CloseProtocol (Controller, &gEfiPciIoProtocolGuid, This->DriverBindingHandle, Controller);
Bail:
DEBUG ((DEBUG_ERROR, "SataControllerStart error return status = %r\n", Status));
return Status;
} }
/** /**