[ros-diffs] [reactos] 01/01: [HALX86] Implement HalQueryAMLIIllegalIOPortAddresses case in HaliQuerySystemInformation CORE-17359

[Vadim Galyant]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=40bb3786b63c69091b70e…

commit 40bb3786b63c69091b70ed4d17a0ee29a99061d4
Author:     Vadim Galyant <vgal(a)rambler.ru>
AuthorDate: Thu Nov 5 22:56:05 2020 +0200
Commit:     Thomas Faber <thomas.faber(a)reactos.org>
CommitDate: Sat Nov 14 15:18:37 2020 +0100

    [HALX86] Implement HalQueryAMLIIllegalIOPortAddresses case in
HaliQuerySystemInformation
    CORE-17359
    
    Co-authored-by: Stanislav Motylkov <x86corez(a)gmail.com>
    Co-authored-by: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua>
---
 hal/halx86/generic/sysinfo.c | 53 +++++++++++++++++++++++++++++++++++++++++++-
 hal/halx86/include/halp.h    |  9 ++++++++
 2 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/hal/halx86/generic/sysinfo.c b/hal/halx86/generic/sysinfo.c
index d3a72c56a2f..ba880f380c3 100644
--- a/hal/halx86/generic/sysinfo.c
+++ b/hal/halx86/generic/sysinfo.c
@@ -4,6 +4,7 @@
  * FILE:            hal/halx86/generic/sysinfo.c
  * PURPOSE:         HAL Information Routines
  * PROGRAMMERS:     Alex Ionescu (alex.ionescu(a)reactos.org)
+ *                  Vadim Galyant (vgal(a)rambler.ru)
  */
 
 /* INCLUDES *******************************************************************/
@@ -12,8 +13,43 @@
 #define NDEBUG
 #include <debug.h>
 
+HAL_AMLI_BAD_IO_ADDRESS_LIST HalALMIBadIOAddressList[] =
+{
+    { 0x0000, 0x10, 1, NULL }, // DMA controller
+    { 0x0020, 0x02, 0, NULL }, // Programmable Interrupt Controller (8259A)
+    { 0x0040, 0x04, 1, NULL }, // System Timer 1
+    { 0x0048, 0x04, 1, NULL }, // System Timer 2 failsafe
+    { 0x0070, 0x02, 1, NULL }, // Real-time clock
+    { 0x0074, 0x03, 1, NULL }, // Extended CMOS
+    { 0x0081, 0x03, 1, NULL }, // DMA 1 page registers
+    { 0x0087, 0x01, 1, NULL }, // DMA 1 Ch 0 low page
+    { 0x0089, 0x01, 1, NULL }, // DMA 2 page registers
+    { 0x008A, 0x02, 1, NULL }, // DMA 2 page registers
+    { 0x008F, 0x01, 1, NULL }, // DMA 2 low page refresh
+    { 0x0090, 0x02, 1, NULL }, // Arbitration control
+    { 0x0093, 0x02, 1, NULL }, // Reserved system board setup
+    { 0x0096, 0x02, 1, NULL }, // POS channel select
+    { 0x00A0, 0x02, 0, NULL }, // Cascaded PIC
+    { 0x00C0, 0x20, 1, NULL }, // ISA DMA
+    { 0x04D0, 0x02, 0, NULL }, // PIC edge/level registers
+    { 0x0CF8, 0x08, 1, &HaliHandlePCIConfigSpaceAccess }, // PCI configuration space
+    { 0x0000, 0x00, 0, NULL } // Reserved
+};
+
 /* FUNCTIONS ******************************************************************/
 
+NTSTATUS
+NTAPI
+HaliHandlePCIConfigSpaceAccess(_In_ BOOLEAN IsRead,
+                               _In_ ULONG Port,
+                               _In_ ULONG Length,
+                               _Inout_ PULONG Buffer)
+{
+    DPRINT1("HaliHandlePCIConfigSpaceAccess: IsRead %X, Port 0x%X, Length %u, Buffer
%p\n", IsRead, Port, Length, Buffer);
+    //ASSERT(FALSE);
+    return STATUS_NOT_IMPLEMENTED;
+}
+
 NTSTATUS
 NTAPI
 HaliQuerySystemInformation(IN HAL_QUERY_INFORMATION_CLASS InformationClass,
@@ -44,7 +80,22 @@ HaliQuerySystemInformation(IN HAL_QUERY_INFORMATION_CLASS
InformationClass,
 		REPORT_THIS_CASE(HalCmcLogInformation);
 		REPORT_THIS_CASE(HalCpeLogInformation);
 		REPORT_THIS_CASE(HalQueryMcaInterface);
-		REPORT_THIS_CASE(HalQueryAMLIIllegalIOPortAddresses);
+		case HalQueryAMLIIllegalIOPortAddresses:
+		{
+			ULONG Size = sizeof(HalALMIBadIOAddressList);
+			NTSTATUS Status = STATUS_INFO_LENGTH_MISMATCH;
+
+			if (BufferSize >= Size)
+			{
+				RtlCopyMemory(Buffer, HalALMIBadIOAddressList, Size);
+				Status = STATUS_SUCCESS;
+			}
+
+			*ReturnedLength = Size;
+			KeFlushWriteBuffer();
+			return Status;
+		}
+
 		REPORT_THIS_CASE(HalQueryMaxHotPlugMemoryAddress);
 		REPORT_THIS_CASE(HalPartitionIpiInterface);
 		REPORT_THIS_CASE(HalPlatformInformation);
diff --git a/hal/halx86/include/halp.h b/hal/halx86/include/halp.h
index 080c0ac8462..746230f5d91 100644
--- a/hal/halx86/include/halp.h
+++ b/hal/halx86/include/halp.h
@@ -316,6 +316,15 @@ HalpUnmapVirtualAddress(
 );
 
 /* sysinfo.c */
+NTSTATUS
+NTAPI
+HaliHandlePCIConfigSpaceAccess(
+    _In_ BOOLEAN IsRead,
+    _In_ ULONG Port,
+    _In_ ULONG Length,
+    _Inout_ PULONG Buffer
+);
+
 NTSTATUS
 NTAPI
 HaliQuerySystemInformation(