Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-03-10 18:24:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed SrbExtension == NULL bug! :D

Browse source 
svn path=/branches/GSoC_2016/AHCI/; revision=71988
This commit is contained in:
Aman Priyadarshi 2016-07-24 12:41:07 +00:00
parent 05153b057d
commit 71e41b01c6
1 changed files with 38 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
drivers/storage/storahci/storahci.c
View file

@ -420,6 +420,7 @@ AhciCommandCompletionDpcRoutine (
StorPortAcquireSpinLock(AdapterExtension, InterruptLock, NULL, &lockhandle); StorPortAcquireSpinLock(AdapterExtension, InterruptLock, NULL, &lockhandle);
Srb = RemoveQueue(&PortExtension->CompletionQueue); Srb = RemoveQueue(&PortExtension->CompletionQueue);
StorPortReleaseSpinLock(AdapterExtension, &lockhandle);
NT_ASSERT(Srb != NULL); NT_ASSERT(Srb != NULL);
@ -427,22 +428,21 @@ AhciCommandCompletionDpcRoutine (
{ {
Srb->SrbStatus = SRB_STATUS_SUCCESS; Srb->SrbStatus = SRB_STATUS_SUCCESS;
} }
SrbExtension = GetSrbExtension(Srb);
CompletionRoutine = SrbExtension->CompletionRoutine;
if (CompletionRoutine != NULL)
{
// now it's completion routine responsibility to set SrbStatus
CompletionRoutine(PortExtension, Srb);
}
else else
{ {
Srb->SrbStatus = SRB_STATUS_SUCCESS; return;
//StorPortNotification(RequestComplete, AdapterExtension, Srb);
} }
StorPortReleaseSpinLock(AdapterExtension, &lockhandle); SrbExtension = GetSrbExtension(Srb);
CompletionRoutine = SrbExtension->CompletionRoutine;
NT_ASSERT(CompletionRoutine != NULL);
// now it's completion routine responsibility to set SrbStatus
CompletionRoutine(PortExtension, Srb);
StorPortNotification(RequestComplete, AdapterExtension, Srb);
return; return;
}// -- AhciCommandCompletionDpcRoutine(); }// -- AhciCommandCompletionDpcRoutine();
@ -537,6 +537,7 @@ AhciCompleteIssuedSrb (
{ {
ULONG NCS, i; ULONG NCS, i;
PSCSI_REQUEST_BLOCK Srb; PSCSI_REQUEST_BLOCK Srb;
PAHCI_SRB_EXTENSION SrbExtension;
PAHCI_ADAPTER_EXTENSION AdapterExtension; PAHCI_ADAPTER_EXTENSION AdapterExtension;
AhciDebugPrint("AhciCompleteIssuedSrb()\n"); AhciDebugPrint("AhciCompleteIssuedSrb()\n");
@ -553,10 +554,25 @@ AhciCompleteIssuedSrb (
if (((1 << i) & CommandsToComplete) != 0) if (((1 << i) & CommandsToComplete) != 0)
{ {
Srb = PortExtension->Slot[i]; Srb = PortExtension->Slot[i];
NT_ASSERT(Srb != NULL);
AddQueue(&PortExtension->CompletionQueue, Srb); if (Srb == NULL)
StorPortIssueDpc(AdapterExtension, &PortExtension->CommandCompletion, PortExtension, Srb); {
continue;
}
SrbExtension = GetSrbExtension(Srb);
NT_ASSERT(SrbExtension != NULL);
if (SrbExtension->CompletionRoutine != NULL)
{
AddQueue(&PortExtension->CompletionQueue, Srb);
StorPortIssueDpc(AdapterExtension, &PortExtension->CommandCompletion, PortExtension, Srb);
}
else
{
Srb->SrbStatus = SRB_STATUS_SUCCESS;
StorPortNotification(RequestComplete, AdapterExtension, Srb);
}
} }
} }
@ -748,7 +764,6 @@ AhciHwStartIo (
return TRUE; return TRUE;
} }
AhciDebugPrint("\tPathId: %d Function: %x\n", Srb->PathId, Srb->Function);
switch(Srb->Function) switch(Srb->Function)
{ {
case SRB_FUNCTION_PNP: case SRB_FUNCTION_PNP:
@ -844,7 +859,10 @@ AhciHwStartIo (
break; break;
} }
StorPortNotification(RequestComplete, AdapterExtension, Srb); if (Srb->SrbStatus != SRB_STATUS_PENDING)
{
StorPortNotification(RequestComplete, AdapterExtension, Srb);
}
return TRUE; return TRUE;
}// -- AhciHwStartIo(); }// -- AhciHwStartIo();
@ -1054,7 +1072,6 @@ AhciHwFindAdapter (
ConfigInfo->NumberOfPhysicalBreaks = 0x21; ConfigInfo->NumberOfPhysicalBreaks = 0x21;
ConfigInfo->MaximumNumberOfLogicalUnits = 1; ConfigInfo->MaximumNumberOfLogicalUnits = 1;
ConfigInfo->NumberOfBuses = MAXIMUM_AHCI_PORT_COUNT; ConfigInfo->NumberOfBuses = MAXIMUM_AHCI_PORT_COUNT;
ConfigInfo->MapBuffers = STOR_MAP_NON_READ_WRITE_BUFFERS;
ConfigInfo->MaximumTransferLength = MAXIMUM_TRANSFER_LENGTH; ConfigInfo->MaximumTransferLength = MAXIMUM_TRANSFER_LENGTH;
ConfigInfo->SynchronizationModel = StorSynchronizeFullDuplex; ConfigInfo->SynchronizationModel = StorSynchronizeFullDuplex;
@ -1396,7 +1413,6 @@ AhciActivatePort (
) )
{ {
AHCI_PORT_CMD cmd; AHCI_PORT_CMD cmd;
ULONG sact, ci;
ULONG QueueSlots, slotToActivate, tmp; ULONG QueueSlots, slotToActivate, tmp;
PAHCI_ADAPTER_EXTENSION AdapterExtension; PAHCI_ADAPTER_EXTENSION AdapterExtension;
@ -1419,9 +1435,6 @@ AhciActivatePort (
return; return;
} }
sact = StorPortReadRegisterUlong(AdapterExtension, &PortExtension->Port->SACT);
ci = StorPortReadRegisterUlong(AdapterExtension, &PortExtension->Port->CI);
// get the lowest set bit // get the lowest set bit
tmp = QueueSlots & (QueueSlots - 1); tmp = QueueSlots & (QueueSlots - 1);
@ -1703,6 +1716,8 @@ UCHAR DeviceRequestReadWrite (
DataTransferLength = Srb->DataTransferLength; DataTransferLength = Srb->DataTransferLength;
BytesPerSector = PortExtension->DeviceParams.BytesPerLogicalSector; BytesPerSector = PortExtension->DeviceParams.BytesPerLogicalSector;
NT_ASSERT(BytesPerSector > 0);
ROUND_UP(DataTransferLength, BytesPerSector); ROUND_UP(DataTransferLength, BytesPerSector);
SectorCount = DataTransferLength / BytesPerSector; SectorCount = DataTransferLength / BytesPerSector;
@ -1712,7 +1727,7 @@ UCHAR DeviceRequestReadWrite (
NT_ASSERT(SectorCount > 0); NT_ASSERT(SectorCount > 0);
SrbExtension->AtaFunction = ATA_FUNCTION_ATA_READ; SrbExtension->AtaFunction = ATA_FUNCTION_ATA_READ;
SrbExtension->Flags = ATA_FLAGS_USE_DMA; SrbExtension->Flags |= ATA_FLAGS_USE_DMA;
SrbExtension->CompletionRoutine = NULL; SrbExtension->CompletionRoutine = NULL;
if (IsReading) if (IsReading)