enderice2/Fennix
enderice2/Fennix
1
0
Fork 0
mirror of https://github.com/EnderIce2/Fennix.git synced 2025-06-07 20:27:59 +00:00
Code Issues Actions Releases Wiki Activity

fix(kernel/pci): 🔥 do not map I/O BARs

Browse Source
This commit is contained in:
EnderIce2 2025-05-24 17:24:32 +00:00
parent 43e7ddb9de
commit 814175ddaf
Signed by: enderice2
GPG Key ID: FEB6B8A8507BA62E
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Kernel/core/pci.cpp
View File

@ -897,8 +897,7 @@ namespace PCI
BAR[4] = hdr0->BAR4; BAR[4] = hdr0->BAR4;
BAR[5] = hdr0->BAR5; BAR[5] = hdr0->BAR5;
debug("Type: %d; IOBase: %#lx; MemoryBase: %#lx", debug("Type: %d; IOBase: %#lx; MemoryBase: %#lx", BAR[0] & 1, BAR[1] & (~3), BAR[0] & (~15));
BAR[0] & 1, BAR[1] & (~3), BAR[0] & (~15));
/* BARs Size */ /* BARs Size */
for (short i = 0; i < 6; i++) for (short i = 0; i < 6; i++)
@ -927,7 +926,7 @@ namespace PCI
size = size & UINT32_MAX; size = size & UINT32_MAX;
if (size == 0) if (size == 0)
{ {
warn("BAR%d size is zero! Device: %#x:%#x", i, Device.Header->VendorID, Device.Header->DeviceID); warn("MEM BAR%d size is zero! Device: %#x:%#x", i, Device.Header->VendorID, Device.Header->DeviceID);
size++; size++;
} }
BARsSize[i] = size; BARsSize[i] = size;
@ -943,7 +942,7 @@ namespace PCI
size = size & UINT16_MAX; size = size & UINT16_MAX;
if (size == 0) if (size == 0)
{ {
warn("BAR%d size is zero! Device: %#x:%#x", i, Device.Header->VendorID, Device.Header->DeviceID); warn("I/O BAR%d size is zero! Device: %#x:%#x", i, Device.Header->VendorID, Device.Header->DeviceID);
size++; size++;
} }
BARsSize[i] = size; BARsSize[i] = size;
@ -972,10 +971,7 @@ namespace PCI
uintptr_t BARBase = BAR[i] & (~3); uintptr_t BARBase = BAR[i] & (~3);
size_t BARSize = BARsSize[i]; size_t BARSize = BARsSize[i];
debug("Mapping BAR%d %#x-%#x", i, BARBase, BARBase + BARSize); debug("no need to map BAR%d %#x-%#x as it's an I/O space", i, BARBase, BARBase + BARSize);
Memory::Virtual(Table).Map((void *)BARBase, (void *)BARBase,
BARSize, Memory::RW | Memory::PWT | Memory::PCD);
} }
} }
break; break;