Skip to content

[DM/OFW][PCI] Fix address translation and PCI resource enumeration #11677

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

Merged
Rbb666 merged 5 commits into from
Aug 14, 2026
Merged

[DM/OFW][PCI] Fix address translation and PCI resource enumeration #11677

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f61db6e
[DM/OFW][PCI] Fix address translation and PCI resource enumeration
GuEe-GUI Aug 1, 2026
31c3c03
style: format code with clang-format
GuEe-GUI Aug 6, 2026
c7ca768
style: format complete changed files with clang-format
GuEe-GUI Aug 7, 2026
c767e7a
drivers: pci: address OFW review feedback
GuEe-GUI Aug 13, 2026
2f5d81d
style: format PCI and OFW changes for current master
GuEe-GUI Aug 14, 2026
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
38 changes: 32 additions & 6 deletions components/drivers/include/drivers/ofw_io.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ int rt_ofw_io_size_cells(struct rt_ofw_node *np);
int rt_ofw_get_address_count(struct rt_ofw_node *np);
rt_err_t rt_ofw_get_address(struct rt_ofw_node *np, int index, rt_uint64_t *out_address, rt_uint64_t *out_size);
rt_err_t rt_ofw_get_address_by_name(struct rt_ofw_node *np, const char *name,
rt_uint64_t *out_address, rt_uint64_t *out_size);
rt_uint64_t *out_address, rt_uint64_t *out_size);
int rt_ofw_get_address_array(struct rt_ofw_node *np, int nr, rt_uint64_t *out_regs);

rt_uint64_t rt_ofw_translate_address(struct rt_ofw_node *np, const char *range_type, rt_uint64_t address);
Expand All @@ -32,20 +32,46 @@ rt_inline rt_uint64_t rt_ofw_translate_dma2cpu(struct rt_ofw_node *np, rt_uint64
{
rt_uint64_t bus_addr, cpu_addr;

bus_addr = rt_ofw_reverse_address(np, "dma-ranges", address);
cpu_addr = rt_ofw_translate_address(np, "ranges", bus_addr);
cpu_addr = rt_ofw_translate_address(np, "dma-ranges", address);
Comment thread
GuEe-GUI marked this conversation as resolved.
if (cpu_addr != ~0ULL && cpu_addr != address)
{
return cpu_addr;
}

return cpu_addr != ~0ULL ? cpu_addr : address;
bus_addr = rt_ofw_translate_address(np, "dma-ranges", address);
if (bus_addr != ~0ULL && bus_addr != address)
{
cpu_addr = rt_ofw_translate_address(np, "ranges", bus_addr);
if (cpu_addr != ~0ULL && cpu_addr != address)
{
return cpu_addr;
}
}

return address;
}

rt_inline rt_uint64_t rt_ofw_translate_cpu2dma(struct rt_ofw_node *np, rt_uint64_t address)
{
rt_uint64_t bus_addr, dma_addr;

dma_addr = rt_ofw_reverse_address(np, "dma-ranges", address);
if (dma_addr != ~0ULL && dma_addr != address)
{
return dma_addr;
}

bus_addr = rt_ofw_reverse_address(np, "ranges", address);
dma_addr = rt_ofw_translate_address(np, "dma-ranges", bus_addr);
if (bus_addr != ~0ULL && bus_addr != address)
{
dma_addr = rt_ofw_reverse_address(np, "dma-ranges", bus_addr);
if (dma_addr != ~0ULL && dma_addr != address)
{
return dma_addr;
}
}

return dma_addr != ~0ULL ? dma_addr : address;
return address;
}

void *rt_ofw_iomap(struct rt_ofw_node *np, int index);
Expand Down
Loading
Loading