Skip to content

Commit ff61bac

Browse files
committed
of/address: Add of_property_read_reg() helper
Add a helper, of_property_read_reg(), to read "reg" entries untranslated address and size. This function is intended mainly for cases with an untranslatable "reg" address (i.e. not MMIO). There's also a few translatable cases such as address cells containing a bus chip-select number. Link: https://lore.kernel.org/r/20230328-dt-address-helpers-v1-5-e2456c3e77ab@kernel.org Signed-off-by: Rob Herring <robh@kernel.org>
1 parent b50c788 commit ff61bac

3 files changed

Lines changed: 52 additions & 0 deletions

File tree

drivers/of/address.c

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -760,6 +760,29 @@ const __be32 *__of_get_address(struct device_node *dev, int index, int bar_no,
760760
}
761761
EXPORT_SYMBOL(__of_get_address);
762762

763+
/**
764+
* of_property_read_reg - Retrieve the specified "reg" entry index without translating
765+
* @np: device tree node for which to retrieve "reg" from
766+
* @idx: "reg" entry index to read
767+
* @addr: return value for the untranslated address
768+
* @size: return value for the entry size
769+
*
770+
* Returns -EINVAL if "reg" is not found. Returns 0 on success with addr and
771+
* size values filled in.
772+
*/
773+
int of_property_read_reg(struct device_node *np, int idx, u64 *addr, u64 *size)
774+
{
775+
const __be32 *prop = of_get_address(np, idx, size, NULL);
776+
777+
if (!prop)
778+
return -EINVAL;
779+
780+
*addr = of_read_number(prop, of_n_addr_cells(np));
781+
782+
return 0;
783+
}
784+
EXPORT_SYMBOL(of_property_read_reg);
785+
763786
static int parser_init(struct of_pci_range_parser *parser,
764787
struct device_node *node, const char *name)
765788
{

drivers/of/unittest.c

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1134,6 +1134,27 @@ static void __init of_unittest_bus_3cell_ranges(void)
11341134
of_node_put(np);
11351135
}
11361136

1137+
static void __init of_unittest_reg(void)
1138+
{
1139+
struct device_node *np;
1140+
int ret;
1141+
u64 addr, size;
1142+
1143+
np = of_find_node_by_path("/testcase-data/address-tests/bus@80000000/device@1000");
1144+
if (!np) {
1145+
pr_err("missing testcase data\n");
1146+
return;
1147+
}
1148+
1149+
ret = of_property_read_reg(np, 0, &addr, &size);
1150+
unittest(!ret, "of_property_read_reg(%pOF) returned error %d\n",
1151+
np, ret);
1152+
unittest(addr == 0x1000, "of_property_read_reg(%pOF) untranslated address (%llx) incorrect\n",
1153+
np, addr);
1154+
1155+
of_node_put(np);
1156+
}
1157+
11371158
static void __init of_unittest_parse_interrupts(void)
11381159
{
11391160
struct device_node *np;
@@ -3772,6 +3793,7 @@ static int __init of_unittest(void)
37723793
of_unittest_pci_dma_ranges();
37733794
of_unittest_bus_ranges();
37743795
of_unittest_bus_3cell_ranges();
3796+
of_unittest_reg();
37753797
of_unittest_match_node();
37763798
of_unittest_platform_populate();
37773799
of_unittest_overlay();

include/linux/of_address.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ void __iomem *of_io_request_and_map(struct device_node *device,
7272
extern const __be32 *__of_get_address(struct device_node *dev, int index, int bar_no,
7373
u64 *size, unsigned int *flags);
7474

75+
int of_property_read_reg(struct device_node *np, int idx, u64 *addr, u64 *size);
76+
7577
extern int of_pci_range_parser_init(struct of_pci_range_parser *parser,
7678
struct device_node *node);
7779
extern int of_pci_dma_range_parser_init(struct of_pci_range_parser *parser,
@@ -106,6 +108,11 @@ static inline const __be32 *__of_get_address(struct device_node *dev, int index,
106108
return NULL;
107109
}
108110

111+
static inline int of_property_read_reg(struct device_node *np, int idx, u64 *addr, u64 *size)
112+
{
113+
return -ENOSYS;
114+
}
115+
109116
static inline int of_pci_range_parser_init(struct of_pci_range_parser *parser,
110117
struct device_node *node)
111118
{

0 commit comments

Comments
 (0)