Skip to content

Commit

Permalink
update to riscv-kernel-6.11.0 v31
Browse files Browse the repository at this point in the history
  • Loading branch information
ZLangJIT committed Oct 16, 2024
1 parent c7d6c61 commit 35f3170
Showing 1 changed file with 54 additions and 15 deletions.
69 changes: 54 additions & 15 deletions rvvm.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5917,30 +5917,69 @@ index 7cbe407..8e5e681 100644
if (rvvm_getarg("dumpdtb")) rvvm_dump_dtb(machine, rvvm_getarg("dumpdtb"));
return true;
diff --git a/src/rvvm.c b/src/rvvm.c
index 71f1dbf..5677da8 100644
index 71f1dbf..7b19c2c 100644
--- a/src/rvvm.c
+++ b/src/rvvm.c
@@ -695,13 +695,23 @@ PUBLIC void rvvm_free_machine(rvvm_machine_t* machine)
@@ -691,16 +691,60 @@ PUBLIC void rvvm_free_machine(rvvm_machine_t* machine)
free(machine);
}

+/*
+should detect
+1. A == B
+|------------|
+|------------|
+2. A overlaps B
+|------------|
+ |------------|
+3. B overlaps A
+ |------------|
+|------------|
+4. B inside A
+|-------------|
+ |-------|
+5. A inside B
+ |-------|
+|-------------|
+6. A inside B
+|-------|
+|-------------|
+7. B inside A
+|-------------|
+|-------|
+8. A inside B
+ |-------|
+|-------------|
+9. B inside A
+|-------------|
+ |-------|
+*/
+static inline bool rvvm_mmio_zone_check_overlap(rvvm_machine_t* machine, rvvm_addr_t A_BEGIN, rvvm_addr_t A_END, rvvm_addr_t B_BEGIN, rvvm_addr_t B_END) {
+ return
+ (
+ A_BEGIN >= B_BEGIN && ( // handle 1, 3, 5, 6, 7, 8, 9
+ (A_END <= B_END) // handle *1, 2, *5, *6, *8, *9
+ || (A_END >= B_END) // handle 1, *3, 4, *7, 8, 9
+ )
+ || (B_BEGIN >= A_BEGIN && ( // handle 1, 2, 4, 6, 7, 9
+ (B_END <= A_END) // handle *1, 3, *4, *7, 8, *9
+ || (B_END >= A_END) // handle 1, *2, 5, *6, 8, 9
+ )
+ );
+}
+
// Returns addr if zone is free
static rvvm_addr_t rvvm_mmio_zone_check(rvvm_machine_t* machine, rvvm_addr_t addr, size_t size)
{
if (addr >= machine->mem.begin && (addr + size) <= (machine->mem.begin + machine->mem.size)) {
+ rvvm_warn("MMIO device desired region 0x%08"PRIx64"-0x%08"PRIx64" is inside of region 0x%08"PRIx64"-0x%08"PRIx64"",
+ addr, (addr + size), machine->mem.begin, (machine->mem.begin + machine->mem.size));
- if (addr >= machine->mem.begin && (addr + size) <= (machine->mem.begin + machine->mem.size)) {
+ if (rvvm_mmio_zone_check_overlap(addr, addr+size, machine->mem.begin, machine->mem.begin+machine->mem.size)) {
addr = machine->mem.begin + machine->mem.size;
+ } else {
+ rvvm_warn("MMIO device desired region 0x%08"PRIx64"-0x%08"PRIx64" is outside of region 0x%08"PRIx64"-0x%08"PRIx64"",
+ addr, (addr + size), machine->mem.begin, (machine->mem.begin + machine->mem.size));
}

vector_foreach(machine->mmio_devs, i) {
rvvm_mmio_dev_t* dev = vector_at(machine->mmio_devs, i);
if (addr >= dev->addr && (addr + size) <= (dev->addr + dev->size)) {
+ rvvm_warn("MMIO device desired region 0x%08"PRIx64"-0x%08"PRIx64" is inside of region 0x%08"PRIx64"-0x%08"PRIx64" of device \"%s\"",
+ addr, (addr + size), dev->addr, (dev->addr + dev->size), dev->type ? dev->type->name : "null");
- if (addr >= dev->addr && (addr + size) <= (dev->addr + dev->size)) {
+ if (rvvm_mmio_zone_check_overlap(addr, addr+size, dev->addr, dev->addr+dev->size)) {
addr = dev->addr + dev->size;
+ } else {
+ rvvm_warn("MMIO device desired region 0x%08"PRIx64"-0x%08"PRIx64" is outside of region 0x%08"PRIx64"-0x%08"PRIx64" of device \"%s\"",
+ addr, (addr + size), dev->addr, (dev->addr + dev->size), dev->type ? dev->type->name : "null");
}
}

0 comments on commit 35f3170

Please sign in to comment.