From 85894aa5bcb8f53d24aedc0e6b1f4f26ec1ef3e1 Mon Sep 17 00:00:00 2001 From: Shuo Liu Date: Sat, 6 Aug 2022 01:20:44 +0800 Subject: [PATCH] tests/lib: Set IORESOURCE_ASSIGNED for bootmem-test and memrange-test IORESOURCE_ASSIGNED is used to indicate the resource is actually mapped host physical address space. E.g. PCI BAR resources not mapped are not regarded as assigned. In src/include/device/device.h, standard macros, e.g. ram_resource, mmio_resource, io_resource, et al, are all following the usage above. This patch updates the bootmem-test and memrange-test to follow the usage as well. Change-Id: Ifc19302482038267cef01321a46a72d90ca76d35 Signed-off-by: Shuo Liu Reviewed-on: https://review.coreboot.org/c/coreboot/+/66450 Reviewed-by: Nico Huber Reviewed-by: Jonathan Zhang Reviewed-by: Jan Dabros Tested-by: build bot (Jenkins) --- tests/lib/bootmem-test.c | 6 +++--- 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} };