diff options
| -rw-r--r-- | tests/lib/bootmem-test.c | 6 | ||||
| -rw-r--r-- | tests/lib/memrange-test.c | 27 |
2 files changed, 21 insertions, 12 deletions
diff --git a/tests/lib/bootmem-test.c b/tests/lib/bootmem-test.c index 7bdbf0d310..4cf9a2d03e 100644 --- a/tests/lib/bootmem-test.c +++ b/tests/lib/bootmem-test.c @@ -116,11 +116,11 @@ struct bootmem_ranges_t *ranges = ranges_mock; /* Note that second region overlaps first */ struct resource res_mock[] = { { .base = ZERO_REGION_START, .size = ZERO_REGION_SIZE, .next = &res_mock[1], - .flags = IORESOURCE_CACHEABLE | IORESOURCE_MEM }, + .flags = IORESOURCE_CACHEABLE | IORESOURCE_MEM | IORESOURCE_ASSIGNED }, { .base = CACHEABLE_START, .size = CACHEABLE_SIZE, .next = &res_mock[2], - .flags = IORESOURCE_CACHEABLE | IORESOURCE_MEM }, + .flags = IORESOURCE_CACHEABLE | IORESOURCE_MEM | IORESOURCE_ASSIGNED }, { .base = RESERVED_START, .size = RESERVED_SIZE, .next = NULL, - .flags = IORESOURCE_RESERVE | IORESOURCE_MEM } + .flags = IORESOURCE_RESERVE | IORESOURCE_MEM | IORESOURCE_ASSIGNED } }; /* Device simulating RAM */ diff --git a/tests/lib/memrange-test.c b/tests/lib/memrange-test.c index 25eb1aaaa4..f99673df5d 100644 --- a/tests/lib/memrange-test.c +++ b/tests/lib/memrange-test.c @@ -25,15 +25,18 @@ struct resource res_mock_1[] = { [CACHEABLE_TAG] = {.base = 0xE000, .size = 0xF2000, .next = &res_mock_1[RESERVED_TAG], - .flags = IORESOURCE_CACHEABLE | IORESOURCE_MEM}, + .flags = IORESOURCE_CACHEABLE | IORESOURCE_MEM | + IORESOURCE_ASSIGNED }, [RESERVED_TAG] = {.base = 4ULL * GiB, .size = 4ULL * KiB, .next = &res_mock_1[READONLY_TAG], - .flags = IORESOURCE_RESERVE | IORESOURCE_MEM}, + .flags = IORESOURCE_RESERVE | IORESOURCE_MEM | + IORESOURCE_ASSIGNED }, [READONLY_TAG] = {.base = 0xFF0000, .size = 0x10000, .next = NULL, - .flags = IORESOURCE_READONLY | IORESOURCE_MEM} + .flags = IORESOURCE_READONLY | IORESOURCE_MEM | + IORESOURCE_ASSIGNED } }; /* Boundary 1 byte below 4GiB and 1 byte above 4GiB. */ @@ -41,15 +44,18 @@ struct resource res_mock_2[] = { [CACHEABLE_TAG] = {.base = 0x1000000, .size = 4ULL * GiB - 0x1000001ULL, .next = &res_mock_2[RESERVED_TAG], - .flags = IORESOURCE_CACHEABLE | IORESOURCE_MEM}, + .flags = IORESOURCE_CACHEABLE | IORESOURCE_MEM | + IORESOURCE_ASSIGNED }, [RESERVED_TAG] = {.base = 4ULL * GiB + 1ULL, .size = 4ULL * GiB, .next = &res_mock_2[READONLY_TAG], - .flags = IORESOURCE_RESERVE | IORESOURCE_MEM}, + .flags = IORESOURCE_RESERVE | IORESOURCE_MEM | + IORESOURCE_ASSIGNED }, [READONLY_TAG] = {.base = 0, .size = 0x10000, .next = NULL, - .flags = IORESOURCE_READONLY | IORESOURCE_MEM} + .flags = IORESOURCE_READONLY | IORESOURCE_MEM | + IORESOURCE_ASSIGNED } }; /* Boundary crossing 4GiB. */ @@ -57,15 +63,18 @@ struct resource res_mock_3[] = { [CACHEABLE_TAG] = {.base = 0xD000, .size = 0xF3000, .next = &res_mock_3[RESERVED_TAG], - .flags = IORESOURCE_CACHEABLE | IORESOURCE_MEM}, + .flags = IORESOURCE_CACHEABLE | IORESOURCE_MEM | + IORESOURCE_ASSIGNED }, [RESERVED_TAG] = {.base = 1ULL * GiB, .size = 4ULL * GiB, .next = &res_mock_3[READONLY_TAG], - .flags = IORESOURCE_RESERVE | IORESOURCE_MEM}, + .flags = IORESOURCE_RESERVE | IORESOURCE_MEM | + IORESOURCE_ASSIGNED }, [READONLY_TAG] = {.base = 0xFF0000, .size = 0x10000, .next = NULL, - .flags = IORESOURCE_READONLY | IORESOURCE_MEM} + .flags = IORESOURCE_READONLY | IORESOURCE_MEM | + IORESOURCE_ASSIGNED} }; |