]> git.proxmox.com Git - mirror_edk2.git/blobdiff - OvmfPkg/PvScsiDxe/PvScsi.c
OvmfPkg: Apply uncrustify changes
[mirror_edk2.git] / OvmfPkg / PvScsiDxe / PvScsi.c
index 843534ebf71103fee18381a96be17cca48f746e9..47cc0ae59bf8ee137244b4b17346182ae04698ac 100644 (file)
@@ -26,7 +26,7 @@
 // Higher versions will be used before lower, 0x10-0xffffffef is the version\r
 // range for IHV (Indie Hardware Vendors)\r
 //\r
-#define PVSCSI_BINDING_VERSION      0x10\r
+#define PVSCSI_BINDING_VERSION  0x10\r
 \r
 //\r
 // Ext SCSI Pass Thru utilities\r
@@ -38,9 +38,9 @@
 STATIC\r
 EFI_STATUS\r
 PvScsiMmioRead32 (\r
-  IN CONST PVSCSI_DEV   *Dev,\r
-  IN UINT64             Offset,\r
-  OUT UINT32            *Value\r
+  IN CONST PVSCSI_DEV  *Dev,\r
+  IN UINT64            Offset,\r
+  OUT UINT32           *Value\r
   )\r
 {\r
   return Dev->PciIo->Mem.Read (\r
@@ -59,9 +59,9 @@ PvScsiMmioRead32 (
 STATIC\r
 EFI_STATUS\r
 PvScsiMmioWrite32 (\r
-  IN CONST PVSCSI_DEV   *Dev,\r
-  IN UINT64             Offset,\r
-  IN UINT32             Value\r
+  IN CONST PVSCSI_DEV  *Dev,\r
+  IN UINT64            Offset,\r
+  IN UINT32            Value\r
   )\r
 {\r
   return Dev->PciIo->Mem.Write (\r
@@ -80,10 +80,10 @@ PvScsiMmioWrite32 (
 STATIC\r
 EFI_STATUS\r
 PvScsiMmioWrite32Multiple (\r
-  IN CONST PVSCSI_DEV   *Dev,\r
-  IN UINT64             Offset,\r
-  IN UINTN              Count,\r
-  IN UINT32             *Words\r
+  IN CONST PVSCSI_DEV  *Dev,\r
+  IN UINT64            Offset,\r
+  IN UINTN             Count,\r
+  IN UINT32            *Words\r
   )\r
 {\r
   return Dev->PciIo->Mem.Write (\r
@@ -116,13 +116,13 @@ PvScsiMmioWrite32Multiple (
 STATIC\r
 EFI_STATUS\r
 PvScsiWriteCmdDesc (\r
-  IN CONST PVSCSI_DEV   *Dev,\r
-  IN UINT32             Cmd,\r
-  IN UINT32             *DescWords      OPTIONAL,\r
-  IN UINTN              DescWordsCount\r
+  IN CONST PVSCSI_DEV  *Dev,\r
+  IN UINT32            Cmd,\r
+  IN UINT32            *DescWords      OPTIONAL,\r
+  IN UINTN             DescWordsCount\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS  Status;\r
 \r
   if (DescWordsCount > PVSCSI_MAX_CMD_DATA_WORDS) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -148,7 +148,7 @@ PvScsiWriteCmdDesc (
 STATIC\r
 EFI_STATUS\r
 PvScsiResetAdapter (\r
-  IN CONST PVSCSI_DEV   *Dev\r
+  IN CONST PVSCSI_DEV  *Dev\r
   )\r
 {\r
   return PvScsiWriteCmdDesc (Dev, PvScsiCmdAdapterReset, NULL, 0);\r
@@ -160,13 +160,13 @@ PvScsiResetAdapter (
 STATIC\r
 BOOLEAN\r
 PvScsiIsReqRingFull (\r
-  IN CONST PVSCSI_DEV   *Dev\r
+  IN CONST PVSCSI_DEV  *Dev\r
   )\r
 {\r
-  PVSCSI_RINGS_STATE *RingsState;\r
-  UINT32             ReqNumEntries;\r
+  PVSCSI_RINGS_STATE  *RingsState;\r
+  UINT32              ReqNumEntries;\r
 \r
-  RingsState = Dev->RingDesc.RingState;\r
+  RingsState    = Dev->RingDesc.RingState;\r
   ReqNumEntries = 1U << RingsState->ReqNumEntriesLog2;\r
   return (RingsState->ReqProdIdx - RingsState->CmpConsIdx) >= ReqNumEntries;\r
 }\r
@@ -177,13 +177,13 @@ PvScsiIsReqRingFull (
 STATIC\r
 PVSCSI_RING_REQ_DESC *\r
 PvScsiGetCurrentRequest (\r
-  IN CONST PVSCSI_DEV   *Dev\r
+  IN CONST PVSCSI_DEV  *Dev\r
   )\r
 {\r
-  PVSCSI_RINGS_STATE *RingState;\r
-  UINT32             ReqNumEntries;\r
+  PVSCSI_RINGS_STATE  *RingState;\r
+  UINT32              ReqNumEntries;\r
 \r
-  RingState = Dev->RingDesc.RingState;\r
+  RingState     = Dev->RingDesc.RingState;\r
   ReqNumEntries = 1U << RingState->ReqNumEntriesLog2;\r
   return Dev->RingDesc.RingReqs +\r
          (RingState->ReqProdIdx & (ReqNumEntries - 1));\r
@@ -195,13 +195,13 @@ PvScsiGetCurrentRequest (
 STATIC\r
 PVSCSI_RING_CMP_DESC *\r
 PvScsiGetCurrentResponse (\r
-  IN CONST PVSCSI_DEV   *Dev\r
+  IN CONST PVSCSI_DEV  *Dev\r
   )\r
 {\r
-  PVSCSI_RINGS_STATE *RingState;\r
-  UINT32             CmpNumEntries;\r
+  PVSCSI_RINGS_STATE  *RingState;\r
+  UINT32              CmpNumEntries;\r
 \r
-  RingState = Dev->RingDesc.RingState;\r
+  RingState     = Dev->RingDesc.RingState;\r
   CmpNumEntries = 1U << RingState->CmpNumEntriesLog2;\r
   return Dev->RingDesc.RingCmps +\r
          (RingState->CmpConsIdx & (CmpNumEntries - 1));\r
@@ -213,11 +213,11 @@ PvScsiGetCurrentResponse (
 STATIC\r
 EFI_STATUS\r
 PvScsiWaitForRequestCompletion (\r
-  IN CONST PVSCSI_DEV   *Dev\r
+  IN CONST PVSCSI_DEV  *Dev\r
   )\r
 {\r
-  EFI_STATUS Status;\r
-  UINT32     IntrStatus;\r
+  EFI_STATUS  Status;\r
+  UINT32      IntrStatus;\r
 \r
   //\r
   // Note: We don't yet support Timeout according to\r
@@ -226,7 +226,7 @@ PvScsiWaitForRequestCompletion (
   // This is consistent with some other Scsi PassThru drivers\r
   // such as VirtioScsi.\r
   //\r
-  for (;;) {\r
+  for ( ; ;) {\r
     Status = PvScsiMmioRead32 (Dev, PvScsiRegOffsetIntrStatus, &IntrStatus);\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
@@ -258,14 +258,14 @@ PvScsiWaitForRequestCompletion (
 STATIC\r
 EFI_STATUS\r
 ReportHostAdapterError (\r
-  OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET *Packet\r
+  OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *Packet\r
   )\r
 {\r
-  Packet->InTransferLength = 0;\r
+  Packet->InTransferLength  = 0;\r
   Packet->OutTransferLength = 0;\r
-  Packet->SenseDataLength = 0;\r
+  Packet->SenseDataLength   = 0;\r
   Packet->HostAdapterStatus = EFI_EXT_SCSI_STATUS_HOST_ADAPTER_OTHER;\r
-  Packet->TargetStatus = EFI_EXT_SCSI_STATUS_TARGET_GOOD;\r
+  Packet->TargetStatus      = EFI_EXT_SCSI_STATUS_TARGET_GOOD;\r
   return EFI_DEVICE_ERROR;\r
 }\r
 \r
@@ -275,12 +275,12 @@ ReportHostAdapterError (
 STATIC\r
 EFI_STATUS\r
 ReportHostAdapterOverrunError (\r
-  OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET *Packet\r
+  OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *Packet\r
   )\r
 {\r
-  Packet->SenseDataLength = 0;\r
+  Packet->SenseDataLength   = 0;\r
   Packet->HostAdapterStatus =\r
-            EFI_EXT_SCSI_STATUS_HOST_ADAPTER_DATA_OVERRUN_UNDERRUN;\r
+    EFI_EXT_SCSI_STATUS_HOST_ADAPTER_DATA_OVERRUN_UNDERRUN;\r
   Packet->TargetStatus = EFI_EXT_SCSI_STATUS_TARGET_GOOD;\r
   return EFI_BAD_BUFFER_SIZE;\r
 }\r
@@ -292,14 +292,14 @@ ReportHostAdapterOverrunError (
 STATIC\r
 EFI_STATUS\r
 PopulateRequest (\r
-  IN CONST PVSCSI_DEV                               *Dev,\r
-  IN UINT8                                          *Target,\r
-  IN UINT64                                         Lun,\r
-  IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET *Packet,\r
-  OUT PVSCSI_RING_REQ_DESC                          *Request\r
+  IN CONST PVSCSI_DEV                                *Dev,\r
+  IN UINT8                                           *Target,\r
+  IN UINT64                                          Lun,\r
+  IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *Packet,\r
+  OUT PVSCSI_RING_REQ_DESC                           *Request\r
   )\r
 {\r
-  UINT8 TargetValue;\r
+  UINT8  TargetValue;\r
 \r
   //\r
   // We only use first byte of target identifer\r
@@ -313,15 +313,15 @@ PopulateRequest (
       //\r
       // Bidirectional transfer was requested\r
       //\r
-      (Packet->InTransferLength > 0 && Packet->OutTransferLength > 0) ||\r
+      ((Packet->InTransferLength > 0) && (Packet->OutTransferLength > 0)) ||\r
       (Packet->DataDirection == EFI_EXT_SCSI_DATA_DIRECTION_BIDIRECTIONAL) ||\r
       //\r
       // Command Descriptor Block bigger than this constant should be considered\r
       // out-of-band. We currently don't support these CDBs.\r
       //\r
       (Packet->CdbLength > PVSCSI_CDB_MAX_SIZE)\r
-      ) {\r
-\r
+      )\r
+  {\r
     //\r
     // This error code doesn't require updates to the Packet output fields\r
     //\r
@@ -348,8 +348,8 @@ PopulateRequest (
       ((Packet->InTransferLength > 0) &&\r
        ((Packet->InDataBuffer == NULL) ||\r
         (Packet->DataDirection == EFI_EXT_SCSI_DATA_DIRECTION_WRITE)\r
-        )\r
-       ) ||\r
+       )\r
+      ) ||\r
       //\r
       // Trying to send, but source pointer is NULL, or contradicting\r
       // transfer direction\r
@@ -357,10 +357,10 @@ PopulateRequest (
       ((Packet->OutTransferLength > 0) &&\r
        ((Packet->OutDataBuffer == NULL) ||\r
         (Packet->DataDirection == EFI_EXT_SCSI_DATA_DIRECTION_READ)\r
-        )\r
        )\r
-      ) {\r
-\r
+      )\r
+      )\r
+  {\r
     //\r
     // This error code doesn't require updates to the Packet output fields\r
     //\r
@@ -374,6 +374,7 @@ PopulateRequest (
     Packet->InTransferLength = sizeof (Dev->DmaBuf->Data);\r
     return ReportHostAdapterOverrunError (Packet);\r
   }\r
+\r
   if (Packet->OutTransferLength > sizeof (Dev->DmaBuf->Data)) {\r
     Packet->OutTransferLength = sizeof (Dev->DmaBuf->Data);\r
     return ReportHostAdapterOverrunError (Packet);\r
@@ -384,27 +385,27 @@ PopulateRequest (
   //\r
   ZeroMem (Request, sizeof (*Request));\r
 \r
-  Request->Bus = 0;\r
+  Request->Bus    = 0;\r
   Request->Target = TargetValue;\r
   //\r
   // This cast is safe as PVSCSI_DEV.MaxLun is defined as UINT8\r
   //\r
-  Request->Lun[1] = (UINT8)Lun;\r
+  Request->Lun[1]   = (UINT8)Lun;\r
   Request->SenseLen = Packet->SenseDataLength;\r
   //\r
   // DMA communication buffer SenseData overflow is not possible\r
   // due to Packet->SenseDataLength defined as UINT8\r
   //\r
   Request->SenseAddr = PVSCSI_DMA_BUF_DEV_ADDR (Dev, SenseData);\r
-  Request->CdbLen = Packet->CdbLength;\r
+  Request->CdbLen    = Packet->CdbLength;\r
   CopyMem (Request->Cdb, Packet->Cdb, Packet->CdbLength);\r
   Request->VcpuHint = 0;\r
-  Request->Tag = PVSCSI_SIMPLE_QUEUE_TAG;\r
+  Request->Tag      = PVSCSI_SIMPLE_QUEUE_TAG;\r
   if (Packet->DataDirection == EFI_EXT_SCSI_DATA_DIRECTION_READ) {\r
-    Request->Flags = PVSCSI_FLAG_CMD_DIR_TOHOST;\r
+    Request->Flags   = PVSCSI_FLAG_CMD_DIR_TOHOST;\r
     Request->DataLen = Packet->InTransferLength;\r
   } else {\r
-    Request->Flags = PVSCSI_FLAG_CMD_DIR_TODEVICE;\r
+    Request->Flags   = PVSCSI_FLAG_CMD_DIR_TODEVICE;\r
     Request->DataLen = Packet->OutTransferLength;\r
     CopyMem (\r
       Dev->DmaBuf->Data,\r
@@ -412,6 +413,7 @@ PopulateRequest (
       Packet->OutTransferLength\r
       );\r
   }\r
+\r
   Request->DataAddr = PVSCSI_DMA_BUF_DEV_ADDR (Dev, Data);\r
 \r
   return EFI_SUCCESS;\r
@@ -426,9 +428,9 @@ PopulateRequest (
 STATIC\r
 EFI_STATUS\r
 HandleResponse (\r
-  IN PVSCSI_DEV                                     *Dev,\r
-  IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET *Packet,\r
-  IN CONST PVSCSI_RING_CMP_DESC                     *Response\r
+  IN PVSCSI_DEV                                      *Dev,\r
+  IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *Packet,\r
+  IN CONST PVSCSI_RING_CMP_DESC                      *Response\r
   )\r
 {\r
   //\r
@@ -437,6 +439,7 @@ HandleResponse (
   if (Packet->SenseDataLength > Response->SenseLen) {\r
     Packet->SenseDataLength = (UINT8)Response->SenseLen;\r
   }\r
+\r
   //\r
   // Copy sense data from DMA communication buffer\r
   //\r
@@ -482,18 +485,19 @@ HandleResponse (
       } else {\r
         Packet->OutTransferLength = (UINT32)Response->DataLen;\r
       }\r
+\r
       Packet->HostAdapterStatus =\r
-                EFI_EXT_SCSI_STATUS_HOST_ADAPTER_DATA_OVERRUN_UNDERRUN;\r
+        EFI_EXT_SCSI_STATUS_HOST_ADAPTER_DATA_OVERRUN_UNDERRUN;\r
       return EFI_SUCCESS;\r
 \r
     case PvScsiBtStatDatarun:\r
       Packet->HostAdapterStatus =\r
-                EFI_EXT_SCSI_STATUS_HOST_ADAPTER_DATA_OVERRUN_UNDERRUN;\r
+        EFI_EXT_SCSI_STATUS_HOST_ADAPTER_DATA_OVERRUN_UNDERRUN;\r
       return EFI_SUCCESS;\r
 \r
     case PvScsiBtStatSelTimeout:\r
       Packet->HostAdapterStatus =\r
-                EFI_EXT_SCSI_STATUS_HOST_ADAPTER_SELECTION_TIMEOUT;\r
+        EFI_EXT_SCSI_STATUS_HOST_ADAPTER_SELECTION_TIMEOUT;\r
       return EFI_TIMEOUT;\r
 \r
     case PvScsiBtStatBusFree:\r
@@ -506,13 +510,13 @@ HandleResponse (
 \r
     case PvScsiBtStatSensFailed:\r
       Packet->HostAdapterStatus =\r
-                EFI_EXT_SCSI_STATUS_HOST_ADAPTER_REQUEST_SENSE_FAILED;\r
+        EFI_EXT_SCSI_STATUS_HOST_ADAPTER_REQUEST_SENSE_FAILED;\r
       break;\r
 \r
     case PvScsiBtStatTagReject:\r
     case PvScsiBtStatBadMsg:\r
       Packet->HostAdapterStatus =\r
-          EFI_EXT_SCSI_STATUS_HOST_ADAPTER_MESSAGE_REJECT;\r
+        EFI_EXT_SCSI_STATUS_HOST_ADAPTER_MESSAGE_REJECT;\r
       break;\r
 \r
     case PvScsiBtStatBusReset:\r
@@ -542,16 +546,17 @@ HandleResponse (
 STATIC\r
 BOOLEAN\r
 IsTargetInitialized (\r
-  IN UINT8                                          *Target\r
+  IN UINT8  *Target\r
   )\r
 {\r
-  UINTN Idx;\r
+  UINTN  Idx;\r
 \r
   for (Idx = 0; Idx < TARGET_MAX_BYTES; ++Idx) {\r
     if (Target[Idx] != 0xFF) {\r
       return TRUE;\r
     }\r
   }\r
+\r
   return FALSE;\r
 }\r
 \r
@@ -563,17 +568,17 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 PvScsiPassThru (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL                *This,\r
-  IN UINT8                                          *Target,\r
-  IN UINT64                                         Lun,\r
-  IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET *Packet,\r
-  IN EFI_EVENT                                      Event    OPTIONAL\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL                 *This,\r
+  IN UINT8                                           *Target,\r
+  IN UINT64                                          Lun,\r
+  IN OUT EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET  *Packet,\r
+  IN EFI_EVENT                                       Event    OPTIONAL\r
   )\r
 {\r
   PVSCSI_DEV            *Dev;\r
   EFI_STATUS            Status;\r
-  PVSCSI_RING_REQ_DESC *Request;\r
-  PVSCSI_RING_CMP_DESC *Response;\r
+  PVSCSI_RING_REQ_DESC  *Request;\r
+  PVSCSI_RING_CMP_DESC  *Response;\r
 \r
   Dev = PVSCSI_FROM_PASS_THRU (This);\r
 \r
@@ -616,7 +621,7 @@ PvScsiPassThru (
   }\r
 \r
   Response = PvScsiGetCurrentResponse (Dev);\r
-  Status = HandleResponse (Dev, Packet, Response);\r
+  Status   = HandleResponse (Dev, Packet, Response);\r
 \r
   //\r
   // Reads from response must complete before releasing completion entry\r
@@ -632,14 +637,14 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 PvScsiGetNextTargetLun (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL                *This,\r
-  IN OUT UINT8                                      **Target,\r
-  IN OUT UINT64                                     *Lun\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This,\r
+  IN OUT UINT8                        **Target,\r
+  IN OUT UINT64                       *Lun\r
   )\r
 {\r
-  UINT8      *TargetPtr;\r
-  UINT8      LastTarget;\r
-  PVSCSI_DEV *Dev;\r
+  UINT8       *TargetPtr;\r
+  UINT8       LastTarget;\r
+  PVSCSI_DEV  *Dev;\r
 \r
   if (Target == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -668,7 +673,7 @@ PvScsiGetNextTargetLun (
   // Increment (target, LUN) pair if valid on input\r
   //\r
   Dev = PVSCSI_FROM_PASS_THRU (This);\r
-  if (LastTarget > Dev->MaxTarget || *Lun > Dev->MaxLun) {\r
+  if ((LastTarget > Dev->MaxTarget) || (*Lun > Dev->MaxLun)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -691,10 +696,10 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 PvScsiBuildDevicePath (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL                *This,\r
-  IN UINT8                                          *Target,\r
-  IN UINT64                                         Lun,\r
-  IN OUT EFI_DEVICE_PATH_PROTOCOL                   **DevicePath\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This,\r
+  IN UINT8                            *Target,\r
+  IN UINT64                           Lun,\r
+  IN OUT EFI_DEVICE_PATH_PROTOCOL     **DevicePath\r
   )\r
 {\r
   UINT8             TargetValue;\r
@@ -711,7 +716,7 @@ PvScsiBuildDevicePath (
   TargetValue = *Target;\r
 \r
   Dev = PVSCSI_FROM_PASS_THRU (This);\r
-  if (TargetValue > Dev->MaxTarget || Lun > Dev->MaxLun) {\r
+  if ((TargetValue > Dev->MaxTarget) || (Lun > Dev->MaxLun)) {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
@@ -735,28 +740,30 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 PvScsiGetTargetLun (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL                *This,\r
-  IN EFI_DEVICE_PATH_PROTOCOL                       *DevicePath,\r
-  OUT UINT8                                         **Target,\r
-  OUT UINT64                                        *Lun\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This,\r
+  IN EFI_DEVICE_PATH_PROTOCOL         *DevicePath,\r
+  OUT UINT8                           **Target,\r
+  OUT UINT64                          *Lun\r
   )\r
 {\r
-  SCSI_DEVICE_PATH *ScsiDevicePath;\r
-  PVSCSI_DEV       *Dev;\r
+  SCSI_DEVICE_PATH  *ScsiDevicePath;\r
+  PVSCSI_DEV        *Dev;\r
 \r
-  if (DevicePath == NULL || Target == NULL || *Target == NULL || Lun == NULL) {\r
+  if ((DevicePath == NULL) || (Target == NULL) || (*Target == NULL) || (Lun == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if (DevicePath->Type    != MESSAGING_DEVICE_PATH ||\r
-      DevicePath->SubType != MSG_SCSI_DP) {\r
+  if ((DevicePath->Type    != MESSAGING_DEVICE_PATH) ||\r
+      (DevicePath->SubType != MSG_SCSI_DP))\r
+  {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
   ScsiDevicePath = (SCSI_DEVICE_PATH *)DevicePath;\r
-  Dev = PVSCSI_FROM_PASS_THRU (This);\r
-  if (ScsiDevicePath->Pun > Dev->MaxTarget ||\r
-      ScsiDevicePath->Lun > Dev->MaxLun) {\r
+  Dev            = PVSCSI_FROM_PASS_THRU (This);\r
+  if ((ScsiDevicePath->Pun > Dev->MaxTarget) ||\r
+      (ScsiDevicePath->Lun > Dev->MaxLun))\r
+  {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
@@ -774,7 +781,7 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 PvScsiResetChannel (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL                *This\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r
@@ -784,9 +791,9 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 PvScsiResetTargetLun (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL                *This,\r
-  IN UINT8                                          *Target,\r
-  IN UINT64                                         Lun\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This,\r
+  IN UINT8                            *Target,\r
+  IN UINT64                           Lun\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r
@@ -796,13 +803,13 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 PvScsiGetNextTarget (\r
-  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL                *This,\r
-  IN OUT UINT8                                      **Target\r
+  IN EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *This,\r
+  IN OUT UINT8                        **Target\r
   )\r
 {\r
-  UINT8      *TargetPtr;\r
-  UINT8      LastTarget;\r
-  PVSCSI_DEV *Dev;\r
+  UINT8       *TargetPtr;\r
+  UINT8       LastTarget;\r
+  PVSCSI_DEV  *Dev;\r
 \r
   if (Target == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -846,10 +853,10 @@ PvScsiGetNextTarget (
 STATIC\r
 EFI_STATUS\r
 PvScsiSetPciAttributes (\r
-  IN OUT PVSCSI_DEV *Dev\r
+  IN OUT PVSCSI_DEV  *Dev\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // Backup original PCI Attributes\r
@@ -907,7 +914,7 @@ PvScsiSetPciAttributes (
 STATIC\r
 VOID\r
 PvScsiRestorePciAttributes (\r
-  IN PVSCSI_DEV *Dev\r
+  IN PVSCSI_DEV  *Dev\r
   )\r
 {\r
   Dev->PciIo->Attributes (\r
@@ -921,14 +928,14 @@ PvScsiRestorePciAttributes (
 STATIC\r
 EFI_STATUS\r
 PvScsiAllocateSharedPages (\r
-  IN PVSCSI_DEV                     *Dev,\r
-  IN UINTN                          Pages,\r
-  OUT VOID                          **HostAddress,\r
-  OUT PVSCSI_DMA_DESC               *DmaDesc\r
+  IN PVSCSI_DEV        *Dev,\r
+  IN UINTN             Pages,\r
+  OUT VOID             **HostAddress,\r
+  OUT PVSCSI_DMA_DESC  *DmaDesc\r
   )\r
 {\r
-  EFI_STATUS Status;\r
-  UINTN      NumberOfBytes;\r
+  EFI_STATUS  Status;\r
+  UINTN       NumberOfBytes;\r
 \r
   Status = Dev->PciIo->AllocateBuffer (\r
                          Dev->PciIo,\r
@@ -943,14 +950,14 @@ PvScsiAllocateSharedPages (
   }\r
 \r
   NumberOfBytes = EFI_PAGES_TO_SIZE (Pages);\r
-  Status = Dev->PciIo->Map (\r
-                         Dev->PciIo,\r
-                         EfiPciIoOperationBusMasterCommonBuffer,\r
-                         *HostAddress,\r
-                         &NumberOfBytes,\r
-                         &DmaDesc->DeviceAddress,\r
-                         &DmaDesc->Mapping\r
-                         );\r
+  Status        = Dev->PciIo->Map (\r
+                                Dev->PciIo,\r
+                                EfiPciIoOperationBusMasterCommonBuffer,\r
+                                *HostAddress,\r
+                                &NumberOfBytes,\r
+                                &DmaDesc->DeviceAddress,\r
+                                &DmaDesc->Mapping\r
+                                );\r
   if (EFI_ERROR (Status)) {\r
     goto FreeBuffer;\r
   }\r
@@ -974,10 +981,10 @@ FreeBuffer:
 STATIC\r
 VOID\r
 PvScsiFreeSharedPages (\r
-  IN PVSCSI_DEV                     *Dev,\r
-  IN UINTN                          Pages,\r
-  IN VOID                           *HostAddress,\r
-  IN PVSCSI_DMA_DESC                *DmaDesc\r
+  IN PVSCSI_DEV       *Dev,\r
+  IN UINTN            Pages,\r
+  IN VOID             *HostAddress,\r
+  IN PVSCSI_DMA_DESC  *DmaDesc\r
   )\r
 {\r
   Dev->PciIo->Unmap (Dev->PciIo, DmaDesc->Mapping);\r
@@ -987,10 +994,10 @@ PvScsiFreeSharedPages (
 STATIC\r
 EFI_STATUS\r
 PvScsiInitRings (\r
-  IN OUT PVSCSI_DEV *Dev\r
+  IN OUT PVSCSI_DEV  *Dev\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS  Status;\r
 \r
   Status = PvScsiAllocateSharedPages (\r
              Dev,\r
@@ -1001,6 +1008,7 @@ PvScsiInitRings (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
+\r
   ZeroMem (Dev->RingDesc.RingState, EFI_PAGE_SIZE);\r
 \r
   Status = PvScsiAllocateSharedPages (\r
@@ -1012,6 +1020,7 @@ PvScsiInitRings (
   if (EFI_ERROR (Status)) {\r
     goto FreeRingState;\r
   }\r
+\r
   ZeroMem (Dev->RingDesc.RingReqs, EFI_PAGE_SIZE);\r
 \r
   Status = PvScsiAllocateSharedPages (\r
@@ -1023,6 +1032,7 @@ PvScsiInitRings (
   if (EFI_ERROR (Status)) {\r
     goto FreeRingReqs;\r
   }\r
+\r
   ZeroMem (Dev->RingDesc.RingCmps, EFI_PAGE_SIZE);\r
 \r
   return EFI_SUCCESS;\r
@@ -1049,7 +1059,7 @@ FreeRingState:
 STATIC\r
 VOID\r
 PvScsiFreeRings (\r
-  IN OUT PVSCSI_DEV *Dev\r
+  IN OUT PVSCSI_DEV  *Dev\r
   )\r
 {\r
   PvScsiFreeSharedPages (\r
@@ -1077,24 +1087,24 @@ PvScsiFreeRings (
 STATIC\r
 EFI_STATUS\r
 PvScsiSetupRings (\r
-  IN OUT PVSCSI_DEV *Dev\r
+  IN OUT PVSCSI_DEV  *Dev\r
   )\r
 {\r
   union {\r
-    PVSCSI_CMD_DESC_SETUP_RINGS Cmd;\r
-    UINT32                      Uint32;\r
+    PVSCSI_CMD_DESC_SETUP_RINGS    Cmd;\r
+    UINT32                         Uint32;\r
   } AlignedCmd;\r
-  PVSCSI_CMD_DESC_SETUP_RINGS *Cmd;\r
+  PVSCSI_CMD_DESC_SETUP_RINGS  *Cmd;\r
 \r
   Cmd = &AlignedCmd.Cmd;\r
 \r
   ZeroMem (Cmd, sizeof (*Cmd));\r
   Cmd->ReqRingNumPages = 1;\r
   Cmd->CmpRingNumPages = 1;\r
-  Cmd->RingsStatePPN = RShiftU64 (\r
-                         Dev->RingDesc.RingStateDmaDesc.DeviceAddress,\r
-                         EFI_PAGE_SHIFT\r
-                         );\r
+  Cmd->RingsStatePPN   = RShiftU64 (\r
+                           Dev->RingDesc.RingStateDmaDesc.DeviceAddress,\r
+                           EFI_PAGE_SHIFT\r
+                           );\r
   Cmd->ReqRingPPNs[0] = RShiftU64 (\r
                           Dev->RingDesc.RingReqsDmaDesc.DeviceAddress,\r
                           EFI_PAGE_SHIFT\r
@@ -1119,16 +1129,16 @@ PvScsiSetupRings (
 STATIC\r
 EFI_STATUS\r
 PvScsiInit (\r
-  IN OUT PVSCSI_DEV *Dev\r
+  IN OUT PVSCSI_DEV  *Dev\r
   )\r
 {\r
-  EFI_STATUS Status;\r
+  EFI_STATUS  Status;\r
 \r
   //\r
   // Init configuration\r
   //\r
-  Dev->MaxTarget = PcdGet8 (PcdPvScsiMaxTargetLimit);\r
-  Dev->MaxLun = PcdGet8 (PcdPvScsiMaxLunLimit);\r
+  Dev->MaxTarget              = PcdGet8 (PcdPvScsiMaxTargetLimit);\r
+  Dev->MaxLun                 = PcdGet8 (PcdPvScsiMaxLunLimit);\r
   Dev->WaitForCmpStallInUsecs = PcdGet32 (PcdPvScsiWaitForCmpStallInUsecs);\r
 \r
   //\r
@@ -1227,7 +1237,7 @@ RestorePciAttributes:
 STATIC\r
 VOID\r
 PvScsiUninit (\r
-  IN OUT PVSCSI_DEV *Dev\r
+  IN OUT PVSCSI_DEV  *Dev\r
   )\r
 {\r
   //\r
@@ -1262,11 +1272,11 @@ STATIC
 VOID\r
 EFIAPI\r
 PvScsiExitBoot (\r
-  IN  EFI_EVENT Event,\r
-  IN  VOID      *Context\r
+  IN  EFI_EVENT  Event,\r
+  IN  VOID       *Context\r
   )\r
 {\r
-  PVSCSI_DEV *Dev;\r
+  PVSCSI_DEV  *Dev;\r
 \r
   Dev = Context;\r
   DEBUG ((DEBUG_VERBOSE, "%a: Context=0x%p\n", __FUNCTION__, Context));\r
@@ -1288,14 +1298,14 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 PvScsiDriverBindingSupported (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  ControllerHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL    *RemainingDevicePath OPTIONAL\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   ControllerHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS          Status;\r
-  EFI_PCI_IO_PROTOCOL *PciIo;\r
-  PCI_TYPE00          Pci;\r
+  EFI_STATUS           Status;\r
+  EFI_PCI_IO_PROTOCOL  *PciIo;\r
+  PCI_TYPE00           Pci;\r
 \r
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
@@ -1321,7 +1331,8 @@ PvScsiDriverBindingSupported (
   }\r
 \r
   if ((Pci.Hdr.VendorId != PCI_VENDOR_ID_VMWARE) ||\r
-      (Pci.Hdr.DeviceId != PCI_DEVICE_ID_VMWARE_PVSCSI)) {\r
+      (Pci.Hdr.DeviceId != PCI_DEVICE_ID_VMWARE_PVSCSI))\r
+  {\r
     Status = EFI_UNSUPPORTED;\r
     goto Done;\r
   }\r
@@ -1343,15 +1354,15 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 PvScsiDriverBindingStart (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  ControllerHandle,\r
-  IN EFI_DEVICE_PATH_PROTOCOL    *RemainingDevicePath OPTIONAL\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   ControllerHandle,\r
+  IN EFI_DEVICE_PATH_PROTOCOL     *RemainingDevicePath OPTIONAL\r
   )\r
 {\r
-  PVSCSI_DEV *Dev;\r
-  EFI_STATUS Status;\r
+  PVSCSI_DEV  *Dev;\r
+  EFI_STATUS  Status;\r
 \r
-  Dev = (PVSCSI_DEV *) AllocateZeroPool (sizeof (*Dev));\r
+  Dev = (PVSCSI_DEV *)AllocateZeroPool (sizeof (*Dev));\r
   if (Dev == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -1388,12 +1399,12 @@ PvScsiDriverBindingStart (
   // Setup complete, attempt to export the driver instance's PassThru interface\r
   //\r
   Dev->Signature = PVSCSI_SIG;\r
-  Status = gBS->InstallProtocolInterface (\r
-                  &ControllerHandle,\r
-                  &gEfiExtScsiPassThruProtocolGuid,\r
-                  EFI_NATIVE_INTERFACE,\r
-                  &Dev->PassThru\r
-                  );\r
+  Status         = gBS->InstallProtocolInterface (\r
+                          &ControllerHandle,\r
+                          &gEfiExtScsiPassThruProtocolGuid,\r
+                          EFI_NATIVE_INTERFACE,\r
+                          &Dev->PassThru\r
+                          );\r
   if (EFI_ERROR (Status)) {\r
     goto CloseExitBoot;\r
   }\r
@@ -1424,15 +1435,15 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 PvScsiDriverBindingStop (\r
-  IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
-  IN EFI_HANDLE                  ControllerHandle,\r
-  IN UINTN                       NumberOfChildren,\r
-  IN EFI_HANDLE                  *ChildHandleBuffer\r
+  IN EFI_DRIVER_BINDING_PROTOCOL  *This,\r
+  IN EFI_HANDLE                   ControllerHandle,\r
+  IN UINTN                        NumberOfChildren,\r
+  IN EFI_HANDLE                   *ChildHandleBuffer\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  EFI_EXT_SCSI_PASS_THRU_PROTOCOL *PassThru;\r
-  PVSCSI_DEV                      *Dev;\r
+  EFI_STATUS                       Status;\r
+  EFI_EXT_SCSI_PASS_THRU_PROTOCOL  *PassThru;\r
+  PVSCSI_DEV                       *Dev;\r
 \r
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
@@ -1473,7 +1484,7 @@ PvScsiDriverBindingStop (
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC EFI_DRIVER_BINDING_PROTOCOL mPvScsiDriverBinding = {\r
+STATIC EFI_DRIVER_BINDING_PROTOCOL  mPvScsiDriverBinding = {\r
   &PvScsiDriverBindingSupported,\r
   &PvScsiDriverBindingStart,\r
   &PvScsiDriverBindingStop,\r
@@ -1486,20 +1497,20 @@ STATIC EFI_DRIVER_BINDING_PROTOCOL mPvScsiDriverBinding = {
 // Component Name\r
 //\r
 \r
-STATIC EFI_UNICODE_STRING_TABLE mDriverNameTable[] = {\r
+STATIC EFI_UNICODE_STRING_TABLE  mDriverNameTable[] = {\r
   { "eng;en", L"PVSCSI Host Driver" },\r
   { NULL,     NULL                  }\r
 };\r
 \r
-STATIC EFI_COMPONENT_NAME_PROTOCOL mComponentName;\r
+STATIC EFI_COMPONENT_NAME_PROTOCOL  mComponentName;\r
 \r
 STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 PvScsiGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL *This,\r
-  IN  CHAR8                       *Language,\r
-  OUT CHAR16                      **DriverName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **DriverName\r
   )\r
 {\r
   return LookupUnicodeString2 (\r
@@ -1515,25 +1526,25 @@ STATIC
 EFI_STATUS\r
 EFIAPI\r
 PvScsiGetDeviceName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL *This,\r
-  IN  EFI_HANDLE                  DeviceHandle,\r
-  IN  EFI_HANDLE                  ChildHandle,\r
-  IN  CHAR8                       *Language,\r
-  OUT CHAR16                      **ControllerName\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  EFI_HANDLE                   DeviceHandle,\r
+  IN  EFI_HANDLE                   ChildHandle,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **ControllerName\r
   )\r
 {\r
   return EFI_UNSUPPORTED;\r
 }\r
 \r
-STATIC EFI_COMPONENT_NAME_PROTOCOL mComponentName = {\r
+STATIC EFI_COMPONENT_NAME_PROTOCOL  mComponentName = {\r
   &PvScsiGetDriverName,\r
   &PvScsiGetDeviceName,\r
   "eng" // SupportedLanguages, ISO 639-2 language codes\r
 };\r
 \r
-STATIC EFI_COMPONENT_NAME2_PROTOCOL mComponentName2 = {\r
-  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)     &PvScsiGetDriverName,\r
-  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) &PvScsiGetDeviceName,\r
+STATIC EFI_COMPONENT_NAME2_PROTOCOL  mComponentName2 = {\r
+  (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)&PvScsiGetDriverName,\r
+  (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME)&PvScsiGetDeviceName,\r
   "en" // SupportedLanguages, RFC 4646 language codes\r
 };\r
 \r
@@ -1544,8 +1555,8 @@ STATIC EFI_COMPONENT_NAME2_PROTOCOL mComponentName2 = {
 EFI_STATUS\r
 EFIAPI\r
 PvScsiEntryPoint (\r
-  IN EFI_HANDLE       ImageHandle,\r
-  IN EFI_SYSTEM_TABLE *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
   return EfiLibInstallDriverBindingComponentName2 (\r