[FREELDR:APPLETV] Simplify memory mapping code, fix Win2K

Author: DistroHopper39B

boot/freeldr/freeldr/arch/i386/appletv/appletvhw.c

@@ -188,6 +188,115 @@ HalpCalibrateStallExecution(VOID)
     delay_count /= (MILLISEC / 2);
 }
 
+static
+BOOLEAN
+AppleTVFindPciBios(PPCI_REGISTRY_INFO BusData)
+{
+    /* We hardcode PCI BIOS here */
+    
+    BusData->MajorRevision = 0x02;
+    BusData->MinorRevision = 0x10;
+    BusData->NoBuses = 7;
+    BusData->HardwareMechanism = 1;
+    return TRUE;
+}
+
+VOID
+DetectPciBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber)
+{
+    PCM_PARTIAL_RESOURCE_LIST PartialResourceList;
+    PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor;
+    PCI_REGISTRY_INFO BusData;
+    ULONG Size;
+    PCONFIGURATION_COMPONENT_DATA BusKey;
+    ULONG i;
+
+    AppleTVFindPciBios(&BusData);
+    
+    /* Set 'Configuration Data' value */
+    Size = FIELD_OFFSET(CM_PARTIAL_RESOURCE_LIST, PartialDescriptors);
+    PartialResourceList = FrLdrHeapAlloc(Size, TAG_HW_RESOURCE_LIST);
+    if (PartialResourceList == NULL)
+    {
+        ERR("Failed to allocate resource descriptor\n");
+        return;
+    }
+
+    /* Initialize resource descriptor */
+    RtlZeroMemory(PartialResourceList, Size);
+
+    /* Increment bus number */
+    (*BusNumber)++;
+
+    // DetectPciIrqRoutingTable(BiosKey);
+
+    /* Report PCI buses */
+    for (i = 0; i < (ULONG)BusData.NoBuses; i++)
+    {
+        /* Check if this is the first bus */
+        if (i == 0)
+        {
+            /* Set 'Configuration Data' value */
+            Size = FIELD_OFFSET(CM_PARTIAL_RESOURCE_LIST,
+                                PartialDescriptors) +
+                   sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) +
+                   sizeof(PCI_REGISTRY_INFO);
+            PartialResourceList = FrLdrHeapAlloc(Size, TAG_HW_RESOURCE_LIST);
+            if (!PartialResourceList)
+            {
+                ERR("Failed to allocate resource descriptor! Ignoring remaining PCI buses. (i = %lu, NoBuses = %lu)\n",
+                    i, (ULONG)BusData.NoBuses);
+                return;
+            }
+
+            /* Initialize resource descriptor */
+            RtlZeroMemory(PartialResourceList, Size);
+            PartialResourceList->Version = 1;
+            PartialResourceList->Revision = 1;
+            PartialResourceList->Count = 1;
+            PartialDescriptor = &PartialResourceList->PartialDescriptors[0];
+            PartialDescriptor->Type = CmResourceTypeDeviceSpecific;
+            PartialDescriptor->ShareDisposition = CmResourceShareUndetermined;
+            PartialDescriptor->u.DeviceSpecificData.DataSize = sizeof(PCI_REGISTRY_INFO);
+            memcpy(&PartialResourceList->PartialDescriptors[1],
+                   &BusData,
+                   sizeof(PCI_REGISTRY_INFO));
+        }
+        else
+        {
+            /* Set 'Configuration Data' value */
+            Size = FIELD_OFFSET(CM_PARTIAL_RESOURCE_LIST,
+                                PartialDescriptors);
+            PartialResourceList = FrLdrHeapAlloc(Size, TAG_HW_RESOURCE_LIST);
+            if (!PartialResourceList)
+            {
+                ERR("Failed to allocate resource descriptor! Ignoring remaining PCI buses. (i = %lu, NoBuses = %lu)\n",
+                    i, (ULONG)BusData.NoBuses);
+                return;
+            }
+
+            /* Initialize resource descriptor */
+            RtlZeroMemory(PartialResourceList, Size);
+        }
+
+        /* Create the bus key */
+        FldrCreateComponentKey(SystemKey,
+                               AdapterClass,
+                               MultiFunctionAdapter,
+                               0x0,
+                               0x0,
+                               0xFFFFFFFF,
+                               "PCI",
+                               PartialResourceList,
+                               Size,
+                               &BusKey);
+
+        /* Increment bus number */
+        (*BusNumber)++;
+    }
+
+}
+
 VOID
 DetectAcpiBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber)
 {
@@ -475,6 +584,7 @@ AppleTVHwDetect(_In_opt_ PCSTR Options)
     /* Create the 'System' key */
     FldrCreateSystemKey(&SystemKey, "Apple TV (1st generation)");
 
+    DetectPciBios(SystemKey, &BusNumber);
     DetectAcpiBios(SystemKey, &BusNumber);
     DetectInternal(SystemKey, &BusNumber);
     DetectSmBios();

boot/freeldr/freeldr/arch/i386/appletv/appletvmem.c

@@ -98,59 +98,6 @@ SetMemory(
                                         MemoryType);
 }
 
-ULONG
-PcMemFinalizeMemoryMap(
-    PFREELDR_MEMORY_DESCRIPTOR MemoryMap)
-{
-    ULONG i;
-
-    /* Reserve some static ranges for freeldr */
-    ReserveMemory(MemoryMap, 0x1000, STACKLOW - 0x1000, LoaderFirmwareTemporary, "BIOS area");
-    ReserveMemory(MemoryMap, STACKLOW, STACKADDR - STACKLOW, LoaderOsloaderStack, "FreeLdr stack");
-    ReserveMemory(MemoryMap, FREELDR_BASE, FrLdrImageSize, LoaderLoadedProgram, "FreeLdr image");
-
-    /* Default to 1 page above the firmware for the disk read buffer */
-    DiskReadBuffer = (PUCHAR)ALIGN_UP_BY(BootArgs->KernelBaseAddress + BootArgs->KernelSize, PAGE_SIZE);
-    DiskReadBufferSize = PAGE_SIZE;
-
-    /* Scan for free range above firmware */
-    for (i = 0; i < FreeldrDescCount; i++)
-    {
-        if ((MemoryMap[i].BasePage > (BootArgs->KernelBaseAddress + BootArgs->KernelSize / PAGE_SIZE)) &&
-            (MemoryMap[i].MemoryType == LoaderFree))
-        {
-            /* Use this range for the disk read buffer */
-            DiskReadBuffer = (PVOID)(MemoryMap[i].BasePage * PAGE_SIZE);
-            DiskReadBufferSize = min(MemoryMap[i].PageCount * PAGE_SIZE,
-                                     MAX_DISKREADBUFFER_SIZE);
-            break;
-        }
-    }
-
-    TRACE("DiskReadBuffer=0x%p, DiskReadBufferSize=0x%lx\n",
-          DiskReadBuffer, DiskReadBufferSize);
-
-    ASSERT(DiskReadBufferSize > 0);
-
-    /* Now reserve the range for the disk read buffer */
-    ReserveMemory(MemoryMap,
-                  (ULONG_PTR)DiskReadBuffer,
-                  DiskReadBufferSize,
-                  LoaderFirmwareTemporary,
-                  "Disk read buffer");
-
-    TRACE("Dumping resulting memory map:\n");
-    for (i = 0; i < FreeldrDescCount; i++)
-    {
-        TRACE("BasePage=0x%lx, PageCount=0x%lx, Type=%s\n",
-              MemoryMap[i].BasePage,
-              MemoryMap[i].PageCount,
-              MmGetSystemMemoryMapTypeString(MemoryMap[i].MemoryType));
-    }
-    return FreeldrDescCount;
-}
-
-
 static
 BIOS_MEMORY_TYPE
 UefiConvertToBiosType(EFI_MEMORY_TYPE MemoryType)
@@ -302,13 +249,26 @@ AppleTVMemGetMemoryMap(ULONG *MemoryMapSize)
     BiosConvertToFreeldrMap(BiosMapPtr,
                             BiosMapNumberOfEntries);
 
-    // The first page should be reserved.
+    // Reserve a few static ranges
+    // Windows requires page #1 to be reserved
     SetMemory(FreeldrMemMap,
-            0x000000,
-            0x01000,
+            0x0,
+            PAGE_SIZE,
             LoaderSpecialMemory);
 
-    *MemoryMapSize = PcMemFinalizeMemoryMap(FreeldrMemMap);
+    // FreeLoader stack
+    SetMemory(FreeldrMemMap,
+        STACKLOW,
+        STACKADDR - STACKLOW,
+        LoaderOsloaderStack);
+        
+    // FreeLoader program
+    SetMemory(FreeldrMemMap,
+        FREELDR_BASE,
+        FrLdrImageSize,
+        LoaderLoadedProgram);
+    
+    *MemoryMapSize = FreeldrDescCount;
 
     return FreeldrMemMap;
 }

boot/freeldr/freeldr/arch/i386/hwdisk.c

@@ -460,6 +460,18 @@ PcInitializeBootDevices(VOID)
     UCHAR DiskCount;
     BOOLEAN BootDriveReported = FALSE;
     CONFIGURATION_TYPE DriveType;
+    
+    #ifdef SARCH_APPLETV
+    // Set up disk read buffer.
+    DiskReadBufferSize = PAGE_SIZE;
+    DiskReadBuffer = MmAllocateMemoryWithType(DiskReadBufferSize, LoaderFirmwareTemporary);
+    if (!DiskReadBuffer)
+    {
+        ERR("Cannot allocate disk read buffer!\n");
+        ASSERT(FALSE);
+        return FALSE;
+    }
+    #endif
 
     DiskCount = EnumerateHarddisks(&BootDriveReported);