Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "resource: fix region_intersects() vs add_memory_driver_managed()"

Browse source 
This reverts commit 29fa0c8808.
This commit is contained in:
Ksawlii 2024-11-24 00:22:55 +01:00
parent 08ae7de936
commit a8299c44cf
1 changed files with 8 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
kernel/resource.c
View file

@ -539,63 +539,21 @@ EXPORT_SYMBOL_GPL(page_is_ram);
int region_intersects(resource_size_t start, size_t size, unsigned long flags, int region_intersects(resource_size_t start, size_t size, unsigned long flags,
unsigned long desc) unsigned long desc)
{ {
resource_size_t ostart, oend;
int type = 0; int other = 0;
struct resource *p, *dp;
bool is_type, covered;
struct resource res; struct resource res;
int type = 0; int other = 0;
struct resource *p;
res.start = start; res.start = start;
res.end = start + size - 1; res.end = start + size - 1;
read_lock(&resource_lock); read_lock(&resource_lock);
for (p = iomem_resource.child; p ; p = p->sibling) { for (p = iomem_resource.child; p ; p = p->sibling) {
if (!resource_overlaps(p, &res)) bool is_type = (((p->flags & flags) == flags) &&
continue; ((desc == IORES_DESC_NONE) ||
is_type = (p->flags & flags) == flags && (desc == p->desc)));
(desc == IORES_DESC_NONE || desc == p->desc);
if (is_type) { if (resource_overlaps(p, &res))
type++; is_type ? type++ : other++;
continue;
}
/*
* Continue to search in descendant resources as if the
* matched descendant resources cover some ranges of 'p'.
*
* |------------- "CXL Window 0" ------------|
* |-- "System RAM" --|
*
* will behave similar as the following fake resource
* tree when searching "System RAM".
*
* |-- "System RAM" --||-- "CXL Window 0a" --|
*/
covered = false;
ostart = max(res.start, p->start);
oend = min(res.end, p->end);
for (dp = p->child; dp; dp = next_resource(dp, false)) {
if (!resource_overlaps(dp, &res))
continue;
is_type = (dp->flags & flags) == flags &&
(desc == IORES_DESC_NONE || desc == dp->desc);
if (is_type) {
type++;
/*
* Range from 'ostart' to 'dp->start'
* isn't covered by matched resource.
*/
if (dp->start > ostart)
break;
if (dp->end >= oend) {
covered = true;
break;
}
/* Remove covered range */
ostart = max(ostart, dp->end + 1);
}
}
if (!covered)
other++;
} }
read_unlock(&resource_lock); read_unlock(&resource_lock);