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

[OFW] io ranges use list to storage without ofw data (#8993) 

[OFW] io ranges use ptr array to storage without ofw data

ofw data is private data for every ofw node that
the drivers of ofw node will use item.
replace the ranges supported to a ptr array.

the ptr array size is config by `RT_USING_OFW_BUS_RANGES_NUMBER`

Signed-off-by: GuEe-GUI <2991707448@qq.com>
This commit is contained in:
GUI 2024-05-28 14:25:09 +08:00 committed by GitHub
parent 6f6b0c3ba0
commit b45fb59df2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/drivers/ofw/Kconfig
View File

@ -20,3 +20,9 @@ config RT_FDT_EARLYCON_MSG_SIZE
int "Earlycon message buffer size (KB)" int "Earlycon message buffer size (KB)"
depends on RT_USING_OFW depends on RT_USING_OFW
default 128 default 128
config RT_USING_OFW_BUS_RANGES_NUMBER
int "Max bus ranges number"
depends on RT_USING_OFW
default 8 if ARCH_CPU_64BIT
default 4

28
components/drivers/ofw/io.c
View File

@ -13,6 +13,7 @@
#include <drivers/ofw.h> #include <drivers/ofw.h>
#include <drivers/ofw_io.h> #include <drivers/ofw_io.h>
#include <drivers/ofw_fdt.h> #include <drivers/ofw_fdt.h>
#include <drivers/misc.h>
#define DBG_TAG "rtdm.ofw" #define DBG_TAG "rtdm.ofw"
#define DBG_LVL DBG_INFO #define DBG_LVL DBG_INFO
@ -20,6 +21,9 @@
#include "ofw_internal.h" #include "ofw_internal.h"
static volatile rt_atomic_t _bus_ranges_idx = 0;
static struct bus_ranges *_bus_ranges[RT_USING_OFW_BUS_RANGES_NUMBER] = {};
static int ofw_bus_addr_cells(struct rt_ofw_node *np) static int ofw_bus_addr_cells(struct rt_ofw_node *np)
{ {
int res = OFW_ROOT_NODE_ADDR_CELLS_DEFAULT; int res = OFW_ROOT_NODE_ADDR_CELLS_DEFAULT;
@ -245,6 +249,7 @@ int rt_ofw_get_address_array(struct rt_ofw_node *np, int nr, rt_uint64_t *out_re
static struct bus_ranges *ofw_bus_ranges(struct rt_ofw_node *np, struct rt_ofw_prop *prop) static struct bus_ranges *ofw_bus_ranges(struct rt_ofw_node *np, struct rt_ofw_prop *prop)
{ {
int id;
const fdt32_t *cell; const fdt32_t *cell;
struct bus_ranges *ranges = RT_NULL; struct bus_ranges *ranges = RT_NULL;
int child_address_cells, child_size_cells, parent_address_cells, groups; int child_address_cells, child_size_cells, parent_address_cells, groups;
@ -322,7 +327,12 @@ static struct bus_ranges *ofw_bus_ranges(struct rt_ofw_node *np, struct rt_ofw_p
*child_size++ = rt_fdt_next_cell(&cell, child_size_cells); *child_size++ = rt_fdt_next_cell(&cell, child_size_cells);
} }
rt_ofw_data(np) = ranges; ranges->np = np;
id = (int)rt_atomic_add(&_bus_ranges_idx, 1);
RT_ASSERT(id < RT_ARRAY_SIZE(_bus_ranges));
_bus_ranges[id] = ranges;
} while (0); } while (0);
return ranges; return ranges;
@ -341,7 +351,7 @@ rt_uint64_t rt_ofw_translate_address(struct rt_ofw_node *np, const char *range_t
{ {
rt_ssize_t len; rt_ssize_t len;
struct rt_ofw_prop *prop; struct rt_ofw_prop *prop;
struct bus_ranges *ranges; struct bus_ranges *ranges = RT_NULL;
prop = rt_ofw_get_prop(np, range_type, &len); prop = rt_ofw_get_prop(np, range_type, &len);
@ -350,7 +360,19 @@ rt_uint64_t rt_ofw_translate_address(struct rt_ofw_node *np, const char *range_t
continue; continue;
} }
ranges = rt_ofw_data(np); for (int i = 0; i < RT_ARRAY_SIZE(_bus_ranges); ++i)
{
if (!_bus_ranges[i])
{
break;
}
if (_bus_ranges[i]->np == np)
{
ranges = _bus_ranges[i];
break;
}
}
if (!ranges) if (!ranges)
{ {

1
components/drivers/ofw/ofw_internal.h
View File

@ -50,6 +50,7 @@ struct alias_info
struct bus_ranges struct bus_ranges
{ {
rt_size_t nr; rt_size_t nr;
struct rt_ofw_node *np;
rt_uint64_t *child_addr; rt_uint64_t *child_addr;
rt_uint64_t *parent_addr; rt_uint64_t *parent_addr;