**/\r
EFI_STATUS\r
EnumerateNvmeDevNamespace (\r
- IN OUT PEI_NVME_CONTROLLER_PRIVATE_DATA *Private,\r
- IN UINT32 NamespaceId\r
+ IN OUT PEI_NVME_CONTROLLER_PRIVATE_DATA *Private,\r
+ IN UINT32 NamespaceId\r
)\r
{\r
- EFI_STATUS Status;\r
- NVME_ADMIN_NAMESPACE_DATA *NamespaceData;\r
- PEI_NVME_NAMESPACE_INFO *NamespaceInfo;\r
- UINT32 DeviceIndex;\r
- UINT32 Lbads;\r
- UINT32 Flbas;\r
- UINT32 LbaFmtIdx;\r
-\r
- NamespaceData = (NVME_ADMIN_NAMESPACE_DATA *) AllocateZeroPool (sizeof (NVME_ADMIN_NAMESPACE_DATA));\r
+ EFI_STATUS Status;\r
+ NVME_ADMIN_NAMESPACE_DATA *NamespaceData;\r
+ PEI_NVME_NAMESPACE_INFO *NamespaceInfo;\r
+ UINT32 DeviceIndex;\r
+ UINT32 Lbads;\r
+ UINT32 Flbas;\r
+ UINT32 LbaFmtIdx;\r
+\r
+ NamespaceData = (NVME_ADMIN_NAMESPACE_DATA *)AllocateZeroPool (sizeof (NVME_ADMIN_NAMESPACE_DATA));\r
if (NamespaceData == NULL) {\r
return EFI_OUT_OF_RESOURCES;\r
}\r
goto Exit;\r
}\r
\r
- DeviceIndex = Private->ActiveNamespaceNum;\r
- NamespaceInfo = &Private->NamespaceInfo[DeviceIndex];\r
+ DeviceIndex = Private->ActiveNamespaceNum;\r
+ NamespaceInfo = &Private->NamespaceInfo[DeviceIndex];\r
NamespaceInfo->NamespaceId = NamespaceId;\r
NamespaceInfo->NamespaceUuid = NamespaceData->Eui64;\r
NamespaceInfo->Controller = Private;\r
NamespaceInfo->Media.RemovableMedia = FALSE;\r
NamespaceInfo->Media.MediaPresent = TRUE;\r
NamespaceInfo->Media.ReadOnly = FALSE;\r
- NamespaceInfo->Media.BlockSize = (UINT32) 1 << Lbads;\r
- NamespaceInfo->Media.LastBlock = (EFI_PEI_LBA) NamespaceData->Nsze - 1;\r
+ NamespaceInfo->Media.BlockSize = (UINT32)1 << Lbads;\r
+ NamespaceInfo->Media.LastBlock = (EFI_PEI_LBA)NamespaceData->Nsze - 1;\r
DEBUG ((\r
DEBUG_INFO,\r
"%a: Namespace ID %d - BlockSize = 0x%x, LastBlock = 0x%lx\n",\r
**/\r
EFI_STATUS\r
NvmeDiscoverNamespaces (\r
- IN OUT PEI_NVME_CONTROLLER_PRIVATE_DATA *Private\r
+ IN OUT PEI_NVME_CONTROLLER_PRIVATE_DATA *Private\r
)\r
{\r
- UINT32 NamespaceId;\r
+ UINT32 NamespaceId;\r
\r
Private->ActiveNamespaceNum = 0;\r
Private->NamespaceInfo = AllocateZeroPool (Private->ControllerData->Nn * sizeof (PEI_NVME_NAMESPACE_INFO));\r
//\r
EnumerateNvmeDevNamespace (Private, NamespaceId);\r
}\r
+\r
if (Private->ActiveNamespaceNum == 0) {\r
return EFI_NOT_FOUND;\r
}\r
IN VOID *Ppi\r
)\r
{\r
- PEI_NVME_CONTROLLER_PRIVATE_DATA *Private;\r
+ PEI_NVME_CONTROLLER_PRIVATE_DATA *Private;\r
\r
Private = GET_NVME_PEIM_HC_PRIVATE_DATA_FROM_THIS_NOTIFY (NotifyDescriptor);\r
NvmeFreeDmaResource (Private);\r
EFI_STATUS\r
EFIAPI\r
NvmExpressPeimEntry (\r
- IN EFI_PEI_FILE_HANDLE FileHandle,\r
- IN CONST EFI_PEI_SERVICES **PeiServices\r
+ IN EFI_PEI_FILE_HANDLE FileHandle,\r
+ IN CONST EFI_PEI_SERVICES **PeiServices\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_BOOT_MODE BootMode;\r
- EDKII_NVM_EXPRESS_HOST_CONTROLLER_PPI *NvmeHcPpi;\r
- UINT8 Controller;\r
- UINTN MmioBase;\r
- UINTN DevicePathLength;\r
- EFI_DEVICE_PATH_PROTOCOL *DevicePath;\r
- PEI_NVME_CONTROLLER_PRIVATE_DATA *Private;\r
- EFI_PHYSICAL_ADDRESS DeviceAddress;\r
+ EFI_STATUS Status;\r
+ EFI_BOOT_MODE BootMode;\r
+ EDKII_NVM_EXPRESS_HOST_CONTROLLER_PPI *NvmeHcPpi;\r
+ UINT8 Controller;\r
+ UINTN MmioBase;\r
+ UINTN DevicePathLength;\r
+ EFI_DEVICE_PATH_PROTOCOL *DevicePath;\r
+ PEI_NVME_CONTROLLER_PRIVATE_DATA *Private;\r
+ EFI_PHYSICAL_ADDRESS DeviceAddress;\r
\r
DEBUG ((DEBUG_INFO, "%a: Enters.\n", __FUNCTION__));\r
\r
&gEdkiiPeiNvmExpressHostControllerPpiGuid,\r
0,\r
NULL,\r
- (VOID **) &NvmeHcPpi\r
+ (VOID **)&NvmeHcPpi\r
);\r
if (EFI_ERROR (Status)) {\r
DEBUG ((DEBUG_ERROR, "%a: Fail to locate NvmeHostControllerPpi.\n", __FUNCTION__));\r
);\r
if (EFI_ERROR (Status)) {\r
DEBUG ((\r
- DEBUG_ERROR, "%a: Fail to allocate get the device path for Controller %d.\n",\r
- __FUNCTION__, Controller\r
+ DEBUG_ERROR,\r
+ "%a: Fail to allocate get the device path for Controller %d.\n",\r
+ __FUNCTION__,\r
+ Controller\r
));\r
return Status;\r
}\r
Status = NvmeIsHcDevicePathValid (DevicePath, DevicePathLength);\r
if (EFI_ERROR (Status)) {\r
DEBUG ((\r
- DEBUG_ERROR, "%a: The device path is invalid for Controller %d.\n",\r
- __FUNCTION__, Controller\r
+ DEBUG_ERROR,\r
+ "%a: The device path is invalid for Controller %d.\n",\r
+ __FUNCTION__,\r
+ Controller\r
));\r
Controller++;\r
continue;\r
// during S3 resume.\r
//\r
if ((BootMode == BOOT_ON_S3_RESUME) &&\r
- (NvmeS3SkipThisController (DevicePath, DevicePathLength))) {\r
+ (NvmeS3SkipThisController (DevicePath, DevicePathLength)))\r
+ {\r
DEBUG ((\r
- DEBUG_ERROR, "%a: Controller %d is skipped during S3.\n",\r
- __FUNCTION__, Controller\r
+ DEBUG_ERROR,\r
+ "%a: Controller %d is skipped during S3.\n",\r
+ __FUNCTION__,\r
+ Controller\r
));\r
Controller++;\r
continue;\r
Private = AllocateZeroPool (sizeof (PEI_NVME_CONTROLLER_PRIVATE_DATA));\r
if (Private == NULL) {\r
DEBUG ((\r
- DEBUG_ERROR, "%a: Fail to allocate private data for Controller %d.\n",\r
- __FUNCTION__, Controller\r
+ DEBUG_ERROR,\r
+ "%a: Fail to allocate private data for Controller %d.\n",\r
+ __FUNCTION__,\r
+ Controller\r
));\r
return EFI_OUT_OF_RESOURCES;\r
}\r
);\r
if (EFI_ERROR (Status)) {\r
DEBUG ((\r
- DEBUG_ERROR, "%a: Fail to allocate DMA buffers for Controller %d.\n",\r
- __FUNCTION__, Controller\r
+ DEBUG_ERROR,\r
+ "%a: Fail to allocate DMA buffers for Controller %d.\n",\r
+ __FUNCTION__,\r
+ Controller\r
));\r
return Status;\r
}\r
- ASSERT (DeviceAddress == ((EFI_PHYSICAL_ADDRESS) (UINTN) Private->Buffer));\r
+\r
+ ASSERT (DeviceAddress == ((EFI_PHYSICAL_ADDRESS)(UINTN)Private->Buffer));\r
DEBUG ((DEBUG_INFO, "%a: DMA buffer base at 0x%x\n", __FUNCTION__, Private->Buffer));\r
\r
//\r
DEBUG ((\r
DEBUG_ERROR,\r
"%a: Controller initialization fail for Controller %d with Status - %r.\n",\r
- __FUNCTION__, Controller, Status\r
+ __FUNCTION__,\r
+ Controller,\r
+ Status\r
));\r
NvmeFreeDmaResource (Private);\r
Controller++;\r
DEBUG ((\r
DEBUG_ERROR,\r
"%a: Namespaces discovery fail for Controller %d with Status - %r.\n",\r
- __FUNCTION__, Controller, Status\r
+ __FUNCTION__,\r
+ Controller,\r
+ Status\r
));\r
NvmeFreeDmaResource (Private);\r
Controller++;\r
//\r
// Nvm Express Pass Thru PPI\r
//\r
- Private->PassThruMode.Attributes = EFI_NVM_EXPRESS_PASS_THRU_ATTRIBUTES_PHYSICAL |\r
- EFI_NVM_EXPRESS_PASS_THRU_ATTRIBUTES_LOGICAL |\r
- EFI_NVM_EXPRESS_PASS_THRU_ATTRIBUTES_CMD_SET_NVM;\r
- Private->PassThruMode.IoAlign = sizeof (UINTN);\r
- Private->PassThruMode.NvmeVersion = EDKII_PEI_NVM_EXPRESS_PASS_THRU_PPI_REVISION;\r
- Private->NvmePassThruPpi.Mode = &Private->PassThruMode;\r
- Private->NvmePassThruPpi.GetDevicePath = NvmePassThruGetDevicePath;\r
- Private->NvmePassThruPpi.GetNextNameSpace = NvmePassThruGetNextNameSpace;\r
- Private->NvmePassThruPpi.PassThru = NvmePassThru;\r
+ Private->PassThruMode.Attributes = EFI_NVM_EXPRESS_PASS_THRU_ATTRIBUTES_PHYSICAL |\r
+ EFI_NVM_EXPRESS_PASS_THRU_ATTRIBUTES_LOGICAL |\r
+ EFI_NVM_EXPRESS_PASS_THRU_ATTRIBUTES_CMD_SET_NVM;\r
+ Private->PassThruMode.IoAlign = sizeof (UINTN);\r
+ Private->PassThruMode.NvmeVersion = EDKII_PEI_NVM_EXPRESS_PASS_THRU_PPI_REVISION;\r
+ Private->NvmePassThruPpi.Mode = &Private->PassThruMode;\r
+ Private->NvmePassThruPpi.GetDevicePath = NvmePassThruGetDevicePath;\r
+ Private->NvmePassThruPpi.GetNextNameSpace = NvmePassThruGetNextNameSpace;\r
+ Private->NvmePassThruPpi.PassThru = NvmePassThru;\r
CopyMem (\r
&Private->NvmePassThruPpiList,\r
&mNvmePassThruPpiListTemplate,\r
sizeof (EFI_PEI_PPI_DESCRIPTOR)\r
);\r
- Private->NvmePassThruPpiList.Ppi = &Private->NvmePassThruPpi;\r
+ Private->NvmePassThruPpiList.Ppi = &Private->NvmePassThruPpi;\r
PeiServicesInstallPpi (&Private->NvmePassThruPpiList);\r
\r
//\r
// Block Io PPI\r
//\r
- Private->BlkIoPpi.GetNumberOfBlockDevices = NvmeBlockIoPeimGetDeviceNo;\r
- Private->BlkIoPpi.GetBlockDeviceMediaInfo = NvmeBlockIoPeimGetMediaInfo;\r
- Private->BlkIoPpi.ReadBlocks = NvmeBlockIoPeimReadBlocks;\r
+ Private->BlkIoPpi.GetNumberOfBlockDevices = NvmeBlockIoPeimGetDeviceNo;\r
+ Private->BlkIoPpi.GetBlockDeviceMediaInfo = NvmeBlockIoPeimGetMediaInfo;\r
+ Private->BlkIoPpi.ReadBlocks = NvmeBlockIoPeimReadBlocks;\r
CopyMem (\r
&Private->BlkIoPpiList,\r
&mNvmeBlkIoPpiListTemplate,\r
sizeof (EFI_PEI_PPI_DESCRIPTOR)\r
);\r
- Private->BlkIoPpiList.Ppi = &Private->BlkIoPpi;\r
+ Private->BlkIoPpiList.Ppi = &Private->BlkIoPpi;\r
\r
Private->BlkIo2Ppi.Revision = EFI_PEI_RECOVERY_BLOCK_IO2_PPI_REVISION;\r
Private->BlkIo2Ppi.GetNumberOfBlockDevices = NvmeBlockIoPeimGetDeviceNo2;\r
&mNvmeBlkIo2PpiListTemplate,\r
sizeof (EFI_PEI_PPI_DESCRIPTOR)\r
);\r
- Private->BlkIo2PpiList.Ppi = &Private->BlkIo2Ppi;\r
+ Private->BlkIo2PpiList.Ppi = &Private->BlkIo2Ppi;\r
PeiServicesInstallPpi (&Private->BlkIoPpiList);\r
\r
//\r
DEBUG ((\r
DEBUG_INFO,\r
"%a: Security Security Command PPI will be produced for Controller %d.\n",\r
- __FUNCTION__, Controller\r
+ __FUNCTION__,\r
+ Controller\r
));\r
Private->StorageSecurityPpi.Revision = EDKII_STORAGE_SECURITY_PPI_REVISION;\r
Private->StorageSecurityPpi.GetNumberofDevices = NvmeStorageSecurityGetDeviceNo;\r
&mNvmeStorageSecurityPpiListTemplate,\r
sizeof (EFI_PEI_PPI_DESCRIPTOR)\r
);\r
- Private->StorageSecurityPpiList.Ppi = &Private->StorageSecurityPpi;\r
+ Private->StorageSecurityPpiList.Ppi = &Private->StorageSecurityPpi;\r
PeiServicesInstallPpi (&Private->StorageSecurityPpiList);\r
}\r
\r
&mNvmeEndOfPeiNotifyListTemplate,\r
sizeof (EFI_PEI_NOTIFY_DESCRIPTOR)\r
);\r
- PeiServicesNotifyPpi (&Private->EndOfPeiNotifyList);\r
+ PeiServicesNotifyPpi (&Private->EndOfPeiNotifyList);\r
\r
DEBUG ((\r
- DEBUG_INFO, "%a: Controller %d has been successfully initialized.\n",\r
- __FUNCTION__, Controller\r
+ DEBUG_INFO,\r
+ "%a: Controller %d has been successfully initialized.\n",\r
+ __FUNCTION__,\r
+ Controller\r
));\r
Controller++;\r
}\r
projects / mirror_edk2.git / blobdiff