SCSI Bus driver that layers on every SCSI Pass Thru and\r
Extended SCSI Pass Thru protocol in the system.\r
\r
-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>\r
This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
which accompanies this distribution. The full text of the license may be found at\r
return DevicePathStatus;\r
}\r
\r
+ //\r
+ // Report Status Code to indicate SCSI bus starts\r
+ //\r
+ REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
+ EFI_PROGRESS_CODE,\r
+ (EFI_IO_BUS_SCSI | EFI_IOB_PC_INIT),\r
+ ParentDevicePath\r
+ ); \r
+\r
//\r
// To keep backward compatibility, UEFI ExtPassThru Protocol is supported as well as \r
// EFI PassThru Protocol. From priority perspective, ExtPassThru Protocol is firstly\r
ScsiBusDev = SCSI_BUS_CONTROLLER_DEVICE_FROM_THIS (BusIdentify);\r
}\r
\r
+ //\r
+ // Report Status Code to indicate detecting devices on bus\r
+ //\r
+ REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
+ EFI_PROGRESS_CODE,\r
+ (EFI_IO_BUS_SCSI | EFI_IOB_PC_DETECT),\r
+ ParentDevicePath\r
+ );\r
+\r
Lun = 0;\r
if (RemainingDevicePath == NULL) {\r
//\r
\r
ScsiIoDevice = SCSI_IO_DEV_FROM_THIS (This);\r
\r
+ //\r
+ // Report Status Code to indicate reset happens\r
+ //\r
+ REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
+ EFI_PROGRESS_CODE,\r
+ (EFI_IO_BUS_ATA_ATAPI | EFI_IOB_PC_RESET),\r
+ ScsiIoDevice->ScsiBusDeviceData->DevicePath\r
+ );\r
+\r
if (ScsiIoDevice->ExtScsiSupport){\r
return ScsiIoDevice->ExtScsiPassThru->ResetChannel (ScsiIoDevice->ExtScsiPassThru);\r
} else {\r
UINT8 Target[TARGET_MAX_BYTES];\r
\r
ScsiIoDevice = SCSI_IO_DEV_FROM_THIS (This);\r
+\r
+ //\r
+ // Report Status Code to indicate reset happens\r
+ //\r
+ REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
+ EFI_PROGRESS_CODE,\r
+ (EFI_IO_BUS_ATA_ATAPI | EFI_IOB_PC_RESET),\r
+ ScsiIoDevice->ScsiBusDeviceData->DevicePath\r
+ );\r
+ \r
CopyMem (Target,&ScsiIoDevice->Pun, TARGET_MAX_BYTES);\r
\r
\r
\r
if (ScsiIoDevice->ExtScsiSupport) {\r
ExtRequestPacket = (EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET *) Packet;\r
- Status = ScsiIoDevice->ExtScsiPassThru->PassThru (\r
- ScsiIoDevice->ExtScsiPassThru,\r
- Target,\r
- ScsiIoDevice->Lun,\r
- ExtRequestPacket,\r
- Event\r
- );\r
+\r
+ if (((ScsiIoDevice->ExtScsiPassThru->Mode->Attributes & EFI_SCSI_PASS_THRU_ATTRIBUTES_NONBLOCKIO) != 0) && (Event != NULL)) {\r
+ Status = ScsiIoDevice->ExtScsiPassThru->PassThru (\r
+ ScsiIoDevice->ExtScsiPassThru,\r
+ Target,\r
+ ScsiIoDevice->Lun,\r
+ ExtRequestPacket,\r
+ Event\r
+ );\r
+ } else {\r
+ //\r
+ // If there's no event or the SCSI Device doesn't support NON-BLOCKING,\r
+ // let the 'Event' parameter for PassThru() be NULL.\r
+ //\r
+ Status = ScsiIoDevice->ExtScsiPassThru->PassThru (\r
+ ScsiIoDevice->ExtScsiPassThru,\r
+ Target,\r
+ ScsiIoDevice->Lun,\r
+ ExtRequestPacket,\r
+ NULL\r
+ );\r
+ if ((!EFI_ERROR(Status)) && (Event != NULL)) {\r
+ //\r
+ // Signal Event to tell caller to pick up the SCSI IO packet if the\r
+ // PassThru() succeeds.\r
+ //\r
+ gBS->SignalEvent (Event);\r
+ }\r
+ }\r
} else {\r
\r
mWorkingBuffer = AllocatePool (sizeof(EFI_SCSI_PASS_THRU_SCSI_REQUEST_PACKET));\r
//\r
Status = gBS->CreateEvent (\r
EVT_NOTIFY_SIGNAL,\r
- TPL_CALLBACK,\r
+ TPL_NOTIFY,\r
NotifyFunction,\r
&EventData,\r
&PacketEvent\r
ScsiIoDevice->Pun.ScsiId.Scsi,\r
ScsiIoDevice->Lun,\r
mWorkingBuffer,\r
- Event\r
+ NULL\r
);\r
if (EFI_ERROR(Status)) {\r
FreePool(mWorkingBuffer);\r
// free mWorkingBuffer.\r
//\r
FreePool(mWorkingBuffer);\r
+\r
+ //\r
+ // Signal Event to tell caller to pick up the SCSI IO Packet.\r
+ //\r
+ if (Event != NULL) {\r
+ gBS->SignalEvent (Event);\r
+ }\r
}\r
}\r
return Status;\r
}\r
\r
ScsiIoDevice->Signature = SCSI_IO_DEV_SIGNATURE;\r
+ ScsiIoDevice->ScsiBusDeviceData = ScsiBusDev;\r
CopyMem(&ScsiIoDevice->Pun, TargetId, TARGET_MAX_BYTES);\r
ScsiIoDevice->Lun = Lun;\r
\r
ScsiIoDevice->ScsiIo.ResetDevice = ScsiResetDevice;\r
ScsiIoDevice->ScsiIo.ExecuteScsiCommand = ScsiExecuteSCSICommand;\r
\r
+ //\r
+ // Report Status Code here since the new SCSI device will be discovered\r
+ //\r
+ REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
+ EFI_PROGRESS_CODE,\r
+ (EFI_IO_BUS_SCSI | EFI_IOB_PC_ENABLE),\r
+ ScsiBusDev->DevicePath\r
+ );\r
+\r
if (!DiscoverScsiDevice (ScsiIoDevice)) {\r
Status = EFI_OUT_OF_RESOURCES;\r
goto ErrorExit;\r
for (Index = 0; Index < MaxRetry; Index++) {\r
Status = ScsiInquiryCommand (\r
&ScsiIoDevice->ScsiIo,\r
- EFI_TIMER_PERIOD_SECONDS (1),\r
+ SCSI_BUS_TIMEOUT,\r
NULL,\r
&SenseDataLength,\r
&HostAdapterStatus,\r
);\r
if (!EFI_ERROR (Status)) {\r
break;\r
- } else if ((Status == EFI_BAD_BUFFER_SIZE) || \r
- (Status == EFI_INVALID_PARAMETER) ||\r
- (Status == EFI_UNSUPPORTED)) {\r
+ }\r
+ if ((Status == EFI_BAD_BUFFER_SIZE) ||\r
+ (Status == EFI_INVALID_PARAMETER) ||\r
+ (Status == EFI_UNSUPPORTED)) {\r
ScsiDeviceFound = FALSE;\r
goto Done;\r
}\r
//\r
// Retrieved inquiry data successfully\r
//\r
- if ((InquiryData->Peripheral_Qualifier != 0) &&\r
- (InquiryData->Peripheral_Qualifier != 3)) {\r
+ if (InquiryData->Peripheral_Qualifier != 0) {\r
ScsiDeviceFound = FALSE;\r
goto Done;\r
}\r
\r
- if (InquiryData->Peripheral_Qualifier == 3) {\r
- if (InquiryData->Peripheral_Type != 0x1f) {\r
- ScsiDeviceFound = FALSE;\r
- goto Done;\r
- }\r
- }\r
-\r
if (0x1e >= InquiryData->Peripheral_Type && InquiryData->Peripheral_Type >= 0xa) {\r
ScsiDeviceFound = FALSE;\r
goto Done;\r
projects / mirror_edk2.git / blobdiff