mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-11 23:47:24 +00:00
c20ee0ed07
When using 32-bit addresses dtoc works correctly. For 64-bit addresses it does not since it ignores the #address-cells and #size-cells properties. Update the tool to use fdt64_t as the element type for reg properties when either the address or size is larger than one cell. Use the correct value so that C code can obtain the information from the device tree easily. Alos create a new type, fdt_val_t, which is defined to either fdt32_t or fdt64_t depending on the word size of the machine. This type corresponds to fdt_addr_t and fdt_size_t. Unfortunately we cannot just use those types since they are defined to phys_addr_t and phys_size_t which use 'unsigned long' in the 32-bit case, rather than 'unsigned int'. Add tests for the four combinations of address and size values (32/32, 64/64, 32/64, 64/32). Also update existing uses for rk3399 and rk3368 which now need to use the new fdt_val_t type. Signed-off-by: Simon Glass <sjg@chromium.org> Suggested-by: Heiko Stuebner <heiko@sntech.de> Reported-by: Kever Yang <kever.yang@rock-chips.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Tested-by: Kever Yang <kever.yang@rock-chips.com>
149 lines
2.9 KiB
C
149 lines
2.9 KiB
C
/*
|
|
* Copyright (c) 2015 Google, Inc
|
|
* Written by Simon Glass <sjg@chromium.org>
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <dm.h>
|
|
#include <errno.h>
|
|
#include <libfdt.h>
|
|
#include <malloc.h>
|
|
#include <mapmem.h>
|
|
#include <regmap.h>
|
|
#include <asm/io.h>
|
|
#include <dm/of_addr.h>
|
|
#include <linux/ioport.h>
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
static struct regmap *regmap_alloc_count(int count)
|
|
{
|
|
struct regmap *map;
|
|
|
|
map = malloc(sizeof(struct regmap));
|
|
if (!map)
|
|
return NULL;
|
|
if (count <= 1) {
|
|
map->range = &map->base_range;
|
|
} else {
|
|
map->range = malloc(count * sizeof(struct regmap_range));
|
|
if (!map->range) {
|
|
free(map);
|
|
return NULL;
|
|
}
|
|
}
|
|
map->range_count = count;
|
|
|
|
return map;
|
|
}
|
|
|
|
#if CONFIG_IS_ENABLED(OF_PLATDATA)
|
|
int regmap_init_mem_platdata(struct udevice *dev, fdt_val_t *reg, int count,
|
|
struct regmap **mapp)
|
|
{
|
|
struct regmap_range *range;
|
|
struct regmap *map;
|
|
|
|
map = regmap_alloc_count(count);
|
|
if (!map)
|
|
return -ENOMEM;
|
|
|
|
map->base = *reg;
|
|
for (range = map->range; count > 0; reg += 2, range++, count--) {
|
|
range->start = *reg;
|
|
range->size = reg[1];
|
|
}
|
|
|
|
*mapp = map;
|
|
|
|
return 0;
|
|
}
|
|
#else
|
|
int regmap_init_mem(struct udevice *dev, struct regmap **mapp)
|
|
{
|
|
struct regmap_range *range;
|
|
struct regmap *map;
|
|
int count;
|
|
int addr_len, size_len, both_len;
|
|
int len;
|
|
int index;
|
|
ofnode node = dev_ofnode(dev);
|
|
struct resource r;
|
|
|
|
addr_len = dev_read_simple_addr_cells(dev->parent);
|
|
size_len = dev_read_simple_size_cells(dev->parent);
|
|
both_len = addr_len + size_len;
|
|
|
|
len = dev_read_size(dev, "reg");
|
|
if (len < 0)
|
|
return len;
|
|
len /= sizeof(fdt32_t);
|
|
count = len / both_len;
|
|
if (!count)
|
|
return -EINVAL;
|
|
|
|
map = regmap_alloc_count(count);
|
|
if (!map)
|
|
return -ENOMEM;
|
|
|
|
for (range = map->range, index = 0; count > 0;
|
|
count--, range++, index++) {
|
|
fdt_size_t sz;
|
|
if (of_live_active()) {
|
|
of_address_to_resource(ofnode_to_np(node), index, &r);
|
|
range->start = r.start;
|
|
range->size = r.end - r.start + 1;
|
|
} else {
|
|
range->start = fdtdec_get_addr_size_fixed(gd->fdt_blob,
|
|
dev_of_offset(dev), "reg", index,
|
|
addr_len, size_len, &sz, true);
|
|
range->size = sz;
|
|
}
|
|
}
|
|
map->base = map->range[0].start;
|
|
|
|
*mapp = map;
|
|
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
void *regmap_get_range(struct regmap *map, unsigned int range_num)
|
|
{
|
|
struct regmap_range *range;
|
|
|
|
if (range_num >= map->range_count)
|
|
return NULL;
|
|
range = &map->range[range_num];
|
|
|
|
return map_sysmem(range->start, range->size);
|
|
}
|
|
|
|
int regmap_uninit(struct regmap *map)
|
|
{
|
|
if (map->range_count > 1)
|
|
free(map->range);
|
|
free(map);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int regmap_read(struct regmap *map, uint offset, uint *valp)
|
|
{
|
|
uint32_t *ptr = map_physmem(map->base + offset, 4, MAP_NOCACHE);
|
|
|
|
*valp = le32_to_cpu(readl(ptr));
|
|
|
|
return 0;
|
|
}
|
|
|
|
int regmap_write(struct regmap *map, uint offset, uint val)
|
|
{
|
|
uint32_t *ptr = map_physmem(map->base + offset, 4, MAP_NOCACHE);
|
|
|
|
writel(cpu_to_le32(val), ptr);
|
|
|
|
return 0;
|
|
}
|