From 238659e94b52a47212109dcfc3d46f10c0494994 Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Sat, 10 Jun 2023 22:22:09 -0400 Subject: [PATCH] Store PCI device mapped memory ranges --- src/hulk/pci.d | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/hulk/pci.d b/src/hulk/pci.d index 94a1211..398ed42 100644 --- a/src/hulk/pci.d +++ b/src/hulk/pci.d @@ -4,6 +4,7 @@ import hulk.cpu; import hulk.klog; import hulk.hurl; import hulk.hurl.a1; +import hulk.range; struct Pci { @@ -35,6 +36,7 @@ struct Pci ubyte if_id; bool multifunction; ubyte header_type; + Range[6] memory_ranges; void initialize(Address address, ushort vendor_id, ushort device_id) { @@ -61,6 +63,7 @@ struct Pci private void map_memory_regions() { + size_t range_index; uint[2] r; uint[2] s; for (uint reg_no = 4u; reg_no <= 9u; reg_no++) @@ -109,10 +112,13 @@ struct Pci { s[1] = 0xFFFF_FFFFu; } - ulong addr = (cast(ulong)r[0] & 0xFFFF_FFF0u) | (cast(ulong)r[1] << 32u); + ulong mm_region_address = (cast(ulong)r[0] & 0xFFFF_FFF0u) | (cast(ulong)r[1] << 32u); ulong length = ~((cast(ulong)s[0] & 0xFFFF_FFF0u) | (cast(ulong)s[1] << 32u)) + 1u; ulong flags = (r[0] & 0x8) != 0u ? PT_WRITE_THROUGH : 0u; - Hurl.identity_map_range(addr, length, flags); + Hurl.identity_map_range(mm_region_address, length, flags); + memory_ranges[range_index].address = mm_region_address; + memory_ranges[range_index].length = length; + range_index++; if (is_64bit) { reg_no++;