diff options
-rw-r--r-- | Platform/ARM/Drivers/CcixDxe/Ccix.c | 44 | ||||
-rw-r--r-- | Platform/ARM/Drivers/CcixDxe/CcixDeviceConfigure.c | 52 | ||||
-rw-r--r-- | Platform/ARM/Drivers/CcixDxe/CcixTopology.c | 12 |
3 files changed, 81 insertions, 27 deletions
diff --git a/Platform/ARM/Drivers/CcixDxe/Ccix.c b/Platform/ARM/Drivers/CcixDxe/Ccix.c index 173bef1f..d508aea0 100644 --- a/Platform/ARM/Drivers/CcixDxe/Ccix.c +++ b/Platform/ARM/Drivers/CcixDxe/Ccix.c @@ -80,52 +80,74 @@ CcixEntryPoint ( EFI_OPEN_PROTOCOL_GET_PROTOCOL ); - if (EFI_ERROR (Status)) + if (EFI_ERROR (Status)) { + DEBUG((DEBUG_ERROR, "Could not open CcixConfigurationProtocol\n")); return Status; + } /* Set up Platform Specific Information Prior to CCIX Enumeration. */ Status = CcixPlatform->PreEnumerationSetup(CcixPlatform, NULL, 0); - if (EFI_ERROR (Status)) + if (EFI_ERROR (Status)) { + DEBUG((DEBUG_ERROR, "PreEnumerationSetup failed\n")); return Status; + } Status = CcixEnumerator(Ccix); - if (EFI_ERROR (Status)) + if (EFI_ERROR (Status)) { + DEBUG((DEBUG_ERROR, "CcixEnumerator failed\n")); return Status; + } Status = CcixTopologyDiscover(Ccix); - if (EFI_ERROR (Status)) + if (EFI_ERROR (Status)) { + DEBUG((DEBUG_ERROR, "CcixTopologyDiscover failed\n")); return Status; + } Status = CcixTopologyConfigure(Ccix); - if (EFI_ERROR (Status)) + if (EFI_ERROR (Status)) { + DEBUG((DEBUG_ERROR, "CcixTopologyConfigure failed\n")); return Status; + } Status = CcixDeviceGetInformation(Ccix); - if (EFI_ERROR (Status)) + if (EFI_ERROR (Status)) { + DEBUG((DEBUG_ERROR, "CcixDeviceGetInformation failed\n")); return Status; + } Status = CcixPlatform->PlatformSpecificEndPointConfig(CcixPlatform, (VOID *)Ccix, sizeof(EFI_CCIX_CONFIGURATION_PROTOCOL)); - if (EFI_ERROR (Status)) + if (EFI_ERROR (Status)) { + DEBUG((DEBUG_ERROR, "PlatformSpecificEndPointConfig failed\n")); return Status; + } Status = CcixPlatform->ConfigureHost(CcixPlatform, (VOID *)Ccix, sizeof(EFI_CCIX_CONFIGURATION_PROTOCOL)); - if (EFI_ERROR (Status)) + if (EFI_ERROR (Status)) { + DEBUG((DEBUG_ERROR, "ConfigureHost failed\n")); return Status; + } Status = CcixDeviceConfigure(Ccix); - if (EFI_ERROR (Status)) + if (EFI_ERROR (Status)) { + DEBUG((DEBUG_ERROR, "CcixDeviceConfigure failed\n")); return Status; + } Status = CcixPlatform->PostConfigurationSetup(CcixPlatform, (VOID *)Ccix, sizeof(EFI_CCIX_CONFIGURATION_PROTOCOL)); - if (EFI_ERROR (Status)) + if (EFI_ERROR (Status)) { + DEBUG((DEBUG_ERROR, "PostConfigurationSetup failed\n")); return Status; + } Status = CcixPrintDeviceInfo(Ccix); - if (EFI_ERROR (Status)) + if (EFI_ERROR (Status)) { + DEBUG((DEBUG_ERROR, "CcixPrintDeviceInfo failed\n")); return Status; + } return Status; } diff --git a/Platform/ARM/Drivers/CcixDxe/CcixDeviceConfigure.c b/Platform/ARM/Drivers/CcixDxe/CcixDeviceConfigure.c index a22deb4d..bd3b4a17 100644 --- a/Platform/ARM/Drivers/CcixDxe/CcixDeviceConfigure.c +++ b/Platform/ARM/Drivers/CcixDxe/CcixDeviceConfigure.c @@ -581,58 +581,84 @@ CcixDeviceConfigure ( continue; Status = CcixEnableVCCapability(Port->CcixIo, Ccix->TrafficClass); - if (EFI_ERROR(Status)) + if (EFI_ERROR(Status)) { + DEBUG((DEBUG_ERROR, "CcixEnableVCCapability failed\n")); goto ErrorExit; + } } Status = ConfigureHAControl(Ccix); - if (EFI_ERROR(Status)) + if (EFI_ERROR(Status)) { + DEBUG((DEBUG_ERROR, "ConfigureHAControl failed\n")); goto ErrorExit; + } Status = ActivateMemPools(Ccix); - if (EFI_ERROR(Status)) + if (EFI_ERROR(Status)) { + DEBUG((DEBUG_ERROR, "ActivateMemPools failed\n")); goto ErrorExit; + } Status = ActivateIDMEntry(Ccix); - if (EFI_ERROR(Status)) + if (EFI_ERROR(Status)) { + DEBUG((DEBUG_ERROR, "ActivateIDMEntry failed\n")); goto ErrorExit; + } Status = ActivateSAMEntry(Ccix); - if (EFI_ERROR(Status)) + if (EFI_ERROR(Status)) { + DEBUG((DEBUG_ERROR, "ActivateSAMEntry failed\n")); goto ErrorExit; + } Status = ActivatePSAMoPortEntry(Ccix); - if (EFI_ERROR(Status)) + if (EFI_ERROR(Status)) { + DEBUG((DEBUG_ERROR, "ActivatePSAMoPortEntry failed\n")); goto ErrorExit; + } Status = EnableAgent(Ccix, AGENT_SA); - if (EFI_ERROR(Status)) + if (EFI_ERROR(Status)) { + DEBUG((DEBUG_ERROR, "Enable Slave Agent failed\n")); goto ErrorExit; + } Status = EnableAgent(Ccix, AGENT_HA); - if (EFI_ERROR(Status)) + if (EFI_ERROR(Status)) { + DEBUG((DEBUG_ERROR, "Enable Home Agent failed\n")); goto ErrorExit; + } Status = EnablePort(Ccix); - if (EFI_ERROR(Status)) + if (EFI_ERROR(Status)) { + DEBUG((DEBUG_ERROR, "EnablePort failed\n")); goto ErrorExit; + } Status = EnableLink(Ccix); - if (EFI_ERROR(Status)) + if (EFI_ERROR(Status)) { + DEBUG((DEBUG_ERROR, "EnableLink failed\n")); goto ErrorExit; + } Status = ActivateRoutingTables(Ccix); - if (EFI_ERROR(Status)) + if (EFI_ERROR(Status)) { + DEBUG((DEBUG_ERROR, "ActivateRoutingTables failed\n")); goto ErrorExit; + } Status = EnableRequestAgent(Ccix); - if (EFI_ERROR(Status)) + if (EFI_ERROR(Status)) { + DEBUG((DEBUG_ERROR, "EnableRequestAgent failed\n")); goto ErrorExit; + } Status = EnableCcixDevice(Ccix); - if (EFI_ERROR(Status)) + if (EFI_ERROR(Status)) { + DEBUG((DEBUG_ERROR, "EnableCcixDevice failed\n")); goto ErrorExit; + } return EFI_SUCCESS; ErrorExit: diff --git a/Platform/ARM/Drivers/CcixDxe/CcixTopology.c b/Platform/ARM/Drivers/CcixDxe/CcixTopology.c index 86cdfd4e..6b26127f 100644 --- a/Platform/ARM/Drivers/CcixDxe/CcixTopology.c +++ b/Platform/ARM/Drivers/CcixDxe/CcixTopology.c @@ -303,16 +303,22 @@ CcixConfigureRoutingTables ( EFI_STATUS Status; Status = ConfigureIDMTables(Ccix); - if (EFI_ERROR(Status)) + if (EFI_ERROR(Status)) { + DEBUG((DEBUG_ERROR, "ConfigureIDMTables failed\n")); goto ErrorExit; + } Status = ConfigureHSAMTables(Ccix); - if (EFI_ERROR(Status)) + if (EFI_ERROR(Status)) { + DEBUG((DEBUG_ERROR, "ConfigureHSAMTables failed\n")); goto ErrorExit; + } Status = ConfigureRSAMTables(Ccix); - if (EFI_ERROR(Status)) + if (EFI_ERROR(Status)) { + DEBUG((DEBUG_ERROR, "ConfigureRSAMTables failed\n")); goto ErrorExit; + } return EFI_SUCCESS; ErrorExit: |