Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-01 10:11:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[HAL] Use a spin lock for the DMA adapter list. CORE-16611

Browse source 
This is necessary because HalPutDmaAdapter can be called at DISPATCH_LEVEL.
This commit is contained in:
Thomas Faber 2020-01-31 23:03:57 +01:00
parent 0e8bf61f81
commit 6c93669012
No known key found for this signature in database
GPG key ID: 076E7C3D44720826
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
hal/halx86/generic/dma.c
View file

@ -85,6 +85,7 @@
#ifndef _MINIHAL_
static KEVENT HalpDmaLock;
static KSPIN_LOCK HalpDmaAdapterListLock;
static LIST_ENTRY HalpDmaAdapterList;
static PADAPTER_OBJECT HalpEisaAdapter[8];
#endif
@ -165,6 +166,7 @@ HalpInitDma(VOID)
* first map buffers.
*/
InitializeListHead(&HalpDmaAdapterList);
KeInitializeSpinLock(&HalpDmaAdapterListLock);
KeInitializeEvent(&HalpDmaLock, NotificationEvent, TRUE);
HalpMasterAdapter = HalpDmaAllocateMasterAdapter();
@ -621,6 +623,7 @@ HalGetAdapter(IN PDEVICE_DESCRIPTION DeviceDescription,
BOOLEAN EisaAdapter;
ULONG MapRegisters;
ULONG MaximumLength;
KIRQL OldIrql;
/* Validate parameters in device description */
if (DeviceDescription->Version > DEVICE_DESCRIPTION_VERSION2) return NULL;
@ -688,8 +691,7 @@ HalGetAdapter(IN PDEVICE_DESCRIPTION DeviceDescription,
}
/*
* Acquire the DMA lock that is used to protect adapter lists and
* EISA adapter array.
* Acquire the DMA lock that is used to protect the EISA adapter array.
*/
KeWaitForSingleObject(&HalpDmaLock, Executive, KernelMode, FALSE, NULL);
@ -745,14 +747,20 @@ HalGetAdapter(IN PDEVICE_DESCRIPTION DeviceDescription,
}
}
if (!EisaAdapter) InsertTailList(&HalpDmaAdapterList, &AdapterObject->AdapterList);
/*
* Release the DMA lock. HalpDmaAdapterList and HalpEisaAdapter will
* no longer be touched, so we don't need it.
* Release the DMA lock. HalpEisaAdapter will no longer be touched,
* so we don't need it.
*/
KeSetEvent(&HalpDmaLock, 0, 0);
if (!EisaAdapter)
{
/* If it's not one of the static adapters, add it to the list */
KeAcquireSpinLock(&HalpDmaAdapterListLock, &OldIrql);
InsertTailList(&HalpDmaAdapterList, &AdapterObject->AdapterList);
KeReleaseSpinLock(&HalpDmaAdapterListLock, OldIrql);
}
/*
* Setup the values in the adapter object that are common for all
* types of buses.
@ -818,11 +826,12 @@ VOID
NTAPI
HalPutDmaAdapter(IN PADAPTER_OBJECT AdapterObject)
{
KIRQL OldIrql;
if (AdapterObject->ChannelNumber == 0xFF)
{
KeWaitForSingleObject(&HalpDmaLock, Executive, KernelMode, FALSE, NULL);
KeAcquireSpinLock(&HalpDmaAdapterListLock, &OldIrql);
RemoveEntryList(&AdapterObject->AdapterList);
KeSetEvent(&HalpDmaLock, 0, 0);
KeReleaseSpinLock(&HalpDmaAdapterListLock, OldIrql);
}
ObDereferenceObject(AdapterObject);