libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

[drivers][ofw] Fixed fdt_scan_memory() memory adjustment bug (#8853) 

* Fixed fdt memory adjustment bug

* Modify the memory adjustment logic
This commit is contained in:
liYangYang 2024-04-27 18:25:42 +08:00 committed by GitHub
parent 946dd264ed
commit d30c8b340e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 48 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
components/drivers/ofw/fdt.c
View File

@ -475,6 +475,19 @@ static rt_err_t fdt_scan_memory(void)
break; break;
} }
/*
* +--------+ +--------+
* | memory | | memory |
* +--------+ +----------+ +----------+ +--------+
* | reserved | | reserved |
* +----------+ +----------+
*/
if (res_region->start >= region->end || res_region->end <= region->start)
{
/* No adjustments needed */
continue;
}
/* /*
* case 0: case 1: * case 0: case 1:
* +------------------+ +----------+ * +------------------+ +----------+
@ -490,56 +503,49 @@ static rt_err_t fdt_scan_memory(void)
* | reserved | | reserved | * | reserved | | reserved |
* +----------+ +----------+ * +----------+ +----------+
*/ */
if (res_region->start > region->start)
/* case 0 */
if (res_region->start >= region->start && res_region->end <= region->end)
{ {
rt_size_t new_size = region->end - res_region->end; if (res_region->end < region->end)
region->end = res_region->start;
/* Commit part next block */
if (new_size)
{ {
/* case 0 */
rt_size_t new_size = region->end - res_region->end;
region->end = res_region->start;
/* Commit part next block */
err = commit_memregion(region->name, res_region->end, new_size, RT_FALSE); err = commit_memregion(region->name, res_region->end, new_size, RT_FALSE);
if (!err)
{
++no;
/* Scan again */
region = &_memregion[0];
--region;
break;
}
} }
else
if (!err)
{ {
++no; /* case 2 */
region->end = res_region->start;
/* Scan again */ }
region = &_memregion[0]; }
--region; else
{
if (res_region->end < region->end)
{
/* case 3 */
region->start = res_region->end;
}
else
{
/* case 1 */
region->name = RT_NULL;
break; break;
} }
continue;
}
/* case 1 */
if (res_region->start <= region->start && res_region->end >= region->end)
{
region->name = RT_NULL;
break;
}
/* case 2 */
if (res_region->start <= region->end && res_region->end >= region->end)
{
region->end = res_region->start;
continue;
}
/* case 3 */
if (res_region->start <= region->start && res_region->end >= region->start)
{
region->start = res_region->end;
continue;
} }
} }
} }