[WIP] The ultimate ros amd64 bringup #361
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,6 +12,16 @@ | |
| #define NDEBUG | ||
|
There was a problem hiding this comment. https://jira.reactos.org/browse/CORE-10146 contains some info about that resource list parsing problem. There was a problem hiding this comment. Yeah, I added another hack to make it work a bit better, but it's still a bug. We need to figure out why these conflicts exist and fix it. |
||
| #include <debug.h> | ||
|
|
||
| static | ||
| ULONG | ||
| IopGetDescriptorSize( | ||
| PCM_FULL_RESOURCE_DESCRIPTOR ResourceDescriptor) | ||
| { | ||
| ULONG Count = ResourceDescriptor->PartialResourceList.Count; | ||
| return FIELD_OFFSET(CM_FULL_RESOURCE_DESCRIPTOR, | ||
| PartialResourceList.PartialDescriptors[Count]); | ||
| } | ||
|
|
||
| static | ||
| BOOLEAN | ||
| IopCheckDescriptorForConflict(PCM_PARTIAL_RESOURCE_DESCRIPTOR CmDesc, OPTIONAL PCM_PARTIAL_RESOURCE_DESCRIPTOR ConflictingDescriptor) | ||
|
|
@@ -195,6 +205,9 @@ IopFindInterruptResource( | |
| } | ||
| } | ||
|
|
||
| DPRINT1("Failed to satisfy interrupt requirement with IRQ 0x%x-0x%x\n", | ||
| IoDesc->u.Interrupt.MinimumVector, | ||
| IoDesc->u.Interrupt.MaximumVector); | ||
| return FALSE; | ||
| } | ||
|
|
||
|
|
@@ -542,12 +555,17 @@ IopCheckResourceDescriptor( | |
| IN BOOLEAN Silent, | ||
| OUT OPTIONAL PCM_PARTIAL_RESOURCE_DESCRIPTOR ConflictingDescriptor) | ||
| { | ||
| ULONG i, ii, DescriptorSize; | ||
| BOOLEAN Result = FALSE; | ||
| PCM_FULL_RESOURCE_DESCRIPTOR FullDesc; | ||
|
|
||
| FullDesc = &ResourceList->List[0]; | ||
| for (i = 0; i < ResourceList->Count; i++) | ||
| { | ||
| PCM_PARTIAL_RESOURCE_LIST ResList = &FullDesc->PartialResourceList; | ||
|
There was a problem hiding this comment. Doing this correctly broke boot on x86 last I tried. https://jira.reactos.org/browse/CORE-10146 There was a problem hiding this comment. It still does. Or rather, after hacking hal it boots, but the i8042prt driver doesn't load due to resource conflict. Any help figuring out why that is / fixing it is welcome. There was a problem hiding this comment. I noticed a while ago that our acpi.sys doesn't correctly translate the resource info from the ACPI tables either, and suspected that could be part of the problem. I have a patch somewhere that's a start on testing/fixing this, but it's unfinished, as other priorities came up. That was what I'd planned as the next step, though I don't know if it will even fix anything. There was a problem hiding this comment. @tkreuzer : about which hack hal? There was a problem hiding this comment. @vgalnt Believe me, when I think some debug print information helps, I either add that, or manually step though the code in WinDbg. The info is all there, it just needs someone to correctly interprete it. |
||
| DescriptorSize = IopGetDescriptorSize(FullDesc); | ||
| FullDesc = (PCM_FULL_RESOURCE_DESCRIPTOR)((PUCHAR)FullDesc + DescriptorSize); | ||
|
|
||
| for (ii = 0; ii < ResList->Count; ii++) | ||
| { | ||
| PCM_PARTIAL_RESOURCE_DESCRIPTOR ResDesc2 = &ResList->PartialDescriptors[ii]; | ||
|
|
@@ -606,6 +624,14 @@ IopCheckResourceDescriptor( | |
| break; | ||
|
|
||
| case CmResourceTypeInterrupt: | ||
| if (ResDesc->u.Interrupt.Vector == 0xA) | ||
| { | ||
| //__debugbreak(); | ||
| DPRINT("Got Interrupt IRQ (0x%x 0x%x vs. 0x%x 0x%x)\n", | ||
| ResDesc->u.Interrupt.Vector, ResDesc->u.Interrupt.Level, | ||
| ResDesc2->u.Interrupt.Vector, ResDesc2->u.Interrupt.Level); | ||
| } | ||
|
|
||
| if (ResDesc->u.Interrupt.Vector == ResDesc2->u.Interrupt.Vector) | ||
| { | ||
| if (!Silent) | ||
|
|
@@ -767,7 +793,7 @@ IopUpdateResourceMap(IN PDEVICE_NODE DeviceNode, PWCHAR Level1Key, PWCHAR Level2 | |
| HANDLE PnpMgrLevel1, PnpMgrLevel2, ResourceMapKey; | ||
| UNICODE_STRING KeyName; | ||
| OBJECT_ATTRIBUTES ObjectAttributes; | ||
| //__debugbreak(); | ||
| RtlInitUnicodeString(&KeyName, | ||
| L"\\Registry\\Machine\\HARDWARE\\RESOURCEMAP"); | ||
| InitializeObjectAttributes(&ObjectAttributes, | ||
|
|
@@ -1097,6 +1123,7 @@ IopAssignDeviceResources( | |
| Status = IopDetectResourceConflict(DeviceNode->ResourceList, FALSE, NULL); | ||
| if (!NT_SUCCESS(Status)) | ||
| { | ||
| //__debugbreak(); | ||
| DPRINT1("Boot resources for %wZ cause a resource conflict!\n", &DeviceNode->InstancePath); | ||
| ExFreePool(DeviceNode->ResourceList); | ||
| DeviceNode->ResourceList = NULL; | ||
|
|
@@ -1173,12 +1200,17 @@ IopCheckForResourceConflict( | |
| IN BOOLEAN Silent, | ||
| OUT OPTIONAL PCM_PARTIAL_RESOURCE_DESCRIPTOR ConflictingDescriptor) | ||
| { | ||
| ULONG i, ii, DescriptorSize; | ||
| BOOLEAN Result = FALSE; | ||
| PCM_FULL_RESOURCE_DESCRIPTOR FullDesc; | ||
|
|
||
| FullDesc = &ResourceList1->List[0]; | ||
| for (i = 0; i < ResourceList1->Count; i++) | ||
| { | ||
| PCM_PARTIAL_RESOURCE_LIST ResList = &FullDesc->PartialResourceList; | ||
| DescriptorSize = IopGetDescriptorSize(FullDesc); | ||
| FullDesc = (PCM_FULL_RESOURCE_DESCRIPTOR)((PUCHAR)FullDesc + DescriptorSize); | ||
|
|
||
| for (ii = 0; ii < ResList->Count; ii++) | ||
| { | ||
| PCM_PARTIAL_RESOURCE_DESCRIPTOR ResDesc = &ResList->PartialDescriptors[ii]; | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
PRIMARY_VECTOR_BASE is the processor's view of the IRQ vector (int 0x30), whereas an IO_RESOURCE_REQUIREMENTS list always refers to raw resources (IRQ 0). So this translation doesn't belong here. Since ROS doesn't have translators & arbiters, I'm not exactly sure where it does belong though :\
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are there any plans to implement resource translators/arbiters in the near future?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not to my knowledge. Regardless, 'here' is not the answer to where it belongs.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is a hack that I applied, which ensures that at least HAL is loaded properly and doesn't have any resource conflicts. I have doubts that what you claim about untranslated resources is true, since you can see in the registry on Windows that e.g. "HKEY_LOCAL_MACHINE\HARDWARE\RESOURCEMAP\Hardware Abstraction Layer\ACPI x64 platform.Raw" contains all vectors starting from 0 and ".Translated" contains the same vectors.