Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
May 28, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions components/drivers/ofw/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,9 @@ config RT_FDT_EARLYCON_MSG_SIZE
int "Earlycon message buffer size (KB)"
depends on RT_USING_OFW
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 changes: 25 additions & 3 deletions components/drivers/ofw/io.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,17 @@
#include <drivers/ofw.h>
#include <drivers/ofw_io.h>
#include <drivers/ofw_fdt.h>
#include <drivers/misc.h>

#define DBG_TAG "rtdm.ofw"
#define DBG_LVL DBG_INFO
#include <rtdbg.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)
{
int res = OFW_ROOT_NODE_ADDR_CELLS_DEFAULT;
Expand Down Expand Up @@ -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)
{
int id;
const fdt32_t *cell;
struct bus_ranges *ranges = RT_NULL;
int child_address_cells, child_size_cells, parent_address_cells, groups;
Expand Down Expand Up @@ -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);
}

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);

return ranges;
Expand All @@ -341,7 +351,7 @@ rt_uint64_t rt_ofw_translate_address(struct rt_ofw_node *np, const char *range_t
{
rt_ssize_t len;
struct rt_ofw_prop *prop;
struct bus_ranges *ranges;
struct bus_ranges *ranges = RT_NULL;

prop = rt_ofw_get_prop(np, range_type, &len);

Expand All @@ -350,7 +360,19 @@ rt_uint64_t rt_ofw_translate_address(struct rt_ofw_node *np, const char *range_t
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)
{
Expand Down
1 change: 1 addition & 0 deletions components/drivers/ofw/ofw_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ struct alias_info
struct bus_ranges
{
rt_size_t nr;
struct rt_ofw_node *np;

rt_uint64_t *child_addr;
rt_uint64_t *parent_addr;
Expand Down
Loading